Update D8 and R8 to 3.3.2-dev am: 313215827c am: c459fca143 am: cee5424697

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

Change-Id: Id328ba69478f3b9830ddc513eecd1ee1cc6a3781
diff --git a/r8.jar b/r8.jar
index ce0592d..5ead4d9 100644
--- a/r8.jar
+++ b/r8.jar
Binary files differ
diff --git a/r8.jar.map b/r8.jar.map
index e85bb30..9a40169 100644
--- a/r8.jar.map
+++ b/r8.jar.map
@@ -1,10 +1,10 @@
 # compiler: R8
-# compiler_version: 3.3.1-dev
+# compiler_version: 3.3.2-dev
 # compiler_hash: engineering
 # common_typos_disable
 # {"id":"com.android.tools.r8.mapping","version":"2.0"}
-# pg_map_id: 3.3.1-dev
-# pg_map_hash: SHA-256 7b37125f8fe1e91fc2280491da4d7df521fbdfbc102bf2b3d142a6c8415dc28c
+# pg_map_id: 3.3.2-dev
+# pg_map_hash: SHA-256 b4c59b1b2059c7bee701733d6cc83adb5faacd5ece81a9630696b28eedc67bf6
 com.android.tools.r8.ApiLevelException -> com.android.tools.r8.internal.b2:
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():10:10 -> <clinit>
@@ -170,7 +170,7 @@
     93:109:void run(com.android.tools.r8.BackportedMethodListCommand):84:100 -> run
     113:113:void run(java.lang.String[]):105:105 -> run
 com.android.tools.r8.BackportedMethodListCommand -> com.android.tools.r8.BackportedMethodListCommand:
-    com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfiguration desugaredLibraryConfiguration -> e
+    com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification desugaredLibrarySpecification -> e
     com.android.tools.r8.graph.DexItemFactory factory -> h
     com.android.tools.r8.StringConsumer backportedMethodListConsumer -> g
     int minApiLevel -> d
@@ -178,10 +178,10 @@
     boolean printVersion -> b
     com.android.tools.r8.utils.AndroidApp app -> f
     com.android.tools.r8.utils.Reporter reporter -> c
-    1:1:void <init>(com.android.tools.r8.utils.Reporter,int,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfiguration,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.StringConsumer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.BackportedMethodListCommand$1):38:38 -> <init>
+    1:1:void <init>(com.android.tools.r8.utils.Reporter,int,com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.StringConsumer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.BackportedMethodListCommand$1):38:38 -> <init>
     2:2:void <init>(boolean,boolean,com.android.tools.r8.BackportedMethodListCommand$1):38:38 -> <init>
     3:11:void <init>(boolean,boolean):77:85 -> <init>
-    12:20:void <init>(com.android.tools.r8.utils.Reporter,int,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfiguration,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.StringConsumer,com.android.tools.r8.graph.DexItemFactory):94:102 -> <init>
+    12:20:void <init>(com.android.tools.r8.utils.Reporter,int,com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.StringConsumer,com.android.tools.r8.graph.DexItemFactory):94:102 -> <init>
     1:1:com.android.tools.r8.utils.AndroidApp getInputApp():74:74 -> a
     1:1:com.android.tools.r8.utils.InternalOptions getInternalOptions():106:106 -> b
     2:2:com.android.tools.r8.utils.Reporter getReporter():58:58 -> b
@@ -191,7 +191,7 @@
     2:2:com.android.tools.r8.BackportedMethodListCommand$Builder builder(com.android.tools.r8.DiagnosticsHandler):117:117 -> builder
     1:1:com.android.tools.r8.utils.Reporter getReporter():58:58 -> c
     1:1:com.android.tools.r8.StringConsumer getBackportedMethodListConsumer():70:70 -> getBackportedMethodListConsumer
-    1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfiguration getDesugaredLibraryConfiguration():66:66 -> getDesugaredLibraryConfiguration
+    1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification getDesugaredLibraryConfiguration():66:66 -> getDesugaredLibraryConfiguration
     1:1:int getMinApiLevel():62:62 -> getMinApiLevel
     1:1:boolean isPrintHelp():50:50 -> isPrintHelp
     1:1:boolean isPrintVersion():54:54 -> isPrintVersion
@@ -251,7 +251,7 @@
     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 desugaredLibraryConfigurationResources -> c
+    java.util.List desugaredLibrarySpecificationResources -> c
     com.android.tools.r8.utils.AndroidApp$Builder app -> d
     boolean printHelp -> f
     com.android.tools.r8.StringConsumer backportedMethodListConsumer -> e
@@ -273,7 +273,7 @@
     2:3:com.android.tools.r8.BackportedMethodListCommand$Builder addLibraryFiles(java.util.Collection):242:243 -> addLibraryFiles
     1:1:com.android.tools.r8.BackportedMethodListCommand$Builder addLibraryResourceProvider(com.android.tools.r8.ClassFileResourceProvider):230:230 -> addLibraryResourceProvider
     1:25:com.android.tools.r8.BackportedMethodListCommand build():308:332 -> build
-    26:36:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfiguration getDesugaredLibraryConfiguration(com.android.tools.r8.graph.DexItemFactory):249:259 -> build
+    26:36:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification getDesugaredLibraryConfiguration(com.android.tools.r8.graph.DexItemFactory):249:259 -> build
     26:36:com.android.tools.r8.BackportedMethodListCommand build():335 -> build
     37:37:com.android.tools.r8.BackportedMethodListCommand build():335:335 -> build
     38:38:com.android.tools.r8.BackportedMethodListCommand build():316:316 -> build
@@ -446,7 +446,7 @@
     com.android.tools.r8.StringConsumer mainDexListConsumer -> g
     com.android.tools.r8.utils.InternalOptions$DesugarState desugarState -> m
     com.android.tools.r8.ProgramConsumer programConsumer -> f
-    java.util.List desugaredLibraryConfigurationResources -> n
+    java.util.List desugaredLibrarySpecificationResources -> n
     1:1:void <clinit>():213:213 -> <clinit>
     1:1:void <init>(com.android.tools.r8.DiagnosticsHandler):246:246 -> <init>
     2:32:void <init>(com.android.tools.r8.DiagnosticsHandler):217:247 -> <init>
@@ -456,14 +456,14 @@
     72:114:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.DiagnosticsHandler):217:259 -> <init>
     boolean lambda$new$0(java.lang.String,java.lang.Long) -> a
     1:33:com.android.tools.r8.InternalProgramOutputPathConsumer createProgramOutputConsumer(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):452:484 -> a
-    34:45:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfiguration getDesugaredLibraryConfiguration(com.android.tools.r8.graph.DexItemFactory,boolean):578:589 -> a
-    46:46:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfiguration getDesugaredLibraryConfiguration(com.android.tools.r8.graph.DexItemFactory,boolean):582:582 -> a
+    34:45:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification getDesugaredLibraryConfiguration(com.android.tools.r8.graph.DexItemFactory,boolean):578:589 -> a
+    46:46:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification getDesugaredLibraryConfiguration(com.android.tools.r8.graph.DexItemFactory,boolean):582:582 -> a
     47:47:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    47:47:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfiguration getDesugaredLibraryConfiguration(com.android.tools.r8.graph.DexItemFactory,boolean):582 -> a
+    47:47:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification getDesugaredLibraryConfiguration(com.android.tools.r8.graph.DexItemFactory,boolean):582 -> 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 com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    48:48:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfiguration getDesugaredLibraryConfiguration(com.android.tools.r8.graph.DexItemFactory,boolean):582 -> a
-    49:49:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfiguration getDesugaredLibraryConfiguration(com.android.tools.r8.graph.DexItemFactory,boolean):582:582 -> a
+    48:48:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification getDesugaredLibraryConfiguration(com.android.tools.r8.graph.DexItemFactory,boolean):582 -> a
+    49:49:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification getDesugaredLibraryConfiguration(com.android.tools.r8.graph.DexItemFactory,boolean):582:582 -> a
     50:54:com.android.tools.r8.BaseCompilerCommand$Builder setThreadCount(int):605:609 -> a
     1:2:com.android.tools.r8.BaseCompilerCommand$Builder addAssertionsConfiguration(java.util.function.Function):629:630 -> addAssertionsConfiguration
     3:3:com.android.tools.r8.AssertionsConfiguration$Builder com.android.tools.r8.AssertionsConfiguration.builder(com.android.tools.r8.utils.Reporter):56:56 -> addAssertionsConfiguration
@@ -668,91 +668,95 @@
     1:1:com.android.tools.r8.CompilationMode[] values():7:7 -> values
 com.android.tools.r8.D8 -> com.android.tools.r8.D8:
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():88:88 -> <clinit>
-    1:3:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):106:108 -> a
-    4:10:void run(java.lang.String[]):131:137 -> a
-    4:10:void lambda$main$2(java.lang.String[]):154 -> a
+    1:1:void <clinit>():85:85 -> <clinit>
+    1:3:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):103:105 -> a
+    4:10:void run(java.lang.String[]):128:134 -> a
+    4:10:void lambda$main$2(java.lang.String[]):151 -> a
     11:11:void lambda$main$2(java.lang.String[]):0:0 -> a
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":18,"2":19,"3":20}}
-    18:18:void run(java.lang.String[]):137:137 -> a
-    18:18:void lambda$main$2(java.lang.String[]):154 -> a
-    19:19:void run(java.lang.String[]):137:137 -> a
-    19:19:void lambda$main$2(java.lang.String[]):154 -> a
-    20:20:void run(java.lang.String[]):137:137 -> a
-    20:20:void lambda$main$2(java.lang.String[]):154 -> a
-    12:17:void run(java.lang.String[]):137:142 -> a
-    12:17:void lambda$main$2(java.lang.String[]):154 -> a
-    21:22:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):159:160 -> 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):174:179 -> a
-    29:29:java.lang.Boolean lambda$run$4(com.android.tools.r8.utils.InternalOptions):199:199 -> a
-    30:32:void lambda$run$5(com.android.tools.r8.graph.analysis.ClassInitializerAssertionEnablingAnalysis,com.android.tools.r8.graph.DexProgramClass):215:217 -> a
-    33:33:void lambda$run$6(java.lang.String):247:247 -> a
-    34:40:com.android.tools.r8.naming.ProguardMapSupplier finalizeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.naming.NamingLens):347:353 -> a
-    41: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):367:387 -> a
-    62:67:com.android.tools.r8.graph.DexApplication rewriteNonDexInputs(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.naming.NamingLens):384:389 -> a
-    68:68:void com.android.tools.r8.naming.signature.GenericSignatureRewriter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):31:31 -> a
-    68:68: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):389 -> a
-    69:89: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):390:410 -> a
-    90:90:com.android.tools.r8.graph.DexApplication com.android.tools.r8.graph.LazyLoadedDexApplication$Builder.build():219:219 -> a
-    90:90:com.android.tools.r8.graph.DexApplication rewriteNonDexInputs(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.naming.NamingLens):410 -> a
-    91:93:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):416:418 -> a
-    1:1:void lambda$run$1(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):126:126 -> b
-    1:3:void lambda$runForTesting$3(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):164:166 -> c
-    1:6:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):184:189 -> d
+    18:18:void run(java.lang.String[]):134:134 -> a
+    18:18:void lambda$main$2(java.lang.String[]):151 -> a
+    19:19:void run(java.lang.String[]):134:134 -> a
+    19:19:void lambda$main$2(java.lang.String[]):151 -> a
+    20:20:void run(java.lang.String[]):134:134 -> a
+    20:20:void lambda$main$2(java.lang.String[]):151 -> a
+    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
+    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
     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":780,"2":781,"3":782}}
-    780:780:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):189:189 -> d
-    781:781:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):189:189 -> d
-    782:782:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):189:189 -> d
-    196:197:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):189:190 -> d
-    198:198: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":783,"2":784,"3":785}}
-    783:783:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):190:190 -> d
-    784:784:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):190:190 -> d
-    785:785:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):190:190 -> d
-    388:389:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):190:191 -> d
-    390:390: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":786,"2":787,"3":788}}
-    786:786:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):191:191 -> d
-    787:787:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):191:191 -> d
-    788:788:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):191:191 -> d
-    581:589:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):191:199 -> d
-    590:590:boolean com.android.tools.r8.utils.AssertionUtils.forTesting(com.android.tools.r8.utils.InternalOptions,java.util.function.Supplier):17:17 -> d
-    590:590:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):199 -> d
-    591:605:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):199:213 -> d
-    606:662:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):212:268 -> d
-    663:666:com.android.tools.r8.naming.NamingLens com.android.tools.r8.naming.PrefixRewritingNamingLens.createPrefixRewritingNamingLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):30:33 -> d
-    663: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:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():471:471 -> d
-    668:668:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):271 -> d
-    669:671:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):273:275 -> d
-    672:672:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():487:487 -> d
-    672:672:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):276 -> d
-    673:694:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):276:297 -> d
-    695:707:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):291:303 -> d
-    708:712:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):300:304 -> d
-    713:714:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):280:281 -> d
-    715:715:void com.android.tools.r8.naming.signature.GenericSignatureRewriter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):31:31 -> d
-    715:715:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):281 -> d
-    716:748:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):282:314 -> d
-    749:772:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):313:336 -> d
-    773:773:java.lang.RuntimeException com.android.tools.r8.utils.ExceptionUtils.unwrapExecutionException(java.util.concurrent.ExecutionException):221:221 -> d
-    773:773:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):331 -> d
-    774:779:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):331:336 -> d
-    1:4:void main(java.lang.String[]):151:154 -> main
-    5:5:void main(java.lang.String[]):152:152 -> main
-    1:5:void run(com.android.tools.r8.D8Command):99:103 -> run
-    6:6:void run(com.android.tools.r8.D8Command):102:102 -> run
-    7:10:void run(com.android.tools.r8.D8Command,java.util.concurrent.ExecutorService):121:124 -> run
-    11:11:void run(com.android.tools.r8.D8Command,java.util.concurrent.ExecutorService):123:123 -> run
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":766,"2":767,"3":768}}
+    766:766:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):186:186 -> d
+    767:767:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):186:186 -> d
+    768:768: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
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":769,"2":770,"3":771}}
+    769:769:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):187:187 -> d
+    770:770:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):187:187 -> d
+    771:771: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
+    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):30:33 -> 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
+    659:659:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> d
+    659:659:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):268 -> d
+    660:660: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
+    660:660:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):269 -> d
+    661:661:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):270:270 -> d
+    662:662:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():489:489 -> d
+    662:662:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):271 -> d
+    663:684:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):271:292 -> d
+    685:697:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):286:298 -> d
+    698:702:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):295:299 -> d
+    703:704:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):275:276 -> d
+    705:705:void com.android.tools.r8.naming.signature.GenericSignatureRewriter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):31:31 -> d
+    705:705:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):276 -> d
+    706:738:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):277:309 -> d
+    739:741:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):308:310 -> d
+    742:742: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
+    742:742:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):312 -> d
+    743:758:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):314:329 -> d
+    759:759:java.lang.RuntimeException com.android.tools.r8.utils.ExceptionUtils.unwrapExecutionException(java.util.concurrent.ExecutionException):221:221 -> d
+    759:759:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):324 -> d
+    760:765:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):324:329 -> 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:
     java.util.List resources -> a
-    1:3:void <init>():433:435 -> <init>
-    1:3:void accept(int,com.android.tools.r8.ByteDataView,java.util.Set,com.android.tools.r8.DiagnosticsHandler):441:443 -> accept
-    4:4:void accept(int,com.android.tools.r8.ByteDataView,java.util.Set,com.android.tools.r8.DiagnosticsHandler):442:442 -> accept
-    5:5:void accept(int,com.android.tools.r8.ByteDataView,java.util.Set,com.android.tools.r8.DiagnosticsHandler):441:441 -> accept
-    1:1:java.util.Collection getProgramResources():448:448 -> getProgramResources
+    1:3:void <init>():419:421 -> <init>
+    1:3:void accept(int,com.android.tools.r8.ByteDataView,java.util.Set,com.android.tools.r8.DiagnosticsHandler):427:429 -> accept
+    4:4:void accept(int,com.android.tools.r8.ByteDataView,java.util.Set,com.android.tools.r8.DiagnosticsHandler):428:428 -> accept
+    5:5:void accept(int,com.android.tools.r8.ByteDataView,java.util.Set,com.android.tools.r8.DiagnosticsHandler):427:427 -> accept
+    1:1:java.util.Collection getProgramResources():434:434 -> getProgramResources
 com.android.tools.r8.D8Command -> com.android.tools.r8.D8Command:
     com.android.tools.r8.graph.DexItemFactory factory -> C
     boolean skipDump -> y
@@ -761,18 +765,18 @@
     boolean intermediate -> u
     com.android.tools.r8.StringConsumer desugaredLibraryKeepRuleConsumer -> w
     boolean $assertionsDisabled -> E
-    com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfiguration libraryConfiguration -> x
+    com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification desugaredLibrarySpecification -> x
     boolean minimalMainDex -> A
     com.android.tools.r8.com.google.common.collect.ImmutableList mainDexKeepRules -> B
     java.lang.String USAGE_MESSAGE -> D
     1:271:void <clinit>():56:326 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.CompilationMode,com.android.tools.r8.ProgramConsumer,com.android.tools.r8.StringConsumer,int,com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.InternalOptions$DesugarState,boolean,boolean,boolean,java.util.function.BiPredicate,com.android.tools.r8.DesugarGraphConsumer,com.android.tools.r8.StringConsumer,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfiguration,java.util.List,java.util.List,java.lang.String,boolean,boolean,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList,int,com.android.tools.r8.utils.DumpInputFlags,com.android.tools.r8.MapIdProvider,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.D8Command$1):57:57 -> <init>
+    1:1:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.CompilationMode,com.android.tools.r8.ProgramConsumer,com.android.tools.r8.StringConsumer,int,com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.InternalOptions$DesugarState,boolean,boolean,boolean,java.util.function.BiPredicate,com.android.tools.r8.DesugarGraphConsumer,com.android.tools.r8.StringConsumer,com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification,java.util.List,java.util.List,java.lang.String,boolean,boolean,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList,int,com.android.tools.r8.utils.DumpInputFlags,com.android.tools.r8.MapIdProvider,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.D8Command$1):57:57 -> <init>
     2:2:void <init>(boolean,boolean,com.android.tools.r8.D8Command$1):57:57 -> <init>
-    3:29:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.CompilationMode,com.android.tools.r8.ProgramConsumer,com.android.tools.r8.StringConsumer,int,com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.InternalOptions$DesugarState,boolean,boolean,boolean,java.util.function.BiPredicate,com.android.tools.r8.DesugarGraphConsumer,com.android.tools.r8.StringConsumer,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfiguration,java.util.List,java.util.List,java.lang.String,boolean,boolean,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList,int,com.android.tools.r8.utils.DumpInputFlags,com.android.tools.r8.MapIdProvider,com.android.tools.r8.graph.DexItemFactory):405:431 -> <init>
+    3:29:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.CompilationMode,com.android.tools.r8.ProgramConsumer,com.android.tools.r8.StringConsumer,int,com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.InternalOptions$DesugarState,boolean,boolean,boolean,java.util.function.BiPredicate,com.android.tools.r8.DesugarGraphConsumer,com.android.tools.r8.StringConsumer,com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification,java.util.List,java.util.List,java.lang.String,boolean,boolean,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList,int,com.android.tools.r8.utils.DumpInputFlags,com.android.tools.r8.MapIdProvider,com.android.tools.r8.graph.DexItemFactory):405:431 -> <init>
     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():471:471 -> b
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> 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
@@ -953,7 +957,7 @@
     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.yd:
+com.android.tools.r8.DataEntryResource$ByteDataEntryResource -> com.android.tools.r8.internal.Ad:
     byte[] bytes -> a
     com.android.tools.r8.origin.Origin origin -> c
     java.lang.String name -> b
@@ -971,7 +975,7 @@
     1:3:java.io.InputStream getByteStream():134:136 -> getByteStream
     1:1:java.lang.String getName():128:128 -> getName
     1:1:com.android.tools.r8.origin.Origin getOrigin():123:123 -> getOrigin
-com.android.tools.r8.DataEntryResource$NestedDataEntryResource -> com.android.tools.r8.internal.zd:
+com.android.tools.r8.DataEntryResource$NestedDataEntryResource -> com.android.tools.r8.internal.Bd:
     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>
@@ -999,24 +1003,24 @@
     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:43:void runInternal(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):96:120 -> a
-    44:44:java.lang.RuntimeException com.android.tools.r8.utils.ExceptionUtils.unwrapExecutionException(java.util.concurrent.ExecutionException):221:221 -> a
-    44:44:void runInternal(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):115 -> a
-    45:50:void runInternal(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):115:120 -> a
-    51:51:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():761:761 -> a
-    51:51:com.android.tools.r8.graph.DexProgramClass keepFirstProgramClassConflictResolver(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):41 -> 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)"]}
-    52:52:com.android.tools.r8.graph.DexProgramClass keepFirstProgramClassConflictResolver(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):41:41 -> a
-    53:53:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():761:761 -> a
-    53:53:com.android.tools.r8.graph.DexProgramClass keepFirstProgramClassConflictResolver(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):42 -> a
+    51:51:com.android.tools.r8.graph.DexProgramClass keepFirstProgramClassConflictResolver(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):41:41 -> a
+    52:52:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():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)"]}
-    54:71:com.android.tools.r8.graph.DexProgramClass keepFirstProgramClassConflictResolver(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):42:59 -> a
-    72:72: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":130,"2":131,"3":132}}
+    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):46:46 -> a
-    132:132:com.android.tools.r8.graph.DexProgramClass keepFirstProgramClassConflictResolver(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):47:47 -> a
-    121:129:com.android.tools.r8.graph.DexProgramClass keepFirstProgramClassConflictResolver(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):49:57 -> 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
 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
@@ -1173,16 +1177,16 @@
     1:1:void <clinit>():41:41 -> <clinit>
     1:1:void <init>():42:42 -> <init>
     1:1:void lambda$run$0(com.android.tools.r8.D8Command,com.android.tools.r8.utils.FeatureClassMapping,java.lang.String,java.lang.String,java.util.concurrent.ExecutorService):51:51 -> a
-    2:12:java.util.Map getDistribution(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.FeatureClassMapping,com.android.tools.r8.naming.ClassNameMapper):139:149 -> a
+    2:12:java.util.Map getDistribution(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.FeatureClassMapping,com.android.tools.r8.naming.ClassNameMapper):138:148 -> a
     1:4:void run(com.android.tools.r8.D8Command,com.android.tools.r8.utils.FeatureClassMapping,java.lang.String,java.lang.String):47:50 -> run
     5:9:void run(com.android.tools.r8.D8Command,com.android.tools.r8.utils.FeatureClassMapping,java.lang.String,java.lang.String):49:53 -> run
-    10:71:void run(com.android.tools.r8.D8Command,com.android.tools.r8.utils.FeatureClassMapping,java.lang.String,java.lang.String,java.util.concurrent.ExecutorService):64:125 -> run
-    72:81:void run(com.android.tools.r8.D8Command,com.android.tools.r8.utils.FeatureClassMapping,java.lang.String,java.lang.String,java.util.concurrent.ExecutorService):123:132 -> run
-    82:84:void run(com.android.tools.r8.D8Command,com.android.tools.r8.utils.FeatureClassMapping,java.lang.String,java.lang.String,java.util.concurrent.ExecutorService):130:132 -> run
-    85:85:java.lang.RuntimeException com.android.tools.r8.utils.ExceptionUtils.unwrapExecutionException(java.util.concurrent.ExecutionException):221:221 -> run
-    85:85:void run(com.android.tools.r8.D8Command,com.android.tools.r8.utils.FeatureClassMapping,java.lang.String,java.lang.String,java.util.concurrent.ExecutorService):128 -> run
-    86:90:void run(com.android.tools.r8.D8Command,com.android.tools.r8.utils.FeatureClassMapping,java.lang.String,java.lang.String,java.util.concurrent.ExecutorService):128:132 -> run
-    1:3:void runD8ForTesting(com.android.tools.r8.D8Command,boolean):156:158 -> runD8ForTesting
+    10:70:void run(com.android.tools.r8.D8Command,com.android.tools.r8.utils.FeatureClassMapping,java.lang.String,java.lang.String,java.util.concurrent.ExecutorService):64:124 -> run
+    71:80:void run(com.android.tools.r8.D8Command,com.android.tools.r8.utils.FeatureClassMapping,java.lang.String,java.lang.String,java.util.concurrent.ExecutorService):122:131 -> run
+    81:83:void run(com.android.tools.r8.D8Command,com.android.tools.r8.utils.FeatureClassMapping,java.lang.String,java.lang.String,java.util.concurrent.ExecutorService):129:131 -> run
+    84:84:java.lang.RuntimeException com.android.tools.r8.utils.ExceptionUtils.unwrapExecutionException(java.util.concurrent.ExecutionException):221:221 -> run
+    84:84:void run(com.android.tools.r8.D8Command,com.android.tools.r8.utils.FeatureClassMapping,java.lang.String,java.lang.String,java.util.concurrent.ExecutorService):127 -> run
+    85:89:void run(com.android.tools.r8.D8Command,com.android.tools.r8.utils.FeatureClassMapping,java.lang.String,java.lang.String,java.util.concurrent.ExecutorService):127:131 -> run
+    1:3:void runD8ForTesting(com.android.tools.r8.D8Command,boolean):155:157 -> runD8ForTesting
 com.android.tools.r8.DiagnosticsHandler -> com.android.tools.r8.DiagnosticsHandler:
     1:1:void error(com.android.tools.r8.Diagnostic):38:38 -> error
     1:1:void info(com.android.tools.r8.Diagnostic):56:56 -> info
@@ -1266,12 +1270,12 @@
     java.util.Optional minification -> j
     com.android.tools.r8.features.FeatureSplitConfiguration featureSplitConfiguration -> m
     com.android.tools.r8.shaking.ProguardConfiguration proguardConfiguration -> n
+    com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification desugaredLibrarySpecification -> l
     com.android.tools.r8.CompilationMode compilationMode -> b
     com.android.tools.r8.utils.InternalOptions$DesugarState desugarState -> f
     boolean optimizeMultidexForLinearAlloc -> d
-    com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfiguration desugaredLibraryConfiguration -> l
-    1:1:void <init>(com.android.tools.r8.dex.Marker$Tool,com.android.tools.r8.CompilationMode,int,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfiguration,boolean,int,com.android.tools.r8.utils.InternalOptions$DesugarState,java.util.Optional,java.util.Optional,java.util.Optional,java.util.Optional,java.util.Optional,com.android.tools.r8.features.FeatureSplitConfiguration,com.android.tools.r8.shaking.ProguardConfiguration,java.util.List,boolean,com.android.tools.r8.DumpOptions$1):19:19 -> <init>
-    2:18:void <init>(com.android.tools.r8.dex.Marker$Tool,com.android.tools.r8.CompilationMode,int,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfiguration,boolean,int,com.android.tools.r8.utils.InternalOptions$DesugarState,java.util.Optional,java.util.Optional,java.util.Optional,java.util.Optional,java.util.Optional,com.android.tools.r8.features.FeatureSplitConfiguration,com.android.tools.r8.shaking.ProguardConfiguration,java.util.List,boolean):77:93 -> <init>
+    1:1:void <init>(com.android.tools.r8.dex.Marker$Tool,com.android.tools.r8.CompilationMode,int,com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification,boolean,int,com.android.tools.r8.utils.InternalOptions$DesugarState,java.util.Optional,java.util.Optional,java.util.Optional,java.util.Optional,java.util.Optional,com.android.tools.r8.features.FeatureSplitConfiguration,com.android.tools.r8.shaking.ProguardConfiguration,java.util.List,boolean,com.android.tools.r8.DumpOptions$1):19:19 -> <init>
+    2:18:void <init>(com.android.tools.r8.dex.Marker$Tool,com.android.tools.r8.CompilationMode,int,com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification,boolean,int,com.android.tools.r8.utils.InternalOptions$DesugarState,java.util.Optional,java.util.Optional,java.util.Optional,java.util.Optional,java.util.Optional,com.android.tools.r8.features.FeatureSplitConfiguration,com.android.tools.r8.shaking.ProguardConfiguration,java.util.List,boolean):77:93 -> <init>
     1:3:void lambda$dumpOptions$0(java.lang.StringBuilder,java.lang.String):119:121 -> a
     4:4:void addDumpEntry(java.lang.StringBuilder,java.lang.String,java.lang.Object):132:132 -> a
     4:4:void lambda$dumpOptions$0(java.lang.StringBuilder,java.lang.String):121 -> a
@@ -1319,15 +1323,15 @@
     java.util.Optional minification -> j
     com.android.tools.r8.features.FeatureSplitConfiguration featureSplitConfiguration -> m
     com.android.tools.r8.shaking.ProguardConfiguration proguardConfiguration -> n
+    com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification desugaredLibrarySpecification -> l
     com.android.tools.r8.CompilationMode compilationMode -> b
     com.android.tools.r8.utils.InternalOptions$DesugarState desugarState -> f
     boolean optimizeMultidexForLinearAlloc -> d
-    com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfiguration desugaredLibraryConfiguration -> l
     1:1:void <init>(com.android.tools.r8.dex.Marker$Tool):197:197 -> <init>
     2:17:void <init>(com.android.tools.r8.dex.Marker$Tool):183:198 -> <init>
     1:1:com.android.tools.r8.DumpOptions$Builder setCompilationMode(com.android.tools.r8.CompilationMode):202:202 -> a
     2:2:com.android.tools.r8.DumpOptions$Builder setMinApi(int):207:207 -> a
-    3:3:com.android.tools.r8.DumpOptions$Builder setDesugaredLibraryConfiguration(com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfiguration):213:213 -> a
+    3:3:com.android.tools.r8.DumpOptions$Builder setDesugaredLibraryConfiguration(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification):213:213 -> a
     4:4:com.android.tools.r8.DumpOptions$Builder setDesugarState(com.android.tools.r8.utils.InternalOptions$DesugarState):228:228 -> a
     5:5:com.android.tools.r8.DumpOptions$Builder setIncludeDataResources(java.util.Optional):238:238 -> a
     6:6:com.android.tools.r8.DumpOptions$Builder setForceProguardCompatibility(boolean):243:243 -> a
@@ -1489,8 +1493,8 @@
 com.android.tools.r8.GenerateLintFiles -> com.android.tools.r8.P:
     java.nio.file.Path desugaredLibraryImplementation -> e
     java.util.Set parallelMethods -> g
+    com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification desugaredLibrarySpecification -> d
     com.android.tools.r8.utils.InternalOptions options -> c
-    com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfiguration desugaredLibraryConfiguration -> d
     java.nio.file.Path outputDirectory -> f
     boolean $assertionsDisabled -> h
     com.android.tools.r8.utils.Reporter reporter -> b
@@ -1511,7 +1515,7 @@
     148:148:void <init>(java.lang.String,java.lang.String,java.lang.String):90:90 -> <init>
     149:149:void <init>(java.lang.String,java.lang.String,java.lang.String):90:90 -> <init>
     143:143:void <init>(java.lang.String,java.lang.String,java.lang.String):90:90 -> <init>
-    1:3:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfiguration readDesugaredLibraryConfiguration(java.lang.String):124:126 -> a
+    1:3:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification readDesugaredLibraryConfiguration(java.lang.String):124:126 -> a
     4:14:void addMethodsToHeaderJar(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.graph.DexClass,java.util.List):142:152 -> a
     15:22:com.android.tools.r8.graph.CfCode buildEmptyThrowingCfCode(com.android.tools.r8.graph.DexMethod):130:137 -> a
     15:22:void addMethodsToHeaderJar(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.graph.DexClass,java.util.List):152 -> a
@@ -1557,185 +1561,185 @@
     709:709:java.nio.file.Path lintFile(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,java.lang.String):307:307 -> a
     710:710:java.nio.file.Path lintFile(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,java.lang.String):304:304 -> a
     717:746:void writeLintFiles(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.GenerateLintFiles$SupportedMethods):317:346 -> a
-    747:763:void writeLintFiles(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.GenerateLintFiles$SupportedMethods):345:361 -> a
-    764:776: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):322:334 -> a
-    777:777:java.lang.String com.android.tools.r8.graph.DexProto.toDescriptorString():118:118 -> a
-    777:777: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):334 -> a
-    778:778: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):334:334 -> a
-    779:789: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):330:340 -> a
-    790:803:void generateLintFiles(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate,java.util.function.BiPredicate):369:382 -> a
-    804:804:boolean lambda$generateLintFiles$4(java.util.function.BiPredicate,com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.graph.DexEncodedMethod):379:379 -> a
-    805:805:void run(int):397:397 -> a
-    806:806:void run(int):396:396 -> a
-    807:807:boolean lambda$run$5(com.android.tools.r8.utils.AndroidApiLevel):398:398 -> a
-    808:813:boolean lambda$run$6(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.graph.DexEncodedMethod):400:405 -> a
-    814:814:com.android.tools.r8.GenerateLintFiles$SourceBuilder com.android.tools.r8.GenerateLintFiles$SourceBuilder.addField(com.android.tools.r8.graph.DexEncodedField):461:461 -> 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):439 -> a
-    814:814:void lambda$generateClassHTML$8(com.android.tools.r8.GenerateLintFiles$SourceBuilder,com.android.tools.r8.graph.DexEncodedField):752 -> a
-    815:829:void generateClassHTML(java.io.PrintStream,com.android.tools.r8.graph.DexClass,boolean,java.util.function.Predicate,java.util.function.Predicate):747:761 -> a
-    830:830:boolean lambda$generateClassHTML$7(com.android.tools.r8.graph.DexEncodedField):750:750 -> a
-    831:832:boolean lambda$generateClassHTML$9(com.android.tools.r8.graph.DexEncodedMethod):757:758 -> a
-    833:833:void lambda$generateClassHTML$10(com.android.tools.r8.GenerateLintFiles$SourceBuilder,com.android.tools.r8.graph.DexEncodedMethod):760:760 -> a
-    834:834: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):439:439 -> a
-    834:834:void lambda$generateClassHTML$10(com.android.tools.r8.GenerateLintFiles$SourceBuilder,com.android.tools.r8.graph.DexEncodedMethod):760 -> a
-    835:839:com.android.tools.r8.GenerateLintFiles$SourceBuilder com.android.tools.r8.GenerateLintFiles$SourceBuilder.addMethod(com.android.tools.r8.graph.DexEncodedMethod):466:470 -> a
-    835:839: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):439 -> a
-    835:839:void lambda$generateClassHTML$10(com.android.tools.r8.GenerateLintFiles$SourceBuilder,com.android.tools.r8.graph.DexEncodedMethod):760 -> a
-    840:851:void generateDesugaredLibraryApisDocumetation():765:776 -> a
-    852:852:void lambda$generateDesugaredLibraryApisDocumetation$15(java.io.PrintStream,com.android.tools.r8.graph.DexClass):770:770 -> a
-    853:853:boolean lambda$generateDesugaredLibraryApisDocumetation$16(com.android.tools.r8.GenerateLintFiles$SupportedMethods,com.android.tools.r8.graph.DexClass):774:774 -> a
-    854:854:void lambda$generateDesugaredLibraryApisDocumetation$20(java.io.PrintStream,com.android.tools.r8.GenerateLintFiles$SupportedMethods,com.android.tools.r8.graph.DexClass):778:778 -> a
-    855:855:boolean lambda$generateDesugaredLibraryApisDocumetation$19(com.android.tools.r8.GenerateLintFiles$SupportedMethods,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):783:783 -> a
-    856:857:void main(java.lang.String[]):787:788 -> a
-    858:862:void run():387:391 -> a
-    858:862:void main(java.lang.String[]):788 -> a
-    863:868:void main(java.lang.String[]):791:796 -> a
+    747:762:void writeLintFiles(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.GenerateLintFiles$SupportedMethods):345:360 -> a
+    763:775: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):322:334 -> a
+    776:776:java.lang.String com.android.tools.r8.graph.DexProto.toDescriptorString():118:118 -> a
+    776:776: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):334 -> a
+    777:777: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):334:334 -> a
+    778:788: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):330:340 -> a
+    789:802:void generateLintFiles(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate,java.util.function.BiPredicate):368:381 -> a
+    803:803:boolean lambda$generateLintFiles$4(java.util.function.BiPredicate,com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.graph.DexEncodedMethod):378:378 -> a
+    804:804:void run(int):396:396 -> a
+    805:805:void run(int):395:395 -> a
+    806:806:boolean lambda$run$5(com.android.tools.r8.utils.AndroidApiLevel):397:397 -> a
+    807:812:boolean lambda$run$6(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.graph.DexEncodedMethod):399:404 -> a
+    813:813:com.android.tools.r8.GenerateLintFiles$SourceBuilder com.android.tools.r8.GenerateLintFiles$SourceBuilder.addField(com.android.tools.r8.graph.DexEncodedField):460:460 -> 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):438 -> a
+    813:813:void lambda$generateClassHTML$8(com.android.tools.r8.GenerateLintFiles$SourceBuilder,com.android.tools.r8.graph.DexEncodedField):751 -> a
+    814:828:void generateClassHTML(java.io.PrintStream,com.android.tools.r8.graph.DexClass,boolean,java.util.function.Predicate,java.util.function.Predicate):746:760 -> a
+    829:829:boolean lambda$generateClassHTML$7(com.android.tools.r8.graph.DexEncodedField):749:749 -> a
+    830:831:boolean lambda$generateClassHTML$9(com.android.tools.r8.graph.DexEncodedMethod):756:757 -> a
+    832:832:void lambda$generateClassHTML$10(com.android.tools.r8.GenerateLintFiles$SourceBuilder,com.android.tools.r8.graph.DexEncodedMethod):759:759 -> a
+    833:833: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):438:438 -> a
+    833:833:void lambda$generateClassHTML$10(com.android.tools.r8.GenerateLintFiles$SourceBuilder,com.android.tools.r8.graph.DexEncodedMethod):759 -> a
+    834:838:com.android.tools.r8.GenerateLintFiles$SourceBuilder com.android.tools.r8.GenerateLintFiles$SourceBuilder.addMethod(com.android.tools.r8.graph.DexEncodedMethod):465:469 -> a
+    834:838: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):438 -> a
+    834:838:void lambda$generateClassHTML$10(com.android.tools.r8.GenerateLintFiles$SourceBuilder,com.android.tools.r8.graph.DexEncodedMethod):759 -> a
+    839:850:void generateDesugaredLibraryApisDocumetation():764:775 -> a
+    851:851:void lambda$generateDesugaredLibraryApisDocumetation$15(java.io.PrintStream,com.android.tools.r8.graph.DexClass):769:769 -> a
+    852:852:boolean lambda$generateDesugaredLibraryApisDocumetation$16(com.android.tools.r8.GenerateLintFiles$SupportedMethods,com.android.tools.r8.graph.DexClass):773:773 -> a
+    853:853:void lambda$generateDesugaredLibraryApisDocumetation$20(java.io.PrintStream,com.android.tools.r8.GenerateLintFiles$SupportedMethods,com.android.tools.r8.graph.DexClass):777:777 -> a
+    854:854:boolean lambda$generateDesugaredLibraryApisDocumetation$19(com.android.tools.r8.GenerateLintFiles$SupportedMethods,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):782:782 -> a
+    855:856:void main(java.lang.String[]):786:787 -> a
+    857:861:void run():386:390 -> a
+    857:861:void main(java.lang.String[]):787 -> a
+    862:867:void main(java.lang.String[]):790:795 -> 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):271:271 -> b
     boolean lambda$generateDesugaredLibraryApisDocumetation$14(com.android.tools.r8.graph.DexEncodedMethod) -> c
     boolean lambda$generateDesugaredLibraryApisDocumetation$18(com.android.tools.r8.graph.DexEncodedField) -> c
     1:1:java.util.List lambda$collectSupportedMethods$2(com.android.tools.r8.graph.DexClass):285:285 -> c
-    1:1:java.lang.String lambda$generateDesugaredLibraryApisDocumetation$12(com.android.tools.r8.graph.DexClass):769:769 -> d
-    1:1:java.lang.String lambda$generateDesugaredLibraryApisDocumetation$17(com.android.tools.r8.graph.DexClass):775:775 -> e
+    1:1:java.lang.String lambda$generateDesugaredLibraryApisDocumetation$12(com.android.tools.r8.graph.DexClass):768:768 -> d
+    1:1:java.lang.String lambda$generateDesugaredLibraryApisDocumetation$17(com.android.tools.r8.graph.DexClass):774:774 -> e
 com.android.tools.r8.GenerateLintFiles$1 -> com.android.tools.r8.K:
 com.android.tools.r8.GenerateLintFiles$HTMLBuilder -> com.android.tools.r8.L:
     java.lang.String indent -> d
-    1:2:void <init>():616:617 -> <init>
-    3:3:void <init>(com.android.tools.r8.GenerateLintFiles$1):616:616 -> <init>
+    1:2:void <init>():615:616 -> <init>
+    3:3:void <init>(com.android.tools.r8.GenerateLintFiles$1):615:615 -> <init>
     1:1:com.android.tools.r8.GenerateLintFiles$HTMLBuilder appendLiCode(java.lang.String):0:0 -> b
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":642,"2":643,"3":644,"4":645,"5":646,"6":647}}
-    642:642:com.android.tools.r8.GenerateLintFiles$HTMLBuilder appendLiCode(java.lang.String):640:640 -> b
-    643:643:com.android.tools.r8.GenerateLintFiles$HTMLBuilder appendLiCode(java.lang.String):640:640 -> b
-    644:644:com.android.tools.r8.GenerateLintFiles$HTMLBuilder appendLiCode(java.lang.String):640:640 -> b
-    645:645:com.android.tools.r8.GenerateLintFiles$HTMLBuilder appendLiCode(java.lang.String):640:640 -> b
-    646:646:com.android.tools.r8.GenerateLintFiles$HTMLBuilder appendLiCode(java.lang.String):640:640 -> b
-    647:647:com.android.tools.r8.GenerateLintFiles$HTMLBuilder appendLiCode(java.lang.String):640:640 -> b
-    641:641:com.android.tools.r8.GenerateLintFiles$HTMLBuilder appendLiCode(java.lang.String):640:640 -> b
-    1:1:void decreaseIndent():625:625 -> c
-    1:1:com.android.tools.r8.GenerateLintFiles$HTMLBuilder end(java.lang.String):651 -> c
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":641,"2":642,"3":643,"4":644,"5":645,"6":646}}
+    641:641:com.android.tools.r8.GenerateLintFiles$HTMLBuilder appendLiCode(java.lang.String):639:639 -> b
+    642:642:com.android.tools.r8.GenerateLintFiles$HTMLBuilder appendLiCode(java.lang.String):639:639 -> b
+    643:643:com.android.tools.r8.GenerateLintFiles$HTMLBuilder appendLiCode(java.lang.String):639:639 -> b
+    644:644:com.android.tools.r8.GenerateLintFiles$HTMLBuilder appendLiCode(java.lang.String):639:639 -> b
+    645:645:com.android.tools.r8.GenerateLintFiles$HTMLBuilder appendLiCode(java.lang.String):639:639 -> b
+    646:646:com.android.tools.r8.GenerateLintFiles$HTMLBuilder appendLiCode(java.lang.String):639:639 -> b
+    640:640:com.android.tools.r8.GenerateLintFiles$HTMLBuilder appendLiCode(java.lang.String):639:639 -> b
+    1:1:void decreaseIndent():624:624 -> c
+    1:1:com.android.tools.r8.GenerateLintFiles$HTMLBuilder end(java.lang.String):650 -> c
     2:2:com.android.tools.r8.GenerateLintFiles$HTMLBuilder end(java.lang.String):0:0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":658,"3":659}}
-    658:658:void decreaseIndent():625:625 -> c
-    658:658:com.android.tools.r8.GenerateLintFiles$HTMLBuilder end(java.lang.String):651 -> c
-    659:659:void decreaseIndent():625:625 -> c
-    659:659:com.android.tools.r8.GenerateLintFiles$HTMLBuilder end(java.lang.String):651 -> c
-    3:3:void decreaseIndent():625:625 -> c
-    3:3:com.android.tools.r8.GenerateLintFiles$HTMLBuilder end(java.lang.String):651 -> c
-    4:4:com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent.indent(java.lang.String):417:417 -> c
-    4:4:void decreaseIndent():626 -> c
-    4:4:com.android.tools.r8.GenerateLintFiles$HTMLBuilder end(java.lang.String):651 -> c
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":657,"3":658}}
+    657:657:void decreaseIndent():624:624 -> c
+    657:657:com.android.tools.r8.GenerateLintFiles$HTMLBuilder end(java.lang.String):650 -> c
+    658:658:void decreaseIndent():624:624 -> c
+    658:658:com.android.tools.r8.GenerateLintFiles$HTMLBuilder end(java.lang.String):650 -> c
+    3:3:void decreaseIndent():624:624 -> c
+    3:3:com.android.tools.r8.GenerateLintFiles$HTMLBuilder end(java.lang.String):650 -> c
+    4:4:com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent.indent(java.lang.String):416:416 -> c
+    4:4:void decreaseIndent():625 -> c
+    4:4:com.android.tools.r8.GenerateLintFiles$HTMLBuilder end(java.lang.String):650 -> c
     5:5:com.android.tools.r8.GenerateLintFiles$HTMLBuilder end(java.lang.String):0:0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":660,"2":661,"3":662,"4":663,"5":664,"6":665}}
-    660:660:com.android.tools.r8.GenerateLintFiles$HTMLBuilder end(java.lang.String):652:652 -> c
-    661:661:com.android.tools.r8.GenerateLintFiles$HTMLBuilder end(java.lang.String):652:652 -> c
-    662:662:com.android.tools.r8.GenerateLintFiles$HTMLBuilder end(java.lang.String):652:652 -> c
-    663:663:com.android.tools.r8.GenerateLintFiles$HTMLBuilder end(java.lang.String):652:652 -> c
-    664:664:com.android.tools.r8.GenerateLintFiles$HTMLBuilder end(java.lang.String):652:652 -> c
-    665:665:com.android.tools.r8.GenerateLintFiles$HTMLBuilder end(java.lang.String):652:652 -> c
-    657:657:com.android.tools.r8.GenerateLintFiles$HTMLBuilder end(java.lang.String):652:652 -> c
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":659,"2":660,"3":661,"4":662,"5":663,"6":664}}
+    659:659:com.android.tools.r8.GenerateLintFiles$HTMLBuilder end(java.lang.String):651:651 -> c
+    660:660:com.android.tools.r8.GenerateLintFiles$HTMLBuilder end(java.lang.String):651:651 -> c
+    661:661:com.android.tools.r8.GenerateLintFiles$HTMLBuilder end(java.lang.String):651:651 -> c
+    662:662:com.android.tools.r8.GenerateLintFiles$HTMLBuilder end(java.lang.String):651:651 -> c
+    663:663:com.android.tools.r8.GenerateLintFiles$HTMLBuilder end(java.lang.String):651:651 -> c
+    664:664:com.android.tools.r8.GenerateLintFiles$HTMLBuilder end(java.lang.String):651:651 -> c
+    656:656:com.android.tools.r8.GenerateLintFiles$HTMLBuilder end(java.lang.String):651:651 -> c
     1:1:com.android.tools.r8.GenerateLintFiles$HTMLBuilder start(java.lang.String):0:0 -> d
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":651,"2":652,"3":653,"4":654,"5":655,"6":656}}
-    651:651:com.android.tools.r8.GenerateLintFiles$HTMLBuilder start(java.lang.String):645:645 -> d
-    652:652:com.android.tools.r8.GenerateLintFiles$HTMLBuilder start(java.lang.String):645:645 -> d
-    653:653:com.android.tools.r8.GenerateLintFiles$HTMLBuilder start(java.lang.String):645:645 -> d
-    654:654:com.android.tools.r8.GenerateLintFiles$HTMLBuilder start(java.lang.String):645:645 -> d
-    655:655:com.android.tools.r8.GenerateLintFiles$HTMLBuilder start(java.lang.String):645:645 -> d
-    656:656:com.android.tools.r8.GenerateLintFiles$HTMLBuilder start(java.lang.String):645:645 -> d
-    646:646:com.android.tools.r8.GenerateLintFiles$HTMLBuilder start(java.lang.String):645:645 -> d
-    647:647:void increaseIndent():620:620 -> d
-    647:647:com.android.tools.r8.GenerateLintFiles$HTMLBuilder start(java.lang.String):646 -> d
-    648:648:com.android.tools.r8.GenerateLintFiles$HTMLBuilder start(java.lang.String):0:0 -> d
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":657,"2":658,"3":659}}
-    657:657:void increaseIndent():620:620 -> d
-    657:657:com.android.tools.r8.GenerateLintFiles$HTMLBuilder start(java.lang.String):646 -> d
-    658:658:void increaseIndent():620:620 -> d
-    658:658:com.android.tools.r8.GenerateLintFiles$HTMLBuilder start(java.lang.String):646 -> d
-    659:659:void increaseIndent():620:620 -> d
-    659:659:com.android.tools.r8.GenerateLintFiles$HTMLBuilder start(java.lang.String):646 -> d
-    649:649:void increaseIndent():620:620 -> d
-    649:649:com.android.tools.r8.GenerateLintFiles$HTMLBuilder start(java.lang.String):646 -> d
-    650:650:com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent.indent(java.lang.String):417:417 -> d
-    650:650:void increaseIndent():621 -> d
-    650:650:com.android.tools.r8.GenerateLintFiles$HTMLBuilder start(java.lang.String):646 -> d
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":650,"2":651,"3":652,"4":653,"5":654,"6":655}}
+    650:650:com.android.tools.r8.GenerateLintFiles$HTMLBuilder start(java.lang.String):644:644 -> d
+    651:651:com.android.tools.r8.GenerateLintFiles$HTMLBuilder start(java.lang.String):644:644 -> d
+    652:652:com.android.tools.r8.GenerateLintFiles$HTMLBuilder start(java.lang.String):644:644 -> d
+    653:653:com.android.tools.r8.GenerateLintFiles$HTMLBuilder start(java.lang.String):644:644 -> d
+    654:654:com.android.tools.r8.GenerateLintFiles$HTMLBuilder start(java.lang.String):644:644 -> d
+    655:655:com.android.tools.r8.GenerateLintFiles$HTMLBuilder start(java.lang.String):644:644 -> d
+    645:645:com.android.tools.r8.GenerateLintFiles$HTMLBuilder start(java.lang.String):644:644 -> d
+    646:646:void increaseIndent():619:619 -> d
+    646:646:com.android.tools.r8.GenerateLintFiles$HTMLBuilder start(java.lang.String):645 -> d
+    647:647:com.android.tools.r8.GenerateLintFiles$HTMLBuilder start(java.lang.String):0:0 -> d
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":656,"2":657,"3":658}}
+    656:656:void increaseIndent():619:619 -> d
+    656:656:com.android.tools.r8.GenerateLintFiles$HTMLBuilder start(java.lang.String):645 -> d
+    657:657:void increaseIndent():619:619 -> d
+    657:657:com.android.tools.r8.GenerateLintFiles$HTMLBuilder start(java.lang.String):645 -> d
+    658:658:void increaseIndent():619:619 -> d
+    658:658:com.android.tools.r8.GenerateLintFiles$HTMLBuilder start(java.lang.String):645 -> d
+    648:648:void increaseIndent():619:619 -> d
+    648:648:com.android.tools.r8.GenerateLintFiles$HTMLBuilder start(java.lang.String):645 -> d
+    649:649:com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent.indent(java.lang.String):416:416 -> d
+    649:649:void increaseIndent():620 -> d
+    649:649:com.android.tools.r8.GenerateLintFiles$HTMLBuilder start(java.lang.String):645 -> d
 com.android.tools.r8.GenerateLintFiles$HTMLSourceBuilder -> com.android.tools.r8.M:
     java.util.Set parallelMethods -> h
     boolean $assertionsDisabled -> i
-    1:1:void <clinit>():657:657 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.graph.DexClass,boolean,java.util.Set):661:662 -> <init>
-    1:11:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.arguments(com.android.tools.r8.graph.DexEncodedMethod):585:595 -> a
-    1:11:java.lang.String arguments(com.android.tools.r8.graph.DexEncodedMethod):657 -> a
+    1:1:void <clinit>():656:656 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.DexClass,boolean,java.util.Set):660:661 -> <init>
+    1:11:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.arguments(com.android.tools.r8.graph.DexEncodedMethod):584:594 -> a
+    1:11:java.lang.String arguments(com.android.tools.r8.graph.DexEncodedMethod):656 -> a
     12:12:java.lang.String arguments(com.android.tools.r8.graph.DexEncodedMethod):0:0 -> a
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":29,"2":30,"3":31,"4":32,"5":33}}
-    29:29:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.arguments(com.android.tools.r8.graph.DexEncodedMethod):596:596 -> a
-    29:29:java.lang.String arguments(com.android.tools.r8.graph.DexEncodedMethod):657 -> a
-    30:30:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.arguments(com.android.tools.r8.graph.DexEncodedMethod):596:596 -> a
-    30:30:java.lang.String arguments(com.android.tools.r8.graph.DexEncodedMethod):657 -> a
-    31:31:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.arguments(com.android.tools.r8.graph.DexEncodedMethod):596:596 -> a
-    31:31:java.lang.String arguments(com.android.tools.r8.graph.DexEncodedMethod):657 -> a
-    32:32:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.arguments(com.android.tools.r8.graph.DexEncodedMethod):596:596 -> a
-    32:32:java.lang.String arguments(com.android.tools.r8.graph.DexEncodedMethod):657 -> a
-    33:33:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.arguments(com.android.tools.r8.graph.DexEncodedMethod):596:596 -> a
-    33:33:java.lang.String arguments(com.android.tools.r8.graph.DexEncodedMethod):657 -> a
-    13:28:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.arguments(com.android.tools.r8.graph.DexEncodedMethod):597:612 -> a
-    13:28:java.lang.String arguments(com.android.tools.r8.graph.DexEncodedMethod):657 -> a
-    1:4:java.lang.String toString():672:675 -> toString
+    29:29:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.arguments(com.android.tools.r8.graph.DexEncodedMethod):595:595 -> a
+    29:29:java.lang.String arguments(com.android.tools.r8.graph.DexEncodedMethod):656 -> a
+    30:30:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.arguments(com.android.tools.r8.graph.DexEncodedMethod):595:595 -> a
+    30:30:java.lang.String arguments(com.android.tools.r8.graph.DexEncodedMethod):656 -> a
+    31:31:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.arguments(com.android.tools.r8.graph.DexEncodedMethod):595:595 -> a
+    31:31:java.lang.String arguments(com.android.tools.r8.graph.DexEncodedMethod):656 -> a
+    32:32:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.arguments(com.android.tools.r8.graph.DexEncodedMethod):595:595 -> a
+    32:32:java.lang.String arguments(com.android.tools.r8.graph.DexEncodedMethod):656 -> a
+    33:33:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.arguments(com.android.tools.r8.graph.DexEncodedMethod):595:595 -> a
+    33:33:java.lang.String arguments(com.android.tools.r8.graph.DexEncodedMethod):656 -> a
+    13:28:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.arguments(com.android.tools.r8.graph.DexEncodedMethod):596:611 -> a
+    13:28:java.lang.String arguments(com.android.tools.r8.graph.DexEncodedMethod):656 -> a
+    1:4:java.lang.String toString():671:674 -> toString
     5:5:java.lang.String toString():0:0 -> toString
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":90,"2":91,"3":92,"4":93,"5":94,"6":95}}
-    90:90:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdCode(java.lang.String):630:630 -> toString
-    90:90:java.lang.String toString():675 -> toString
-    91:91:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdCode(java.lang.String):630:630 -> toString
-    91:91:java.lang.String toString():675 -> toString
-    92:92:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdCode(java.lang.String):630:630 -> toString
-    92:92:java.lang.String toString():675 -> toString
-    93:93:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdCode(java.lang.String):630:630 -> toString
-    93:93:java.lang.String toString():675 -> toString
-    94:94:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdCode(java.lang.String):630:630 -> toString
-    94:94:java.lang.String toString():675 -> toString
-    95:95:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdCode(java.lang.String):630:630 -> toString
-    95:95:java.lang.String toString():675 -> toString
-    6:6:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdCode(java.lang.String):630:630 -> toString
-    6:6:java.lang.String toString():675 -> toString
-    7:7:java.lang.String toString():677:677 -> toString
+    90:90:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdCode(java.lang.String):629:629 -> toString
+    90:90:java.lang.String toString():674 -> toString
+    91:91:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdCode(java.lang.String):629:629 -> toString
+    91:91:java.lang.String toString():674 -> toString
+    92:92:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdCode(java.lang.String):629:629 -> toString
+    92:92:java.lang.String toString():674 -> toString
+    93:93:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdCode(java.lang.String):629:629 -> toString
+    93:93:java.lang.String toString():674 -> toString
+    94:94:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdCode(java.lang.String):629:629 -> toString
+    94:94:java.lang.String toString():674 -> toString
+    95:95:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdCode(java.lang.String):629:629 -> toString
+    95:95:java.lang.String toString():674 -> toString
+    6:6:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdCode(java.lang.String):629:629 -> toString
+    6:6:java.lang.String toString():674 -> toString
+    7:7:java.lang.String toString():676:676 -> toString
     8:8:java.lang.String toString():0:0 -> toString
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":96,"2":97,"3":98,"4":99,"5":100,"6":101}}
-    96:96:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdCode(java.lang.String):630:630 -> toString
-    96:96:java.lang.String toString():677 -> toString
-    97:97:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdCode(java.lang.String):630:630 -> toString
-    97:97:java.lang.String toString():677 -> toString
-    98:98:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdCode(java.lang.String):630:630 -> toString
-    98:98:java.lang.String toString():677 -> toString
-    99:99:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdCode(java.lang.String):630:630 -> toString
-    99:99:java.lang.String toString():677 -> toString
-    100:100:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdCode(java.lang.String):630:630 -> toString
-    100:100:java.lang.String toString():677 -> toString
-    101:101:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdCode(java.lang.String):630:630 -> toString
-    101:101:java.lang.String toString():677 -> toString
-    9:9:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdCode(java.lang.String):630:630 -> toString
-    9:9:java.lang.String toString():677 -> toString
-    10:19:java.lang.String toString():678:687 -> toString
-    20:34:java.lang.String toString():682:696 -> toString
-    35:51:java.lang.String toString():692:708 -> toString
-    52:85:java.lang.String toString():702:735 -> toString
+    96:96:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdCode(java.lang.String):629:629 -> toString
+    96:96:java.lang.String toString():676 -> toString
+    97:97:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdCode(java.lang.String):629:629 -> toString
+    97:97:java.lang.String toString():676 -> toString
+    98:98:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdCode(java.lang.String):629:629 -> toString
+    98:98:java.lang.String toString():676 -> toString
+    99:99:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdCode(java.lang.String):629:629 -> toString
+    99:99:java.lang.String toString():676 -> toString
+    100:100:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdCode(java.lang.String):629:629 -> toString
+    100:100:java.lang.String toString():676 -> toString
+    101:101:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdCode(java.lang.String):629:629 -> toString
+    101:101:java.lang.String toString():676 -> toString
+    9:9:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdCode(java.lang.String):629:629 -> toString
+    9:9:java.lang.String toString():676 -> toString
+    10:19:java.lang.String toString():677:686 -> toString
+    20:34:java.lang.String toString():681:695 -> toString
+    35:51:java.lang.String toString():691:707 -> toString
+    52:85:java.lang.String toString():701:734 -> toString
     86:86:java.lang.String toString():0:0 -> toString
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":102,"2":103,"3":104,"4":105,"5":106,"6":107}}
-    102:102:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdP(java.lang.String):635:635 -> toString
-    102:102:java.lang.String toString():735 -> toString
-    103:103:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdP(java.lang.String):635:635 -> toString
-    103:103:java.lang.String toString():735 -> toString
-    104:104:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdP(java.lang.String):635:635 -> toString
-    104:104:java.lang.String toString():735 -> toString
-    105:105:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdP(java.lang.String):635:635 -> toString
-    105:105:java.lang.String toString():735 -> toString
-    106:106:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdP(java.lang.String):635:635 -> toString
-    106:106:java.lang.String toString():735 -> toString
-    107:107:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdP(java.lang.String):635:635 -> toString
-    107:107:java.lang.String toString():735 -> toString
-    87:87:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdP(java.lang.String):635:635 -> toString
-    87:87:java.lang.String toString():735 -> toString
-    88:88:java.lang.String toString():736:736 -> toString
-    89:89:java.lang.String com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent.toString():435:435 -> toString
-    89:89:java.lang.String toString():737 -> toString
+    102:102:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdP(java.lang.String):634:634 -> toString
+    102:102:java.lang.String toString():734 -> toString
+    103:103:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdP(java.lang.String):634:634 -> toString
+    103:103:java.lang.String toString():734 -> toString
+    104:104:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdP(java.lang.String):634:634 -> toString
+    104:104:java.lang.String toString():734 -> toString
+    105:105:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdP(java.lang.String):634:634 -> toString
+    105:105:java.lang.String toString():734 -> toString
+    106:106:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdP(java.lang.String):634:634 -> toString
+    106:106:java.lang.String toString():734 -> toString
+    107:107:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdP(java.lang.String):634:634 -> toString
+    107:107:java.lang.String toString():734 -> toString
+    87:87:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdP(java.lang.String):634:634 -> toString
+    87:87:java.lang.String toString():734 -> toString
+    88:88:java.lang.String toString():735:735 -> toString
+    89:89:java.lang.String com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent.toString():434:434 -> toString
+    89:89:java.lang.String toString():736 -> toString
 com.android.tools.r8.GenerateLintFiles$SourceBuilder -> com.android.tools.r8.N:
     java.util.List fields -> b
     java.lang.String packageName -> f
@@ -1744,27 +1748,27 @@
     boolean $assertionsDisabled -> g
     boolean newClass -> a
     java.lang.String className -> e
-    1:1:void <clinit>():439:439 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexClass,boolean,com.android.tools.r8.GenerateLintFiles$1):439:439 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexClass,boolean):450:450 -> <init>
-    3:15:void <init>(com.android.tools.r8.graph.DexClass,boolean):443:455 -> <init>
-    1:5:java.lang.String typeInPackage(java.lang.String,java.lang.String):476:480 -> a
-    6:13:java.lang.String typeInPackage(java.lang.String):486:493 -> a
-    14:17:java.lang.String typeInPackage(com.android.tools.r8.graph.DexType):497:500 -> a
-    18:27:java.lang.String accessFlags(com.android.tools.r8.graph.FieldAccessFlags):532:541 -> a
-    28:33:java.lang.String accessFlags(com.android.tools.r8.graph.FieldAccessFlags):540:545 -> a
-    34:43:java.lang.String accessFlags(com.android.tools.r8.graph.FieldAccessFlags):544:553 -> a
-    44:53:java.lang.String accessFlags(com.android.tools.r8.graph.MethodAccessFlags):557:566 -> a
-    54:59:java.lang.String accessFlags(com.android.tools.r8.graph.MethodAccessFlags):565:570 -> a
-    60:72:java.lang.String accessFlags(com.android.tools.r8.graph.MethodAccessFlags):569:581 -> a
+    1:1:void <clinit>():438:438 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexClass,boolean,com.android.tools.r8.GenerateLintFiles$1):438:438 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexClass,boolean):449:449 -> <init>
+    3:15:void <init>(com.android.tools.r8.graph.DexClass,boolean):442:454 -> <init>
+    1:5:java.lang.String typeInPackage(java.lang.String,java.lang.String):475:479 -> a
+    6:13:java.lang.String typeInPackage(java.lang.String):485:492 -> a
+    14:17:java.lang.String typeInPackage(com.android.tools.r8.graph.DexType):496:499 -> a
+    18:27:java.lang.String accessFlags(com.android.tools.r8.graph.FieldAccessFlags):531:540 -> a
+    28:33:java.lang.String accessFlags(com.android.tools.r8.graph.FieldAccessFlags):539:544 -> a
+    34:43:java.lang.String accessFlags(com.android.tools.r8.graph.FieldAccessFlags):543:552 -> a
+    44:53:java.lang.String accessFlags(com.android.tools.r8.graph.MethodAccessFlags):556:565 -> a
+    54:59:java.lang.String accessFlags(com.android.tools.r8.graph.MethodAccessFlags):564:569 -> a
+    60:72:java.lang.String accessFlags(com.android.tools.r8.graph.MethodAccessFlags):568:580 -> a
 com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent -> com.android.tools.r8.O:
     java.lang.StringBuilder builder -> b
     java.lang.String NL -> a
     java.lang.String indent -> c
-    1:1:void <init>():414:414 -> <init>
-    2:4:void <init>():410:412 -> <init>
-    1:3:com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent appendLine(java.lang.String):422:424 -> a
-    1:1:java.lang.String toString():435:435 -> toString
+    1:1:void <init>():413:413 -> <init>
+    2:4:void <init>():409:411 -> <init>
+    1:3:com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent appendLine(java.lang.String):421:423 -> a
+    1:1:java.lang.String toString():434:434 -> toString
 com.android.tools.r8.GenerateLintFiles$SupportedMethods -> com.android.tools.r8.internal.yk:
     java.util.Map supportedMethods -> b
     java.util.Set classesWithAllMethodsSupported -> a
@@ -1904,86 +1908,86 @@
     190:190:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):157:157 -> getProgramResource
 com.android.tools.r8.L8 -> com.android.tools.r8.L8:
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():38:38 -> <clinit>
-    1:1:void <init>():39:39 -> <init>
-    1:2:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,boolean,com.android.tools.r8.D8Command,com.android.tools.r8.R8Command):79:80 -> a
-    3:31:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,boolean,com.android.tools.r8.D8Command,com.android.tools.r8.R8Command,java.util.concurrent.ExecutorService):92:120 -> a
-    32:38:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):98:104 -> a
-    39:50:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):126:137 -> a
-    39:50:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):106 -> a
-    51:51:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing):321:321 -> a
-    51:51:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):137 -> a
-    51:51:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):106 -> a
-    52:56:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):137:141 -> a
-    52:56:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):106 -> a
-    57:57:com.android.tools.r8.naming.NamingLens com.android.tools.r8.naming.PrefixRewritingNamingLens.createPrefixRewritingNamingLens(com.android.tools.r8.graph.AppView):25:25 -> a
-    57:57:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):141 -> a
-    57:57:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):106 -> a
-    58:61:com.android.tools.r8.naming.NamingLens com.android.tools.r8.naming.PrefixRewritingNamingLens.createPrefixRewritingNamingLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):30:33 -> a
-    58:61:com.android.tools.r8.naming.NamingLens com.android.tools.r8.naming.PrefixRewritingNamingLens.createPrefixRewritingNamingLens(com.android.tools.r8.graph.AppView):25 -> a
-    58:61:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):141 -> a
-    58:61:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):106 -> a
-    62:62:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):142:142 -> a
-    62:62:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):106 -> a
-    63:63:void com.android.tools.r8.naming.signature.GenericSignatureRewriter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):31:31 -> a
-    63:63:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):142 -> a
-    63:63:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):106 -> a
-    64:67:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):142:145 -> a
-    64:67:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):106 -> a
-    68:68:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():487:487 -> a
-    68:68:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):146 -> a
-    68:68:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):106 -> a
-    69:77:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):146:154 -> a
-    69:77:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):106 -> a
-    78:81:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):108:111 -> a
-    82:82:java.lang.RuntimeException com.android.tools.r8.utils.ExceptionUtils.unwrapExecutionException(java.util.concurrent.ExecutionException):221:221 -> a
-    82:82:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):149 -> a
-    82:82:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):106 -> a
-    83:88:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):149:154 -> a
-    83:88:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):106 -> a
-    89:96: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):162:169 -> a
-    97:98:void run(java.lang.String[]):173:174 -> a
-    97:98:void lambda$main$1(java.lang.String[]):195 -> a
-    99:99:void com.android.tools.r8.utils.SelfRetraceTest.test():25:25 -> a
-    99:99:void run(java.lang.String[]):175 -> a
-    99:99:void lambda$main$1(java.lang.String[]):195 -> a
-    100:100:void run(java.lang.String[]):176:176 -> a
-    100:100:void lambda$main$1(java.lang.String[]):195 -> a
-    101:101:void com.android.tools.r8.utils.SelfRetraceTest.foo3():13:13 -> a
-    101:101:void com.android.tools.r8.utils.SelfRetraceTest.foo2():17 -> a
-    101:101:void com.android.tools.r8.utils.SelfRetraceTest.foo1():21 -> a
-    101:101:void com.android.tools.r8.utils.SelfRetraceTest.test():26 -> a
-    101:101:void run(java.lang.String[]):175 -> a
-    101:101:void lambda$main$1(java.lang.String[]):195 -> a
-    102:103:void run(java.lang.String[]):179:180 -> a
-    102:103:void lambda$main$1(java.lang.String[]):195 -> a
-    104:104:void lambda$main$1(java.lang.String[]):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":109,"2":110,"3":111}}
-    109:109:void run(java.lang.String[]):180:180 -> a
-    109:109:void lambda$main$1(java.lang.String[]):195 -> a
-    110:110:void run(java.lang.String[]):180:180 -> a
-    110:110:void lambda$main$1(java.lang.String[]):195 -> a
-    111:111:void run(java.lang.String[]):180:180 -> a
-    111:111:void lambda$main$1(java.lang.String[]):195 -> a
-    105:108:void run(java.lang.String[]):180:183 -> a
-    105:108:void lambda$main$1(java.lang.String[]):195 -> a
-    1:4:void main(java.lang.String[]):192:195 -> main
-    5:5:void main(java.lang.String[]):193:193 -> main
-    1:5:void run(com.android.tools.r8.L8Command):48:52 -> run
-    6:6:void run(com.android.tools.r8.L8Command):47:47 -> run
-    7:11:void run(com.android.tools.r8.L8Command,java.util.concurrent.ExecutorService):64:68 -> run
-    12:12:void run(com.android.tools.r8.L8Command,java.util.concurrent.ExecutorService):63:63 -> run
+    1:1:void <clinit>():39:39 -> <clinit>
+    1:1:void <init>():40:40 -> <init>
+    1:2:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,boolean,com.android.tools.r8.D8Command,com.android.tools.r8.R8Command):80:81 -> a
+    3:31:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,boolean,com.android.tools.r8.D8Command,com.android.tools.r8.R8Command,java.util.concurrent.ExecutorService):93:121 -> a
+    32:38:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):99:105 -> a
+    39:54:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):127:142 -> a
+    39:54:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):107 -> a
+    55:55:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing):319:319 -> a
+    55:55:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):142 -> a
+    55:55:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):107 -> a
+    56:60:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):142:146 -> a
+    56:60:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):107 -> a
+    61:61:com.android.tools.r8.naming.NamingLens com.android.tools.r8.naming.PrefixRewritingNamingLens.createPrefixRewritingNamingLens(com.android.tools.r8.graph.AppView):25:25 -> a
+    61:61:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):146 -> a
+    61:61:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):107 -> a
+    62:65:com.android.tools.r8.naming.NamingLens com.android.tools.r8.naming.PrefixRewritingNamingLens.createPrefixRewritingNamingLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):30:33 -> a
+    62:65:com.android.tools.r8.naming.NamingLens com.android.tools.r8.naming.PrefixRewritingNamingLens.createPrefixRewritingNamingLens(com.android.tools.r8.graph.AppView):25 -> a
+    62:65:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):146 -> a
+    62:65:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):107 -> a
+    66:66:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):147:147 -> a
+    66:66:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):107 -> a
+    67:67:void com.android.tools.r8.naming.signature.GenericSignatureRewriter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):31:31 -> a
+    67:67:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):147 -> a
+    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():489:489 -> 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
+    72:80:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):107 -> a
+    81:84:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):109:112 -> a
+    85:85:java.lang.RuntimeException com.android.tools.r8.utils.ExceptionUtils.unwrapExecutionException(java.util.concurrent.ExecutionException):221:221 -> a
+    85:85:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):153 -> a
+    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
+    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
+    12:12:void run(com.android.tools.r8.L8Command,java.util.concurrent.ExecutorService):64:64 -> run
 com.android.tools.r8.L8Command -> com.android.tools.r8.L8Command:
     com.android.tools.r8.R8Command r8Command -> v
     java.lang.String USAGE_MESSAGE -> y
     boolean $assertionsDisabled -> z
     com.android.tools.r8.graph.DexItemFactory factory -> x
-    com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfiguration libraryConfiguration -> w
+    com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification desugaredLibrarySpecification -> w
     com.android.tools.r8.D8Command d8Command -> u
     1:4:void <clinit>():38:41 -> <clinit>
-    1:1: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.DesugaredLibraryConfiguration,java.util.List,java.util.List,int,com.android.tools.r8.utils.DumpInputFlags,com.android.tools.r8.MapIdProvider,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.L8Command$1):39:39 -> <init>
+    1:1: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,com.android.tools.r8.L8Command$1):39:39 -> <init>
     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.DesugaredLibraryConfiguration,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>
+    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:58:com.android.tools.r8.DumpOptions dumpOptions():442:447 -> b
@@ -2144,157 +2148,157 @@
     com.android.tools.r8.utils.Timing timing -> a
     com.android.tools.r8.utils.InternalOptions options -> b
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():165:165 -> <clinit>
-    1:6:void <init>(com.android.tools.r8.utils.InternalOptions):171:176 -> <init>
+    1:1:void <clinit>():163:163 -> <clinit>
+    1:6:void <init>(com.android.tools.r8.utils.InternalOptions):169:174 -> <init>
     boolean lambda$run$3(com.android.tools.r8.graph.DexType) -> a
     com.android.tools.r8.graph.DexApplication lambda$run$8(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexApplication) -> a
-    1:1:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):209:209 -> a
-    2: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.naming.ProguardMapSupplier):222:229 -> a
-    10:10:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():471:471 -> 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.naming.ProguardMapSupplier):230 -> 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.naming.ProguardMapSupplier):231:231 -> a
-    12:12:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():487:487 -> a
-    12:12:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):232 -> a
-    13:26:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):232:245 -> a
-    27:28:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):251:252 -> a
-    29:29:void com.android.tools.r8.utils.ExceptionUtils.withR8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):69:69 -> a
-    29:29:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):252 -> a
-    30:46:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):273:289 -> a
-    47:47:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2068,"2":2069,"3":2070}}
-    2068:2068:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):289:289 -> a
-    2069:2069:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):289:289 -> a
-    2070:2070:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):289:289 -> a
-    336:337:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):289:290 -> a
-    338:338:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2071,"2":2072,"3":2073}}
-    2071:2071:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):290:290 -> a
-    2072:2072:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):290:290 -> a
-    2073:2073:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):290:290 -> a
-    628:629:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):290:291 -> a
-    630:630:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2074,"2":2075,"3":2076}}
-    2074:2074:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):291:291 -> a
-    2075:2075:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):291:291 -> a
-    2076:2076:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):291:291 -> a
-    921:959:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):291:329 -> a
-    960:973:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):328:341 -> a
-    974:974:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):340:340 -> a
-    975:990:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):337:352 -> a
-    991:995:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):351:355 -> a
-    996:996:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):354:354 -> a
-    997:1008:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):353:364 -> a
-    1009:1009:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):363:363 -> a
-    1010:1015:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):360:365 -> a
-    1016:1058:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):359:401 -> a
-    1059:1089:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):400:430 -> a
-    1090:1140:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):425:475 -> a
-    1141:1280:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):472:611 -> a
-    1281:1302:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):609:630 -> a
-    1303:1320:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):625:642 -> a
-    1321:1370:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):641:690 -> a
-    1371:1441:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):671:741 -> a
-    1442:1469:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):740:767 -> a
-    1470:1573:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):764:867 -> a
-    1574:1588:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):805:819 -> a
-    1589:1629:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):816:856 -> a
-    1630:1648:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):849:867 -> a
-    1649:1649:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):547:547 -> a
-    1650:2067:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):450:867 -> a
-    2077:2077:java.lang.Boolean lambda$run$2():283:283 -> a
-    2078:2078:void lambda$run$4(com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):409:409 -> a
-    2079:2079:void lambda$run$9(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):602:602 -> a
-    2080:2080:com.android.tools.r8.shaking.TreePrunerConfiguration lambda$run$10(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):610:610 -> a
-    2081:2081:void lambda$run$13(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):685:685 -> a
-    2082:2082:void lambda$run$14(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):692:692 -> a
-    2083:2083:void lambda$run$15(java.lang.String):800:800 -> a
-    2084:2084:boolean lambda$run$16(com.android.tools.r8.graph.DexProgramClass):806:806 -> a
-    2085:2091:boolean allReferencesAssignedApiLevel(com.android.tools.r8.graph.AppView):874:880 -> a
-    2092:2095:void lambda$allReferencesAssignedApiLevel$18(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMember):882:885 -> a
-    2096:2096:void lambda$allReferencesAssignedApiLevel$18(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMember):884:884 -> a
-    2097:2117:void performFinalMainDexTracing(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):912:932 -> a
-    2118:2118:void performFinalMainDexTracing(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):931:931 -> a
-    2119:2121:java.lang.Iterable lambda$performFinalMainDexTracing$20(com.android.tools.r8.shaking.MainDexInfo,com.android.tools.r8.graph.AppView):934:936 -> a
-    2122:2124:void lambda$performFinalMainDexTracing$19(com.android.tools.r8.graph.AppView,java.util.ArrayList,com.android.tools.r8.graph.DexType):938:940 -> a
-    2125:2126:boolean verifyMovedMethodsHaveOriginalMethodPosition(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication):956:957 -> a
-    2127:2127:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$22(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):959:959 -> a
-    2128:2128:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):962:962 -> a
-    2129:2129:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):316:316 -> a
-    2129:2129:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):962 -> a
+    1:1:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):207:207 -> a
+    2: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):220:227 -> a
+    10:10:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> 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):228 -> 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):229:229 -> a
+    12:12:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():489:489 -> a
+    12:12:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp):230 -> a
+    13:25: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
+    26:27:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):248:249 -> a
+    28:28:void com.android.tools.r8.utils.ExceptionUtils.withR8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):69:69 -> a
+    28:28:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):249 -> a
+    29:45:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):270:286 -> a
+    46:46:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2045,"2":2046,"3":2047}}
+    2045:2045:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):286:286 -> a
+    2046:2046:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):286:286 -> a
+    2047:2047:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):286:286 -> a
+    332:333:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):286:287 -> a
+    334:334:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2048,"2":2049,"3":2050}}
+    2048:2048:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):287:287 -> a
+    2049:2049:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):287:287 -> a
+    2050:2050:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):287:287 -> a
+    621:622:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):287:288 -> a
+    623:623:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2051,"2":2052,"3":2053}}
+    2051:2051:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):288:288 -> a
+    2052:2052:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):288:288 -> a
+    2053:2053:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):288:288 -> a
+    911:949:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):288:326 -> a
+    950:963:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):325:338 -> a
+    964:964:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):337:337 -> a
+    965:980:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):334:349 -> a
+    981:985:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):348:352 -> a
+    986:986:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):351:351 -> a
+    987:998:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):350:361 -> a
+    999:999:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):360:360 -> a
+    1000:1005:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):357:362 -> a
+    1006:1048:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):356:398 -> a
+    1049:1079:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):397:427 -> a
+    1080:1130:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):422:472 -> a
+    1131:1270:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):469:608 -> a
+    1271:1292:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):606:627 -> a
+    1293:1310:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):622:639 -> a
+    1311:1360:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):638:687 -> a
+    1361:1431:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):668:738 -> a
+    1432:1459:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):737:764 -> a
+    1460:1557:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):761:858 -> a
+    1558:1572:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):794:808 -> a
+    1573:1612:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):805:844 -> a
+    1613:1631:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):840:858 -> a
+    1632:1632:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):544:544 -> a
+    1633:2044:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):447:858 -> a
+    2054:2054:java.lang.Boolean lambda$run$2():280:280 -> a
+    2055:2055:void lambda$run$4(com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):406:406 -> a
+    2056:2056: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
+    2057:2057: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
+    2058:2058:void lambda$run$13(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):682:682 -> a
+    2059:2059:void lambda$run$14(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):689:689 -> a
+    2060:2060:void lambda$run$15(java.lang.String):789:789 -> a
+    2061:2061:boolean lambda$run$16(com.android.tools.r8.graph.DexProgramClass):795:795 -> a
+    2062:2068:boolean allReferencesAssignedApiLevel(com.android.tools.r8.graph.AppView):865:871 -> a
+    2069:2072:void lambda$allReferencesAssignedApiLevel$18(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMember):873:876 -> a
+    2073:2073:void lambda$allReferencesAssignedApiLevel$18(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMember):875:875 -> a
+    2074:2094:void performFinalMainDexTracing(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):903:923 -> a
+    2095:2095:void performFinalMainDexTracing(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):922:922 -> a
+    2096:2098:java.lang.Iterable lambda$performFinalMainDexTracing$20(com.android.tools.r8.shaking.MainDexInfo,com.android.tools.r8.graph.AppView):925:927 -> a
+    2099:2101:void lambda$performFinalMainDexTracing$19(com.android.tools.r8.graph.AppView,java.util.ArrayList,com.android.tools.r8.graph.DexType):929:931 -> a
+    2102:2103:boolean verifyMovedMethodsHaveOriginalMethodPosition(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication):947:948 -> a
+    2104:2104:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$22(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):950:950 -> a
+    2105:2105:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):953:953 -> a
+    2106:2106:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):316:316 -> a
+    2106:2106:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):953 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2130:2137:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):963:970 -> a
-    2138:2139:boolean verifyOriginalMethodInPosition(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexMethod):982:983 -> a
-    2138:2139:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):970 -> a
-    2140:2140:boolean com.android.tools.r8.cf.code.CfInstruction.isPosition():0:0 -> a
-    2140:2140:boolean verifyOriginalMethodInPosition(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexMethod):983 -> a
-    2140:2140:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):970 -> a
-    2141:2142:boolean verifyOriginalMethodInPosition(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexMethod):986:987 -> a
-    2141:2142:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):970 -> a
-    2143:2144:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):971:972 -> a
-    2145:2149:boolean verifyOriginalMethodInDebugInfo(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexMethod):993:997 -> a
-    2145:2149:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):972 -> a
-    2150:2150:boolean com.android.tools.r8.graph.DexDebugEvent.isSetInlineFrame():0:0 -> a
-    2150:2150:boolean verifyOriginalMethodInDebugInfo(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexMethod):997 -> a
-    2150:2150:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):972 -> a
-    2151:2151:boolean verifyOriginalMethodInDebugInfo(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexMethod):997:997 -> a
-    2151:2151:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):972 -> a
-    2152:2152:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):974:974 -> a
-    2153:2153:boolean com.android.tools.r8.graph.Code.isDefaultInstanceInitializerCode():0:0 -> a
-    2153:2153:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):974 -> a
-    2154:2154:boolean com.android.tools.r8.graph.Code.isThrowNullCode():0:0 -> a
-    2154:2154:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):974 -> a
-    2155:2155:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):974:974 -> a
-    2156:2164: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):1010:1018 -> a
-    2165:2170: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):1016:1021 -> a
-    2171:2173:void com.android.tools.r8.shaking.RuntimeTypeCheckInfo$Builder.attach(com.android.tools.r8.shaking.Enqueuer):87:89 -> a
-    2171:2173:com.android.tools.r8.graph.AppView runEnqueuer(com.android.tools.r8.shaking.AnnotationRemover$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.shaking.RuntimeTypeCheckInfo$Builder):1022 -> a
-    2174:2184: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):1026:1036 -> a
-    2185:2185:void lambda$runEnqueuer$23(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.proto.ProtoShrinker):1034:1034 -> a
-    2186:2188: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):1055:1057 -> a
-    2189:2224: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):1056:1091 -> a
-    2225:2229: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):1088:1092 -> a
-    2230:2233:boolean verifyNoJarApplicationReaders(java.util.Collection):1096:1099 -> a
-    2234:2234:void lambda$run$25(com.android.tools.r8.R8Command,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):1121:1121 -> a
-    2235:2235:void lambda$main$26(java.lang.String[]):1136:1136 -> a
-    1:3:void lambda$runForTesting$1(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):256:258 -> b
-    4:4:com.android.tools.r8.graph.DirectMappedDexApplication getDirectApp(com.android.tools.r8.graph.AppView):269:269 -> b
-    5:16:void performInitialMainDexTracing(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):895:906 -> b
-    17:17:void lambda$runEnqueuer$24(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):1038:1038 -> b
-    18:19:void run(java.lang.String[]):1107:1108 -> b
+    2107:2114:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):954:961 -> a
+    2115:2116:boolean verifyOriginalMethodInPosition(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexMethod):973:974 -> a
+    2115:2116:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):961 -> a
+    2117:2117:boolean com.android.tools.r8.cf.code.CfInstruction.isPosition():0:0 -> a
+    2117:2117:boolean verifyOriginalMethodInPosition(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexMethod):974 -> a
+    2117:2117:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):961 -> a
+    2118:2119:boolean verifyOriginalMethodInPosition(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexMethod):977:978 -> a
+    2118:2119:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):961 -> a
+    2120:2121:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):962:963 -> a
+    2122:2126:boolean verifyOriginalMethodInDebugInfo(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexMethod):984:988 -> a
+    2122:2126:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):963 -> a
+    2127:2127:boolean com.android.tools.r8.graph.DexDebugEvent.isSetInlineFrame():0:0 -> a
+    2127:2127:boolean verifyOriginalMethodInDebugInfo(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexMethod):988 -> a
+    2127:2127:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):963 -> a
+    2128:2128:boolean verifyOriginalMethodInDebugInfo(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexMethod):988:988 -> a
+    2128:2128:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):963 -> a
+    2129:2129:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):965:965 -> a
+    2130:2130:boolean com.android.tools.r8.graph.Code.isDefaultInstanceInitializerCode():0:0 -> a
+    2130:2130:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):965 -> a
+    2131:2131:boolean com.android.tools.r8.graph.Code.isThrowNullCode():0:0 -> a
+    2131:2131:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):965 -> a
+    2132:2132:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):965:965 -> a
+    2133:2141: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):1001:1009 -> a
+    2142:2147: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):1007:1012 -> a
+    2148:2150:void com.android.tools.r8.shaking.RuntimeTypeCheckInfo$Builder.attach(com.android.tools.r8.shaking.Enqueuer):87:89 -> a
+    2148:2150: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):1013 -> a
+    2151:2161:com.android.tools.r8.graph.AppView runEnqueuer(com.android.tools.r8.shaking.AnnotationRemover$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.shaking.RuntimeTypeCheckInfo$Builder):1017:1027 -> a
+    2162:2162:void lambda$runEnqueuer$23(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.proto.ProtoShrinker):1025:1025 -> a
+    2163:2165: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):1046:1048 -> a
+    2166:2201: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:1082 -> a
+    2202:2206: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):1079:1083 -> a
+    2207:2210:boolean verifyNoJarApplicationReaders(java.util.Collection):1087:1090 -> a
+    2211:2211:void lambda$run$25(com.android.tools.r8.R8Command,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):1112:1112 -> a
+    2212:2212:void lambda$main$26(java.lang.String[]):1127:1127 -> a
+    1:3:void lambda$runForTesting$1(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):253:255 -> b
+    4:4:com.android.tools.r8.graph.DirectMappedDexApplication getDirectApp(com.android.tools.r8.graph.AppView):266:266 -> b
+    5:16:void performInitialMainDexTracing(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):886:897 -> b
+    17:17:void lambda$runEnqueuer$24(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):1029:1029 -> b
+    18:19:void run(java.lang.String[]):1098:1099 -> b
     20:20:void com.android.tools.r8.utils.SelfRetraceTest.test():25:25 -> b
-    20:20:void run(java.lang.String[]):1109 -> b
-    21:21:void run(java.lang.String[]):1110:1110 -> b
+    20:20:void run(java.lang.String[]):1100 -> b
+    21:21:void run(java.lang.String[]):1101:1101 -> b
     22:22:void com.android.tools.r8.utils.SelfRetraceTest.foo3():13:13 -> b
     22:22:void com.android.tools.r8.utils.SelfRetraceTest.foo2():17 -> b
     22:22:void com.android.tools.r8.utils.SelfRetraceTest.foo1():21 -> b
     22:22:void com.android.tools.r8.utils.SelfRetraceTest.test():26 -> b
-    22:22:void run(java.lang.String[]):1109 -> b
-    23:24:void run(java.lang.String[]):1113:1114 -> b
+    22:22:void run(java.lang.String[]):1100 -> b
+    23:24:void run(java.lang.String[]):1104:1105 -> b
     25:25:void run(java.lang.String[]):0:0 -> b
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1148,"2":1149,"3":1150}}
-    1148:1148:void run(java.lang.String[]):1114:1114 -> b
-    1149:1149:void run(java.lang.String[]):1114:1114 -> b
-    1150:1150:void run(java.lang.String[]):1114:1114 -> b
-    1139:1145:void run(java.lang.String[]):1114:1120 -> b
-    1146:1146:void com.android.tools.r8.utils.ExceptionUtils.withR8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):69:69 -> b
-    1146:1146:void run(java.lang.String[]):1120 -> b
-    1147:1147:void run(java.lang.String[]):1123:1123 -> b
-    1:1:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):265:265 -> c
-    2:2:java.lang.Iterable lambda$run$11(com.android.tools.r8.graph.AppView):643:643 -> c
-    1:1:java.lang.Boolean lambda$run$12(com.android.tools.r8.graph.AppView):662:662 -> d
-    2:6:java.lang.Boolean lambda$run$12(com.android.tools.r8.graph.AppView):661:661 -> d
-    1:3:java.lang.Boolean lambda$run$17(com.android.tools.r8.graph.AppView):839:841 -> e
-    4:7:java.lang.Boolean lambda$run$17(com.android.tools.r8.graph.AppView):840:843 -> e
-    8:8:java.lang.Boolean lambda$run$17(com.android.tools.r8.graph.AppView):839:839 -> e
-    1:1:java.lang.Boolean lambda$run$5(com.android.tools.r8.graph.AppView):447:447 -> f
-    1:1:java.lang.Boolean lambda$run$6(com.android.tools.r8.graph.AppView):457:457 -> g
-    1:1:java.lang.Boolean lambda$run$7(com.android.tools.r8.graph.AppView):528:528 -> h
-    1:4:void main(java.lang.String[]):1133:1136 -> main
-    5:5:void main(java.lang.String[]):1134:1134 -> main
-    1:3:void run(com.android.tools.r8.R8Command):188:190 -> run
-    4:7:void run(com.android.tools.r8.R8Command,java.util.concurrent.ExecutorService):204:207 -> run
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1139,"2":1140,"3":1141}}
+    1139:1139:void run(java.lang.String[]):1105:1105 -> b
+    1140:1140:void run(java.lang.String[]):1105:1105 -> b
+    1141:1141:void run(java.lang.String[]):1105:1105 -> b
+    1130:1136:void run(java.lang.String[]):1105:1111 -> 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[]):1111 -> b
+    1138:1138:void run(java.lang.String[]):1114:1114 -> b
+    1:1:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):262:262 -> c
+    2:2:java.lang.Iterable lambda$run$11(com.android.tools.r8.graph.AppView):640:640 -> c
+    1:1:java.lang.Boolean lambda$run$12(com.android.tools.r8.graph.AppView):659:659 -> d
+    2:6:java.lang.Boolean lambda$run$12(com.android.tools.r8.graph.AppView):658:658 -> d
+    1:3:java.lang.Boolean lambda$run$17(com.android.tools.r8.graph.AppView):830:832 -> e
+    4:7:java.lang.Boolean lambda$run$17(com.android.tools.r8.graph.AppView):831:834 -> e
+    8:8:java.lang.Boolean lambda$run$17(com.android.tools.r8.graph.AppView):830:830 -> e
+    1:1:java.lang.Boolean lambda$run$5(com.android.tools.r8.graph.AppView):444:444 -> f
+    1:1:java.lang.Boolean lambda$run$6(com.android.tools.r8.graph.AppView):454:454 -> g
+    1:1:java.lang.Boolean lambda$run$7(com.android.tools.r8.graph.AppView):525:525 -> h
+    1:4:void main(java.lang.String[]):1124:1127 -> main
+    5:5:void main(java.lang.String[]):1125:1125 -> main
+    1:3:void run(com.android.tools.r8.R8Command):186:188 -> run
+    4:7:void run(com.android.tools.r8.R8Command,java.util.concurrent.ExecutorService):202:205 -> run
     8:8:void com.android.tools.r8.utils.ExceptionUtils.withR8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):69:69 -> run
-    8:8:void run(com.android.tools.r8.R8Command,java.util.concurrent.ExecutorService):206 -> run
+    8:8:void run(com.android.tools.r8.R8Command,java.util.concurrent.ExecutorService):204 -> run
 com.android.tools.r8.R8Command -> com.android.tools.r8.R8Command:
     boolean $assertionsDisabled -> N
     com.android.tools.r8.experimental.graphinfo.GraphConsumer keptGraphConsumer -> F
@@ -2314,12 +2318,12 @@
     com.android.tools.r8.StringConsumer proguardUsageConsumer -> C
     com.android.tools.r8.shaking.ProguardConfiguration proguardConfiguration -> v
     com.android.tools.r8.StringConsumer proguardSeedsConsumer -> D
-    com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfiguration libraryConfiguration -> J
     com.android.tools.r8.StringConsumer proguardMapConsumer -> B
+    com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification desugaredLibrarySpecification -> J
     1:587:void <clinit>():69:655 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ProgramConsumer,java.util.List,com.android.tools.r8.StringConsumer,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.CompilationMode,int,com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.InternalOptions$DesugarState,boolean,boolean,boolean,boolean,java.util.Optional,com.android.tools.r8.StringConsumer,com.android.tools.r8.StringConsumer,com.android.tools.r8.StringConsumer,com.android.tools.r8.StringConsumer,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.experimental.graphinfo.GraphConsumer,java.util.function.Consumer,boolean,boolean,java.util.function.BiPredicate,com.android.tools.r8.StringConsumer,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfiguration,com.android.tools.r8.features.FeatureSplitConfiguration,java.util.List,java.util.List,java.lang.String,boolean,int,com.android.tools.r8.utils.DumpInputFlags,com.android.tools.r8.MapIdProvider,com.android.tools.r8.SourceFileProvider,com.android.tools.r8.R8Command$1):70:70 -> <init>
+    1:1:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ProgramConsumer,java.util.List,com.android.tools.r8.StringConsumer,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.CompilationMode,int,com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.InternalOptions$DesugarState,boolean,boolean,boolean,boolean,java.util.Optional,com.android.tools.r8.StringConsumer,com.android.tools.r8.StringConsumer,com.android.tools.r8.StringConsumer,com.android.tools.r8.StringConsumer,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.experimental.graphinfo.GraphConsumer,java.util.function.Consumer,boolean,boolean,java.util.function.BiPredicate,com.android.tools.r8.StringConsumer,com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification,com.android.tools.r8.features.FeatureSplitConfiguration,java.util.List,java.util.List,java.lang.String,boolean,int,com.android.tools.r8.utils.DumpInputFlags,com.android.tools.r8.MapIdProvider,com.android.tools.r8.SourceFileProvider,com.android.tools.r8.R8Command$1):70:70 -> <init>
     2:2:void <init>(boolean,boolean,com.android.tools.r8.R8Command$1):70:70 -> <init>
-    3:40:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ProgramConsumer,java.util.List,com.android.tools.r8.StringConsumer,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.CompilationMode,int,com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.InternalOptions$DesugarState,boolean,boolean,boolean,boolean,java.util.Optional,com.android.tools.r8.StringConsumer,com.android.tools.r8.StringConsumer,com.android.tools.r8.StringConsumer,com.android.tools.r8.StringConsumer,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.experimental.graphinfo.GraphConsumer,java.util.function.Consumer,boolean,boolean,java.util.function.BiPredicate,com.android.tools.r8.StringConsumer,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfiguration,com.android.tools.r8.features.FeatureSplitConfiguration,java.util.List,java.util.List,java.lang.String,boolean,int,com.android.tools.r8.utils.DumpInputFlags,com.android.tools.r8.MapIdProvider,com.android.tools.r8.SourceFileProvider):760:797 -> <init>
+    3:40:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ProgramConsumer,java.util.List,com.android.tools.r8.StringConsumer,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.CompilationMode,int,com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.InternalOptions$DesugarState,boolean,boolean,boolean,boolean,java.util.Optional,com.android.tools.r8.StringConsumer,com.android.tools.r8.StringConsumer,com.android.tools.r8.StringConsumer,com.android.tools.r8.StringConsumer,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.experimental.graphinfo.GraphConsumer,java.util.function.Consumer,boolean,boolean,java.util.function.BiPredicate,com.android.tools.r8.StringConsumer,com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification,com.android.tools.r8.features.FeatureSplitConfiguration,java.util.List,java.util.List,java.lang.String,boolean,int,com.android.tools.r8.utils.DumpInputFlags,com.android.tools.r8.MapIdProvider,com.android.tools.r8.SourceFileProvider):760:797 -> <init>
     41:60:void <init>(boolean,boolean):801:820 -> <init>
     1:1:com.android.tools.r8.R8Command$Builder builder(com.android.tools.r8.utils.AndroidApp):689:689 -> a
     2:2:com.android.tools.r8.R8Command$Builder builder(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.DiagnosticsHandler):694:694 -> a
@@ -2330,7 +2334,7 @@
     58:68:com.android.tools.r8.utils.InternalOptions getInternalOptions():886:896 -> b
     69:79:com.android.tools.r8.utils.InternalOptions getInternalOptions():893:903 -> b
     80:107:com.android.tools.r8.utils.InternalOptions getInternalOptions():900:927 -> b
-    108:108:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():471:471 -> b
+    108:108:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> b
     108:108:com.android.tools.r8.utils.InternalOptions getInternalOptions():932 -> b
     109:130:com.android.tools.r8.utils.InternalOptions getInternalOptions():933:954 -> b
     131:139:com.android.tools.r8.utils.InternalOptions getInternalOptions():953:961 -> b
@@ -2420,7 +2424,7 @@
     1:4:com.android.tools.r8.R8Command makeCommand():466:469 -> q
     5:5:com.android.tools.r8.R8Command makeCommand():467:467 -> q
     1:16:com.android.tools.r8.R8Command makeR8Command():473:488 -> r
-    17:17:boolean com.android.tools.r8.utils.InternalOptions.shouldEnableKeepRuleSynthesisForRecompilation():776:776 -> r
+    17:17:boolean com.android.tools.r8.utils.InternalOptions.shouldEnableKeepRuleSynthesisForRecompilation():775:775 -> r
     17:17:com.android.tools.r8.R8Command makeR8Command():488 -> r
     18:84:com.android.tools.r8.R8Command makeR8Command():489:555 -> r
     85:85:com.android.tools.r8.utils.InternalOptions$DesugarState com.android.tools.r8.BaseCompilerCommand$Builder.getDesugaringState():534:534 -> r
@@ -2726,14 +2730,14 @@
     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.UU:
+com.android.tools.r8.StringResource -> com.android.tools.r8.internal.dV:
     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.RU:
-com.android.tools.r8.StringResource$FileResource -> com.android.tools.r8.internal.SU:
+com.android.tools.r8.StringResource$1 -> com.android.tools.r8.internal.aV:
+com.android.tools.r8.StringResource$FileResource -> com.android.tools.r8.internal.bV:
     java.nio.charset.Charset charset -> b
     com.android.tools.r8.origin.Origin origin -> c
     java.nio.file.Path file -> a
@@ -2743,7 +2747,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.TU:
+com.android.tools.r8.StringResource$StringContentResource -> com.android.tools.r8.internal.cV:
     com.android.tools.r8.origin.Origin origin -> a
     java.lang.String content -> b
     boolean $assertionsDisabled -> c
@@ -2769,7 +2773,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.aS:
+com.android.tools.r8.algorithms.scc.SCC -> com.android.tools.r8.internal.jS:
     java.util.Deque unassignedStack -> d
     java.util.Set unassignedSet -> c
     java.util.List components -> f
@@ -2799,30 +2803,31 @@
     5:6:com.android.tools.r8.androidapi.AndroidApiLevelCompute create(com.android.tools.r8.graph.AppView):48:49 -> a
     7:7:com.android.tools.r8.androidapi.AndroidApiLevelCompute com.android.tools.r8.androidapi.AndroidApiLevelCompute.noAndroidApiLevelCompute():54:54 -> a
     7:7:com.android.tools.r8.androidapi.AndroidApiLevelCompute create(com.android.tools.r8.graph.AppView):50 -> a
-    8:10:com.android.tools.r8.androidapi.ComputedApiLevel computeInitialMinApiLevel(com.android.tools.r8.utils.InternalOptions):58:60 -> a
-    11:11:com.android.tools.r8.androidapi.ComputedApiLevel$KnownApiLevel com.android.tools.r8.androidapi.ComputedApiLevel.platform():26:26 -> a
-    11:11:com.android.tools.r8.androidapi.ComputedApiLevel computeInitialMinApiLevel(com.android.tools.r8.utils.InternalOptions):60 -> a
-    12:14:com.android.tools.r8.androidapi.ComputedApiLevel computeInitialMinApiLevel(com.android.tools.r8.utils.InternalOptions):61:63 -> a
-    15:15:com.android.tools.r8.androidapi.ComputedApiLevel$UnknownApiLevel com.android.tools.r8.androidapi.ComputedApiLevel.unknown():22:22 -> a
-    15:15:com.android.tools.r8.androidapi.ComputedApiLevel computeInitialMinApiLevel(com.android.tools.r8.utils.InternalOptions):63 -> a
-    1:2:com.android.tools.r8.androidapi.ComputedApiLevel getPlatformApiLevelOrUnknown(com.android.tools.r8.graph.AppView):68:69 -> b
+    8:9:com.android.tools.r8.androidapi.ComputedApiLevel computeInitialMinApiLevel(com.android.tools.r8.utils.InternalOptions):58:59 -> a
+    10:10:com.android.tools.r8.androidapi.ComputedApiLevel$KnownApiLevel com.android.tools.r8.androidapi.ComputedApiLevel.platform():26:26 -> a
+    10:10:com.android.tools.r8.androidapi.ComputedApiLevel computeInitialMinApiLevel(com.android.tools.r8.utils.InternalOptions):59 -> a
+    11:11:com.android.tools.r8.androidapi.ComputedApiLevel computeInitialMinApiLevel(com.android.tools.r8.utils.InternalOptions):60:60 -> a
+    1:2:com.android.tools.r8.androidapi.ComputedApiLevel getPlatformApiLevelOrUnknown(com.android.tools.r8.graph.AppView):64:65 -> b
     3:3:com.android.tools.r8.androidapi.ComputedApiLevel$KnownApiLevel com.android.tools.r8.androidapi.ComputedApiLevel.platform():26:26 -> b
-    3:3:com.android.tools.r8.androidapi.ComputedApiLevel getPlatformApiLevelOrUnknown(com.android.tools.r8.graph.AppView):69 -> b
-    4:4:com.android.tools.r8.androidapi.ComputedApiLevel getPlatformApiLevelOrUnknown(com.android.tools.r8.graph.AppView):71:71 -> b
+    3:3:com.android.tools.r8.androidapi.ComputedApiLevel getPlatformApiLevelOrUnknown(com.android.tools.r8.graph.AppView):65 -> b
+    4:4:com.android.tools.r8.androidapi.ComputedApiLevel getPlatformApiLevelOrUnknown(com.android.tools.r8.graph.AppView):67:67 -> b
     5:5:com.android.tools.r8.androidapi.ComputedApiLevel$UnknownApiLevel com.android.tools.r8.androidapi.ComputedApiLevel.unknown():22:22 -> b
-    5:5:com.android.tools.r8.androidapi.ComputedApiLevel getPlatformApiLevelOrUnknown(com.android.tools.r8.graph.AppView):71 -> b
+    5:5:com.android.tools.r8.androidapi.ComputedApiLevel getPlatformApiLevelOrUnknown(com.android.tools.r8.graph.AppView):67 -> b
 com.android.tools.r8.androidapi.AndroidApiLevelCompute$DefaultAndroidApiLevelCompute -> com.android.tools.r8.internal.M1:
     com.android.tools.r8.androidapi.AndroidApiReferenceLevelCache cache -> b
     com.android.tools.r8.androidapi.ComputedApiLevel minApiLevel -> c
-    1:3:void <init>(com.android.tools.r8.graph.AppView):94:96 -> <init>
-    1:3:com.android.tools.r8.androidapi.ComputedApiLevel computeApiLevelForDefinition(java.lang.Iterable,com.android.tools.r8.androidapi.ComputedApiLevel):102:104 -> a
+    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):104 -> a
-    6:6:com.android.tools.r8.androidapi.ComputedApiLevel computeApiLevelForLibraryReference(com.android.tools.r8.graph.DexReference,com.android.tools.r8.androidapi.ComputedApiLevel):112:112 -> 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
 com.android.tools.r8.androidapi.AndroidApiLevelCompute$NoAndroidApiLevelCompute -> com.android.tools.r8.internal.N1:
-    1:1:void <init>():74:74 -> <init>
+    1:1:void <init>():70:70 -> <init>
     com.android.tools.r8.androidapi.ComputedApiLevel computeApiLevelForDefinition(java.lang.Iterable,com.android.tools.r8.androidapi.ComputedApiLevel) -> a
     com.android.tools.r8.androidapi.ComputedApiLevel computeApiLevelForLibraryReference(com.android.tools.r8.graph.DexReference,com.android.tools.r8.androidapi.ComputedApiLevel) -> a
+    1:1:com.android.tools.r8.androidapi.ComputedApiLevel computeInitialMinApiLevel(com.android.tools.r8.utils.InternalOptions):86:86 -> a
+    2:2:com.android.tools.r8.androidapi.ComputedApiLevel$UnknownApiLevel com.android.tools.r8.androidapi.ComputedApiLevel.unknown():22:22 -> a
+    2:2:com.android.tools.r8.androidapi.ComputedApiLevel computeInitialMinApiLevel(com.android.tools.r8.utils.InternalOptions):86 -> a
 com.android.tools.r8.androidapi.AndroidApiLevelDatabase -> com.android.tools.r8.internal.P1:
     com.android.tools.r8.utils.AndroidApiLevel getFieldApiLevel(com.android.tools.r8.graph.DexField) -> a
     com.android.tools.r8.utils.AndroidApiLevel getMethodApiLevel(com.android.tools.r8.graph.DexMethod) -> a
@@ -2878,7 +2883,7 @@
     115:115:void loadData():88:88 -> b
     116:137:void loadData():68:89 -> b
 com.android.tools.r8.androidapi.AndroidApiReferenceLevelCache -> com.android.tools.r8.internal.S1:
-    com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfiguration desugaredLibraryConfiguration -> a
+    com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification desugaredLibrarySpecification -> a
     com.android.tools.r8.androidapi.AndroidApiLevelDatabase androidApiLevelDatabase -> c
     com.android.tools.r8.graph.DexItemFactory factory -> e
     com.android.tools.r8.graph.AppView appView -> d
@@ -2892,7 +2897,112 @@
     45:45:com.android.tools.r8.androidapi.ComputedApiLevel lookup(com.android.tools.r8.graph.DexReference,com.android.tools.r8.androidapi.ComputedApiLevel):91 -> a
     46:55:com.android.tools.r8.androidapi.ComputedApiLevel lookup(com.android.tools.r8.graph.DexReference,com.android.tools.r8.androidapi.ComputedApiLevel):91:100 -> a
     56:56:com.android.tools.r8.androidapi.ComputedApiLevel lookup(com.android.tools.r8.graph.DexReference,com.android.tools.r8.androidapi.ComputedApiLevel):63:63 -> a
-com.android.tools.r8.androidapi.AvailableApiExceptions -> com.android.tools.r8.internal.L3:
+com.android.tools.r8.androidapi.ApiReferenceStubber -> com.android.tools.r8.internal.f2:
+    java.util.Map libraryClassesToMock -> b
+    com.android.tools.r8.graph.AppView appView -> a
+    java.util.Set seenTypes -> c
+    com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification desugaredLibraryConfiguration -> e
+    boolean $assertionsDisabled -> f
+    com.android.tools.r8.androidapi.AndroidApiLevelCompute apiLevelCompute -> d
+    1:1:void <clinit>():37:37 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):123:123 -> <init>
+    2:11:void <init>(com.android.tools.r8.graph.AppView):117:126 -> <init>
+    1:1:com.android.tools.r8.graph.AppView access$000(com.android.tools.r8.androidapi.ApiReferenceStubber):37:37 -> a
+    2:2:void access$100(com.android.tools.r8.androidapi.ApiReferenceStubber,com.android.tools.r8.graph.DexType):37:37 -> a
+    3:3:void access$200(com.android.tools.r8.androidapi.ApiReferenceStubber,com.android.tools.r8.graph.DexMethod):37:37 -> a
+    4:4:void run(java.util.concurrent.ExecutorService):130:130 -> a
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> a
+    5:5:void run(java.util.concurrent.ExecutorService):130 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    6:22:void run(java.util.concurrent.ExecutorService):130:146 -> a
+    23:23:boolean com.android.tools.r8.graph.AppView.hasLiveness():659:659 -> a
+    23:23:void run(java.util.concurrent.ExecutorService):146 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    24:26:void run(java.util.concurrent.ExecutorService):147:149 -> a
+    27:32:void run(java.util.concurrent.ExecutorService):148:153 -> a
+    33:37:void lambda$run$0(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):140:140 -> a
+    38:39:void processClass(com.android.tools.r8.graph.DexProgramClass):158:159 -> a
+    40:40:void lambda$processClass$1(com.android.tools.r8.graph.ProgramMethod):161:161 -> a
+    41:45:void findReferencedLibraryMethod(com.android.tools.r8.graph.DexMethod):165:169 -> a
+    46:46:void findReferencedLibraryMethod(com.android.tools.r8.graph.DexMethod):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":235,"2":236,"3":237}}
+    235:235:void findReferencedLibraryMethod(com.android.tools.r8.graph.DexMethod):169:169 -> a
+    236:236:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    236:236:void findReferencedLibraryMethod(com.android.tools.r8.graph.DexMethod):169 -> a
+    237:237:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    237:237:void findReferencedLibraryMethod(com.android.tools.r8.graph.DexMethod):169 -> a
+    216:216:void findReferencedLibraryMethod(com.android.tools.r8.graph.DexMethod):170:170 -> a
+    217:217:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    217:217:void findReferencedLibraryMethod(com.android.tools.r8.graph.DexMethod):171 -> a
+    218:219:void findReferencedLibraryMethod(com.android.tools.r8.graph.DexMethod):174:175 -> a
+    220:220:com.android.tools.r8.androidapi.ComputedApiLevel$UnknownApiLevel com.android.tools.r8.androidapi.ComputedApiLevel.unknown():22:22 -> a
+    220:220:void findReferencedLibraryMethod(com.android.tools.r8.graph.DexMethod):175 -> a
+    221:223:void findReferencedLibraryMethod(com.android.tools.r8.graph.DexMethod):175:177 -> a
+    224:224:com.android.tools.r8.androidapi.ComputedApiLevel$UnknownApiLevel com.android.tools.r8.androidapi.ComputedApiLevel.unknown():22:22 -> a
+    224:224:void findReferencedLibraryMethod(com.android.tools.r8.graph.DexMethod):179 -> a
+    225:234:void findReferencedLibraryMethod(com.android.tools.r8.graph.DexMethod):178:187 -> a
+    238:243:void findReferencedLibraryClasses(com.android.tools.r8.graph.DexType):193:198 -> a
+    244:244:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    244:244:void findReferencedLibraryClasses(com.android.tools.r8.graph.DexType):202 -> a
+    245:247:void findReferencedLibraryClasses(com.android.tools.r8.graph.DexType):203:205 -> a
+    248:248:com.android.tools.r8.androidapi.ComputedApiLevel$UnknownApiLevel com.android.tools.r8.androidapi.ComputedApiLevel.unknown():22:22 -> a
+    248:248:void findReferencedLibraryClasses(com.android.tools.r8.graph.DexType):205 -> a
+    249:254:void findReferencedLibraryClasses(com.android.tools.r8.graph.DexType):204:209 -> a
+    255:259:void findReferencedLibraryClasses(com.android.tools.r8.graph.DexType):208:212 -> a
+    260:260:java.util.Set lambda$findReferencedLibraryClasses$3(com.android.tools.r8.graph.DexLibraryClass):209:209 -> a
+    261:275:void mockMissingLibraryClass(com.android.tools.r8.graph.DexLibraryClass,java.util.Set,com.android.tools.r8.graph.ThrowExceptionCode):220:234 -> a
+    276:276:void mockMissingLibraryClass(com.android.tools.r8.graph.DexLibraryClass,java.util.Set,com.android.tools.r8.graph.ThrowExceptionCode):230:230 -> a
+    277:281: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):237:241 -> a
+    282:282: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):240:240 -> a
+    283:288: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):239:244 -> a
+    289:289:boolean com.android.tools.r8.graph.DexClass.isFinal():656:656 -> a
+    289:289: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):246 -> a
+    290:297: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):247:254 -> a
+    298:298: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):253:253 -> a
+    299:306: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):252:259 -> a
+    307: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:262 -> a
+    312:319: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):256:263 -> a
+    320:321:java.util.List buildLibraryMethodsForProgram(com.android.tools.r8.graph.DexLibraryClass,java.lang.Iterable,java.util.Set):269:270 -> a
+    322:325:void lambda$buildLibraryMethodsForProgram$5(java.util.Set,com.android.tools.r8.graph.DexLibraryClass,java.util.List,com.android.tools.r8.graph.DexEncodedMethod):272:275 -> a
+    326:329:com.android.tools.r8.graph.DexEncodedMethod buildLibraryMethodForProgram(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexEncodedMethod):284:284 -> a
+    332:339:com.android.tools.r8.graph.DexEncodedMethod buildLibraryMethodForProgram(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexEncodedMethod):287:294 -> a
+    340:343:com.android.tools.r8.graph.DexEncodedMethod buildLibraryMethodForProgram(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexEncodedMethod):293:296 -> a
+    344:344:void lambda$buildLibraryMethodForProgram$6(com.android.tools.r8.graph.DexEncodedMethod$Builder):292:292 -> a
+    1:1:java.util.Set lambda$findReferencedLibraryMethod$2(com.android.tools.r8.graph.DexLibraryClass):186:186 -> b
+    2:2:void lambda$buildLibraryMethodForProgram$7(com.android.tools.r8.graph.DexEncodedMethod$Builder):295:295 -> b
+com.android.tools.r8.androidapi.ApiReferenceStubber$ReferencesToApiLevelUseRegistry -> com.android.tools.r8.internal.e2:
+    com.android.tools.r8.androidapi.ApiReferenceStubber this$0 -> e
+    1:2:void <init>(com.android.tools.r8.androidapi.ApiReferenceStubber,com.android.tools.r8.graph.ProgramMethod):41:42 -> <init>
+    1:1:void registerInvokeDirect(com.android.tools.r8.graph.DexMethod):57:57 -> a
+    2:2:void registerInstanceFieldRead(com.android.tools.r8.graph.DexField):77:77 -> a
+    3:10:void checkReferenceToLibraryClass(com.android.tools.r8.graph.DexReference):101:108 -> a
+    11:11:void checkReferenceToLibraryClass(com.android.tools.r8.graph.DexReference):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":123,"2":124,"3":125}}
+    123:123:void checkReferenceToLibraryClass(com.android.tools.r8.graph.DexReference):108:108 -> a
+    124:124:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    124:124:void checkReferenceToLibraryClass(com.android.tools.r8.graph.DexReference):108 -> a
+    125:125:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    125:125:void checkReferenceToLibraryClass(com.android.tools.r8.graph.DexReference):108 -> a
+    120:122:void checkReferenceToLibraryClass(com.android.tools.r8.graph.DexReference):109:111 -> a
+    1:1:void registerInitClass(com.android.tools.r8.graph.DexType):47:47 -> b
+    2:2:void registerInvokeInterface(com.android.tools.r8.graph.DexMethod):67:67 -> b
+    1:1:void registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):82:82 -> c
+    1:1:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):62:62 -> d
+    1:1:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):87:87 -> e
+    1:1:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):72:72 -> f
+    2:2:void registerTypeReference(com.android.tools.r8.graph.DexType):97:97 -> f
+    1:1:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):52:52 -> g
+    2:2:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):92:92 -> g
+    3:3:void lambda$checkReferenceToLibraryClass$0(com.android.tools.r8.graph.DexType):106:106 -> g
+    4:4:void lambda$checkReferenceToLibraryClass$0(com.android.tools.r8.graph.DexType):0:0 -> g
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":111,"2":112,"3":113}}
+    111:111:void lambda$checkReferenceToLibraryClass$0(com.android.tools.r8.graph.DexType):106:106 -> g
+    112:112:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> g
+    112:112:void lambda$checkReferenceToLibraryClass$0(com.android.tools.r8.graph.DexType):106 -> g
+    113:113:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> g
+    113:113:void lambda$checkReferenceToLibraryClass$0(com.android.tools.r8.graph.DexType):106 -> g
+    110:110:void lambda$checkReferenceToLibraryClass$0(com.android.tools.r8.graph.DexType):106:106 -> g
+com.android.tools.r8.androidapi.AvailableApiExceptions -> com.android.tools.r8.internal.O3:
     java.util.Set exceptions -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():24:24 -> <clinit>
@@ -3763,64 +3873,64 @@
     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.vc:
+com.android.tools.r8.androidapi.ComputedApiLevel -> com.android.tools.r8.internal.xc:
     int $r8$clinit -> a
     1:1:void <clinit>():15:15 -> <clinit>
-    boolean isUnknownApiLevel() -> B
-    boolean isNotSetApiLevel() -> D
-    com.android.tools.r8.androidapi.ComputedApiLevel$KnownApiLevel asKnownApiLevel() -> R
+    boolean isUnknownApiLevel() -> C
+    boolean isNotSetApiLevel() -> E
+    com.android.tools.r8.androidapi.ComputedApiLevel$KnownApiLevel asKnownApiLevel() -> S
     1:1:boolean isEqualTo(java.lang.Object):15:15 -> a
     2:11:boolean isGreaterThan(com.android.tools.r8.androidapi.ComputedApiLevel):42:51 -> a
     1:1:com.android.tools.r8.androidapi.ComputedApiLevel max(com.android.tools.r8.androidapi.ComputedApiLevel):38:38 -> b
     1:3:boolean isGreaterThanOrEqualTo(com.android.tools.r8.androidapi.ComputedApiLevel):55:57 -> c
     1:1:boolean isEqualTo(com.android.tools.r8.androidapi.ComputedApiLevel):70:70 -> d
-    1:1:com.android.tools.r8.androidapi.ComputedApiLevel$UnknownApiLevel unknown():22:22 -> k
-    1:1:com.android.tools.r8.androidapi.ComputedApiLevel$NotSetApiLevel notSet():18:18 -> s
-    boolean isKnownApiLevel() -> t
-com.android.tools.r8.androidapi.ComputedApiLevel$1 -> com.android.tools.r8.internal.uc:
+    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.wc:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():42:42 -> <clinit>
-com.android.tools.r8.androidapi.ComputedApiLevel$KnownApiLevel -> com.android.tools.r8.internal.vc$a:
+com.android.tools.r8.androidapi.ComputedApiLevel$KnownApiLevel -> com.android.tools.r8.internal.xc$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>
     1:2:void <init>(com.android.tools.r8.utils.AndroidApiLevel):129:130 -> <init>
-    com.android.tools.r8.androidapi.ComputedApiLevel$KnownApiLevel asKnownApiLevel() -> R
+    com.android.tools.r8.androidapi.ComputedApiLevel$KnownApiLevel asKnownApiLevel() -> S
     1:1:com.android.tools.r8.androidapi.ComputedApiLevel$KnownApiLevel access$200():122:122 -> a
     1:1:com.android.tools.r8.utils.AndroidApiLevel getApiLevel():134:134 -> b
     1:5:boolean equals(java.lang.Object):157:161 -> equals
     1:1:int hashCode():166:166 -> hashCode
-    boolean isKnownApiLevel() -> t
     1:1:java.lang.String toString():149:149 -> toString
-com.android.tools.r8.androidapi.ComputedApiLevel$NotSetApiLevel -> com.android.tools.r8.internal.wc:
+    boolean isKnownApiLevel() -> u
+com.android.tools.r8.androidapi.ComputedApiLevel$NotSetApiLevel -> com.android.tools.r8.internal.yc:
     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() -> D
+    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.xc:
+com.android.tools.r8.androidapi.ComputedApiLevel$UnknownApiLevel -> com.android.tools.r8.internal.zc:
     com.android.tools.r8.androidapi.ComputedApiLevel$UnknownApiLevel INSTANCE -> b
     1:1:void <clinit>():97:97 -> <clinit>
     1:1:void <init>():99:99 -> <init>
-    boolean isUnknownApiLevel() -> B
+    boolean isUnknownApiLevel() -> C
     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.L4:
+com.android.tools.r8.bisect.Bisect -> com.android.tools.r8.internal.O4:
     1:4:com.android.tools.r8.graph.DexProgramClass run(com.android.tools.r8.bisect.BisectState,com.android.tools.r8.bisect.Bisect$Command,java.nio.file.Path,java.util.concurrent.ExecutorService):80:83 -> a
-    5:23:void com.android.tools.r8.bisect.Bisect.writeApp(com.android.tools.r8.graph.DexApplication,java.nio.file.Path,java.util.concurrent.ExecutorService):186:204 -> a
-    5:23:com.android.tools.r8.graph.DexProgramClass run(com.android.tools.r8.bisect.BisectState,com.android.tools.r8.bisect.Bisect$Command,java.nio.file.Path,java.util.concurrent.ExecutorService):86 -> a
-    24:30:com.android.tools.r8.graph.DexProgramClass run(com.android.tools.r8.bisect.BisectState,com.android.tools.r8.bisect.Bisect$Command,java.nio.file.Path,java.util.concurrent.ExecutorService):87:93 -> a
-com.android.tools.r8.bisect.Bisect$Command -> com.android.tools.r8.internal.L4$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.O4$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.M4:
+com.android.tools.r8.bisect.BisectOptions$Result -> com.android.tools.r8.internal.P4:
     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.Q4:
+com.android.tools.r8.bisect.BisectState -> com.android.tools.r8.internal.T4:
     java.nio.file.Path stateFile -> e
     com.android.tools.r8.graph.DexApplication badApp -> b
     java.util.Map indexMap -> d
@@ -3926,7 +4036,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     11:16:void write():316:321 -> d
     17:27:void write():311:321 -> d
-com.android.tools.r8.bisect.BisectState$Range -> com.android.tools.r8.internal.O4:
+com.android.tools.r8.bisect.BisectState$Range -> com.android.tools.r8.internal.R4:
     int end -> b
     boolean $assertionsDisabled -> c
     int start -> a
@@ -3956,14 +4066,14 @@
     193:193:java.lang.String toString():94:94 -> toString
     194:194:java.lang.String toString():94:94 -> toString
     195:195:java.lang.String toString():94:94 -> toString
-com.android.tools.r8.bisect.BisectState$Run -> com.android.tools.r8.internal.P4:
+com.android.tools.r8.bisect.BisectState$Run -> com.android.tools.r8.internal.S4:
     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.A6:
+com.android.tools.r8.cf.CfCodePrinter -> com.android.tools.r8.internal.D6:
     java.util.Map knownTypeFields -> r
     java.util.Set imports -> j
     boolean pendingComma -> p
@@ -4228,7 +4338,7 @@
     1:1:java.util.List getMethods():110:110 -> k
     1:1:java.util.Set getSynthesizedTypes():644:644 -> l
     1:1:java.lang.String immutableListType():197:197 -> m
-com.android.tools.r8.cf.CfPrinter -> com.android.tools.r8.internal.X7:
+com.android.tools.r8.cf.CfPrinter -> com.android.tools.r8.internal.Z7:
     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
@@ -4399,7 +4509,7 @@
     1:1:void print(com.android.tools.r8.cf.code.CfReturnVoid):356:356 -> g
     1:1:void print(com.android.tools.r8.cf.code.CfArrayLength):557:557 -> h
     1:1:java.lang.String toString():816:816 -> toString
-com.android.tools.r8.cf.CfPrinter$1 -> com.android.tools.r8.internal.W7:
+com.android.tools.r8.cf.CfPrinter$1 -> com.android.tools.r8.internal.Y7:
     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
@@ -4408,7 +4518,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.a8:
+com.android.tools.r8.cf.CfRegisterAllocator -> com.android.tools.r8.internal.c8:
     boolean $assertionsDisabled -> n
     int maxRegisterNumber -> l
     com.android.tools.r8.graph.AppView appView -> a
@@ -4512,7 +4622,7 @@
     10:19:com.android.tools.r8.cf.CfRegisterAllocator$TypesAtBlockEntry lambda$getTypesAtBlockEntry$0(com.android.tools.r8.ir.code.BasicBlock):368:377 -> b
     20:31:void mergeBlocks(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):383:394 -> b
     1:1:int registersUsed():123:123 -> c
-com.android.tools.r8.cf.CfRegisterAllocator$TypesAtBlockEntry -> com.android.tools.r8.internal.Z7:
+com.android.tools.r8.cf.CfRegisterAllocator$TypesAtBlockEntry -> com.android.tools.r8.internal.b8:
     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>
@@ -4522,7 +4632,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.I8:
+com.android.tools.r8.cf.CfVersion -> com.android.tools.r8.internal.K8:
     com.android.tools.r8.cf.CfVersion V17 -> n
     com.android.tools.r8.cf.CfVersion V12 -> l
     com.android.tools.r8.cf.CfVersion V15 -> m
@@ -4540,7 +4650,7 @@
     com.android.tools.r8.cf.CfVersion[] versions -> o
     1:30:void <clinit>():15:44 -> <clinit>
     1:2:void <init>(int):65:66 -> <init>
-    com.android.tools.r8.utils.structural.StructuralItem self() -> K
+    com.android.tools.r8.utils.structural.StructuralItem self() -> L
     1:1:int major():74:74 -> a
     2:2:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):90:90 -> a
     3:3:boolean lambda$rangeInclusive$0(com.android.tools.r8.cf.CfVersion,com.android.tools.r8.cf.CfVersion):98:98 -> a
@@ -4591,7 +4701,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.EA:
+com.android.tools.r8.cf.LoadStoreHelper -> com.android.tools.r8.internal.JA:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Map clonableConstants -> d
     boolean $assertionsDisabled -> f
@@ -4730,14 +4840,14 @@
     88:90: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
     88:90:void storeOutValue(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):205 -> b
     91:93: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.CA:
+com.android.tools.r8.cf.LoadStoreHelper$1 -> com.android.tools.r8.internal.HA:
     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.DA:
+com.android.tools.r8.cf.LoadStoreHelper$PhiMove -> com.android.tools.r8.internal.IA:
     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.EX:
+com.android.tools.r8.cf.TypeVerificationHelper -> com.android.tools.r8.internal.NX:
     boolean computingVerificationTypes -> i
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.AppView appView -> e
@@ -4784,10 +4894,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.zX:
+com.android.tools.r8.cf.TypeVerificationHelper$1 -> com.android.tools.r8.internal.IX:
     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.AX:
+com.android.tools.r8.cf.TypeVerificationHelper$InitializedTypeInfo -> com.android.tools.r8.internal.JX:
     com.android.tools.r8.graph.DexType type -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():41:41 -> <clinit>
@@ -4795,7 +4905,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.BX:
+com.android.tools.r8.cf.TypeVerificationHelper$NewInstanceInfo -> com.android.tools.r8.internal.KX:
     com.android.tools.r8.ir.code.NewInstance newInstance -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():60:60 -> <clinit>
@@ -4809,7 +4919,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.CX:
+com.android.tools.r8.cf.TypeVerificationHelper$ThisInstanceInfo -> com.android.tools.r8.internal.LX:
     com.android.tools.r8.ir.code.Argument thisArgument -> b
     com.android.tools.r8.graph.DexType type -> a
     boolean $assertionsDisabled -> c
@@ -4824,9 +4934,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.DX:
+com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo -> com.android.tools.r8.internal.MX:
     com.android.tools.r8.graph.DexType getDexType() -> a
-com.android.tools.r8.cf.code.CfArithmeticBinop -> com.android.tools.r8.internal.j6:
+com.android.tools.r8.cf.code.CfArithmeticBinop -> com.android.tools.r8.internal.m6:
     com.android.tools.r8.ir.code.NumericType type -> c
     com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode opcode -> b
     int $r8$clinit -> e
@@ -4871,12 +4981,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.i6:
+com.android.tools.r8.cf.code.CfArithmeticBinop$1 -> com.android.tools.r8.internal.l6:
     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.j6$a:
+com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode -> com.android.tools.r8.internal.m6$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
@@ -4887,7 +4997,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.k6:
+com.android.tools.r8.cf.code.CfArrayLength -> com.android.tools.r8.internal.n6:
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():27:27 -> <clinit>
     1:1:void <init>():27:27 -> <init>
@@ -4902,7 +5012,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.l6:
+com.android.tools.r8.cf.code.CfArrayLoad -> com.android.tools.r8.internal.o6:
     com.android.tools.r8.ir.code.MemberType type -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():31:31 -> <clinit>
@@ -4937,7 +5047,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.m6:
+com.android.tools.r8.cf.code.CfArrayStore -> com.android.tools.r8.internal.p6:
     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
@@ -4957,7 +5067,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.q6:
+com.android.tools.r8.cf.code.CfCheckCast -> com.android.tools.r8.internal.t6:
     com.android.tools.r8.graph.DexType type -> b
     boolean ignoreCompatRules -> c
     1:1:void <init>(com.android.tools.r8.graph.DexType):36:36 -> <init>
@@ -4985,7 +5095,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.x6:
+com.android.tools.r8.cf.code.CfCmp -> com.android.tools.r8.internal.A6:
     com.android.tools.r8.ir.code.Cmp$Bias bias -> b
     com.android.tools.r8.ir.code.NumericType type -> c
     boolean $assertionsDisabled -> d
@@ -5014,10 +5124,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.w6:
+com.android.tools.r8.cf.code.CfCmp$1 -> com.android.tools.r8.internal.z6:
     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.D6:
+com.android.tools.r8.cf.code.CfConstClass -> com.android.tools.r8.internal.F6:
     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>
@@ -5064,7 +5174,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.E6:
+com.android.tools.r8.cf.code.CfConstDynamic -> com.android.tools.r8.internal.G6:
     com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicReference reference -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():40:40 -> <clinit>
@@ -5120,7 +5230,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.F6:
+com.android.tools.r8.cf.code.CfConstMethodHandle -> com.android.tools.r8.internal.H6:
     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
@@ -5136,7 +5246,7 @@
     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):95 -> a
     boolean canThrow() -> q
     int getCompareToId() -> s
-com.android.tools.r8.cf.code.CfConstMethodType -> com.android.tools.r8.internal.G6:
+com.android.tools.r8.cf.code.CfConstMethodType -> com.android.tools.r8.internal.I6:
     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
@@ -5154,7 +5264,7 @@
     12:12: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.H6:
+com.android.tools.r8.cf.code.CfConstNull -> com.android.tools.r8.internal.J6:
     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
@@ -5168,7 +5278,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.J6:
+com.android.tools.r8.cf.code.CfConstNumber -> com.android.tools.r8.internal.L6:
     com.android.tools.r8.ir.code.ValueType type -> c
     long value -> b
     int $r8$clinit -> e
@@ -5211,10 +5321,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.I6:
+com.android.tools.r8.cf.code.CfConstNumber$1 -> com.android.tools.r8.internal.K6:
     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.K6:
+com.android.tools.r8.cf.code.CfConstString -> com.android.tools.r8.internal.M6:
     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
@@ -5233,7 +5343,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.L6:
+com.android.tools.r8.cf.code.CfDexItemBasedConstString -> com.android.tools.r8.internal.N6:
     com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo nameComputationInfo -> c
     com.android.tools.r8.graph.DexReference item -> b
     boolean $assertionsDisabled -> d
@@ -5259,7 +5369,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.M6:
+com.android.tools.r8.cf.code.CfFieldInstruction -> com.android.tools.r8.internal.O6:
     boolean $assertionsDisabled -> e
     com.android.tools.r8.graph.DexField declaringField -> d
     com.android.tools.r8.graph.DexField field -> c
@@ -5333,7 +5443,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.V6:
+com.android.tools.r8.cf.code.CfFrame -> com.android.tools.r8.internal.X6:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap locals -> b
     java.util.Deque stack -> c
     boolean $assertionsDisabled -> d
@@ -5377,8 +5487,8 @@
     com.android.tools.r8.cf.code.CfFrame asFrame() -> g
     int getCompareToId() -> s
     1:1:java.lang.String toString():450:450 -> toString
-com.android.tools.r8.cf.code.CfFrame$1 -> com.android.tools.r8.internal.N6:
-com.android.tools.r8.cf.code.CfFrame$FrameType -> com.android.tools.r8.internal.O6:
+com.android.tools.r8.cf.code.CfFrame$1 -> com.android.tools.r8.internal.P6:
+com.android.tools.r8.cf.code.CfFrame$FrameType -> com.android.tools.r8.internal.Q6:
     1:1:void <init>(com.android.tools.r8.cf.code.CfFrame$1):40:40 -> <init>
     2:2:void <init>():108:108 -> <init>
     com.android.tools.r8.graph.DexType getInitializedType() -> a
@@ -5407,7 +5517,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.P6:
+com.android.tools.r8.cf.code.CfFrame$InitializedType -> com.android.tools.r8.internal.R6:
     com.android.tools.r8.graph.DexType type -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():165:165 -> <clinit>
@@ -5432,28 +5542,28 @@
     179:179:java.lang.String toString():176:176 -> toString
     180:180:java.lang.String toString():176:176 -> toString
     177:177:java.lang.String toString():176:176 -> toString
-com.android.tools.r8.cf.code.CfFrame$OneWord -> com.android.tools.r8.internal.Q6:
+com.android.tools.r8.cf.code.CfFrame$OneWord -> com.android.tools.r8.internal.S6:
     com.android.tools.r8.cf.code.CfFrame$OneWord SINGLETON -> a
     1:1:void <clinit>():294:294 -> <clinit>
     1:1:void <init>():292:292 -> <init>
     1:1:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):298:298 -> a
     1:1:com.android.tools.r8.cf.code.CfFrame$OneWord access$400():292:292 -> k
     1:1:java.lang.String toString():308:308 -> toString
-com.android.tools.r8.cf.code.CfFrame$Top -> com.android.tools.r8.internal.R6:
+com.android.tools.r8.cf.code.CfFrame$Top -> com.android.tools.r8.internal.T6:
     com.android.tools.r8.cf.code.CfFrame$Top SINGLETON -> a
     1:1:void <clinit>():219:219 -> <clinit>
     1:1:void <init>():217:217 -> <init>
     1:1:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):228:228 -> a
     1:1:com.android.tools.r8.cf.code.CfFrame$Top access$300():217:217 -> k
     1:1:java.lang.String toString():223:223 -> toString
-com.android.tools.r8.cf.code.CfFrame$TwoWord -> com.android.tools.r8.internal.S6:
+com.android.tools.r8.cf.code.CfFrame$TwoWord -> com.android.tools.r8.internal.U6:
     com.android.tools.r8.cf.code.CfFrame$TwoWord SINGLETON -> a
     1:1:void <clinit>():314:314 -> <clinit>
     1:1:void <init>():312:312 -> <init>
     1:1:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):318:318 -> a
     1:1:com.android.tools.r8.cf.code.CfFrame$TwoWord access$500():312:312 -> k
     1:1:java.lang.String toString():333:333 -> toString
-com.android.tools.r8.cf.code.CfFrame$UninitializedNew -> com.android.tools.r8.internal.T6:
+com.android.tools.r8.cf.code.CfFrame$UninitializedNew -> com.android.tools.r8.internal.V6:
     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):237:237 -> <init>
@@ -5462,12 +5572,12 @@
     1:1:com.android.tools.r8.cf.code.CfLabel getUninitializedLabel():263:263 -> b
     1:1:com.android.tools.r8.graph.DexType getUninitializedNewType():268:268 -> c
     1:1:java.lang.String toString():248:248 -> toString
-com.android.tools.r8.cf.code.CfFrame$UninitializedThis -> com.android.tools.r8.internal.U6:
+com.android.tools.r8.cf.code.CfFrame$UninitializedThis -> com.android.tools.r8.internal.W6:
     1:1:void <init>(com.android.tools.r8.cf.code.CfFrame$1):272:272 -> <init>
     2:2:void <init>():274:274 -> <init>
     1:1:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):278:278 -> a
     1:1:java.lang.String toString():283:283 -> toString
-com.android.tools.r8.cf.code.CfFrameVerificationHelper -> com.android.tools.r8.internal.W6:
+com.android.tools.r8.cf.code.CfFrameVerificationHelper -> com.android.tools.r8.internal.Y6:
     java.util.Map stateMap -> d
     com.android.tools.r8.graph.GraphLens graphLens -> g
     java.util.Set tryCatchRangeLabels -> j
@@ -5647,7 +5757,7 @@
     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.X6:
+com.android.tools.r8.cf.code.CfGoto -> com.android.tools.r8.internal.Z6:
     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
@@ -5662,7 +5772,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.Z6:
+com.android.tools.r8.cf.code.CfIf -> com.android.tools.r8.internal.b7:
     com.android.tools.r8.ir.code.ValueType type -> c
     com.android.tools.r8.ir.code.If$Type kind -> b
     boolean $assertionsDisabled -> e
@@ -5694,10 +5804,10 @@
     17:17: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.Y6:
+com.android.tools.r8.cf.code.CfIf$1 -> com.android.tools.r8.internal.a7:
     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.b7:
+com.android.tools.r8.cf.code.CfIfCmp -> com.android.tools.r8.internal.d7:
     com.android.tools.r8.ir.code.ValueType type -> c
     com.android.tools.r8.ir.code.If$Type kind -> b
     boolean $assertionsDisabled -> e
@@ -5733,10 +5843,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.a7:
+com.android.tools.r8.cf.code.CfIfCmp$1 -> com.android.tools.r8.internal.c7:
     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.c7:
+com.android.tools.r8.cf.code.CfIinc -> com.android.tools.r8.internal.e7:
     int var -> b
     int increment -> c
     1:3:void <init>(int,int):37:39 -> <init>
@@ -5750,7 +5860,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.d7:
+com.android.tools.r8.cf.code.CfInitClass -> com.android.tools.r8.internal.f7:
     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
@@ -5770,13 +5880,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.e7:
+com.android.tools.r8.cf.code.CfInstanceFieldRead -> com.android.tools.r8.internal.g7:
     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.f7:
+com.android.tools.r8.cf.code.CfInstanceFieldWrite -> com.android.tools.r8.internal.h7:
     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.g7:
+com.android.tools.r8.cf.code.CfInstanceOf -> com.android.tools.r8.internal.i7:
     com.android.tools.r8.graph.DexType type -> b
     1:2:void <init>(com.android.tools.r8.graph.DexType):33:34 -> <init>
     boolean isTypeInstruction() -> E
@@ -5800,7 +5910,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.h7:
+com.android.tools.r8.cf.code.CfInstruction -> com.android.tools.r8.internal.j7:
     1:1:void <init>():31:31 -> <init>
     boolean isInvokeStatic() -> A
     boolean isInvokeVirtual() -> B
@@ -5843,7 +5953,7 @@
     boolean isInvoke() -> x
     boolean isInvokeInterface() -> y
     boolean isInvokeSpecial() -> z
-com.android.tools.r8.cf.code.CfInvoke -> com.android.tools.r8.internal.o7:
+com.android.tools.r8.cf.code.CfInvoke -> com.android.tools.r8.internal.q7:
     boolean $assertionsDisabled -> e
     com.android.tools.r8.graph.DexMethod method -> b
     int opcode -> c
@@ -5921,7 +6031,7 @@
     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.p7:
+com.android.tools.r8.cf.code.CfInvokeDynamic -> com.android.tools.r8.internal.r7:
     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
@@ -5965,7 +6075,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.q7:
+com.android.tools.r8.cf.code.CfJsrRet -> com.android.tools.r8.internal.s7:
     int local -> b
     1:2:void <init>(int):36:37 -> <init>
     1:1:com.android.tools.r8.errors.CompilationError error():30:30 -> F
@@ -5980,7 +6090,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):77:77 -> 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):89:89 -> a
     1:1:int getCompareToId():42:42 -> s
-com.android.tools.r8.cf.code.CfLabel -> com.android.tools.r8.internal.r7:
+com.android.tools.r8.cf.code.CfLabel -> com.android.tools.r8.internal.t7:
     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
@@ -5996,7 +6106,7 @@
     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.x7:
+com.android.tools.r8.cf.code.CfLoad -> com.android.tools.r8.internal.z7:
     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>
@@ -6025,10 +6135,10 @@
     com.android.tools.r8.cf.code.CfLoad asLoad() -> l
     boolean emitsIR() -> r
     1:1:int getCompareToId():41:41 -> s
-com.android.tools.r8.cf.code.CfLoad$1 -> com.android.tools.r8.internal.w7:
+com.android.tools.r8.cf.code.CfLoad$1 -> com.android.tools.r8.internal.y7:
     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.z7:
+com.android.tools.r8.cf.code.CfLogicalBinop -> com.android.tools.r8.internal.B7:
     com.android.tools.r8.ir.code.NumericType type -> c
     com.android.tools.r8.cf.code.CfLogicalBinop$Opcode opcode -> b
     boolean $assertionsDisabled -> d
@@ -6072,7 +6182,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.y7:
+com.android.tools.r8.cf.code.CfLogicalBinop$Opcode -> com.android.tools.r8.internal.A7:
     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
@@ -6083,7 +6193,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.A7:
+com.android.tools.r8.cf.code.CfMonitor -> com.android.tools.r8.internal.C7:
     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
@@ -6102,7 +6212,7 @@
     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.B7:
+com.android.tools.r8.cf.code.CfMultiANewArray -> com.android.tools.r8.internal.D7:
     com.android.tools.r8.graph.DexType type -> b
     int dimensions -> c
     boolean $assertionsDisabled -> d
@@ -6132,7 +6242,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.D7:
+com.android.tools.r8.cf.code.CfNeg -> com.android.tools.r8.internal.F7:
     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
@@ -6154,10 +6264,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.C7:
+com.android.tools.r8.cf.code.CfNeg$1 -> com.android.tools.r8.internal.E7:
     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.E7:
+com.android.tools.r8.cf.code.CfNew -> com.android.tools.r8.internal.G7:
     com.android.tools.r8.graph.DexType type -> b
     1:2:void <init>(com.android.tools.r8.graph.DexType):34:35 -> <init>
     boolean isTypeInstruction() -> E
@@ -6177,7 +6287,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.F7:
+com.android.tools.r8.cf.code.CfNewArray -> com.android.tools.r8.internal.H7:
     com.android.tools.r8.graph.DexType type -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():32:32 -> <clinit>
@@ -6221,7 +6331,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.G7:
+com.android.tools.r8.cf.code.CfNewUnboxedEnum -> com.android.tools.r8.internal.I7:
     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>
@@ -6243,7 +6353,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.H7:
+com.android.tools.r8.cf.code.CfNop -> com.android.tools.r8.internal.J7:
     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
@@ -6253,7 +6363,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.J7:
+com.android.tools.r8.cf.code.CfNumberConversion -> com.android.tools.r8.internal.L7:
     com.android.tools.r8.ir.code.NumericType to -> c
     com.android.tools.r8.ir.code.NumericType from -> b
     boolean $assertionsDisabled -> d
@@ -6309,10 +6419,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.I7:
+com.android.tools.r8.cf.code.CfNumberConversion$1 -> com.android.tools.r8.internal.K7:
     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.N7:
+com.android.tools.r8.cf.code.CfPosition -> com.android.tools.r8.internal.P7:
     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>
@@ -6333,7 +6443,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.Y7:
+com.android.tools.r8.cf.code.CfRecordFieldValues -> com.android.tools.r8.internal.a8:
     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
@@ -6355,7 +6465,7 @@
     23:23: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.c8:
+com.android.tools.r8.cf.code.CfReturn -> com.android.tools.r8.internal.e8:
     com.android.tools.r8.ir.code.ValueType type -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():29:29 -> <clinit>
@@ -6377,10 +6487,10 @@
     9:9:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forReturn():315:315 -> 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):106 -> a
     1:1:int getCompareToId():43:43 -> s
-com.android.tools.r8.cf.code.CfReturn$1 -> com.android.tools.r8.internal.b8:
+com.android.tools.r8.cf.code.CfReturn$1 -> com.android.tools.r8.internal.d8:
     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.d8:
+com.android.tools.r8.cf.code.CfReturnVoid -> com.android.tools.r8.internal.f8:
     1:1:void <init>():26:26 -> <init>
     boolean isJump() -> C
     boolean isReturn() -> D
@@ -6392,11 +6502,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.e8:
+com.android.tools.r8.cf.code.CfSafeCheckCast -> com.android.tools.r8.internal.g8:
     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.m8:
+com.android.tools.r8.cf.code.CfStackInstruction -> com.android.tools.r8.internal.o8:
     com.android.tools.r8.cf.code.CfStackInstruction$Opcode opcode -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():31:31 -> <clinit>
@@ -6630,10 +6740,10 @@
     17:17:void dup2x1(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):304 -> b
     boolean emitsIR() -> r
     1:1:int getCompareToId():88:88 -> s
-com.android.tools.r8.cf.code.CfStackInstruction$1 -> com.android.tools.r8.internal.l8:
+com.android.tools.r8.cf.code.CfStackInstruction$1 -> com.android.tools.r8.internal.n8:
     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.m8$a:
+com.android.tools.r8.cf.code.CfStackInstruction$Opcode -> com.android.tools.r8.internal.o8$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
@@ -6650,15 +6760,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.y8:
+com.android.tools.r8.cf.code.CfStaticFieldRead -> com.android.tools.r8.internal.A8:
     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.z8:
+com.android.tools.r8.cf.code.CfStaticFieldWrite -> com.android.tools.r8.internal.B8:
     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.B8:
+com.android.tools.r8.cf.code.CfStore -> com.android.tools.r8.internal.D8:
     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>
@@ -6695,10 +6805,10 @@
     com.android.tools.r8.cf.code.CfStore asStore() -> o
     boolean emitsIR() -> r
     1:1:int getCompareToId():44:44 -> s
-com.android.tools.r8.cf.code.CfStore$1 -> com.android.tools.r8.internal.A8:
+com.android.tools.r8.cf.code.CfStore$1 -> com.android.tools.r8.internal.C8:
     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.D8:
+com.android.tools.r8.cf.code.CfSwitch -> com.android.tools.r8.internal.F8:
     java.util.List targets -> e
     int[] keys -> d
     com.android.tools.r8.cf.code.CfSwitch$Kind kind -> b
@@ -6728,17 +6838,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.C8:
+com.android.tools.r8.cf.code.CfSwitch$1 -> com.android.tools.r8.internal.E8:
     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.D8$a:
+com.android.tools.r8.cf.code.CfSwitch$Kind -> com.android.tools.r8.internal.F8$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.E8:
+com.android.tools.r8.cf.code.CfThrow -> com.android.tools.r8.internal.G8:
     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
@@ -6750,7 +6860,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.F8:
+com.android.tools.r8.cf.code.CfTryCatch -> com.android.tools.r8.internal.H8:
     com.android.tools.r8.cf.code.CfLabel start -> a
     com.android.tools.r8.cf.code.CfLabel end -> b
     java.util.List targets -> d
@@ -6775,7 +6885,7 @@
     1:1:com.android.tools.r8.cf.code.CfLabel lambda$acceptCompareTo$1(com.android.tools.r8.cf.code.CfTryCatch):57:57 -> b
     1:1:java.util.Collection lambda$acceptCompareTo$2(com.android.tools.r8.cf.code.CfTryCatch):58:58 -> c
     1:1:java.util.Collection lambda$acceptCompareTo$3(com.android.tools.r8.cf.code.CfTryCatch):59:59 -> d
-com.android.tools.r8.cf.code.CfTypeInstruction -> com.android.tools.r8.internal.G8:
+com.android.tools.r8.cf.code.CfTypeInstruction -> com.android.tools.r8.internal.I8:
 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>
@@ -7054,17 +7164,17 @@
     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.Y5:
-com.android.tools.r8.code.CfOrDexInstanceFieldRead -> com.android.tools.r8.internal.K7:
-com.android.tools.r8.code.CfOrDexInstruction -> com.android.tools.r8.internal.L7:
+com.android.tools.r8.code.BytecodeStream -> com.android.tools.r8.internal.b6:
+com.android.tools.r8.code.CfOrDexInstanceFieldRead -> com.android.tools.r8.internal.M7:
+com.android.tools.r8.code.CfOrDexInstruction -> com.android.tools.r8.internal.N7:
     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.M7:
+com.android.tools.r8.code.CfOrDexStaticFieldRead -> com.android.tools.r8.internal.O7:
 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>
     3:4:void <init>(int,com.android.tools.r8.graph.DexType,boolean):32:33 -> <init>
-    boolean isCheckCast() -> E
+    boolean isCheckCast() -> D
     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
@@ -8432,7 +8542,7 @@
     1:1:void <clinit>():17:17 -> <clinit>
     1:3:void <init>(int,com.android.tools.r8.code.BytecodeStream):28:30 -> <init>
     4:7:void <init>(int,int):33:36 -> <init>
-    boolean hasPayload() -> C
+    boolean hasPayload() -> B
     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:int lambda$specify$0(com.android.tools.r8.code.Format31t):23:23 -> a
     2:2:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):23:23 -> a
@@ -8839,15 +8949,15 @@
     1:3:void <init>(com.android.tools.r8.code.BytecodeStream):39:41 -> <init>
     4:5:void <init>():44:45 -> <init>
     1:1:boolean hasOffset():137:137 -> A
-    boolean hasPayload() -> C
-    boolean isCheckCast() -> E
+    boolean hasPayload() -> B
+    boolean isCheckCast() -> D
     boolean isConstString() -> F
     boolean isDexItemBasedConstString() -> G
     boolean isIntSwitch() -> H
     boolean isPayload() -> I
     1:1:boolean isSimpleNop():232:232 -> J
-    com.android.tools.r8.utils.structural.StructuralItem self() -> K
-    boolean isSwitchPayload() -> L
+    boolean isSwitchPayload() -> K
+    com.android.tools.r8.utils.structural.StructuralItem self() -> L
     void buildIR(com.android.tools.r8.ir.conversion.IRBuilder) -> a
     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:java.lang.String formatSmaliString(java.lang.String):0:0 -> a
@@ -8918,7 +9028,7 @@
     com.android.tools.r8.code.ConstStringJumbo asConstStringJumbo() -> g
     com.android.tools.r8.code.DexItemBasedConstString asDexItemBasedConstString() -> h
     com.android.tools.r8.code.InstanceOf asInstanceOf() -> i
-    com.android.tools.r8.code.InvokeVirtual asInvokeVirtual() -> j
+    com.android.tools.r8.code.InvokeVirtual asInvokeVirtual() -> k
     com.android.tools.r8.code.InvokeVirtualRange asInvokeVirtualRange() -> l
     boolean canThrow() -> m
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():333:333 -> n
@@ -8926,8 +9036,8 @@
     1:1:int getCompareToId():337:337 -> p
     com.android.tools.r8.graph.DexMethod getMethod() -> q
     java.lang.String getName() -> r
+    1:1:int getOffset():141:141 -> s
     1:1:java.lang.String toString():384:384 -> toString
-    1:1:int getOffset():141:141 -> u
     int getOpcode() -> v
     int getPayloadOffset() -> w
     int getSize() -> x
@@ -10067,7 +10177,7 @@
     1:1:com.android.tools.r8.ir.code.Invoke$Type getInvokeType():28:28 -> M
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):58:58 -> a
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):63:63 -> a
-    com.android.tools.r8.code.InvokeVirtual asInvokeVirtual() -> j
+    com.android.tools.r8.code.InvokeVirtual asInvokeVirtual() -> k
     boolean canThrow() -> m
     1:1:java.lang.String getName():33:33 -> r
     int getOpcode() -> v
@@ -11122,7 +11232,7 @@
 com.android.tools.r8.code.SwitchPayload -> com.android.tools.r8.code.V3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):11:11 -> <init>
     2:2:void <init>():14:14 -> <init>
-    boolean isSwitchPayload() -> L
+    boolean isSwitchPayload() -> K
     int[] keys() -> M
     int numberOfKeys() -> N
     int[] switchTargetOffsets() -> O
@@ -11227,10 +11337,10 @@
     1:1:void <init>():34:34 -> <init>
     1:1:java.lang.Object or(java.lang.Object):48: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.Q8:
+com.android.tools.r8.com.google.common.base.CharMatcher -> com.android.tools.r8.internal.S8:
     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.N8:
+com.android.tools.r8.com.google.common.base.CharMatcher$Any -> com.android.tools.r8.internal.P8:
     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>
@@ -11238,7 +11348,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.O8:
+com.android.tools.r8.com.google.common.base.CharMatcher$NamedFastMatcher -> com.android.tools.r8.internal.Q8:
     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>
@@ -11251,7 +11361,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.P8:
+com.android.tools.r8.com.google.common.base.CharMatcher$None -> com.android.tools.r8.internal.R8:
     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>
@@ -11259,10 +11369,10 @@
     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.Y8:
+com.android.tools.r8.com.google.common.base.Charsets -> com.android.tools.r8.internal.a9:
     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.Xb:
+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.CommonMatcher matcher(java.lang.CharSequence) -> a
 com.android.tools.r8.com.google.common.base.Equivalence -> com.android.tools.r8.internal.ai:
@@ -11299,15 +11409,15 @@
     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.MoreObjects -> com.android.tools.r8.internal.ND:
+com.android.tools.r8.com.google.common.base.MoreObjects -> com.android.tools.r8.internal.SD:
     1:1:java.lang.Object firstNonNull(java.lang.Object,java.lang.Object):64:64 -> a
-com.android.tools.r8.com.google.common.base.Objects -> com.android.tools.r8.internal.pI:
+com.android.tools.r8.com.google.common.base.Objects -> com.android.tools.r8.internal.uI:
     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.EI:
+com.android.tools.r8.com.google.common.base.Optional -> com.android.tools.r8.internal.JI:
     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.IJ:
+com.android.tools.r8.com.google.common.base.Platform -> com.android.tools.r8.internal.RJ:
     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>
@@ -11316,11 +11426,11 @@
     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.FJ:
-com.android.tools.r8.com.google.common.base.Platform$JdkPatternCompiler -> com.android.tools.r8.internal.GJ:
+com.android.tools.r8.com.google.common.base.Platform$1 -> com.android.tools.r8.internal.OJ:
+com.android.tools.r8.com.google.common.base.Platform$JdkPatternCompiler -> com.android.tools.r8.internal.PJ:
     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.UJ:
+com.android.tools.r8.com.google.common.base.Preconditions -> com.android.tools.r8.internal.dK:
     int $r8$clinit -> a
     1:9:void <clinit>():1439:1447 -> <clinit>
     1:1:void checkArgument(boolean):130:130 -> a
@@ -11360,9 +11470,9 @@
     2:2:int checkPositionIndex(int,int):1374:1374 -> b
     3:3:int com.android.tools.r8.com.google.common.base.Preconditions.checkPositionIndex(int,int,java.lang.String):1392:1392 -> b
     3:3:int checkPositionIndex(int,int):1374 -> b
-com.android.tools.r8.com.google.common.base.Predicate -> com.android.tools.r8.internal.VJ:
+com.android.tools.r8.com.google.common.base.Predicate -> com.android.tools.r8.internal.eK:
     1:1:boolean test(java.lang.Object):79:79 -> test
-com.android.tools.r8.com.google.common.base.Predicates -> com.android.tools.r8.internal.gK:
+com.android.tools.r8.com.google.common.base.Predicates -> com.android.tools.r8.internal.pK:
     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
@@ -11372,15 +11482,15 @@
     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
     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.YJ:
-com.android.tools.r8.com.google.common.base.Predicates$NotPredicate -> com.android.tools.r8.internal.ZJ:
+com.android.tools.r8.com.google.common.base.Predicates$1 -> com.android.tools.r8.internal.hK:
+com.android.tools.r8.com.google.common.base.Predicates$NotPredicate -> com.android.tools.r8.internal.iK:
     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.eK:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate -> com.android.tools.r8.internal.nK:
     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
@@ -11388,19 +11498,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.aK:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$1 -> com.android.tools.r8.internal.jK:
     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.bK:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$2 -> com.android.tools.r8.internal.kK:
     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.cK:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$3 -> com.android.tools.r8.internal.lK:
     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.dK:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$4 -> com.android.tools.r8.internal.mK:
     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.fK:
+com.android.tools.r8.com.google.common.base.Predicates$OrPredicate -> com.android.tools.r8.internal.oK:
     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>
@@ -11411,7 +11521,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.AT:
+com.android.tools.r8.com.google.common.base.Splitter -> com.android.tools.r8.internal.JT:
     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
@@ -11428,31 +11538,31 @@
     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.hV:
+com.android.tools.r8.com.google.common.base.Strings -> com.android.tools.r8.internal.qV:
     1:23:java.lang.String repeat(java.lang.String,int):144:166 -> a
     24:24:java.lang.String repeat(java.lang.String,int):156:156 -> a
     25:26:java.lang.String lenientFormat(java.lang.String,java.lang.Object[]):266:267 -> a
     27:38:java.lang.String com.android.tools.r8.com.google.common.base.Strings.lenientToString(java.lang.Object):302:313 -> a
     27:38:java.lang.String lenientFormat(java.lang.String,java.lang.Object[]):267 -> a
     39:69: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.AV:
-com.android.tools.r8.com.google.common.base.Suppliers -> com.android.tools.r8.internal.EV:
+com.android.tools.r8.com.google.common.base.Supplier -> com.android.tools.r8.internal.JV:
+com.android.tools.r8.com.google.common.base.Suppliers -> com.android.tools.r8.internal.NV:
     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.CV:
+com.android.tools.r8.com.google.common.base.Suppliers$MemoizingSupplier -> com.android.tools.r8.internal.LV:
     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.DV:
+com.android.tools.r8.com.google.common.base.Suppliers$NonSerializableMemoizingSupplier -> com.android.tools.r8.internal.MV:
     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.lW:
+com.android.tools.r8.com.google.common.base.Throwables -> com.android.tools.r8.internal.uW:
     java.lang.Object jla -> a
     int $r8$clinit -> b
     1:1:void <clinit>():451:451 -> <clinit>
@@ -12000,10 +12110,10 @@
     java.util.Set entrySet -> c
     java.util.Set elementSet -> b
     1:1:void <init>():45:45 -> <init>
-    1:1:java.util.Set elementSet():131:131 -> C
-    2:2:java.util.Set com.android.tools.r8.com.google.common.collect.AbstractMultiset.createElementSet():143:143 -> C
-    2:2:java.util.Set elementSet():133 -> C
-    3:3:java.util.Set elementSet():133:133 -> C
+    1:1:java.util.Set elementSet():131:131 -> D
+    2:2:java.util.Set com.android.tools.r8.com.google.common.collect.AbstractMultiset.createElementSet():143:143 -> D
+    2:2:java.util.Set elementSet():133 -> D
+    3:3:java.util.Set elementSet():133:133 -> D
     int distinctElements() -> a
     int remove(java.lang.Object,int) -> a
     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 -> a
@@ -12116,7 +12226,7 @@
     6:6: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.Y2:
+com.android.tools.r8.com.google.common.collect.ArrayListMultimap -> com.android.tools.r8.internal.b3:
     int expectedValuesPerKey -> h
     1:3:void <init>(int,int):112:114 -> <init>
     1:1:java.util.Map com.android.tools.r8.com.google.common.collect.ArrayListMultimap.asMap():61:61 -> a
@@ -12136,7 +12246,7 @@
     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.Z2:
+com.android.tools.r8.com.google.common.collect.ArrayListMultimapGwtSerializationDependencies -> com.android.tools.r8.internal.c3:
     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.Collection com.android.tools.r8.com.google.common.collect.AbstractListMultimap.wrapCollection(java.lang.Object,java.util.Collection):62:62 -> a
@@ -12161,12 +12271,12 @@
     1:1:java.util.Collection com.android.tools.r8.com.google.common.collect.AbstractListMultimap.get(java.lang.Object):35:35 -> get
     1:1:java.util.Collection com.android.tools.r8.com.google.common.collect.AbstractListMultimap.get(java.lang.Object):0 -> get
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.com.google.common.collect.BaseImmutableMultimap -> com.android.tools.r8.internal.d4:
+com.android.tools.r8.com.google.common.collect.BaseImmutableMultimap -> com.android.tools.r8.internal.g4:
     1:1:void <init>():25:25 -> <init>
-com.android.tools.r8.com.google.common.collect.BiMap -> com.android.tools.r8.internal.v4:
+com.android.tools.r8.com.google.common.collect.BiMap -> com.android.tools.r8.internal.y4:
     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.K5:
+com.android.tools.r8.com.google.common.collect.ByFunctionOrdering -> com.android.tools.r8.internal.N5:
     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>
@@ -12176,11 +12286,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.Db:
+com.android.tools.r8.com.google.common.collect.CollectPreconditions -> com.android.tools.r8.internal.Fb:
     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.Kb:
+com.android.tools.r8.com.google.common.collect.CollectSpliterators -> com.android.tools.r8.internal.Mb:
     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
@@ -12195,7 +12305,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.Eb:
+com.android.tools.r8.com.google.common.collect.CollectSpliterators$1 -> com.android.tools.r8.internal.Gb:
     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>
@@ -12206,7 +12316,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.Fb:
+com.android.tools.r8.com.google.common.collect.CollectSpliterators$1Splitr -> com.android.tools.r8.internal.Hb:
     java.util.function.Predicate val$predicate -> c
     java.lang.Object holder -> a
     java.util.Spliterator val$fromSpliterator -> b
@@ -12224,7 +12334,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.Gb:
+com.android.tools.r8.com.google.common.collect.CollectSpliterators$1WithCharacteristics -> com.android.tools.r8.internal.Ib:
     java.util.function.IntFunction val$function -> b
     java.util.Spliterator$OfInt delegate -> a
     java.util.Comparator val$comparator -> d
@@ -12238,7 +12348,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.Ib:
+com.android.tools.r8.com.google.common.collect.CollectSpliterators$FlatMapSpliterator -> com.android.tools.r8.internal.Kb:
     long estimatedSize -> f
     java.util.function.Function function -> c
     java.util.Spliterator from -> b
@@ -12253,18 +12363,18 @@
     1:12:void forEachRemaining(java.util.function.Consumer):353:364 -> forEachRemaining
     1:9:boolean tryAdvance(java.util.function.Consumer):337:345 -> tryAdvance
     1:17:java.util.Spliterator trySplit():369:385 -> trySplit
-com.android.tools.r8.com.google.common.collect.CollectSpliterators$FlatMapSpliterator$Factory -> com.android.tools.r8.internal.Hb:
+com.android.tools.r8.com.google.common.collect.CollectSpliterators$FlatMapSpliterator$Factory -> com.android.tools.r8.internal.Jb:
     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.Jb:
+com.android.tools.r8.com.google.common.collect.CollectSpliterators$FlatMapSpliteratorOfObject -> com.android.tools.r8.internal.Lb:
     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.Yb:
+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.Count -> com.android.tools.r8.internal.sd:
+com.android.tools.r8.com.google.common.collect.Count -> com.android.tools.r8.internal.ud:
     int value -> b
     1:2:void <init>(int):30:31 -> <init>
     1:1:void add(int):39:39 -> a
@@ -13189,11 +13299,11 @@
 com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Keys -> com.android.tools.r8.internal.bn:
     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:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Keys.elementSet():639:639 -> C
-    1:1:java.util.Set elementSet():623 -> C
-    2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableMultimap.keySet():493:493 -> C
-    2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Keys.elementSet():639 -> C
-    2:2:java.util.Set elementSet():623 -> C
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Keys.elementSet():639:639 -> D
+    1:1:java.util.Set elementSet():623 -> D
+    2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableMultimap.keySet():493:493 -> D
+    2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Keys.elementSet():639 -> D
+    2:2:java.util.Set elementSet():623 -> D
     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
@@ -13773,8 +13883,8 @@
     com.android.tools.r8.com.google.common.collect.ImmutableList entries -> g
     java.util.Map delegateMap -> f
     1:4:void <init>(java.util.Map,com.android.tools.r8.com.google.common.collect.ImmutableList,long):57:60 -> <init>
-    1:2:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.JdkBackedImmutableMultiset.elementSet():72:73 -> C
-    1:2:java.util.Set elementSet():31 -> C
+    1:2:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.JdkBackedImmutableMultiset.elementSet():72:73 -> D
+    1:2:java.util.Set elementSet():31 -> D
     1:8:com.android.tools.r8.com.google.common.collect.ImmutableMultiset create(java.util.Collection):39:46 -> a
     9:9:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):880:880 -> a
     9:9:com.android.tools.r8.com.google.common.collect.ImmutableMultiset create(java.util.Collection):46 -> a
@@ -13798,7 +13908,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.fA:
+com.android.tools.r8.com.google.common.collect.LinkedHashMultiset -> com.android.tools.r8.internal.kA:
     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
@@ -13811,7 +13921,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.tA:
+com.android.tools.r8.com.google.common.collect.Lists -> com.android.tools.r8.internal.yA:
     1:1:java.util.ArrayList com.android.tools.r8.com.google.common.collect.Lists.newArrayList():83:83 -> a
     1:1:java.util.ArrayList newArrayList(java.util.Iterator):142 -> a
     2:2:java.util.ArrayList newArrayList(java.util.Iterator):143:143 -> a
@@ -13833,9 +13943,9 @@
     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.qA:
+com.android.tools.r8.com.google.common.collect.Lists$RandomAccessReverseList -> com.android.tools.r8.internal.vA:
     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.sA:
+com.android.tools.r8.com.google.common.collect.Lists$ReverseList -> com.android.tools.r8.internal.xA:
     java.util.List forwardList -> b
     1:2:void <init>(java.util.List):810:811 -> <init>
     1:1:int access$000(com.android.tools.r8.com.google.common.collect.Lists$ReverseList,int):807:807 -> a
@@ -13858,7 +13968,7 @@
     1:1:int com.android.tools.r8.com.google.common.collect.Lists$ReverseList.size():862:862 -> subList
     1:1:java.util.List subList(int,int):867 -> subList
     2:3:java.util.List subList(int,int):867:868 -> subList
-com.android.tools.r8.com.google.common.collect.Lists$ReverseList$1 -> com.android.tools.r8.internal.rA:
+com.android.tools.r8.com.google.common.collect.Lists$ReverseList$1 -> com.android.tools.r8.internal.wA:
     java.util.ListIterator val$forwardIterator -> c
     com.android.tools.r8.com.google.common.collect.Lists$ReverseList this$0 -> d
     boolean canRemoveOrSet -> b
@@ -13883,7 +13993,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.OB:
+com.android.tools.r8.com.google.common.collect.Maps -> com.android.tools.r8.internal.TB:
     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
@@ -13893,22 +14003,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.CB:
+com.android.tools.r8.com.google.common.collect.Maps$1 -> com.android.tools.r8.internal.HB:
     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.DB:
+com.android.tools.r8.com.google.common.collect.Maps$2 -> com.android.tools.r8.internal.IB:
     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.EB:
+com.android.tools.r8.com.google.common.collect.Maps$7 -> com.android.tools.r8.internal.JB:
     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.FB:
+com.android.tools.r8.com.google.common.collect.Maps$8 -> com.android.tools.r8.internal.KB:
     java.util.Iterator val$entryIterator -> b
     1:1:void <init>(java.util.Iterator):1361:1361 -> <init>
     1:1:boolean hasNext():1364:1364 -> hasNext
@@ -13924,23 +14034,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.IB:
+com.android.tools.r8.com.google.common.collect.Maps$EntryFunction -> com.android.tools.r8.internal.NB:
     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.GB:
+com.android.tools.r8.com.google.common.collect.Maps$EntryFunction$1 -> com.android.tools.r8.internal.LB:
     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.HB:
+com.android.tools.r8.com.google.common.collect.Maps$EntryFunction$2 -> com.android.tools.r8.internal.MB:
     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.JB:
+com.android.tools.r8.com.google.common.collect.Maps$EntrySet -> com.android.tools.r8.internal.OB:
     1:1:void <init>():3900:3900 -> <init>
     java.util.Map map() -> a
     1:1:void clear():3910:3910 -> clear
@@ -13956,21 +14066,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.LB:
+com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap -> com.android.tools.r8.internal.QB:
     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.KB:
+com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap$1 -> com.android.tools.r8.internal.PB:
     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.MB:
+com.android.tools.r8.com.google.common.collect.Maps$KeySet -> com.android.tools.r8.internal.RB:
     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
@@ -13990,7 +14100,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.NB:
+com.android.tools.r8.com.google.common.collect.Maps$Values -> com.android.tools.r8.internal.SB:
     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
@@ -14046,15 +14156,15 @@
     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.XD:
+com.android.tools.r8.com.google.common.collect.Multimap -> com.android.tools.r8.internal.cE:
     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.aE:
+com.android.tools.r8.com.google.common.collect.Multimaps$Keys -> com.android.tools.r8.internal.fE:
     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 -> C
+    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
     2:2:int distinctElements():1702:1702 -> a
     3:21:int remove(java.lang.Object,int):1728:1746 -> a
@@ -14072,18 +14182,18 @@
     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.ZD:
+com.android.tools.r8.com.google.common.collect.Multimaps$Keys$1 -> com.android.tools.r8.internal.eE:
     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.YD:
+com.android.tools.r8.com.google.common.collect.Multimaps$Keys$1$1 -> com.android.tools.r8.internal.dE:
     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.cE:
-    java.util.Set elementSet() -> C
+com.android.tools.r8.com.google.common.collect.Multiset -> com.android.tools.r8.internal.hE:
+    java.util.Set elementSet() -> D
     int remove(java.lang.Object,int) -> a
     boolean setCount(java.lang.Object,int,int) -> a
     1:1:void forEachEntry(java.util.function.ObjIntConsumer):338:338 -> a
@@ -14100,10 +14210,10 @@
     2:2:void forEach(java.util.function.Consumer):459 -> forEach
     3:4:void forEach(java.util.function.Consumer):460:461 -> forEach
     1:1:java.util.Spliterator spliterator():473:473 -> spliterator
-com.android.tools.r8.com.google.common.collect.Multiset$Entry -> com.android.tools.r8.internal.bE:
+com.android.tools.r8.com.google.common.collect.Multiset$Entry -> com.android.tools.r8.internal.gE:
     int getCount() -> a
     java.lang.Object getElement() -> b
-com.android.tools.r8.com.google.common.collect.Multisets -> com.android.tools.r8.internal.gE:
+com.android.tools.r8.com.google.common.collect.Multisets -> com.android.tools.r8.internal.lE:
     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
@@ -14126,26 +14236,26 @@
     34:34:com.android.tools.r8.com.google.common.collect.ImmutableMultiset copyHighestCountFirst(com.android.tools.r8.com.google.common.collect.Multiset):1131 -> a
     1:8:java.util.Spliterator spliteratorImpl(com.android.tools.r8.com.google.common.collect.Multiset):1097:1104 -> b
     9:9:java.util.Spliterator spliteratorImpl(com.android.tools.r8.com.google.common.collect.Multiset):1098:1098 -> b
-com.android.tools.r8.com.google.common.collect.Multisets$AbstractEntry -> com.android.tools.r8.internal.dE:
+com.android.tools.r8.com.google.common.collect.Multisets$AbstractEntry -> com.android.tools.r8.internal.iE:
     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.eE:
+com.android.tools.r8.com.google.common.collect.Multisets$DecreasingCount -> com.android.tools.r8.internal.jE:
     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.fE:
+com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry -> com.android.tools.r8.internal.kE:
     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.NaturalOrdering -> com.android.tools.r8.internal.sE:
+com.android.tools.r8.com.google.common.collect.NaturalOrdering -> com.android.tools.r8.internal.xE:
     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>
@@ -14161,7 +14271,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.PH:
+com.android.tools.r8.com.google.common.collect.ObjectArrays -> com.android.tools.r8.internal.UH:
     1:1:java.lang.Object[] concat(java.lang.Object,java.lang.Object[]):86:86 -> a
     2:2:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.newArray(java.lang.Object[],int):59:59 -> a
     2:2:java.lang.Object[] concat(java.lang.Object,java.lang.Object[]):86 -> a
@@ -14175,11 +14285,11 @@
     13:13:java.lang.Object com.android.tools.r8.com.google.common.collect.ObjectArrays.checkElementNotNull(java.lang.Object,int):225:225 -> a
     13:13:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.checkElementsNotNull(java.lang.Object[],int):215 -> a
     13:13:java.lang.Object[] checkElementsNotNull(java.lang.Object[]):209 -> a
-com.android.tools.r8.com.google.common.collect.Ordering -> com.android.tools.r8.internal.PI:
+com.android.tools.r8.com.google.common.collect.Ordering -> com.android.tools.r8.internal.UI:
     1:1:void <init>():391:391 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.Ordering natural():162:162 -> a
     2:4:com.android.tools.r8.com.google.common.collect.Ordering from(java.util.Comparator):182:184 -> a
-com.android.tools.r8.com.google.common.collect.Platform -> com.android.tools.r8.internal.HJ:
+com.android.tools.r8.com.google.common.collect.Platform -> com.android.tools.r8.internal.QJ:
 # {"id":"sourceFile","fileName":"Platform.java"}
     int $r8$clinit -> a
     1:1:void <clinit>():33:33 -> <clinit>
@@ -14187,7 +14297,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.XP:
+com.android.tools.r8.com.google.common.collect.RegularImmutableAsList -> com.android.tools.r8.internal.gQ:
     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>
@@ -14201,7 +14311,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.cQ:
+com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap -> com.android.tools.r8.internal.lQ:
     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
@@ -14254,8 +14364,8 @@
     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.YP:
-com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse -> com.android.tools.r8.internal.bQ:
+com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$1 -> com.android.tools.r8.internal.hQ:
+com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse -> com.android.tools.r8.internal.kQ:
     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>
@@ -14282,7 +14392,7 @@
     2:2:int size():196 -> size
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     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.aQ:
+com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet -> com.android.tools.r8.internal.jQ:
     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
@@ -14293,7 +14403,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.ZP:
+com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet$1 -> com.android.tools.r8.internal.iQ:
     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
@@ -14302,7 +14412,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.dQ:
+com.android.tools.r8.com.google.common.collect.RegularImmutableList -> com.android.tools.r8.internal.mQ:
     java.lang.Object[] array -> d
     com.android.tools.r8.com.google.common.collect.ImmutableList EMPTY -> e
     1:1:void <clinit>():32:32 -> <clinit>
@@ -14317,7 +14427,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.gQ:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMap -> com.android.tools.r8.internal.pQ:
     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
@@ -14357,7 +14467,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.eQ:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMap$KeySet -> com.android.tools.r8.internal.nQ:
     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
@@ -14367,7 +14477,7 @@
     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.fQ:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMap$Values -> com.android.tools.r8.internal.oQ:
     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
@@ -14376,7 +14486,7 @@
     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.iQ:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset -> com.android.tools.r8.internal.rQ:
     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
@@ -14387,8 +14497,8 @@
     1:1:void <clinit>():38 -> <clinit>
     2:2:void <clinit>():38:38 -> <clinit>
     1:6:void <init>(com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry[],com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry[],int,int,com.android.tools.r8.com.google.common.collect.ImmutableSet):130:135 -> <init>
-    1:2:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset.elementSet():182:183 -> C
-    1:2:java.util.Set elementSet():35 -> C
+    1:2:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset.elementSet():182:183 -> D
+    1:2:java.util.Set elementSet():35 -> D
     1:5:com.android.tools.r8.com.google.common.collect.ImmutableMultiset create(java.util.Collection):41:45 -> a
     6:6:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableSet.of():75:75 -> a
     6:6:com.android.tools.r8.com.google.common.collect.ImmutableMultiset create(java.util.Collection):45 -> a
@@ -14408,11 +14518,11 @@
     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.hQ:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$NonTerminalEntry -> com.android.tools.r8.internal.qQ:
     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.jQ:
+com.android.tools.r8.com.google.common.collect.RegularImmutableSet -> com.android.tools.r8.internal.sQ:
     java.lang.Object[] elements -> e
     int hashCode -> h
     com.android.tools.r8.com.google.common.collect.RegularImmutableSet EMPTY -> i
@@ -14439,7 +14549,7 @@
     1:1:java.util.Iterator iterator():30 -> iterator
     1:1:int size():69:69 -> size
     1:1:java.util.Spliterator spliterator():79:79 -> spliterator
-com.android.tools.r8.com.google.common.collect.Sets -> com.android.tools.r8.internal.zS:
+com.android.tools.r8.com.google.common.collect.Sets -> com.android.tools.r8.internal.IS:
     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
@@ -14463,8 +14573,8 @@
     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.oS:
-com.android.tools.r8.com.google.common.collect.Sets$2 -> com.android.tools.r8.internal.qS:
+com.android.tools.r8.com.google.common.collect.Sets$1 -> com.android.tools.r8.internal.xS:
+com.android.tools.r8.com.google.common.collect.Sets$2 -> com.android.tools.r8.internal.zS:
     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>
@@ -14476,12 +14586,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.pS:
+com.android.tools.r8.com.google.common.collect.Sets$2$1 -> com.android.tools.r8.internal.yS:
     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.sS:
+com.android.tools.r8.com.google.common.collect.Sets$3 -> com.android.tools.r8.internal.BS:
     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>
@@ -14494,12 +14604,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.rS:
+com.android.tools.r8.com.google.common.collect.Sets$3$1 -> com.android.tools.r8.internal.AS:
     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.wS:
+com.android.tools.r8.com.google.common.collect.Sets$5 -> com.android.tools.r8.internal.FS:
     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>
@@ -14507,25 +14617,25 @@
     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.vS:
+com.android.tools.r8.com.google.common.collect.Sets$5$1 -> com.android.tools.r8.internal.ES:
     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.uS:
+com.android.tools.r8.com.google.common.collect.Sets$5$1$1 -> com.android.tools.r8.internal.DS:
     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.tS:
+com.android.tools.r8.com.google.common.collect.Sets$5$1$1$1 -> com.android.tools.r8.internal.CS:
     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.xS:
+com.android.tools.r8.com.google.common.collect.Sets$ImprovedAbstractSet -> com.android.tools.r8.internal.GS:
     1:1:void <init>():76:76 -> <init>
     1:1:boolean com.android.tools.r8.com.google.common.collect.Sets.removeAllImpl(java.util.Set,java.util.Collection):1920:1920 -> removeAll
     1:1:boolean removeAll(java.util.Collection):79 -> removeAll
@@ -14538,7 +14648,7 @@
     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.yS:
+com.android.tools.r8.com.google.common.collect.Sets$SetView -> com.android.tools.r8.internal.HS:
     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
@@ -14548,7 +14658,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.fT:
+com.android.tools.r8.com.google.common.collect.SingletonImmutableBiMap -> com.android.tools.r8.internal.oT:
     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
@@ -14573,7 +14683,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.gT:
+com.android.tools.r8.com.google.common.collect.SingletonImmutableList -> com.android.tools.r8.internal.pT:
     java.lang.Object element -> d
     1:2:void <init>(java.lang.Object):37:38 -> <init>
     boolean isPartialView() -> e
@@ -14588,7 +14698,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.hT:
+com.android.tools.r8.com.google.common.collect.SingletonImmutableSet -> com.android.tools.r8.internal.qT:
     java.lang.Object element -> e
     int cachedHashCode -> f
     1:2:void <init>(java.lang.Object):43:44 -> <init>
@@ -14604,7 +14714,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.GU:
+com.android.tools.r8.com.google.common.collect.Streams -> com.android.tools.r8.internal.PU:
     java.util.Spliterator lambda$concat$0(java.util.Spliterator) -> a
     1:3:java.util.stream.Stream stream(java.lang.Iterable):62:64 -> a
     4:4:java.util.stream.Stream stream(java.util.Iterator):84:84 -> a
@@ -14629,27 +14739,27 @@
     69:117: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.AU:
+com.android.tools.r8.com.google.common.collect.Streams$1 -> com.android.tools.r8.internal.JU:
     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.BU:
+com.android.tools.r8.com.google.common.collect.Streams$1Splitr -> com.android.tools.r8.internal.KU:
     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.CU:
+com.android.tools.r8.com.google.common.collect.Streams$2 -> com.android.tools.r8.internal.LU:
     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.DU:
+com.android.tools.r8.com.google.common.collect.Streams$FunctionWithIndex -> com.android.tools.r8.internal.MU:
     java.lang.Object apply(java.lang.Object,long) -> a
-com.android.tools.r8.com.google.common.collect.Streams$MapWithIndexSpliterator -> com.android.tools.r8.internal.EU:
+com.android.tools.r8.com.google.common.collect.Streams$MapWithIndexSpliterator -> com.android.tools.r8.internal.NU:
     long index -> b
     java.util.Spliterator fromSpliterator -> a
     1:3:void <init>(java.util.Spliterator,long):732:734 -> <init>
@@ -14663,17 +14773,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.WW:
+com.android.tools.r8.com.google.common.collect.TransformedIterator -> com.android.tools.r8.internal.fX:
     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.XX:
+com.android.tools.r8.com.google.common.collect.UnmodifiableIterator -> com.android.tools.r8.internal.gY:
     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.YX:
+com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator -> com.android.tools.r8.internal.hY:
     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
@@ -14784,7 +14894,7 @@
 com.android.tools.r8.com.google.common.hash.Hashing$Sha256Holder -> com.android.tools.r8.internal.vl:
     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.rC:
+com.android.tools.r8.com.google.common.hash.MessageDigestHashFunction -> com.android.tools.r8.internal.wC:
     java.security.MessageDigest prototype -> b
     int bytes -> c
     java.lang.String toString -> e
@@ -14799,8 +14909,8 @@
     12:12:com.android.tools.r8.com.google.common.hash.Hasher newHasher():97 -> a
     1:3:java.security.MessageDigest getMessageDigest(java.lang.String):82:84 -> b
     1:1:java.lang.String toString():77:77 -> toString
-com.android.tools.r8.com.google.common.hash.MessageDigestHashFunction$1 -> com.android.tools.r8.internal.pC:
-com.android.tools.r8.com.google.common.hash.MessageDigestHashFunction$MessageDigestHasher -> com.android.tools.r8.internal.qC:
+com.android.tools.r8.com.google.common.hash.MessageDigestHashFunction$1 -> com.android.tools.r8.internal.uC:
+com.android.tools.r8.com.google.common.hash.MessageDigestHashFunction$MessageDigestHasher -> com.android.tools.r8.internal.vC:
     java.security.MessageDigest digest -> b
     int bytes -> c
     boolean done -> d
@@ -14815,7 +14925,7 @@
     1:2:void update(byte):135:136 -> b
     3:4:void update(byte[],int,int):141:142 -> b
     5:5:void checkNotDone():152:152 -> b
-com.android.tools.r8.com.google.common.hash.Murmur3_128HashFunction -> com.android.tools.r8.internal.iE:
+com.android.tools.r8.com.google.common.hash.Murmur3_128HashFunction -> com.android.tools.r8.internal.nE:
     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>
@@ -14823,7 +14933,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.hE:
+com.android.tools.r8.com.google.common.hash.Murmur3_128HashFunction$Murmur3_128Hasher -> com.android.tools.r8.internal.mE:
     long h2 -> e
     int length -> f
     long h1 -> d
@@ -14926,7 +15036,7 @@
     2:2:void com.android.tools.r8.com.google.common.hash.AbstractStreamingHasher.munch():206 -> b
     3:8:void com.android.tools.r8.com.google.common.hash.AbstractStreamingHasher.munch():207:212 -> b
     1:3:void com.android.tools.r8.com.google.common.hash.AbstractStreamingHasher.munchIfFull():199:201 -> c
-com.android.tools.r8.com.google.common.io.BaseEncoding -> com.android.tools.r8.internal.c4:
+com.android.tools.r8.com.google.common.io.BaseEncoding -> com.android.tools.r8.internal.f4:
     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>
@@ -14949,7 +15059,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.Y3:
+com.android.tools.r8.com.google.common.io.BaseEncoding$Alphabet -> com.android.tools.r8.internal.b4:
     char[] chars -> b
     int bytesPerChunk -> f
     byte[] decodabet -> g
@@ -14966,19 +15076,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.Z3:
+com.android.tools.r8.com.google.common.io.BaseEncoding$Base16Encoding -> com.android.tools.r8.internal.c4:
     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.a4:
+com.android.tools.r8.com.google.common.io.BaseEncoding$Base64Encoding -> com.android.tools.r8.internal.d4:
     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.b4:
+com.android.tools.r8.com.google.common.io.BaseEncoding$StandardBaseEncoding -> com.android.tools.r8.internal.e4:
     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>
@@ -14993,7 +15103,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.N5:
+com.android.tools.r8.com.google.common.io.ByteStreams -> com.android.tools.r8.internal.Q5:
     java.io.OutputStream NULL_OUTPUT_STREAM -> a
     int $r8$clinit -> b
     1:1:void <clinit>():640:640 -> <clinit>
@@ -15009,7 +15119,7 @@
     19:19:byte[] toByteArray(java.io.InputStream):221 -> a
     20:24:byte[] com.android.tools.r8.com.google.common.io.ByteStreams.toByteArrayInternal(java.io.InputStream,java.util.Queue,int):191:195 -> a
     20:24:byte[] toByteArray(java.io.InputStream):221 -> a
-com.android.tools.r8.com.google.common.io.ByteStreams$1 -> com.android.tools.r8.internal.M5:
+com.android.tools.r8.com.google.common.io.ByteStreams$1 -> com.android.tools.r8.internal.P5:
     1:1:void <init>():641:641 -> <init>
     1:1:java.lang.String toString():660:660 -> toString
     1:1:void write(byte[]):649:649 -> write
@@ -15018,7 +15128,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.R8:
+com.android.tools.r8.com.google.common.io.CharSequenceReader -> com.android.tools.r8.internal.T8:
     java.lang.CharSequence seq -> b
     int mark -> d
     int pos -> c
@@ -15037,12 +15147,12 @@
     1:1:boolean ready():104:104 -> ready
     1:2:void reset():122:123 -> reset
     1:4:long skip(long):95:98 -> skip
-com.android.tools.r8.com.google.common.io.CharSource -> com.android.tools.r8.internal.U8:
+com.android.tools.r8.com.google.common.io.CharSource -> com.android.tools.r8.internal.W8:
     1:1:void <init>():75:75 -> <init>
     1:4:java.io.BufferedReader openBufferedStream():112:115 -> a
     5:7:com.android.tools.r8.com.google.common.io.CharSource wrap(java.lang.CharSequence):480:482 -> a
     java.io.Reader openStream() -> b
-com.android.tools.r8.com.google.common.io.CharSource$CharSequenceCharSource -> com.android.tools.r8.internal.S8:
+com.android.tools.r8.com.google.common.io.CharSource$CharSequenceCharSource -> com.android.tools.r8.internal.U8:
     java.lang.CharSequence seq -> a
     1:1:void <clinit>():524:524 -> <clinit>
     1:2:void <init>(java.lang.CharSequence):528:529 -> <init>
@@ -15056,10 +15166,10 @@
     4:22:java.lang.String com.android.tools.r8.com.google.common.base.Ascii.truncate(java.lang.CharSequence,int,java.lang.String):557:575 -> toString
     4:22:java.lang.String toString():608 -> toString
     23:23:java.lang.String toString():608:608 -> toString
-com.android.tools.r8.com.google.common.io.CharSource$StringCharSource -> com.android.tools.r8.internal.T8:
+com.android.tools.r8.com.google.common.io.CharSource$StringCharSource -> com.android.tools.r8.internal.V8:
     1:1:void <init>(java.lang.String):629:629 -> <init>
     1:1:java.io.Reader openStream():634:634 -> b
-com.android.tools.r8.com.google.common.io.CharStreams -> com.android.tools.r8.internal.V8:
+com.android.tools.r8.com.google.common.io.CharStreams -> com.android.tools.r8.internal.X8:
     1:1:long copyReaderToBuilder(java.io.Reader,java.lang.StringBuilder):115:115 -> a
     2:2:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):880:880 -> a
     2:2:long copyReaderToBuilder(java.io.Reader,java.lang.StringBuilder):115 -> a
@@ -15092,10 +15202,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.eb:
+com.android.tools.r8.com.google.common.io.Closeables -> com.android.tools.r8.internal.gb:
     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.ib:
+com.android.tools.r8.com.google.common.io.Closer -> com.android.tools.r8.internal.kb:
     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
@@ -15128,12 +15238,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.fb:
+com.android.tools.r8.com.google.common.io.Closer$LoggingSuppressor -> com.android.tools.r8.internal.hb:
     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.gb:
+com.android.tools.r8.com.google.common.io.Closer$SuppressingSuppressor -> com.android.tools.r8.internal.ib:
     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>
@@ -15144,7 +15254,7 @@
     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.hb:
+com.android.tools.r8.com.google.common.io.Closer$Suppressor -> com.android.tools.r8.internal.jb:
     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.Qr:
     int[] biggestBinomials -> a
@@ -15175,7 +15285,7 @@
 com.android.tools.r8.com.google.common.math.IntMath$1 -> com.android.tools.r8.internal.Pr:
     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.VB:
+com.android.tools.r8.com.google.common.math.MathPreconditions -> com.android.tools.r8.internal.aC:
     1:1:int checkNonNegative(java.lang.String,int):54:54 -> a
     2:2:void checkRoundingUnnecessary(boolean):82:82 -> a
 com.android.tools.r8.com.google.common.primitives.Ints -> com.android.tools.r8.internal.Ps:
@@ -15301,7 +15411,7 @@
 com.android.tools.r8.com.google.gson.JsonSyntaxException -> com.android.tools.r8.internal.ku:
     1:1:void <init>(java.lang.String):30:30 -> <init>
     2:2:void <init>(java.lang.Throwable):45:45 -> <init>
-com.android.tools.r8.com.google.gson.TypeAdapter -> com.android.tools.r8.internal.kX:
+com.android.tools.r8.com.google.gson.TypeAdapter -> com.android.tools.r8.internal.tX:
     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
@@ -15315,7 +15425,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.nA:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap -> com.android.tools.r8.internal.sA:
     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
@@ -15358,12 +15468,12 @@
     1:3:java.lang.Object remove(java.lang.Object):111 -> remove
     4:4:java.lang.Object remove(java.lang.Object):112:112 -> remove
     1:1:int size():78:78 -> size
-com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$1 -> com.android.tools.r8.internal.gA:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$1 -> com.android.tools.r8.internal.lA:
     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.iA:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$EntrySet -> com.android.tools.r8.internal.nA:
     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
@@ -15371,11 +15481,11 @@
     1:1:java.util.Iterator iterator():566:566 -> iterator
     1:9:boolean remove(java.lang.Object):578:586 -> remove
     1:1:int size():562:562 -> size
-com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$EntrySet$1 -> com.android.tools.r8.internal.hA:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$EntrySet$1 -> com.android.tools.r8.internal.mA:
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$EntrySet):566:566 -> <init>
     1:1:java.util.Map$Entry com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$EntrySet$1.next():568:568 -> next
     1:1:java.lang.Object next():566 -> next
-com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$KeySet -> com.android.tools.r8.internal.kA:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$KeySet -> com.android.tools.r8.internal.pA:
     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
@@ -15386,10 +15496,10 @@
     2:4:boolean remove(java.lang.Object):613 -> remove
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:1:int size():597:597 -> size
-com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$KeySet$1 -> com.android.tools.r8.internal.jA:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$KeySet$1 -> com.android.tools.r8.internal.oA:
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$KeySet):601:601 -> <init>
     1:1:java.lang.Object next():603:603 -> next
-com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$LinkedTreeMapIterator -> com.android.tools.r8.internal.lA:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$LinkedTreeMapIterator -> com.android.tools.r8.internal.qA:
     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
@@ -15402,7 +15512,7 @@
     11:11:com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node nextNode():541:541 -> l
     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.mA:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node -> com.android.tools.r8.internal.rA:
     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
@@ -15419,16 +15529,16 @@
     1:2:int hashCode():491:492 -> hashCode
     1:2:java.lang.Object setValue(java.lang.Object):475:476 -> setValue
     1:1:java.lang.String toString():496:496 -> toString
-com.android.tools.r8.com.google.gson.internal.Streams -> com.android.tools.r8.internal.FU:
+com.android.tools.r8.com.google.gson.internal.Streams -> com.android.tools.r8.internal.OU:
 # {"id":"sourceFile","fileName":"Streams.java"}
     1:19:com.android.tools.r8.com.google.gson.JsonElement parse(com.android.tools.r8.com.google.gson.stream.JsonReader):46:64 -> a
     20:20:com.android.tools.r8.com.google.gson.JsonElement parse(com.android.tools.r8.com.google.gson.stream.JsonReader):62:62 -> a
     21:21:com.android.tools.r8.com.google.gson.JsonElement parse(com.android.tools.r8.com.google.gson.stream.JsonReader):60:60 -> a
     22:25:com.android.tools.r8.com.google.gson.JsonElement parse(com.android.tools.r8.com.google.gson.stream.JsonReader):55:58 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters -> com.android.tools.r8.internal.mX:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters -> com.android.tools.r8.internal.vX:
     com.android.tools.r8.com.google.gson.TypeAdapter JSON_ELEMENT -> a
     1:1:void <clinit>():714:714 -> <clinit>
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$29 -> com.android.tools.r8.internal.lX:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$29 -> com.android.tools.r8.internal.uX:
     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
@@ -15678,7 +15788,7 @@
     10:11:void writeDeferredName():402:403 -> i
     12:12:void com.android.tools.r8.com.google.gson.stream.JsonWriter.beforeName():616:616 -> i
     12:12:void writeDeferredName():401 -> i
-com.android.tools.r8.com.google.gson.stream.MalformedJsonException -> com.android.tools.r8.internal.yB:
+com.android.tools.r8.com.google.gson.stream.MalformedJsonException -> com.android.tools.r8.internal.DB:
     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
@@ -15744,7 +15854,7 @@
     83:103: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.pc:
+com.android.tools.r8.contexts.CompilationContext -> com.android.tools.r8.internal.rc:
     java.util.Map seenSetForTesting -> b
     java.util.function.Consumer testingConsumer -> a
     int nextProcessorId -> c
@@ -15764,13 +15874,13 @@
     66:66:boolean verifyContext(com.android.tools.r8.contexts.CompilationContext$ContextDescriptorProvider):51:51 -> a
     61:61:boolean verifyContext(com.android.tools.r8.contexts.CompilationContext$ContextDescriptorProvider):51:51 -> a
     67:68:com.android.tools.r8.contexts.CompilationContext$ProcessorContext createProcessorContext():64:65 -> a
-com.android.tools.r8.contexts.CompilationContext$1 -> com.android.tools.r8.internal.kc:
-com.android.tools.r8.contexts.CompilationContext$ContextDescriptorProvider -> com.android.tools.r8.internal.lc:
+com.android.tools.r8.contexts.CompilationContext$1 -> com.android.tools.r8.internal.mc:
+com.android.tools.r8.contexts.CompilationContext$ContextDescriptorProvider -> com.android.tools.r8.internal.nc:
     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.mc:
+com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext -> com.android.tools.r8.internal.oc:
     com.android.tools.r8.graph.ProgramMethod method -> b
     int nextId -> c
     com.android.tools.r8.contexts.CompilationContext$ProcessorContext parent -> a
@@ -15789,7 +15899,7 @@
     2:2:java.lang.StringBuilder buildSyntheticSuffix(java.lang.StringBuilder):159:159 -> b
     3:5:java.lang.StringBuilder com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext.buildSuffix(java.lang.StringBuilder):145:147 -> b
     3:5:java.lang.StringBuilder buildSyntheticSuffix(java.lang.StringBuilder):159 -> b
-com.android.tools.r8.contexts.CompilationContext$ProcessorContext -> com.android.tools.r8.internal.nc:
+com.android.tools.r8.contexts.CompilationContext$ProcessorContext -> com.android.tools.r8.internal.pc:
     com.android.tools.r8.contexts.CompilationContext parent -> a
     int processorId -> b
     boolean $assertionsDisabled -> c
@@ -15806,7 +15916,7 @@
     6:6:java.lang.StringBuilder buildContextDescriptorForTesting(java.lang.StringBuilder):102 -> a
     1:1:java.lang.StringBuilder com.android.tools.r8.contexts.CompilationContext$ProcessorContext.buildSuffix(java.lang.StringBuilder):97:97 -> b
     1:1:java.lang.StringBuilder buildSyntheticSuffix(java.lang.StringBuilder):107 -> b
-com.android.tools.r8.contexts.CompilationContext$UniqueContext -> com.android.tools.r8.internal.oc:
+com.android.tools.r8.contexts.CompilationContext$UniqueContext -> com.android.tools.r8.internal.qc:
     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):163:163 -> <init>
@@ -15825,13 +15935,13 @@
     5:5:java.lang.StringBuilder com.android.tools.r8.contexts.CompilationContext$UniqueContext.buildSyntheticSuffix(java.lang.StringBuilder):183 -> b
     5:5:java.lang.String getSyntheticSuffix():191 -> b
     6:6:java.lang.String getSyntheticSuffix():191:191 -> b
-com.android.tools.r8.desugar.desugaredlibrary.DesugaredLibraryKeepRuleGenerator -> com.android.tools.r8.internal.Pe:
+com.android.tools.r8.desugar.desugaredlibrary.DesugaredLibraryKeepRuleGenerator -> com.android.tools.r8.internal.Oe:
     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():436:436 -> a
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():438:438 -> 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
@@ -15964,11 +16074,11 @@
     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.h2:
+com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver -> com.android.tools.r8.internal.k2:
     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.s2:
+com.android.tools.r8.dex.ApplicationWriter -> com.android.tools.r8.internal.v2:
     com.android.tools.r8.graph.AppView appView -> a
-    boolean $assertionsDisabled -> l
+    boolean $assertionsDisabled -> k
     com.android.tools.r8.dex.CodeToKeep desugaredLibraryCodeToKeep -> f
     com.android.tools.r8.utils.InternalOptions options -> e
     java.util.List markerStrings -> i
@@ -15978,226 +16088,230 @@
     com.android.tools.r8.graph.InitClassLens initClassLens -> c
     java.util.function.Predicate isTypeMissing -> g
     com.android.tools.r8.graph.GraphLens graphLens -> b
-    com.android.tools.r8.naming.ProguardMapSupplier proguardMapSupplier -> k
-    1:1:void <clinit>():74:74 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,java.util.List,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.naming.ProguardMapSupplier):159:159 -> <init>
-    2:13:void <init>(com.android.tools.r8.graph.AppView,java.util.List,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.naming.ProguardMapSupplier,com.android.tools.r8.DexIndexedConsumer):176:187 -> <init>
+    1:1:void <clinit>():79:79 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,java.util.List,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):162:162 -> <init>
+    2:12:void <init>(com.android.tools.r8.graph.AppView,java.util.List,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DexIndexedConsumer):177:187 -> <init>
     1:1:com.android.tools.r8.utils.Timing lambda$write$2(java.util.List,com.android.tools.r8.dex.VirtualFile):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":304,"2":305,"3":306}}
-    304:304:com.android.tools.r8.utils.Timing lambda$write$2(java.util.List,com.android.tools.r8.dex.VirtualFile):286:286 -> a
-    305:305:com.android.tools.r8.utils.Timing lambda$write$2(java.util.List,com.android.tools.r8.dex.VirtualFile):286:286 -> a
-    306:306:com.android.tools.r8.utils.Timing lambda$write$2(java.util.List,com.android.tools.r8.dex.VirtualFile):286:286 -> a
-    287:287:com.android.tools.r8.utils.Timing lambda$write$2(java.util.List,com.android.tools.r8.dex.VirtualFile):286:286 -> a
-    288:293:void com.android.tools.r8.dex.ApplicationWriter.computeOffsetMappingAndRewriteJumboStrings(com.android.tools.r8.dex.VirtualFile,java.util.List,com.android.tools.r8.utils.Timing):429:434 -> a
-    288:293:com.android.tools.r8.utils.Timing lambda$write$2(java.util.List,com.android.tools.r8.dex.VirtualFile):287 -> a
-    294:299:void com.android.tools.r8.dex.ApplicationWriter.computeOffsetMappingAndRewriteJumboStrings(com.android.tools.r8.dex.VirtualFile,java.util.List,com.android.tools.r8.utils.Timing):433:438 -> a
-    294:299:com.android.tools.r8.utils.Timing lambda$write$2(java.util.List,com.android.tools.r8.dex.VirtualFile):287 -> a
-    300:302:void com.android.tools.r8.dex.ApplicationWriter.computeOffsetMappingAndRewriteJumboStrings(com.android.tools.r8.dex.VirtualFile,java.util.List,com.android.tools.r8.utils.Timing):437:439 -> a
-    300:302:com.android.tools.r8.utils.Timing lambda$write$2(java.util.List,com.android.tools.r8.dex.VirtualFile):287 -> a
-    303:303:com.android.tools.r8.utils.Timing lambda$write$2(java.util.List,com.android.tools.r8.dex.VirtualFile):289:289 -> a
-    307:307:com.android.tools.r8.graph.DexString access$000(com.android.tools.r8.dex.ApplicationWriter,com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId):74:74 -> a
-    308:308:void com.android.tools.r8.graph.DexClass.setSourceFile(com.android.tools.r8.graph.DexString):181:181 -> a
-    308:308:void lambda$computeSourceFileString$4(com.android.tools.r8.graph.DexProgramClass):379 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":313,"2":314,"3":315}}
+    313:313:com.android.tools.r8.utils.Timing lambda$write$2(java.util.List,com.android.tools.r8.dex.VirtualFile):295:295 -> a
+    314:314:com.android.tools.r8.utils.Timing lambda$write$2(java.util.List,com.android.tools.r8.dex.VirtualFile):295:295 -> a
+    315:315:com.android.tools.r8.utils.Timing lambda$write$2(java.util.List,com.android.tools.r8.dex.VirtualFile):295:295 -> a
+    296:296:com.android.tools.r8.utils.Timing lambda$write$2(java.util.List,com.android.tools.r8.dex.VirtualFile):295:295 -> a
+    297:302:void com.android.tools.r8.dex.ApplicationWriter.computeOffsetMappingAndRewriteJumboStrings(com.android.tools.r8.dex.VirtualFile,java.util.List,com.android.tools.r8.utils.Timing):446:451 -> a
+    297:302:com.android.tools.r8.utils.Timing lambda$write$2(java.util.List,com.android.tools.r8.dex.VirtualFile):296 -> a
+    303:308:void com.android.tools.r8.dex.ApplicationWriter.computeOffsetMappingAndRewriteJumboStrings(com.android.tools.r8.dex.VirtualFile,java.util.List,com.android.tools.r8.utils.Timing):450:455 -> a
+    303:308:com.android.tools.r8.utils.Timing lambda$write$2(java.util.List,com.android.tools.r8.dex.VirtualFile):296 -> a
+    309:311:void com.android.tools.r8.dex.ApplicationWriter.computeOffsetMappingAndRewriteJumboStrings(com.android.tools.r8.dex.VirtualFile,java.util.List,com.android.tools.r8.utils.Timing):454:456 -> a
+    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)"]}
-    309:309:void com.android.tools.r8.graph.DexClass.setSourceFile(com.android.tools.r8.graph.DexString):181:181 -> a
-    309:309:void lambda$rewriteSourceFile$5(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProgramClass):423 -> a
+    318:318:java.util.List distribute(java.util.concurrent.ExecutorService):194:194 -> a
+    319:319:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():469:469 -> 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)"]}
-    310:310:java.util.List distribute(java.util.concurrent.ExecutorService):194:194 -> a
-    311:311:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():467:467 -> a
-    311:311:java.util.List distribute(java.util.concurrent.ExecutorService):194 -> a
+    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():485:485 -> 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)"]}
-    312:312:java.util.List distribute(java.util.concurrent.ExecutorService):195:195 -> a
-    313:313:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():483:483 -> a
-    313:313:java.util.List distribute(java.util.concurrent.ExecutorService):196 -> a
+    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
+    334:334:void encodeChecksums(java.lang.Iterable):216 -> a
+    335:344:void encodeChecksums(java.lang.Iterable):217:226 -> a
+    345:350:void write(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp):242:247 -> a
+    351:368:void com.android.tools.r8.dex.ApplicationWriter.computeMarkerStrings(com.android.tools.r8.utils.Box,java.util.List):354:371 -> a
+    351:368:void write(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp):248 -> a
+    369:369:com.android.tools.r8.graph.DexString com.android.tools.r8.dex.Marker.toDexString(com.android.tools.r8.graph.DexItemFactory):296:296 -> a
+    369:369:void com.android.tools.r8.dex.ApplicationWriter.computeMarkerStrings(com.android.tools.r8.utils.Box,java.util.List):371 -> a
+    369:369:void write(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp):248 -> a
+    370:370:void com.android.tools.r8.dex.ApplicationWriter.computeMarkerStrings(com.android.tools.r8.utils.Box,java.util.List):371:371 -> a
+    370:370:void write(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp):248 -> a
+    371:384:com.android.tools.r8.utils.OriginalSourceFiles com.android.tools.r8.dex.ApplicationWriter.computeSourceFileString(com.android.tools.r8.utils.Box,java.util.List):378:391 -> a
+    371:384:void write(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp):250 -> a
+    385:385:void com.android.tools.r8.graph.DexClass.setSourceFile(com.android.tools.r8.graph.DexString):181:181 -> a
+    385:385:com.android.tools.r8.utils.OriginalSourceFiles com.android.tools.r8.dex.ApplicationWriter.computeSourceFileString(com.android.tools.r8.utils.Box,java.util.List):392 -> a
+    385:385:void write(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp):250 -> a
+    386:394:com.android.tools.r8.utils.OriginalSourceFiles com.android.tools.r8.dex.ApplicationWriter.computeSourceFileString(com.android.tools.r8.utils.Box,java.util.List):396:404 -> a
+    386:394:void write(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp):250 -> a
+    395:418:void write(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp):253:276 -> a
+    419:454:void write(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp):274:309 -> a
+    455:487:void write(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp):308:340 -> a
+    488:488:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():438:438 -> a
+    488:488: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)"]}
-    314:323:java.util.List distribute(java.util.concurrent.ExecutorService):196:205 -> a
-    324:325:void encodeChecksums(java.lang.Iterable):215:216 -> a
-    326:326:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap.<init>(int):110:110 -> a
-    326:326:void encodeChecksums(java.lang.Iterable):216 -> a
-    327:336:void encodeChecksums(java.lang.Iterable):217:226 -> a
-    337:337:java.lang.Boolean lambda$write$0(java.util.List,com.android.tools.r8.ir.analysis.proto.ProtoShrinker):269:269 -> a
-    338:338:void lambda$write$1(com.android.tools.r8.dex.ApplicationWriter$SortAnnotations,com.android.tools.r8.graph.DexProgramClass):275:275 -> a
-    339:349:void computeSourceFileString(com.android.tools.r8.utils.Box,java.util.List):371:381 -> a
-    350:362:com.android.tools.r8.SourceFileEnvironment createSourceFileEnvironment(com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId):392:404 -> a
-    363:366: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):502:505 -> a
-    367:374: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):503:510 -> a
-    375:422: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):509:556 -> a
-    423:423: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):555:555 -> a
-    424:424:void lambda$supplyAdditionalConsumers$6(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):532:532 -> a
-    425:434:void lambda$supplyAdditionalConsumers$6(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):531:540 -> a
-    435:441:void lambda$supplyAdditionalConsumers$6(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):535:541 -> a
-    442:442:void lambda$supplyAdditionalConsumers$6(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":995,"2":996,"3":997,"4":998,"5":999}}
-    995:995:void lambda$supplyAdditionalConsumers$6(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):541:541 -> a
-    996:996:void lambda$supplyAdditionalConsumers$6(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):541:541 -> a
-    997:997:void lambda$supplyAdditionalConsumers$6(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):541:541 -> a
-    998:998:void lambda$supplyAdditionalConsumers$6(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):541:541 -> a
-    999:999:void lambda$supplyAdditionalConsumers$6(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):541:541 -> a
-    985:985:void lambda$supplyAdditionalConsumers$6(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):543:543 -> a
-    986:986:void lambda$supplyAdditionalConsumers$6(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):534:534 -> a
-    987:987:void lambda$supplyAdditionalConsumers$6(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):533:533 -> a
-    1000:1033:void adaptAndPassDataResources(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.DataResourceConsumer,java.util.Collection,com.android.tools.r8.dex.ResourceAdapter):566:599 -> a
-    1034:1034:void insertAttributeAnnotations():606:606 -> a
-    1035:1049:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):614:628 -> a
-    1035:1049:void insertAttributeAnnotations():607 -> a
-    1050:1050:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):627:627 -> a
-    1050:1050:void insertAttributeAnnotations():607 -> a
-    1051:1059:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):626:634 -> a
-    1051:1059:void insertAttributeAnnotations():607 -> a
-    1060:1060:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):633:633 -> a
-    1060:1060:void insertAttributeAnnotations():607 -> a
-    1061:1077:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):632:648 -> a
-    1061:1077:void insertAttributeAnnotations():607 -> a
-    1078:1084:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):647:653 -> a
-    1078:1084:void insertAttributeAnnotations():607 -> a
-    1085:1094: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):182:191 -> a
-    1085:1094:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):651 -> a
-    1085:1094:void insertAttributeAnnotations():607 -> a
-    1095:1103:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):650:658 -> a
-    1095:1103:void insertAttributeAnnotations():607 -> a
-    1104:1104:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):657:657 -> a
-    1104:1104:void insertAttributeAnnotations():607 -> a
-    1105:1116:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):656:667 -> a
-    1105:1116:void insertAttributeAnnotations():607 -> a
-    1117:1125:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):666:674 -> a
-    1117:1125:void insertAttributeAnnotations():607 -> a
-    1126:1126:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):673:673 -> a
-    1126:1126:void insertAttributeAnnotations():607 -> a
-    1127:1138:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):672:683 -> a
-    1127:1138:void insertAttributeAnnotations():607 -> a
-    1139:1139: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
-    1139:1139:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):681 -> a
-    1139:1139:void insertAttributeAnnotations():607 -> a
-    1140:1140:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.newArray(java.lang.Class,int):49:49 -> a
-    1140:1140:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.concat(java.lang.Object[],java.lang.Object[],java.lang.Class):71 -> a
-    1140:1140:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):681 -> a
-    1140:1140:void insertAttributeAnnotations():607 -> a
-    1141:1142: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
-    1141:1142:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):681 -> a
-    1141:1142:void insertAttributeAnnotations():607 -> a
-    1143:1153:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):681:691 -> a
-    1143:1153:void insertAttributeAnnotations():607 -> a
-    1154:1155:void insertAttributeAnnotations():608:609 -> a
-    1156:1165:void insertAttributeAnnotationsForField(com.android.tools.r8.graph.DexEncodedField):695:704 -> a
-    1166:1166:void insertAttributeAnnotationsForField(com.android.tools.r8.graph.DexEncodedField):703:703 -> a
-    1167:1167:void insertAttributeAnnotationsForField(com.android.tools.r8.graph.DexEncodedField):701:701 -> a
-    1168:1168:void insertAttributeAnnotationsForField(com.android.tools.r8.graph.DexEncodedField):700:700 -> a
-    1169:1176:void insertAttributeAnnotationsForField(com.android.tools.r8.graph.DexEncodedField):699:706 -> a
-    1177:1186:void insertAttributeAnnotationsForMethod(com.android.tools.r8.graph.DexEncodedMethod):710:719 -> a
-    1187:1187:void insertAttributeAnnotationsForMethod(com.android.tools.r8.graph.DexEncodedMethod):718:718 -> a
-    1188:1188:void insertAttributeAnnotationsForMethod(com.android.tools.r8.graph.DexEncodedMethod):716:716 -> a
-    1189:1189:void insertAttributeAnnotationsForMethod(com.android.tools.r8.graph.DexEncodedMethod):715:715 -> a
-    1190:1197:void insertAttributeAnnotationsForMethod(com.android.tools.r8.graph.DexEncodedMethod):714:721 -> a
-    1198:1198:void lambda$setCallSiteContexts$7(com.android.tools.r8.graph.ProgramMethod):732:732 -> a
-    1199:1211:void rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,java.util.Collection,com.android.tools.r8.graph.DexApplication):747:759 -> a
-    1212:1219:void lambda$rewriteCodeWithJumboStrings$8(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.ProgramMethod):762:769 -> a
-    1220:1221:java.lang.String com.android.tools.r8.dex.ApplicationWriter.mapMainDexListName(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.NamingLens):792:793 -> a
-    1220:1221:void lambda$writeMainDexList$9(java.lang.StringBuilder,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexType):804 -> a
-    1222:1222:void lambda$writeMainDexList$9(java.lang.StringBuilder,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexType):804:804 -> a
-    1223:1230:java.lang.String writeMainDexList(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):798:805 -> a
+    489:497:void write(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp):340:348 -> a
+    498:498:java.lang.Boolean lambda$write$0(java.util.List,com.android.tools.r8.ir.analysis.proto.ProtoShrinker):278:278 -> a
+    499:499:void lambda$write$1(com.android.tools.r8.dex.ApplicationWriter$SortAnnotations,com.android.tools.r8.graph.DexProgramClass):284:284 -> a
+    500:512:com.android.tools.r8.SourceFileEnvironment createSourceFileEnvironment(com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId):409:421 -> a
+    513:516: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
+    517:524: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
+    525:572: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:573 -> a
+    573:573: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:572 -> a
+    574:574: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
+    575:584: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
+    585:591: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
+    592:592: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":1162,"2":1163,"3":1164,"4":1165,"5":1166}}
+    1162:1162: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
+    1163:1163: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
+    1164:1164: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
+    1165:1165: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
+    1166:1166: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
+    1152:1152: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
+    1153:1153: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
+    1154:1154: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
+    1167:1200:void adaptAndPassDataResources(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.DataResourceConsumer,java.util.Collection,com.android.tools.r8.dex.ResourceAdapter):583:616 -> a
+    1201:1201:void insertAttributeAnnotations():623:623 -> a
+    1202:1216:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):631:645 -> a
+    1202:1216:void insertAttributeAnnotations():624 -> a
+    1217:1217:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):644:644 -> a
+    1217:1217:void insertAttributeAnnotations():624 -> a
+    1218:1226:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):643:651 -> a
+    1218:1226:void insertAttributeAnnotations():624 -> a
+    1227:1227:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):650:650 -> a
+    1227:1227:void insertAttributeAnnotations():624 -> a
+    1228:1244:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):649:665 -> a
+    1228:1244:void insertAttributeAnnotations():624 -> a
+    1245:1251:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):664:670 -> a
+    1245:1251:void insertAttributeAnnotations():624 -> a
+    1252:1261: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
+    1252:1261:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):668 -> a
+    1252:1261:void insertAttributeAnnotations():624 -> a
+    1262:1270:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):667:675 -> a
+    1262:1270:void insertAttributeAnnotations():624 -> a
+    1271:1271:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):674:674 -> a
+    1271:1271:void insertAttributeAnnotations():624 -> a
+    1272:1283:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):673:684 -> a
+    1272:1283:void insertAttributeAnnotations():624 -> a
+    1284:1292:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):683:691 -> a
+    1284:1292:void insertAttributeAnnotations():624 -> a
+    1293:1293:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):690:690 -> a
+    1293:1293:void insertAttributeAnnotations():624 -> a
+    1294:1305:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):689:700 -> a
+    1294:1305:void insertAttributeAnnotations():624 -> a
+    1306:1306: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
+    1306:1306:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):698 -> a
+    1306:1306:void insertAttributeAnnotations():624 -> a
+    1307:1307:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.newArray(java.lang.Class,int):49:49 -> a
+    1307:1307:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.concat(java.lang.Object[],java.lang.Object[],java.lang.Class):71 -> a
+    1307:1307:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):698 -> a
+    1307:1307:void insertAttributeAnnotations():624 -> a
+    1308:1309: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
+    1308:1309:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):698 -> a
+    1308:1309:void insertAttributeAnnotations():624 -> a
+    1310:1320:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):698:708 -> a
+    1310:1320:void insertAttributeAnnotations():624 -> a
+    1321:1322:void insertAttributeAnnotations():625:626 -> a
+    1323:1332:void insertAttributeAnnotationsForField(com.android.tools.r8.graph.DexEncodedField):712:721 -> a
+    1333:1333:void insertAttributeAnnotationsForField(com.android.tools.r8.graph.DexEncodedField):720:720 -> a
+    1334:1334:void insertAttributeAnnotationsForField(com.android.tools.r8.graph.DexEncodedField):718:718 -> a
+    1335:1335:void insertAttributeAnnotationsForField(com.android.tools.r8.graph.DexEncodedField):717:717 -> a
+    1336:1343:void insertAttributeAnnotationsForField(com.android.tools.r8.graph.DexEncodedField):716:723 -> a
+    1344:1353:void insertAttributeAnnotationsForMethod(com.android.tools.r8.graph.DexEncodedMethod):727:736 -> a
+    1354:1354:void insertAttributeAnnotationsForMethod(com.android.tools.r8.graph.DexEncodedMethod):735:735 -> a
+    1355:1355:void insertAttributeAnnotationsForMethod(com.android.tools.r8.graph.DexEncodedMethod):733:733 -> a
+    1356:1356:void insertAttributeAnnotationsForMethod(com.android.tools.r8.graph.DexEncodedMethod):732:732 -> a
+    1357:1364:void insertAttributeAnnotationsForMethod(com.android.tools.r8.graph.DexEncodedMethod):731:738 -> a
+    1365:1365:void setCallSiteContexts(com.android.tools.r8.graph.DexProgramClass):747:747 -> a
+    1366:1366:void lambda$setCallSiteContexts$6(com.android.tools.r8.graph.ProgramMethod):749:749 -> a
+    1367:1379:void rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,java.util.Collection,com.android.tools.r8.graph.DexApplication):764:776 -> a
+    1380:1387: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
+    1388:1389:java.lang.String com.android.tools.r8.dex.ApplicationWriter.mapMainDexListName(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.NamingLens):809:810 -> a
+    1388:1389:void lambda$writeMainDexList$8(java.lang.StringBuilder,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexType):821 -> a
+    1390:1390:void lambda$writeMainDexList$8(java.lang.StringBuilder,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexType):821:821 -> a
+    1391:1398:java.lang.String writeMainDexList(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):815:822 -> 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":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):321:321 -> b
-    386:386:com.android.tools.r8.utils.Timing lambda$write$3(java.util.List,com.android.tools.r8.dex.VirtualFile):321:321 -> b
-    387:387:com.android.tools.r8.utils.Timing lambda$write$3(java.util.List,com.android.tools.r8.dex.VirtualFile):321:321 -> b
-    322:322:com.android.tools.r8.utils.Timing lambda$write$3(java.util.List,com.android.tools.r8.dex.VirtualFile):321:321 -> b
-    323:333:void com.android.tools.r8.dex.ApplicationWriter.writeVirtualFile(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.Timing,java.util.List):444:454 -> b
-    323:333:com.android.tools.r8.utils.Timing lambda$write$3(java.util.List,com.android.tools.r8.dex.VirtualFile):322 -> b
-    334:334:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():483:483 -> b
-    334:334:void com.android.tools.r8.dex.ApplicationWriter.writeVirtualFile(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.Timing,java.util.List):454 -> b
-    334:334:com.android.tools.r8.utils.Timing lambda$write$3(java.util.List,com.android.tools.r8.dex.VirtualFile):322 -> b
-    335:341:void com.android.tools.r8.dex.ApplicationWriter.writeVirtualFile(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.Timing,java.util.List):457:463 -> b
-    335:341:com.android.tools.r8.utils.Timing lambda$write$3(java.util.List,com.android.tools.r8.dex.VirtualFile):322 -> b
-    342:342:com.android.tools.r8.DexIndexedConsumer com.android.tools.r8.utils.InternalOptions.getDexIndexedConsumer():479:479 -> 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):463 -> b
-    342:342:com.android.tools.r8.utils.Timing lambda$write$3(java.util.List,com.android.tools.r8.dex.VirtualFile):322 -> b
-    343:348:void com.android.tools.r8.dex.ApplicationWriter.writeVirtualFile(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.Timing,java.util.List):468:473 -> b
-    343:348:com.android.tools.r8.utils.Timing lambda$write$3(java.util.List,com.android.tools.r8.dex.VirtualFile):322 -> b
-    349:360:com.android.tools.r8.dex.FileWriter$ByteBufferResult com.android.tools.r8.dex.ApplicationWriter.writeDexFile(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ByteBufferProvider):777:788 -> b
-    349:360:void com.android.tools.r8.dex.ApplicationWriter.writeVirtualFile(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.Timing,java.util.List):474 -> b
-    349:360:com.android.tools.r8.utils.Timing lambda$write$3(java.util.List,com.android.tools.r8.dex.VirtualFile):322 -> b
-    361:370:void com.android.tools.r8.dex.ApplicationWriter.writeVirtualFile(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.Timing,java.util.List):475:484 -> b
-    361:370:com.android.tools.r8.utils.Timing lambda$write$3(java.util.List,com.android.tools.r8.dex.VirtualFile):322 -> 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):481:493 -> b
-    371:383:com.android.tools.r8.utils.Timing lambda$write$3(java.util.List,com.android.tools.r8.dex.VirtualFile):322 -> b
-    384:384:com.android.tools.r8.utils.Timing lambda$write$3(java.util.List,com.android.tools.r8.dex.VirtualFile):323:323 -> b
-    388:388:boolean willComputeProguardMap():231:231 -> b
-    389:389:com.android.tools.r8.graph.DexString rewriteSourceFile(com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId):418:418 -> b
-    390:402:com.android.tools.r8.SourceFileEnvironment com.android.tools.r8.dex.ApplicationWriter.createSourceFileEnvironment(com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId):392:404 -> b
-    390:402:com.android.tools.r8.graph.DexString rewriteSourceFile(com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId):419 -> b
-    403:406:com.android.tools.r8.graph.DexString rewriteSourceFile(com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId):420:423 -> b
-    407:409:void setCallSiteContexts(java.util.concurrent.ExecutorService):725:725 -> b
-    410:410:void setCallSiteContexts(com.android.tools.r8.graph.DexProgramClass):730:730 -> b
-    1:5:void write(java.util.concurrent.ExecutorService):235:239 -> c
-    6:23:void com.android.tools.r8.dex.ApplicationWriter.computeMarkerStrings(com.android.tools.r8.utils.Box,java.util.List):347:364 -> c
-    6:23:void write(java.util.concurrent.ExecutorService):240 -> c
-    24:24:com.android.tools.r8.graph.DexString com.android.tools.r8.dex.Marker.toDexString(com.android.tools.r8.graph.DexItemFactory):296:296 -> c
-    24:24:void com.android.tools.r8.dex.ApplicationWriter.computeMarkerStrings(com.android.tools.r8.utils.Box,java.util.List):364 -> c
-    24:24:void write(java.util.concurrent.ExecutorService):240 -> c
-    25:25:void com.android.tools.r8.dex.ApplicationWriter.computeMarkerStrings(com.android.tools.r8.utils.Box,java.util.List):364:364 -> c
-    25:25:void write(java.util.concurrent.ExecutorService):240 -> c
-    26:52:void write(java.util.concurrent.ExecutorService):241:267 -> c
-    53:121:void write(java.util.concurrent.ExecutorService):265:333 -> c
-    122:122:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():436:436 -> c
-    122:122:void write(java.util.concurrent.ExecutorService):333 -> c
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    123:131:void write(java.util.concurrent.ExecutorService):333:341 -> c
-com.android.tools.r8.dex.ApplicationWriter$1 -> com.android.tools.r8.internal.l2:
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":392,"2":393,"3":394}}
+    392:392:com.android.tools.r8.utils.Timing lambda$write$3(java.util.List,com.android.tools.r8.dex.VirtualFile):328:328 -> b
+    393:393:com.android.tools.r8.utils.Timing lambda$write$3(java.util.List,com.android.tools.r8.dex.VirtualFile):328:328 -> b
+    394:394: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():485:485 -> 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():481:481 -> 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:355:void com.android.tools.r8.dex.ApplicationWriter.writeVirtualFile(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.Timing,java.util.List):485:490 -> b
+    350:355:com.android.tools.r8.utils.Timing lambda$write$3(java.util.List,com.android.tools.r8.dex.VirtualFile):329 -> b
+    356:367:com.android.tools.r8.dex.FileWriter$ByteBufferResult com.android.tools.r8.dex.ApplicationWriter.writeDexFile(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ByteBufferProvider):794:805 -> b
+    356:367:void com.android.tools.r8.dex.ApplicationWriter.writeVirtualFile(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.Timing,java.util.List):491 -> b
+    356:367:com.android.tools.r8.utils.Timing lambda$write$3(java.util.List,com.android.tools.r8.dex.VirtualFile):329 -> b
+    368:377:void com.android.tools.r8.dex.ApplicationWriter.writeVirtualFile(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.Timing,java.util.List):492:501 -> b
+    368:377:com.android.tools.r8.utils.Timing lambda$write$3(java.util.List,com.android.tools.r8.dex.VirtualFile):329 -> b
+    378:390: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
+    378:390:com.android.tools.r8.utils.Timing lambda$write$3(java.util.List,com.android.tools.r8.dex.VirtualFile):329 -> b
+    391:391:com.android.tools.r8.utils.Timing lambda$write$3(java.util.List,com.android.tools.r8.dex.VirtualFile):330:330 -> b
+    395:395:boolean willComputeProguardMap():231:231 -> b
+    396:396:com.android.tools.r8.graph.DexString rewriteSourceFile(com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId):435:435 -> b
+    397:409:com.android.tools.r8.SourceFileEnvironment com.android.tools.r8.dex.ApplicationWriter.createSourceFileEnvironment(com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId):409:421 -> b
+    397:409:com.android.tools.r8.graph.DexString rewriteSourceFile(com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId):436 -> b
+    410:413:com.android.tools.r8.graph.DexString rewriteSourceFile(com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId):437:440 -> b
+    414:416:void setCallSiteContexts(java.util.concurrent.ExecutorService):742:742 -> b
+    1:2:void write(java.util.concurrent.ExecutorService):236:237 -> c
+com.android.tools.r8.dex.ApplicationWriter$1 -> com.android.tools.r8.internal.o2:
     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):352:352 -> <init>
-    1:3:com.android.tools.r8.graph.DexString internalCompute():356:358 -> b
+    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():358 -> b
-com.android.tools.r8.dex.ApplicationWriter$2 -> com.android.tools.r8.internal.m2:
+    4:4:com.android.tools.r8.graph.DexString internalCompute():365 -> b
+com.android.tools.r8.dex.ApplicationWriter$2 -> com.android.tools.r8.internal.p2:
     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):382:382 -> <init>
-    1:1:com.android.tools.r8.graph.DexString internalCompute():385:385 -> b
-com.android.tools.r8.dex.ApplicationWriter$3 -> com.android.tools.r8.internal.n2:
-    1:1:void <init>():392:392 -> <init>
-com.android.tools.r8.dex.ApplicationWriter$4 -> com.android.tools.r8.internal.o2:
+    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.q2:
+    1:1:void <init>():409:409 -> <init>
+com.android.tools.r8.dex.ApplicationWriter$4 -> com.android.tools.r8.internal.r2:
     com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId val$proguardMapId -> a
-    1:1:void <init>(com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId):404:404 -> <init>
-    1:1:java.lang.String getMapHash():412:412 -> getMapHash
-    1:1:java.lang.String getMapId():407:407 -> getMapId
-com.android.tools.r8.dex.ApplicationWriter$5 -> com.android.tools.r8.internal.p2:
+    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.s2:
     com.android.tools.r8.dex.ResourceAdapter val$resourceAdapter -> a
     com.android.tools.r8.DataResourceConsumer val$dataResourceConsumer -> b
     java.util.Set val$generatedResourceNames -> d
     com.android.tools.r8.utils.InternalOptions val$options -> c
-    1:1:void <init>(com.android.tools.r8.dex.ResourceAdapter,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,java.util.Set):571:571 -> <init>
-    1:4:void visit(com.android.tools.r8.DataDirectoryResource):574:577 -> visit
-    5:5:void visit(com.android.tools.r8.DataEntryResource):583:583 -> visit
+    1:1:void <init>(com.android.tools.r8.dex.ResourceAdapter,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,java.util.Set):588:588 -> <init>
+    1:4:void visit(com.android.tools.r8.DataDirectoryResource):591:594 -> visit
+    5:5:void visit(com.android.tools.r8.DataEntryResource):600:600 -> visit
     6:6:boolean com.android.tools.r8.dex.ResourceAdapter.isService(com.android.tools.r8.DataEntryResource):108:108 -> visit
-    6:6:void visit(com.android.tools.r8.DataEntryResource):583 -> visit
-    7:11:void visit(com.android.tools.r8.DataEntryResource):588:592 -> visit
+    6:6:void visit(com.android.tools.r8.DataEntryResource):600 -> visit
+    7:11:void visit(com.android.tools.r8.DataEntryResource):605:609 -> visit
     12:12:void visit(com.android.tools.r8.DataEntryResource):0:0 -> visit
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":610,"2":611,"3":612}}
-    610:610:void visit(com.android.tools.r8.DataEntryResource):592:592 -> visit
-    611:611:void visit(com.android.tools.r8.DataEntryResource):592:592 -> visit
-    612:612:void visit(com.android.tools.r8.DataEntryResource):592:592 -> visit
-    605:605:void visit(com.android.tools.r8.DataEntryResource):593:593 -> visit
-    606:609:void visit(com.android.tools.r8.DataEntryResource):592:595 -> visit
-com.android.tools.r8.dex.ApplicationWriter$LazyDexString -> com.android.tools.r8.internal.q2:
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":627,"2":628,"3":629}}
+    627:627:void visit(com.android.tools.r8.DataEntryResource):609:609 -> visit
+    628:628:void visit(com.android.tools.r8.DataEntryResource):609:609 -> visit
+    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.t2:
     boolean computed -> a
     boolean $assertionsDisabled -> b
-    1:1:void <clinit>():808:808 -> <clinit>
-    1:2:void <init>():808:809 -> <init>
-    1:3:com.android.tools.r8.graph.DexString compute():814:816 -> a
+    1:1:void <clinit>():825:825 -> <clinit>
+    1:2:void <init>():825:826 -> <init>
+    1:3:com.android.tools.r8.graph.DexString compute():831:833 -> a
     com.android.tools.r8.graph.DexString internalCompute() -> b
-com.android.tools.r8.dex.ApplicationWriter$SortAnnotations -> com.android.tools.r8.internal.r2:
+com.android.tools.r8.dex.ApplicationWriter$SortAnnotations -> com.android.tools.r8.internal.u2:
     com.android.tools.r8.naming.NamingLens namingLens -> a
-    1:2:void <init>(com.android.tools.r8.naming.NamingLens):93:94 -> <init>
+    1:2:void <init>(com.android.tools.r8.naming.NamingLens):97:98 -> <init>
     boolean add(com.android.tools.r8.graph.DexDebugInfo) -> a
     boolean add(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexWritableCode) -> a
     boolean add(com.android.tools.r8.graph.DexProgramClass) -> a
     boolean add(com.android.tools.r8.graph.DexTypeList) -> a
     boolean add(com.android.tools.r8.graph.ParameterAnnotationsList) -> a
     boolean setAnnotationsDirectoryForClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotationDirectory) -> a
-    1:1:boolean add(com.android.tools.r8.graph.DexAnnotationSet):100:100 -> a
-    2:2:boolean add(com.android.tools.r8.graph.DexAnnotation):107:107 -> a
-    3:4:boolean add(com.android.tools.r8.graph.DexEncodedArray):114:115 -> a
+    1:1:boolean add(com.android.tools.r8.graph.DexAnnotationSet):104:104 -> a
+    2:2:boolean add(com.android.tools.r8.graph.DexAnnotation):111:111 -> a
+    3:4:boolean add(com.android.tools.r8.graph.DexEncodedArray):118:119 -> a
 com.android.tools.r8.dex.BinaryReader -> com.android.tools.r8.dex.c:
     com.android.tools.r8.origin.Origin origin -> a
     com.android.tools.r8.dex.CompatByteBuffer buffer -> b
@@ -16214,7 +16328,7 @@
     1:1:int getUleb128():44:44 -> e
     1:1:int getUleb128p1():52 -> e
     1:2:int getUshort():62:63 -> f
-com.android.tools.r8.dex.ClassesChecksum -> com.android.tools.r8.internal.Ya:
+com.android.tools.r8.dex.ClassesChecksum -> com.android.tools.r8.internal.ab:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap dictionary -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():14:14 -> <clinit>
@@ -16231,7 +16345,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.zb:
+com.android.tools.r8.dex.CodeToKeep -> com.android.tools.r8.internal.Bb:
     1:1:void <init>():24:24 -> <init>
     void generateKeepRules(com.android.tools.r8.utils.InternalOptions) -> a
     boolean isNop() -> a
@@ -16240,13 +16354,13 @@
     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():436:436 -> a
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():438:438 -> 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.ub:
-com.android.tools.r8.dex.CodeToKeep$DesugaredLibraryCodeToKeep -> com.android.tools.r8.internal.xb:
+com.android.tools.r8.dex.CodeToKeep$1 -> com.android.tools.r8.internal.wb:
+com.android.tools.r8.dex.CodeToKeep$DesugaredLibraryCodeToKeep -> com.android.tools.r8.internal.zb:
     java.util.Map toKeep -> c
     com.android.tools.r8.naming.NamingLens namingLens -> a
     com.android.tools.r8.utils.InternalOptions options -> d
@@ -16292,18 +16406,18 @@
     90:90:boolean shouldKeep(com.android.tools.r8.graph.DexType):77:77 -> d
     82:86:boolean shouldKeep(com.android.tools.r8.graph.DexType):77:81 -> d
     87:87:boolean shouldKeep(com.android.tools.r8.graph.DexType):78:78 -> d
-com.android.tools.r8.dex.CodeToKeep$DesugaredLibraryCodeToKeep$2 -> com.android.tools.r8.internal.vb:
+com.android.tools.r8.dex.CodeToKeep$DesugaredLibraryCodeToKeep$2 -> com.android.tools.r8.internal.xb:
     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.wb:
+com.android.tools.r8.dex.CodeToKeep$DesugaredLibraryCodeToKeep$KeepStruct -> com.android.tools.r8.internal.yb:
     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.yb:
+com.android.tools.r8.dex.CodeToKeep$NopCodeToKeep -> com.android.tools.r8.internal.Ab:
     1:1:void <init>():218:218 -> <init>
     boolean isNop() -> a
     void recordClass(com.android.tools.r8.graph.DexType) -> a
@@ -16311,7 +16425,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.jc:
+com.android.tools.r8.dex.CompatByteBuffer -> com.android.tools.r8.internal.lc:
     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
@@ -16379,12 +16493,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.md:
+com.android.tools.r8.dex.Constants -> com.android.tools.r8.internal.od:
     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.Jd:
+com.android.tools.r8.dex.DebugBytecodeWriter -> com.android.tools.r8.internal.Ld:
     com.android.tools.r8.graph.ObjectToOffsetMapping mapping -> a
     com.android.tools.r8.graph.DexDebugInfo info -> c
     java.nio.ByteBuffer buffer -> d
@@ -16513,7 +16627,7 @@
     353:353:int com.android.tools.r8.dex.BinaryReader.getUleb128():44:44 -> a
     353:353:com.android.tools.r8.graph.DexEncodedField[] readFields(int,com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation[],com.android.tools.r8.graph.DexValue[]):636 -> a
     354:364:com.android.tools.r8.graph.DexEncodedField[] readFields(int,com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation[],com.android.tools.r8.graph.DexValue[]):636:646 -> a
-    365:366:java.lang.String com.android.tools.r8.graph.DexAnnotation.getSignature(com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):285:286 -> a
+    365:366: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
     365:366:com.android.tools.r8.graph.DexEncodedField[] readFields(int,com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation[],com.android.tools.r8.graph.DexValue[]):646 -> a
     367:370:com.android.tools.r8.graph.DexEncodedField[] readFields(int,com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation[],com.android.tools.r8.graph.DexValue[]):648:651 -> a
     371:383:com.android.tools.r8.graph.DexEncodedField[] readFields(int,com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation[],com.android.tools.r8.graph.DexValue[]):650:662 -> a
@@ -16612,7 +16726,7 @@
     490:491:void ensureCodesInited(int):167:168 -> a
     490:491:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):684 -> a
     492:500:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):685:693 -> a
-    501:502:java.lang.String com.android.tools.r8.graph.DexAnnotation.getSignature(com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):285:286 -> a
+    501:502: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
     501:502:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):693 -> a
     503:506:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):695:698 -> a
     507:524:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):697:714 -> a
@@ -17269,7 +17383,7 @@
     8:8:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():172:172 -> c
     9:23:boolean com.android.tools.r8.dex.FileWriter.verifyNames():308:322 -> c
     9:23:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():172 -> c
-    24:24:boolean com.android.tools.r8.synthesis.SyntheticNaming.verifyNotInternalSynthetic(com.android.tools.r8.graph.DexType):207:207 -> c
+    24:24:boolean com.android.tools.r8.synthesis.SyntheticNaming.verifyNotInternalSynthetic(com.android.tools.r8.graph.DexType):208:208 -> c
     24:24:boolean com.android.tools.r8.dex.FileWriter.verifyNames():322 -> c
     24:24:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():172 -> c
     25:32:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():174:181 -> c
@@ -17859,7 +17973,7 @@
     1:5:void replaceTarget(com.android.tools.r8.code.Instruction,com.android.tools.r8.code.Instruction):72:76 -> a
     6:6:int getStartOffset():81:81 -> a
     1:4:int getStartToEndDelta():85:88 -> b
-com.android.tools.r8.dex.Marker -> com.android.tools.r8.internal.TB:
+com.android.tools.r8.dex.Marker -> com.android.tools.r8.internal.YB:
     com.android.tools.r8.dex.Marker$Tool tool -> b
     boolean $assertionsDisabled -> f
     java.lang.String D8_PREFIX -> c
@@ -17932,12 +18046,12 @@
     1:1:boolean isL8():132:132 -> o
     1:1:boolean isRelocator():136:136 -> p
     1:5:java.lang.String toString():274:278 -> toString
-com.android.tools.r8.dex.Marker$Backend$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.SB:
+com.android.tools.r8.dex.Marker$Backend$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.XB:
 # {"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.TB$a:
+com.android.tools.r8.dex.Marker$Tool -> com.android.tools.r8.internal.YB$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
@@ -17945,7 +18059,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.CD:
+com.android.tools.r8.dex.MixedSectionCollection -> com.android.tools.r8.internal.HD:
     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
@@ -17957,7 +18071,7 @@
     boolean add(com.android.tools.r8.graph.ParameterAnnotationsList) -> 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.KQ:
+com.android.tools.r8.dex.ResourceAdapter -> com.android.tools.r8.internal.TQ:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.utils.InternalOptions options -> e
@@ -17998,31 +18112,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.EQ:
+com.android.tools.r8.dex.ResourceAdapter$DefaultFileNameAdapter -> com.android.tools.r8.internal.NQ:
     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.FQ:
+com.android.tools.r8.dex.ResourceAdapter$DirectoryNameAdapter -> com.android.tools.r8.internal.OQ:
     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.GQ:
+com.android.tools.r8.dex.ResourceAdapter$FileContentsAdapter -> com.android.tools.r8.internal.PQ:
     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.HQ:
+com.android.tools.r8.dex.ResourceAdapter$FileNameAdapter -> com.android.tools.r8.internal.QQ:
     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.IQ:
+com.android.tools.r8.dex.ResourceAdapter$ServiceFileNameAdapter -> com.android.tools.r8.internal.RQ:
     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.JQ:
+com.android.tools.r8.dex.ResourceAdapter$StringAdapter -> com.android.tools.r8.internal.SQ:
     java.lang.StringBuilder result -> b
     java.lang.String contents -> a
     int outputFrom -> d
@@ -18153,7 +18267,7 @@
     14:14:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> g
     14:14:void setByteOrder():87 -> g
     15:15:void setByteOrder():87:87 -> g
-com.android.tools.r8.dex.VirtualFile -> com.android.tools.r8.internal.oZ:
+com.android.tools.r8.dex.VirtualFile -> com.android.tools.r8.internal.xZ:
     com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection indexedItems -> b
     com.android.tools.r8.graph.ObjectToOffsetMapping objectMapping -> f
     boolean $assertionsDisabled -> g
@@ -18238,15 +18352,15 @@
     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.eZ:
-com.android.tools.r8.dex.VirtualFile$Distributor -> com.android.tools.r8.internal.fZ:
+com.android.tools.r8.dex.VirtualFile$1 -> com.android.tools.r8.internal.nZ:
+com.android.tools.r8.dex.VirtualFile$Distributor -> com.android.tools.r8.internal.oZ:
     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.gZ:
+com.android.tools.r8.dex.VirtualFile$DistributorBase -> com.android.tools.r8.internal.pZ:
     com.android.tools.r8.dex.VirtualFile mainDexFile -> f
     java.util.Set classes -> d
     com.android.tools.r8.utils.InternalOptions options -> g
@@ -18271,20 +18385,20 @@
     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.hZ:
+com.android.tools.r8.dex.VirtualFile$FilePerInputClassDistributor -> com.android.tools.r8.internal.qZ:
     boolean $assertionsDisabled -> e
     boolean combineSyntheticClassesWithPrimaryClass -> d
     1:1:void <clinit>():328:328 -> <clinit>
     1:2:void <init>(com.android.tools.r8.dex.ApplicationWriter,boolean):333:334 -> <init>
     1:8:java.util.List run():339:346 -> a
-    9:9:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):264:264 -> a
+    9:9:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):265:265 -> a
     9:9:java.util.List run():346 -> a
-    10:10:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexType):260:260 -> a
-    10:10:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):264 -> a
+    10:10:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexType):261:261 -> a
+    10:10:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):265 -> a
     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.iZ:
+com.android.tools.r8.dex.VirtualFile$FillFilesDistributor -> com.android.tools.r8.internal.rZ:
     com.android.tools.r8.dex.VirtualFile$FillStrategy fillStrategy -> i
     java.util.concurrent.ExecutorService executorService -> j
     boolean $assertionsDisabled -> k
@@ -18292,7 +18406,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.jZ:
+com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction -> com.android.tools.r8.internal.sZ:
     com.android.tools.r8.ir.conversion.LensCodeRewriterUtils rewriter -> e
     boolean $assertionsDisabled -> n
     com.android.tools.r8.naming.NamingLens namingLens -> d
@@ -18329,7 +18443,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):207:207 -> b
+    6:6:boolean com.android.tools.r8.synthesis.SyntheticNaming.verifyNotInternalSynthetic(com.android.tools.r8.graph.DexType):208:208 -> 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
@@ -18338,13 +18452,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.kZ:
+com.android.tools.r8.dex.VirtualFile$MonoDexDistributor -> com.android.tools.r8.internal.tZ:
     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.lZ:
+com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator -> com.android.tools.r8.internal.uZ:
     java.util.List classes -> a
     java.util.Map originalNames -> b
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
@@ -18397,7 +18511,7 @@
     157:157:boolean isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1173 -> a
     158:160:com.android.tools.r8.dex.VirtualFile getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1203:1205 -> a
     1:1:java.lang.Object call():1014:1014 -> call
-com.android.tools.r8.dex.VirtualFile$VirtualFileCycler -> com.android.tools.r8.internal.mZ:
+com.android.tools.r8.dex.VirtualFile$VirtualFileCycler -> com.android.tools.r8.internal.vZ:
     java.util.List files -> a
     com.android.tools.r8.FeatureSplit featuresplit -> i
     com.android.tools.r8.graph.AppView appView -> b
@@ -18421,7 +18535,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.nZ:
+com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection -> com.android.tools.r8.internal.wZ:
     java.util.Set methods -> g
     java.util.Set fields -> h
     java.util.Set strings -> i
@@ -18451,7 +18565,7 @@
     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):207:207 -> b
+    5:5:boolean com.android.tools.r8.synthesis.SyntheticNaming.verifyNotInternalSynthetic(com.android.tools.r8.graph.DexType):208:208 -> 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
@@ -18499,7 +18613,7 @@
     68:89:void splitNonClassResources(com.android.tools.r8.dexsplitter.DexSplitter$Options,com.android.tools.r8.utils.FeatureClassMapping):329:350 -> run
     68:89:void run(com.android.tools.r8.dexsplitter.DexSplitter$Options):322 -> run
     90:90:void run(com.android.tools.r8.dexsplitter.DexSplitter$Options):300:300 -> run
-com.android.tools.r8.dexsplitter.DexSplitter$FeatureJar -> com.android.tools.r8.internal.fg:
+com.android.tools.r8.dexsplitter.DexSplitter$FeatureJar -> com.android.tools.r8.internal.eg:
     java.lang.String jar -> a
     java.lang.String outputName -> b
     1:3:void <init>(java.lang.String,java.lang.String):49:51 -> <init>
@@ -18656,33 +18770,33 @@
     2:3:boolean validate():54:55 -> d
     2:3:com.android.tools.r8.diagnostic.internal.DefinitionMethodContextImpl build():48 -> d
     4:4:com.android.tools.r8.diagnostic.internal.DefinitionMethodContextImpl build():49:49 -> d
-com.android.tools.r8.diagnostic.internal.MissingClassInfoImpl -> com.android.tools.r8.internal.mD:
+com.android.tools.r8.diagnostic.internal.MissingClassInfoImpl -> com.android.tools.r8.internal.rD:
     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.kD:
-com.android.tools.r8.diagnostic.internal.MissingClassInfoImpl$Builder -> com.android.tools.r8.internal.lD:
+com.android.tools.r8.diagnostic.internal.MissingClassInfoImpl$1 -> com.android.tools.r8.internal.pD:
+com.android.tools.r8.diagnostic.internal.MissingClassInfoImpl$Builder -> com.android.tools.r8.internal.qD:
     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.rD:
+com.android.tools.r8.diagnostic.internal.MissingDefinitionInfoBase -> com.android.tools.r8.internal.wD:
     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.qD:
+com.android.tools.r8.diagnostic.internal.MissingDefinitionInfoBase$Builder -> com.android.tools.r8.internal.vD:
     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.sD:
+com.android.tools.r8.diagnostic.internal.MissingDefinitionInfoUtils -> com.android.tools.r8.internal.xD:
     boolean $assertionsDisabled -> b
     java.util.Comparator COMPARATOR -> a
     1:3:void <clinit>():26:28 -> <clinit>
@@ -18730,7 +18844,7 @@
     1:23:void writeReferencedFromSuffix(java.lang.StringBuilder,com.android.tools.r8.diagnostic.MissingDefinitionInfo):110:132 -> b
     24:28:void writeReferencedFromSuffix(java.lang.StringBuilder,com.android.tools.r8.diagnostic.MissingDefinitionInfo):131:135 -> b
     29:32:void writeReferencedFromSuffix(java.lang.StringBuilder,com.android.tools.r8.diagnostic.MissingDefinitionInfo):134:137 -> b
-com.android.tools.r8.diagnostic.internal.MissingDefinitionsDiagnosticImpl -> com.android.tools.r8.internal.vD:
+com.android.tools.r8.diagnostic.internal.MissingDefinitionsDiagnosticImpl -> com.android.tools.r8.internal.AD:
     java.util.Collection missingDefinitions -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():17:17 -> <clinit>
@@ -18747,36 +18861,36 @@
     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.tD:
-com.android.tools.r8.diagnostic.internal.MissingDefinitionsDiagnosticImpl$Builder -> com.android.tools.r8.internal.uD:
+com.android.tools.r8.diagnostic.internal.MissingDefinitionsDiagnosticImpl$1 -> com.android.tools.r8.internal.yD:
+com.android.tools.r8.diagnostic.internal.MissingDefinitionsDiagnosticImpl$Builder -> com.android.tools.r8.internal.zD:
     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.yD:
+com.android.tools.r8.diagnostic.internal.MissingFieldInfoImpl -> com.android.tools.r8.internal.DD:
     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.wD:
-com.android.tools.r8.diagnostic.internal.MissingFieldInfoImpl$Builder -> com.android.tools.r8.internal.xD:
+com.android.tools.r8.diagnostic.internal.MissingFieldInfoImpl$1 -> com.android.tools.r8.internal.BD:
+com.android.tools.r8.diagnostic.internal.MissingFieldInfoImpl$Builder -> com.android.tools.r8.internal.CD:
     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.BD:
+com.android.tools.r8.diagnostic.internal.MissingMethodInfoImpl -> com.android.tools.r8.internal.GD:
     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.zD:
-com.android.tools.r8.diagnostic.internal.MissingMethodInfoImpl$Builder -> com.android.tools.r8.internal.AD:
+com.android.tools.r8.diagnostic.internal.MissingMethodInfoImpl$1 -> com.android.tools.r8.internal.ED:
+com.android.tools.r8.diagnostic.internal.MissingMethodInfoImpl$Builder -> com.android.tools.r8.internal.FD:
     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>
@@ -18853,7 +18967,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.qc:
+com.android.tools.r8.errors.CompilationError -> com.android.tools.r8.internal.sc:
     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>
@@ -18875,14 +18989,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.ae:
+com.android.tools.r8.errors.DefaultInterfaceMethodDiagnostic -> com.android.tools.r8.internal.ce:
     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.Qe:
+com.android.tools.r8.errors.DesugaredLibraryMismatchDiagnostic -> com.android.tools.r8.internal.Pe:
     java.util.Set markers -> c
     java.util.Set desugaredLibraryIdentifiers -> b
     1:3:void <init>(java.util.Set,java.util.Set):20:22 -> <init>
@@ -18989,24 +19103,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.EK:
+com.android.tools.r8.errors.PrivateInterfaceMethodDiagnostic -> com.android.tools.r8.internal.NK:
     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.sU:
+com.android.tools.r8.errors.StaticInterfaceMethodDiagnostic -> com.android.tools.r8.internal.BU:
     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.HX:
+com.android.tools.r8.errors.Unimplemented -> com.android.tools.r8.internal.QX:
     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.aY:
+com.android.tools.r8.errors.Unreachable -> com.android.tools.r8.internal.jY:
     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>
@@ -19031,7 +19145,7 @@
     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.rF:
+com.android.tools.r8.errors.dontwarn.NonEmptyDontWarnConfiguration -> com.android.tools.r8.internal.wF:
     java.util.List dontWarnPatterns -> a
     java.util.Map matchedDontWarnPatterns -> b
     boolean $assertionsDisabled -> c
@@ -19210,7 +19324,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.cU:
+com.android.tools.r8.experimental.startup.StartupConfiguration -> com.android.tools.r8.internal.lU:
     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
@@ -19225,7 +19339,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.Ia:
+com.android.tools.r8.features.ClassToFeatureSplitMap -> com.android.tools.r8.internal.Ka:
     java.util.Map classToFeatureSplitMap -> b
     java.util.Map representativeStringsForFeatureSplit -> c
     com.android.tools.r8.FeatureSplit baseStartup -> a
@@ -19415,15 +19529,15 @@
     1:12:void <clinit>():15:26 -> <clinit>
     1:3:void <init>(int,int):54:56 -> <init>
     1:2:void setPrivate():166:167 -> A
-    1:2:void setProtected():179:180 -> C
-    1:2:void setPublic():153:154 -> E
+    1:2:void setProtected():179:180 -> B
+    1:2:void setPublic():153:154 -> D
     1:1:void setStatic():192:192 -> F
     1:1:void setSynthetic():217:217 -> G
     1:1:java.lang.String toSmaliString():285:285 -> H
     1:2:com.android.tools.r8.graph.AccessFlags unsetFinal():208:209 -> I
     1:1:void unsetPrivate():171:171 -> J
-    1:1:com.android.tools.r8.utils.structural.StructuralItem self():15:15 -> K
-    1:1:void unsetProtected():184:184 -> L
+    1:1:void unsetProtected():184:184 -> K
+    1:1:com.android.tools.r8.utils.structural.StructuralItem self():15:15 -> L
     1:1:void unsetPublic():158:158 -> M
     1:2:com.android.tools.r8.graph.AccessFlags unsetSynthetic():221:222 -> N
     1:1:boolean wasSet(int):251:251 -> O
@@ -19446,8 +19560,8 @@
     1:1:int hashCode():96:96 -> hashCode
     1:1:boolean isPackagePrivateOrProtected():145:145 -> i
     2:3:void set(int):263:264 -> i
-    1:1:boolean isPrivate():162:162 -> j
-    2:3:void unset(int):268:269 -> j
+    1:2:void unset(int):268:269 -> j
+    1:1:boolean isPrivate():162:162 -> k
     1:1:boolean isPromoted(int):273:273 -> l
     1:1:boolean isPromotedToPublic():238 -> l
     1:1:boolean isProtected():175:175 -> m
@@ -19456,8 +19570,8 @@
     1:1:boolean isStatic():188:188 -> p
     1:1:boolean isSynthetic():213:213 -> q
     1:1:boolean isVisibilityDependingOnPackage():137:137 -> r
+    1:1:int materialize():74:74 -> s
     1:1:java.lang.String toString():290:290 -> toString
-    1:1:int materialize():74:74 -> u
     1:1:void promoteToFinal():230:230 -> v
     1:2:void promoteToPublic():242:243 -> w
     1:1:void promoteToStatic():247:247 -> x
@@ -19727,7 +19841,7 @@
     34:62:com.android.tools.r8.graph.MethodResolutionResult internalResolve(com.android.tools.r8.graph.DexClass):1154:1182 -> a
     63:66:com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult singleResultHelper(com.android.tools.r8.graph.DexClass,java.util.Map$Entry):1187:1190 -> 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.f2:
+com.android.tools.r8.graph.AppServices -> com.android.tools.r8.internal.i2:
     java.util.Map services -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.GraphLens applied -> b
@@ -19793,8 +19907,8 @@
     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.d2:
-com.android.tools.r8.graph.AppServices$Builder -> com.android.tools.r8.internal.f2$a:
+com.android.tools.r8.graph.AppServices$1 -> com.android.tools.r8.internal.g2:
+com.android.tools.r8.graph.AppServices$Builder -> com.android.tools.r8.internal.i2$a:
     java.util.Map services -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.utils.InternalOptions options -> b
@@ -19811,7 +19925,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.e2:
+com.android.tools.r8.graph.AppServices$Builder$DataResourceProviderVisitor -> com.android.tools.r8.internal.h2:
     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>
@@ -19856,6 +19970,7 @@
     com.android.tools.r8.graph.AppView$WholeProgramOptimizations wholeProgramOptimizations -> e
     com.android.tools.r8.shaking.KeepInfoCollection keepInfo -> l
     boolean allCodeProcessed -> u
+    com.android.tools.r8.androidapi.AndroidApiLevelCompute apiLevelCompute -> G
     java.util.Set cfByteCodePassThrough -> A
     com.android.tools.r8.ir.optimize.enums.EnumDataMap unboxedEnums -> z
     java.util.Map sourceDebugExtensions -> B
@@ -19865,9 +19980,11 @@
     java.util.Set alreadyLibraryDesugared -> D
     com.android.tools.r8.graph.classmerging.VerticallyMergedClasses verticallyMergedClasses -> y
     com.android.tools.r8.shaking.RootSetUtils$RootSet rootSet -> j
+    com.android.tools.r8.androidapi.ComputedApiLevel computedMinApiLevel -> H
     com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses horizontallyMergedClasses -> x
     com.android.tools.r8.graph.GraphLens codeLens -> f
     com.android.tools.r8.graph.InitClassLens initClassLens -> h
+    boolean $assertionsDisabled -> I
     com.android.tools.r8.ir.optimize.library.LibraryMemberOptimizer libraryMemberOptimizer -> s
     com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagator argumentPropagator -> r
     java.util.function.Predicate classesEscapingIntoLibrary -> v
@@ -19880,243 +19997,242 @@
     com.android.tools.r8.ir.analysis.value.AbstractValueFactory abstractValueFactory -> m
     com.android.tools.r8.ir.desugar.PrefixRewritingMapper rewritePrefix -> p
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoFactory instanceFieldInitializationInfoFactory -> n
-    boolean $assertionsDisabled -> H
     com.android.tools.r8.graph.AppInfo appInfo -> a
     com.android.tools.r8.ir.analysis.proto.ProtoShrinker protoShrinker -> t
-    com.android.tools.r8.androidapi.ComputedApiLevel computedMinApiLevel -> G
     com.android.tools.r8.errors.dontwarn.DontWarnConfiguration dontWarnConfiguration -> d
     com.android.tools.r8.contexts.CompilationContext context -> E
     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):127:127 -> <init>
-    2:74:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):74:146 -> <init>
-    1:1:boolean hasVerticallyMergedClasses():598:598 -> A
-    1:1:com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses horizontallyMergedClasses():583:583 -> B
-    1:1:com.android.tools.r8.graph.InitClassLens initClassLens():467:467 -> C
-    1:1:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoFactory instanceFieldInitializationInfoFactory():210:210 -> D
-    1:1:boolean isAllCodeProcessed():263:263 -> E
-    1:1:com.android.tools.r8.ir.optimize.library.LibraryMemberOptimizer libraryMethodOptimizer():356:356 -> F
-    1:4:void loadApplyMappingSeedMapper():827:830 -> G
-    5:5:void loadApplyMappingSeedMapper():829:829 -> G
-    1:1:com.android.tools.r8.utils.InternalOptions options():496:496 -> H
-    1:1:com.android.tools.r8.ir.analysis.proto.ProtoShrinker protoShrinker():364:364 -> I
-    1:1:com.android.tools.r8.shaking.RootSetUtils$RootSet rootSet():512:512 -> J
-    1:1:void setAllCodeProcessed():267:267 -> K
-    1:1:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory simpleInliningConstraintFactory():214:214 -> L
-    1:1:com.android.tools.r8.ir.optimize.enums.EnumDataMap unboxedEnums():620:620 -> M
-    2:2:com.android.tools.r8.ir.optimize.enums.EnumDataMap com.android.tools.r8.ir.optimize.enums.EnumDataMap.empty():20:20 -> M
-    2:2:com.android.tools.r8.ir.optimize.enums.EnumDataMap unboxedEnums():620 -> M
-    1:4:boolean validateUnboxedEnumsHaveBeenPruned():630:633 -> N
-    1:1:com.android.tools.r8.graph.classmerging.VerticallyMergedClasses verticallyMergedClasses():606:606 -> O
-    1:1:com.android.tools.r8.graph.AppView withClassHierarchy():645:645 -> P
-    com.android.tools.r8.graph.AppView withLiveness() -> Q
-    1:1:com.android.tools.r8.graph.AppView withoutClassHierarchy():652:652 -> R
-    2:2:boolean hasClassHierarchy():640:640 -> R
-    2:2:com.android.tools.r8.graph.AppView withoutClassHierarchy():652 -> R
-    3:3:com.android.tools.r8.graph.AppView withoutClassHierarchy():652:652 -> R
-    1:1:com.android.tools.r8.graph.AppView createForD8(com.android.tools.r8.graph.AppInfo):165:165 -> a
-    2:3:com.android.tools.r8.ir.desugar.PrefixRewritingMapper defaultPrefixRewritingMapper(com.android.tools.r8.graph.AppInfo):160:161 -> a
-    2:3:com.android.tools.r8.graph.AppView createForD8(com.android.tools.r8.graph.AppInfo):166 -> a
-    4:4:com.android.tools.r8.graph.AppView createForD8(com.android.tools.r8.graph.AppInfo):166:166 -> a
-    5:5:com.android.tools.r8.graph.AppView createForD8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):171:171 -> a
-    6:6:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.DexApplication):175:175 -> a
-    7:8:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.shaking.MainDexInfo):180:181 -> a
+    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):181 -> 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):181 -> a
-    11:14:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.shaking.MainDexInfo):183:186 -> a
-    15:15:com.android.tools.r8.graph.AppView createForTracer(com.android.tools.r8.graph.AppInfoWithClassHierarchy):201:201 -> a
-    16:17:com.android.tools.r8.ir.desugar.PrefixRewritingMapper defaultPrefixRewritingMapper(com.android.tools.r8.graph.AppInfo):160:161 -> a
-    16:17:com.android.tools.r8.graph.AppView createForTracer(com.android.tools.r8.graph.AppInfoWithClassHierarchy):202 -> a
-    18:18:com.android.tools.r8.graph.AppView createForTracer(com.android.tools.r8.graph.AppInfoWithClassHierarchy):202:202 -> a
-    19:19:void setAppServices(com.android.tools.r8.graph.AppServices):281:281 -> a
-    20:20:void setClassesEscapingIntoLibrary(java.util.function.Predicate):294:294 -> a
-    21:21:void setSourceDebugExtensionForType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexValue$DexValueString):298:298 -> a
-    22:22:com.android.tools.r8.graph.DexValue$DexValueString getSourceDebugExtensionForType(com.android.tools.r8.graph.DexClass):302:302 -> a
-    23:23:com.android.tools.r8.graph.DexItemFactory dexItemFactory():326:326 -> a
-    24:25:void withArgumentPropagator(com.android.tools.r8.utils.ThrowingConsumer):350:351 -> a
-    26:27:java.lang.Object withGeneratedExtensionRegistryShrinker(java.util.function.Function,java.lang.Object):397:398 -> a
-    28:29:java.lang.Object withGeneratedMessageLiteBuilderShrinker(java.util.function.Function,java.lang.Object):427:428 -> a
-    30:37:boolean setGraphLens(com.android.tools.r8.graph.GraphLens):447:454 -> 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:14:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.shaking.MainDexInfo):185:188 -> a
+    15:15:com.android.tools.r8.graph.AppView createForTracer(com.android.tools.r8.graph.AppInfoWithClassHierarchy):203:203 -> a
+    16:17:com.android.tools.r8.ir.desugar.PrefixRewritingMapper defaultPrefixRewritingMapper(com.android.tools.r8.graph.AppInfo):162:163 -> a
+    16:17:com.android.tools.r8.graph.AppView createForTracer(com.android.tools.r8.graph.AppInfoWithClassHierarchy):204 -> a
+    18:18:com.android.tools.r8.graph.AppView createForTracer(com.android.tools.r8.graph.AppInfoWithClassHierarchy):204:204 -> a
+    19:19:void setAppServices(com.android.tools.r8.graph.AppServices):283:283 -> a
+    20:20:void setClassesEscapingIntoLibrary(java.util.function.Predicate):296:296 -> a
+    21:21:void setSourceDebugExtensionForType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexValue$DexValueString):300:300 -> a
+    22:22:com.android.tools.r8.graph.DexValue$DexValueString getSourceDebugExtensionForType(com.android.tools.r8.graph.DexClass):304:304 -> a
+    23:23:com.android.tools.r8.graph.DexItemFactory dexItemFactory():328:328 -> a
+    24:25:void withArgumentPropagator(com.android.tools.r8.utils.ThrowingConsumer):352:353 -> a
+    26:27:java.lang.Object withGeneratedExtensionRegistryShrinker(java.util.function.Function,java.lang.Object):399:400 -> a
+    28:29:java.lang.Object withGeneratedMessageLiteBuilderShrinker(java.util.function.Function,java.lang.Object):429:430 -> a
+    30:37:boolean setGraphLens(com.android.tools.r8.graph.GraphLens):449:456 -> a
     38:38:boolean com.android.tools.r8.graph.GraphLens.isAppliedLens():0:0 -> a
-    38:38:boolean setGraphLens(com.android.tools.r8.graph.GraphLens):454 -> a
+    38:38:boolean setGraphLens(com.android.tools.r8.graph.GraphLens):456 -> a
     39:39:boolean com.android.tools.r8.graph.GraphLens.isClearCodeRewritingLens():0:0 -> a
-    39:39:boolean setGraphLens(com.android.tools.r8.graph.GraphLens):454 -> a
-    40:40:void setCodeLens(com.android.tools.r8.graph.GraphLens):438:438 -> a
-    40:40:boolean setGraphLens(com.android.tools.r8.graph.GraphLens):455 -> a
-    41:41:void setInitClassLens(com.android.tools.r8.graph.InitClassLens):475:475 -> a
-    42:42:void setInitializedClassesInInstanceMethods(com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$InitializedClassesInInstanceMethods):480:480 -> a
-    43:43:com.android.tools.r8.utils.InternalOptions$TestingOptions testing():504:504 -> a
-    43:43:boolean checkForTesting(java.util.function.Supplier):843 -> a
-    44:44:boolean checkForTesting(java.util.function.Supplier):843:843 -> a
-    45:46:void setRootSet(com.android.tools.r8.shaking.RootSetUtils$RootSet):516:517 -> a
-    47:48:void setMainDexRootSet(com.android.tools.r8.shaking.RootSetUtils$MainDexRootSet):521:522 -> a
-    49:49:com.android.tools.r8.shaking.KeepInfoCollection getKeepInfo():534:534 -> a
-    49:49:com.android.tools.r8.shaking.KeepClassInfo getKeepInfo(com.android.tools.r8.graph.DexProgramClass):538 -> a
-    50:50:com.android.tools.r8.shaking.KeepClassInfo getKeepInfo(com.android.tools.r8.graph.DexProgramClass):538:538 -> a
-    51:51:com.android.tools.r8.shaking.KeepInfoCollection getKeepInfo():534:534 -> a
-    51:51:com.android.tools.r8.shaking.KeepFieldInfo getKeepInfo(com.android.tools.r8.graph.ProgramField):542 -> a
-    52:52:com.android.tools.r8.shaking.KeepFieldInfo getKeepInfo(com.android.tools.r8.graph.ProgramField):542:542 -> a
+    39:39:boolean setGraphLens(com.android.tools.r8.graph.GraphLens):456 -> a
+    40:40:void setCodeLens(com.android.tools.r8.graph.GraphLens):440:440 -> a
+    40:40:boolean setGraphLens(com.android.tools.r8.graph.GraphLens):457 -> a
+    41:41:void setInitClassLens(com.android.tools.r8.graph.InitClassLens):477:477 -> a
+    42:42:void setInitializedClassesInInstanceMethods(com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$InitializedClassesInInstanceMethods):482:482 -> a
+    43:43:com.android.tools.r8.utils.InternalOptions$TestingOptions testing():506:506 -> a
+    43:43:boolean checkForTesting(java.util.function.Supplier):845 -> a
+    44:44:boolean checkForTesting(java.util.function.Supplier):845:845 -> a
+    45:46:void setRootSet(com.android.tools.r8.shaking.RootSetUtils$RootSet):518:519 -> a
+    47:48:void setMainDexRootSet(com.android.tools.r8.shaking.RootSetUtils$MainDexRootSet):523:524 -> a
+    49:49:com.android.tools.r8.shaking.KeepInfoCollection getKeepInfo():536:536 -> a
+    49:49:com.android.tools.r8.shaking.KeepClassInfo getKeepInfo(com.android.tools.r8.graph.DexProgramClass):540 -> a
+    50:50:com.android.tools.r8.shaking.KeepClassInfo getKeepInfo(com.android.tools.r8.graph.DexProgramClass):540:540 -> a
+    51:51:com.android.tools.r8.shaking.KeepInfoCollection getKeepInfo():536:536 -> a
+    51:51:com.android.tools.r8.shaking.KeepFieldInfo getKeepInfo(com.android.tools.r8.graph.ProgramField):544 -> a
+    52:52:com.android.tools.r8.shaking.KeepFieldInfo getKeepInfo(com.android.tools.r8.graph.ProgramField):544:544 -> a
     53:53:com.android.tools.r8.shaking.KeepFieldInfo com.android.tools.r8.shaking.KeepInfoCollection.getFieldInfo(com.android.tools.r8.graph.ProgramField):118:118 -> a
-    53:53:com.android.tools.r8.shaking.KeepFieldInfo getKeepInfo(com.android.tools.r8.graph.ProgramField):542 -> a
-    54:54:com.android.tools.r8.shaking.KeepInfoCollection getKeepInfo():534:534 -> a
-    54:54:com.android.tools.r8.shaking.KeepMethodInfo getKeepInfo(com.android.tools.r8.graph.ProgramMethod):546 -> a
-    55:55:com.android.tools.r8.shaking.KeepMethodInfo getKeepInfo(com.android.tools.r8.graph.ProgramMethod):546:546 -> a
+    53:53:com.android.tools.r8.shaking.KeepFieldInfo getKeepInfo(com.android.tools.r8.graph.ProgramField):544 -> a
+    54:54:com.android.tools.r8.shaking.KeepInfoCollection getKeepInfo():536:536 -> a
+    54:54:com.android.tools.r8.shaking.KeepMethodInfo getKeepInfo(com.android.tools.r8.graph.ProgramMethod):548 -> a
+    55:55:com.android.tools.r8.shaking.KeepMethodInfo getKeepInfo(com.android.tools.r8.graph.ProgramMethod):548:548 -> a
     56:56:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepInfoCollection.getMethodInfo(com.android.tools.r8.graph.ProgramMethod):105:105 -> a
-    56:56:com.android.tools.r8.shaking.KeepMethodInfo getKeepInfo(com.android.tools.r8.graph.ProgramMethod):546 -> a
-    57:58:void setProguardCompatibilityActions(com.android.tools.r8.shaking.ProguardCompatibilityActions):559:560 -> a
-    59:59:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):588:588 -> a
-    60:60:boolean hasHorizontallyMergedClasses():575:575 -> a
-    60:60:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):588 -> a
-    61:61:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):588:588 -> a
-    62:62:com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses horizontallyMergedClasses():583:583 -> a
-    62:62:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):589 -> a
-    63:64:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):589:590 -> a
-    65:65:com.android.tools.r8.utils.InternalOptions$TestingOptions testing():504:504 -> a
-    65:65:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):591 -> a
-    66:68:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):591:593 -> a
-    69:69:com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses horizontallyMergedClasses():583:583 -> a
-    69:69:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):593 -> a
-    70:70:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):593:593 -> a
-    71:72:void setVerticallyMergedClasses(com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):610:611 -> a
-    73:73:com.android.tools.r8.utils.InternalOptions$TestingOptions testing():504:504 -> a
-    73:73:void setVerticallyMergedClasses(com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):612 -> a
-    74:74:void setVerticallyMergedClasses(com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):612:612 -> a
-    75:76:void setUnboxedEnums(com.android.tools.r8.ir.optimize.enums.EnumDataMap):624:625 -> a
-    77:77:com.android.tools.r8.utils.InternalOptions$TestingOptions testing():504:504 -> a
-    77:77:void setUnboxedEnums(com.android.tools.r8.ir.optimize.enums.EnumDataMap):626 -> a
-    78:78:void setUnboxedEnums(com.android.tools.r8.ir.optimize.enums.EnumDataMap):626:626 -> a
-    79:79:boolean hasLiveness():657:657 -> a
-    79:79:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):794 -> a
+    56:56:com.android.tools.r8.shaking.KeepMethodInfo getKeepInfo(com.android.tools.r8.graph.ProgramMethod):548 -> a
+    57:58:void setProguardCompatibilityActions(com.android.tools.r8.shaking.ProguardCompatibilityActions):561:562 -> a
+    59:59:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):590:590 -> a
+    60:60:boolean hasHorizontallyMergedClasses():577:577 -> a
+    60:60:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):590 -> a
+    61:61:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):590:590 -> a
+    62:62:com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses horizontallyMergedClasses():585:585 -> a
+    62:62:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):591 -> a
+    63:64:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):591:592 -> a
+    65:65:com.android.tools.r8.utils.InternalOptions$TestingOptions testing():506:506 -> a
+    65:65:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):593 -> a
+    66:68:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):593:595 -> a
+    69:69:com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses horizontallyMergedClasses():585:585 -> a
+    69:69:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):595 -> a
+    70:70:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):595:595 -> a
+    71:72:void setVerticallyMergedClasses(com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):612:613 -> a
+    73:73:com.android.tools.r8.utils.InternalOptions$TestingOptions testing():506:506 -> a
+    73:73:void setVerticallyMergedClasses(com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):614 -> a
+    74:74:void setVerticallyMergedClasses(com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):614:614 -> a
+    75:76:void setUnboxedEnums(com.android.tools.r8.ir.optimize.enums.EnumDataMap):626:627 -> a
+    77:77:com.android.tools.r8.utils.InternalOptions$TestingOptions testing():506:506 -> a
+    77:77:void setUnboxedEnums(com.android.tools.r8.ir.optimize.enums.EnumDataMap):628 -> a
+    78:78:void setUnboxedEnums(com.android.tools.r8.ir.optimize.enums.EnumDataMap):628:628 -> a
+    79:79:boolean hasLiveness():659:659 -> a
+    79:79: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)"]}
-    80:81:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):796:797 -> a
-    82:82:com.android.tools.r8.graph.AppServices appServices():277:277 -> a
-    82:82:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):799 -> a
-    83:83:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):799:799 -> a
-    84:84:boolean hasInitClassLens():471:471 -> 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):800 -> a
-    85:85: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
-    86:86:void setInitClassLens(com.android.tools.r8.graph.InitClassLens):475:475 -> a
-    86:86: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
-    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):803:803 -> a
-    88:88:com.android.tools.r8.shaking.ProguardCompatibilityActions getProguardCompatibilityActions():554:554 -> 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):805 -> 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):805:805 -> 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):804:804 -> a
-    91:91:com.android.tools.r8.shaking.RootSetUtils$MainDexRootSet getMainDexRootSet():530:530 -> 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):807 -> 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):808:808 -> a
-    93:95:com.android.tools.r8.utils.OptionalBool isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):670:672 -> a
-    96:96:boolean isCfByteCodePassThrough(com.android.tools.r8.graph.DexEncodedMethod):676:676 -> a
-    97:97:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():471:471 -> a
-    97:97:boolean isCfByteCodePassThrough(com.android.tools.r8.graph.DexEncodedMethod):676 -> a
+    80:81: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
+    82:82:com.android.tools.r8.graph.AppServices appServices():279:279 -> a
+    82:82: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
+    83:83: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
+    84:84:boolean hasInitClassLens():473:473 -> 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):802 -> a
+    85:85: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
+    86:86:void setInitClassLens(com.android.tools.r8.graph.InitClassLens):477:477 -> a
+    86:86: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
+    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):805:805 -> a
+    88:88:com.android.tools.r8.shaking.ProguardCompatibilityActions getProguardCompatibilityActions():556:556 -> 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):807 -> 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):807:807 -> 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):806:806 -> a
+    91:91:com.android.tools.r8.shaking.RootSetUtils$MainDexRootSet getMainDexRootSet():532:532 -> 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):809 -> 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):810:810 -> a
+    93:95:com.android.tools.r8.utils.OptionalBool isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):672:674 -> a
+    96:96:boolean isCfByteCodePassThrough(com.android.tools.r8.graph.DexEncodedMethod):678:678 -> a
+    97:97:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> a
+    97:97:boolean isCfByteCodePassThrough(com.android.tools.r8.graph.DexEncodedMethod):678 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    98:102:boolean isCfByteCodePassThrough(com.android.tools.r8.graph.DexEncodedMethod):679:683 -> a
-    103:112:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):692:701 -> a
-    113:113:void pruneAppInfo(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):725:725 -> a
-    113:113:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):703 -> a
-    114:114:com.android.tools.r8.graph.AppServices appServices():277:277 -> a
-    114:114:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):705 -> a
-    115:117:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):706:708 -> a
-    118:118:com.android.tools.r8.shaking.ProguardCompatibilityActions getProguardCompatibilityActions():554:554 -> a
-    118:118:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):710 -> a
-    119:119:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):710:710 -> a
-    120:120:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):709:709 -> a
-    121:121:boolean hasRootSet():508:508 -> a
-    121:121:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):712 -> a
-    122:122:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):713:713 -> a
-    123:123:boolean hasMainDexRootSet():526:526 -> a
-    123:123:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):715 -> a
-    124:124:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):716:716 -> a
-    125:127:void rewriteWithLensAndApplication(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens):741:743 -> a
-    128:147: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):755:774 -> a
+    98:102:boolean isCfByteCodePassThrough(com.android.tools.r8.graph.DexEncodedMethod):681:685 -> a
+    103:112:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):694:703 -> a
+    113:113:void pruneAppInfo(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):727:727 -> a
+    113:113:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):705 -> a
+    114:114:com.android.tools.r8.graph.AppServices appServices():279:279 -> a
+    114:114:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):707 -> a
+    115:117:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):708:710 -> a
+    118:118:com.android.tools.r8.shaking.ProguardCompatibilityActions getProguardCompatibilityActions():556:556 -> a
+    118:118:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):712 -> a
+    119:119:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):712:712 -> a
+    120:120:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):711:711 -> a
+    121:121:boolean hasRootSet():510:510 -> a
+    121:121:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):714 -> a
+    122:122:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):715:715 -> a
+    123:123:boolean hasMainDexRootSet():528:528 -> a
+    123:123:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):717 -> a
+    124:124:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):718:718 -> a
+    125:127:void rewriteWithLensAndApplication(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens):743:745 -> a
+    128:147: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
     148:148:boolean com.android.tools.r8.graph.GraphLens.isMemberRebindingLens():0:0 -> a
-    148:148: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):780 -> a
-    149:158: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:791 -> a
-    159:159:boolean lambda$rewriteWithLens$0(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):776:776 -> a
+    148:148: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
+    149:158: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
+    159:159:boolean lambda$rewriteWithLens$0(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):778:778 -> a
     160:160:boolean com.android.tools.r8.graph.GraphLens.isMemberRebindingLens():0:0 -> a
-    160:160:boolean lambda$rewriteWithLens$0(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):776 -> a
+    160:160:boolean lambda$rewriteWithLens$0(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):778 -> a
     161:161:boolean com.android.tools.r8.graph.GraphLens.isMemberRebindingIdentityLens():0:0 -> a
-    161:161:boolean lambda$rewriteWithLens$0(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):776 -> a
-    162:163:void setAlreadyLibraryDesugared(java.util.Set):814:815 -> a
-    1:1:com.android.tools.r8.graph.AppView createForL8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):191:191 -> b
-    2:2:com.android.tools.r8.graph.AppView createForRelocator(com.android.tools.r8.graph.AppInfo):195:195 -> b
-    3:4:com.android.tools.r8.ir.desugar.PrefixRewritingMapper defaultPrefixRewritingMapper(com.android.tools.r8.graph.AppInfo):160:161 -> b
-    3:4:com.android.tools.r8.graph.AppView createForRelocator(com.android.tools.r8.graph.AppInfo):196 -> b
-    5:5:com.android.tools.r8.graph.AppView createForRelocator(com.android.tools.r8.graph.AppInfo):196:196 -> b
-    6:6:com.android.tools.r8.ir.analysis.value.AbstractValueFactory abstractValueFactory():206:206 -> b
-    7:8:void withGeneratedExtensionRegistryShrinker(com.android.tools.r8.utils.ThrowingConsumer):390:391 -> b
-    9:10:java.lang.Object withGeneratedMessageLiteShrinker(java.util.function.Function,java.lang.Object):419:420 -> b
-    11:11:void setCfByteCodePassThrough(java.util.Set):484:484 -> b
-    12:13:java.lang.Object withInitializedClassesInInstanceMethods(java.util.function.Function,java.lang.Object):489:490 -> b
-    14:14:void rewriteWithLens(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):730:730 -> b
-    15:19:boolean isAlreadyLibraryDesugared(com.android.tools.r8.graph.DexProgramClass):819:823 -> b
-    1:2:com.android.tools.r8.ir.desugar.PrefixRewritingMapper defaultPrefixRewritingMapper(com.android.tools.r8.graph.AppInfo):160:161 -> c
-    3:3:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):307:307 -> c
-    4:5:java.lang.Object withProtoShrinker(java.util.function.Function,java.lang.Object):375:376 -> c
-    6:6:java.lang.Object withProtoEnumShrinker(java.util.function.Function,java.lang.Object):382:382 -> c
-    7:7:boolean com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.isEnumLiteProtoShrinkingEnabled():1578:1578 -> c
-    7:7:java.lang.Object withProtoEnumShrinker(java.util.function.Function,java.lang.Object):382 -> c
+    161:161:boolean lambda$rewriteWithLens$0(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):778 -> a
+    162:163: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:2:com.android.tools.r8.ir.desugar.PrefixRewritingMapper defaultPrefixRewritingMapper(com.android.tools.r8.graph.AppInfo):162:163 -> c
+    3:3:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):309:309 -> c
+    4:5:java.lang.Object withProtoShrinker(java.util.function.Function,java.lang.Object):377:378 -> c
+    6:6:java.lang.Object withProtoEnumShrinker(java.util.function.Function,java.lang.Object):384:384 -> c
+    7:7:boolean com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.isEnumLiteProtoShrinkingEnabled():1577:1577 -> c
+    7:7:java.lang.Object withProtoEnumShrinker(java.util.function.Function,java.lang.Object):384 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8:8:java.lang.Object withProtoEnumShrinker(java.util.function.Function,java.lang.Object):383:383 -> c
-    9:10:void withGeneratedMessageLiteBuilderShrinker(com.android.tools.r8.utils.ThrowingConsumer):412:413 -> c
-    11:11:com.android.tools.r8.graph.classmerging.MergedClassesCollection allMergedClasses():564:564 -> c
-    12:12:boolean hasHorizontallyMergedClasses():575:575 -> c
-    12:12:com.android.tools.r8.graph.classmerging.MergedClassesCollection allMergedClasses():565 -> c
-    13:16:com.android.tools.r8.graph.classmerging.MergedClassesCollection allMergedClasses():566:569 -> c
-    1:1:boolean isModeled(com.android.tools.r8.graph.DexType):156:156 -> d
-    2:3:com.android.tools.r8.graph.AppInfo appInfo():222:223 -> d
-    4:6:com.android.tools.r8.graph.AppView setAppInfo(com.android.tools.r8.graph.AppInfo):247:249 -> d
-    7:7:void unsetAppInfoForDesugaring():243:243 -> d
-    7:7:com.android.tools.r8.graph.AppView setAppInfo(com.android.tools.r8.graph.AppInfo):250 -> d
-    8:11:com.android.tools.r8.graph.AppView setAppInfo(com.android.tools.r8.graph.AppInfo):252:255 -> d
-    12:13:void withGeneratedMessageLiteShrinker(com.android.tools.r8.utils.ThrowingConsumer):405:406 -> d
-    1:9:com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfoForDesugaring():231:239 -> e
-    10:11:boolean isClassEscapingIntoLibrary(com.android.tools.r8.graph.DexType):289:290 -> e
-    12:13:void withProtoShrinker(com.android.tools.r8.utils.ThrowingConsumer):369:370 -> e
-    1:1:com.android.tools.r8.shaking.AppInfoWithLiveness appInfoWithLiveness():227:227 -> f
-    2:12:com.android.tools.r8.utils.OptionalBool isInterface(com.android.tools.r8.graph.DexType):311:321 -> f
-    1:1:com.android.tools.r8.graph.AppServices appServices():277:277 -> g
-    1:1:boolean canUseInitClass():463:463 -> h
-    2:2:boolean com.android.tools.r8.graph.InitClassLens.isFinal():0:0 -> h
-    2:2:boolean canUseInitClass():463 -> h
-    1:1:void clearApplyMappingSeedMapper():839:839 -> i
-    1:1:com.android.tools.r8.graph.GraphLens clearCodeRewritings():271:271 -> j
-    2:3:com.android.tools.r8.graph.GraphLens com.android.tools.r8.graph.GraphLens.withCodeRewritingsApplied(com.android.tools.r8.graph.DexItemFactory):528:529 -> j
-    2:3:com.android.tools.r8.graph.GraphLens clearCodeRewritings():271 -> j
+    8:8:java.lang.Object withProtoEnumShrinker(java.util.function.Function,java.lang.Object):385:385 -> c
+    9:10:void withGeneratedMessageLiteBuilderShrinker(com.android.tools.r8.utils.ThrowingConsumer):414:415 -> c
+    11:11:com.android.tools.r8.graph.classmerging.MergedClassesCollection allMergedClasses():566:566 -> c
+    12:12:boolean hasHorizontallyMergedClasses():577:577 -> c
+    12:12:com.android.tools.r8.graph.classmerging.MergedClassesCollection allMergedClasses():567 -> c
+    13:16: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:4:com.android.tools.r8.graph.AppView setAppInfo(com.android.tools.r8.graph.AppInfo):249:251 -> d
+    5:5:void unsetAppInfoForDesugaring():245:245 -> d
+    5:5:com.android.tools.r8.graph.AppView setAppInfo(com.android.tools.r8.graph.AppInfo):252 -> d
+    6:9:com.android.tools.r8.graph.AppView setAppInfo(com.android.tools.r8.graph.AppInfo):254:257 -> d
+    10:11:void withGeneratedMessageLiteShrinker(com.android.tools.r8.utils.ThrowingConsumer):407:408 -> d
+    12:12:com.android.tools.r8.androidapi.AndroidApiLevelCompute apiLevelCompute():849:849 -> d
+    1:2:com.android.tools.r8.graph.AppInfo appInfo():224:225 -> e
+    3:4:boolean isClassEscapingIntoLibrary(com.android.tools.r8.graph.DexType):291:292 -> e
+    5:6:void withProtoShrinker(com.android.tools.r8.utils.ThrowingConsumer):371:372 -> e
+    1:9:com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfoForDesugaring():233:241 -> f
+    10:20:com.android.tools.r8.utils.OptionalBool isInterface(com.android.tools.r8.graph.DexType):313:323 -> f
+    1:1:com.android.tools.r8.shaking.AppInfoWithLiveness appInfoWithLiveness():229:229 -> g
+    1:1:com.android.tools.r8.graph.AppServices appServices():279:279 -> h
+    1:1:boolean canUseInitClass():465:465 -> i
+    2:2:boolean com.android.tools.r8.graph.InitClassLens.isFinal():0:0 -> i
+    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):528:529 -> 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():272:272 -> j
-    1:1:com.android.tools.r8.graph.GraphLens codeLens():434:434 -> k
-    1:1:com.android.tools.r8.androidapi.ComputedApiLevel computedMinApiLevel():847:847 -> l
-    1:1:com.android.tools.r8.contexts.CompilationContext$ProcessorContext createProcessorContext():340:340 -> m
-    2:2:boolean verifyMainThread():150:150 -> m
-    2:2:com.android.tools.r8.contexts.CompilationContext$ProcessorContext createProcessorContext():340 -> m
-    3:3:com.android.tools.r8.contexts.CompilationContext$ProcessorContext createProcessorContext():341:341 -> m
-    1:1:boolean enableWholeProgramOptimizations():330:330 -> n
-    1:1:com.android.tools.r8.naming.SeedMapper getApplyMappingSeedMapper():835:835 -> o
-    1:1:com.android.tools.r8.errors.dontwarn.DontWarnConfiguration getDontWarnConfiguration():285:285 -> p
-    1:1:com.android.tools.r8.shaking.KeepInfoCollection getKeepInfo():534:534 -> q
-    1:1:com.android.tools.r8.ir.optimize.library.LibraryMethodSideEffectModelCollection getLibraryMethodSideEffectModelCollection():360:360 -> r
-    1:1:com.android.tools.r8.shaking.RootSetUtils$MainDexRootSet getMainDexRootSet():530:530 -> s
-    1:1:com.android.tools.r8.shaking.ProguardCompatibilityActions getProguardCompatibilityActions():554:554 -> t
-    1:1:com.android.tools.r8.synthesis.SyntheticItems getSyntheticItems():345:345 -> u
-    1:1:com.android.tools.r8.graph.GraphLens graphLens():442:442 -> v
-    1:1:boolean hasCfByteCodePassThroughMethods():687:687 -> w
-    1:1:boolean hasMainDexRootSet():526:526 -> x
-    1:1:boolean hasProguardCompatibilityActions():550:550 -> y
-    1:1:boolean hasUnboxedEnums():616:616 -> z
-com.android.tools.r8.graph.ApplicationReaderMap -> com.android.tools.r8.internal.k2:
+    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
+    1:1:com.android.tools.r8.contexts.CompilationContext$ProcessorContext createProcessorContext():342:342 -> n
+    2:2:boolean verifyMainThread():152:152 -> n
+    2:2:com.android.tools.r8.contexts.CompilationContext$ProcessorContext createProcessorContext():342 -> n
+    3:3:com.android.tools.r8.contexts.CompilationContext$ProcessorContext createProcessorContext():343:343 -> n
+    1:1:boolean enableWholeProgramOptimizations():332:332 -> o
+    1:1:com.android.tools.r8.naming.SeedMapper getApplyMappingSeedMapper():837:837 -> p
+    1:1:com.android.tools.r8.errors.dontwarn.DontWarnConfiguration getDontWarnConfiguration():287:287 -> q
+    1:1:com.android.tools.r8.shaking.KeepInfoCollection getKeepInfo():536:536 -> r
+    1:1:com.android.tools.r8.ir.optimize.library.LibraryMethodSideEffectModelCollection getLibraryMethodSideEffectModelCollection():362:362 -> s
+    1:1:com.android.tools.r8.shaking.RootSetUtils$MainDexRootSet getMainDexRootSet():532:532 -> t
+    1:1:com.android.tools.r8.shaking.ProguardCompatibilityActions getProguardCompatibilityActions():556:556 -> u
+    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.n2:
     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.i2:
+com.android.tools.r8.graph.ApplicationReaderMap$EmptyMap -> com.android.tools.r8.internal.l2:
     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.j2:
+com.android.tools.r8.graph.ApplicationReaderMap$RecordMap -> com.android.tools.r8.internal.m2:
     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
@@ -20148,7 +20264,7 @@
     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.j3:
+com.android.tools.r8.graph.AssemblyWriter -> com.android.tools.r8.internal.m3:
     com.android.tools.r8.kotlin.Kotlin kotlin -> i
     com.android.tools.r8.contexts.CompilationContext compilationContext -> k
     com.android.tools.r8.graph.AppInfo appInfo -> h
@@ -20184,7 +20300,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):325:325 -> 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):323:323 -> 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
@@ -20228,7 +20344,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.C5:
+com.android.tools.r8.graph.BottomUpClassHierarchyTraversal -> com.android.tools.r8.internal.F5:
     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
@@ -20246,8 +20362,8 @@
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():9:9 -> <clinit>
     1:5:void <init>():9:13 -> <init>
-    int computeHashCode() -> e0
     1:1:boolean equals(java.lang.Object):51:51 -> equals
+    int computeHashCode() -> f0
     boolean computeEquals(java.lang.Object) -> g
     1:9:int hashCode():21:29 -> hashCode
     10:14:boolean verifyHashCodeConsistent(int):34:38 -> hashCode
@@ -20266,8 +20382,8 @@
     3:3:void <init>(com.android.tools.r8.graph.DexType,int,int,java.util.List):155:155 -> <init>
     4:4:void <init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):170:170 -> <init>
     5:30:void <init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):151:176 -> <init>
-    com.android.tools.r8.graph.CfCode asCfCode() -> E
-    com.android.tools.r8.utils.structural.StructuralItem self() -> K
+    com.android.tools.r8.graph.CfCode asCfCode() -> F
+    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):65:65 -> a
     2:2:void setInstructions(java.util.List):228:228 -> a
     3:6:void acceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):290:293 -> a
@@ -20458,7 +20574,6 @@
     3059:3082:boolean isAssignable(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1023:1046 -> a
     3083:3087:boolean isAssignable(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1045:1049 -> a
     3088:3089:com.android.tools.r8.graph.DexType byteCharShortOrBooleanToInt(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):1054:1055 -> a
-    com.android.tools.r8.graph.CfWritableCode$CfWritableCodeKind getCfWritableCodeKind() -> a0
     1:1:java.util.Collection lambda$acceptCompareTo$2(com.android.tools.r8.graph.CfCode):304:304 -> 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):481:485 -> b
     7:9:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.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):499:501 -> b
@@ -20469,39 +20584,40 @@
     24:26: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):511 -> b
     27:27: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):546:546 -> b
     27:27: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):511 -> b
+    com.android.tools.r8.graph.CfWritableCode$CfWritableCodeKind getCfWritableCodeKind() -> b0
     1:1:java.util.Collection lambda$acceptCompareTo$3(com.android.tools.r8.graph.CfCode):305:305 -> c
-    1:1:int computeHashCode():423:423 -> e0
-    com.android.tools.r8.graph.CfWritableCode asCfWritableCode() -> f0
+    1:1:int computeHashCode():423:423 -> f0
     1:1:boolean computeEquals(java.lang.Object):428:428 -> g
+    com.android.tools.r8.graph.CfWritableCode asCfWritableCode() -> g0
     1:1:boolean estimatedSizeForInliningAtMost(int):242:242 -> i
-    1:1:int estimatedSizeForInlining():237:237 -> i0
-    1:1:int estimatedDexCodeSizeUpperBoundInBytes():247 -> i0
     1:2:int countNonStackOperations(int):252:253 -> j
     1:1:int estimatedSizeForInlining():237:237 -> j0
+    1:1:int estimatedDexCodeSizeUpperBoundInBytes():247 -> j0
     1:1:void setMaxLocals(int):212:212 -> k
-    boolean isCfCode() -> k0
+    1:1:int estimatedSizeForInlining():237:237 -> k0
     1:1:void setMaxStack(int):216:216 -> l
-    boolean isCfWritableCode() -> l0
+    boolean isCfCode() -> l0
+    boolean isCfWritableCode() -> m0
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():191:191 -> n
-    1:1:java.util.List getInstructions():224:224 -> r0
-    1:1:java.util.List getLocalVariables():232:232 -> s0
-    1:1:int getMaxLocals():203:203 -> t0
+    1:1:java.util.List getInstructions():224:224 -> s0
+    1:1:java.util.List getLocalVariables():232:232 -> t0
     1:1:java.lang.String toString():707:707 -> toString
     2:2:void com.android.tools.r8.cf.CfPrinter.<init>(com.android.tools.r8.graph.CfCode):132:132 -> toString
     2:2:java.lang.String toString():707 -> toString
     3:3:java.lang.String toString():707:707 -> toString
-    1:1:int getMaxStack():199:199 -> u0
-    1:1:com.android.tools.r8.graph.DexType getOriginalHolder():195:195 -> v0
-    1:2:com.android.tools.r8.graph.CfCode$StackMapStatus getStackMapStatus():207:208 -> w0
-    1:1:java.util.List getTryCatchRanges():220:220 -> x0
-    1:2:boolean shouldComputeInitialFrame():964:965 -> y0
-    3:3:boolean com.android.tools.r8.cf.code.CfInstruction.isFrame():0:0 -> y0
-    3:3:boolean shouldComputeInitialFrame():965 -> y0
-    4:4:boolean com.android.tools.r8.cf.code.CfInstruction.isLabel():0:0 -> y0
-    4:4:boolean shouldComputeInitialFrame():967 -> y0
-    5:5:boolean com.android.tools.r8.cf.code.CfInstruction.isPosition():0:0 -> y0
-    5:5:boolean shouldComputeInitialFrame():967 -> y0
-    6:6:boolean shouldComputeInitialFrame():972:972 -> y0
+    1:1:int getMaxLocals():203:203 -> u0
+    1:1:int getMaxStack():199:199 -> v0
+    1:1:com.android.tools.r8.graph.DexType getOriginalHolder():195:195 -> w0
+    1:2:com.android.tools.r8.graph.CfCode$StackMapStatus getStackMapStatus():207:208 -> x0
+    1:1:java.util.List getTryCatchRanges():220:220 -> y0
+    1:2:boolean shouldComputeInitialFrame():964:965 -> z0
+    3:3:boolean com.android.tools.r8.cf.code.CfInstruction.isFrame():0:0 -> z0
+    3:3:boolean shouldComputeInitialFrame():965 -> z0
+    4:4:boolean com.android.tools.r8.cf.code.CfInstruction.isLabel():0:0 -> z0
+    4:4:boolean shouldComputeInitialFrame():967 -> z0
+    5:5:boolean com.android.tools.r8.cf.code.CfInstruction.isPosition():0:0 -> z0
+    5:5:boolean shouldComputeInitialFrame():967 -> z0
+    6:6:boolean shouldComputeInitialFrame():972:972 -> z0
 com.android.tools.r8.graph.CfCode$LocalVariableInfo -> com.android.tools.r8.graph.l$a:
     com.android.tools.r8.graph.DebugLocalInfo local -> b
     boolean $assertionsDisabled -> e
@@ -20535,11 +20651,11 @@
     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.CfCode$StackMapStatus$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.y6:
+com.android.tools.r8.graph.CfCode$StackMapStatus$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.B6:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     boolean com.android.tools.r8.graph.CfCode$StackMapStatus.isValid() -> a
-com.android.tools.r8.graph.CfCodeDiagnostics -> com.android.tools.r8.internal.z6:
+com.android.tools.r8.graph.CfCodeDiagnostics -> com.android.tools.r8.internal.C6:
     com.android.tools.r8.position.MethodPosition methodPosition -> c
     com.android.tools.r8.origin.Origin origin -> b
     java.lang.String diagnosticMessage -> d
@@ -20547,7 +20663,7 @@
     1:1:java.lang.String getDiagnosticMessage():26:26 -> getDiagnosticMessage
     1:1:com.android.tools.r8.origin.Origin getOrigin():16:16 -> getOrigin
     1:1:com.android.tools.r8.position.Position getPosition():21:21 -> getPosition
-com.android.tools.r8.graph.CfCodeStackMapValidatingException -> com.android.tools.r8.internal.B6:
+com.android.tools.r8.graph.CfCodeStackMapValidatingException -> com.android.tools.r8.internal.E6:
     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
@@ -20610,26 +20726,26 @@
     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.J8:
-    com.android.tools.r8.graph.CfCode asCfCode() -> E
+com.android.tools.r8.graph.CfWritableCode -> com.android.tools.r8.internal.L8:
+    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() -> a0
+    com.android.tools.r8.graph.CfWritableCode$CfWritableCodeKind getCfWritableCodeKind() -> b0
 com.android.tools.r8.graph.ClassAccessFlags -> com.android.tools.r8.graph.r:
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():12:12 -> <clinit>
     1:1:void <init>(int,int):58:58 -> <init>
-    com.android.tools.r8.utils.structural.StructuralItem self() -> K
+    com.android.tools.r8.utils.structural.StructuralItem self() -> L
     1:1:com.android.tools.r8.graph.ClassAccessFlags createPublicFinalSynthetic():62:62 -> P
     2:2:void <init>(int):54:54 -> P
     2:2:com.android.tools.r8.graph.ClassAccessFlags createPublicFinalSynthetic():62 -> P
     1:1:void demoteFromAbstract():155:155 -> Q
-    1:4:int getAsCfAccessFlags():92:95 -> S
-    5:5:boolean isEnum():179:179 -> S
-    5:5:int getAsCfAccessFlags():95 -> S
-    6:6:int getAsCfAccessFlags():95:95 -> S
-    7:7:int com.android.tools.r8.graph.AccessFlags.materialize():74:74 -> S
-    7:7:int getAsCfAccessFlags():96 -> S
+    1:4:int getAsCfAccessFlags():92:95 -> R
+    5:5:boolean isEnum():179:179 -> R
+    5:5:int getAsCfAccessFlags():95 -> R
+    6:6:int getAsCfAccessFlags():95:95 -> R
+    7:7:int com.android.tools.r8.graph.AccessFlags.materialize():74:74 -> R
+    7:7:int getAsCfAccessFlags():96 -> R
     1:1:int com.android.tools.r8.graph.AccessFlags.materialize():74:74 -> T
     1:1:int getAsDexAccessFlags():103 -> T
     2:2:int getAsDexAccessFlags():104:104 -> T
@@ -20665,11 +20781,11 @@
     3:3:com.android.tools.r8.graph.ClassAccessFlags fromDexAccessFlags(int):73 -> m
     3:3:com.android.tools.r8.graph.ClassAccessFlags fromSharedAccessFlags(int):69 -> m
     com.android.tools.r8.graph.AccessFlags self() -> y
-com.android.tools.r8.graph.ClassDefinition -> com.android.tools.r8.internal.x9:
-    com.android.tools.r8.graph.MethodCollection getMethodCollection() -> O
-    com.android.tools.r8.graph.DexLibraryClass asLibraryClass() -> S
-    com.android.tools.r8.graph.DexClasspathClass asClasspathClass() -> m
-com.android.tools.r8.graph.ClassHierarchyTraversal -> com.android.tools.r8.internal.z9:
+com.android.tools.r8.graph.ClassDefinition -> com.android.tools.r8.internal.z9:
+    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.B9:
     java.util.Deque worklist -> d
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set visited -> c
@@ -20697,7 +20813,7 @@
     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.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.ab:
+com.android.tools.r8.graph.ClasspathDefinition -> com.android.tools.r8.internal.cb:
     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:
     boolean $assertionsDisabled -> f
@@ -20714,26 +20830,26 @@
     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>
-    1:2:com.android.tools.r8.graph.DexClasspathClass getHolder():43:44 -> K
-    3:3:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> K
-    3:3:com.android.tools.r8.graph.DexClasspathClass getHolder():44 -> K
-    4:5:com.android.tools.r8.graph.DexClasspathClass getHolder():44:45 -> K
-    com.android.tools.r8.graph.ClasspathMethod asClasspathMethod() -> Z
+    1:2:com.android.tools.r8.graph.DexClasspathClass getHolder():43:44 -> J
+    3:3:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> J
+    3:3:com.android.tools.r8.graph.DexClasspathClass getHolder():44 -> J
+    4:5:com.android.tools.r8.graph.DexClasspathClass getHolder():44:45 -> J
+    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.bb:
-com.android.tools.r8.graph.ClasspathOrLibraryContext -> com.android.tools.r8.internal.cb:
+com.android.tools.r8.graph.ClasspathOrLibraryClass -> com.android.tools.r8.internal.db:
+com.android.tools.r8.graph.ClasspathOrLibraryContext -> com.android.tools.r8.internal.eb:
     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.db:
+com.android.tools.r8.graph.ClasspathOrLibraryDefinition -> com.android.tools.r8.internal.fb:
     com.android.tools.r8.graph.ClasspathOrLibraryDefinition asClasspathOrLibraryDefinition() -> e
 com.android.tools.r8.graph.Code -> com.android.tools.r8.graph.w:
     1:1:void <init>():17:17 -> <init>
-    1:1:com.android.tools.r8.graph.CfCode asCfCode():114:114 -> E
-    1:1:com.android.tools.r8.graph.DexCode asDexCode():126:126 -> I
+    1:1:com.android.tools.r8.graph.CfCode asCfCode():122:122 -> F
+    1:1:com.android.tools.r8.graph.DexCode asDexCode():134:134 -> J
     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) -> a
     com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata getMetadata(com.android.tools.r8.code.CfOrDexInstruction) -> a
     void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry) -> a
@@ -20747,28 +20863,29 @@
     36:36: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):30:30 -> a
     33:33: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):31:31 -> a
     37:37:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap collectParameterInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):49:49 -> a
-    38:38:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):135:135 -> a
-    39:39:com.android.tools.r8.graph.Code getCodeAsInlining(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):145:145 -> a
-    1:1:com.android.tools.r8.graph.CfWritableCode asCfWritableCode():118:118 -> f0
-    1:1:com.android.tools.r8.graph.DexWritableCode asDexWritableCode():130:130 -> g0
-    1:1:com.android.tools.r8.graph.LazyCfCode asLazyCfCode():122:122 -> h0
-    1:1:boolean estimatedSizeForInliningAtMost(int):108:108 -> i
-    int estimatedDexCodeSizeUpperBoundInBytes() -> i0
-    int estimatedSizeForInlining() -> j0
-    boolean isCfCode() -> k0
-    boolean isCfWritableCode() -> l0
-    boolean isDexCode() -> m0
-    boolean isDexWritableCode() -> n0
-    boolean isHorizontalClassMergingCode() -> o0
-    boolean isSharedCodeObject() -> p0
-    boolean verifyNoInputReaders() -> q0
-com.android.tools.r8.graph.DebugLocalInfo -> com.android.tools.r8.internal.Kd:
+    38:38:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):143:143 -> a
+    39:39:com.android.tools.r8.graph.Code getCodeAsInlining(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):153:153 -> a
+    1:1:com.android.tools.r8.graph.CfWritableCode asCfWritableCode():126:126 -> g0
+    1:1:com.android.tools.r8.graph.DexWritableCode asDexWritableCode():138:138 -> h0
+    1:1:boolean estimatedSizeForInliningAtMost(int):116:116 -> i
+    1:1:com.android.tools.r8.graph.LazyCfCode asLazyCfCode():130:130 -> i0
+    int estimatedDexCodeSizeUpperBoundInBytes() -> j0
+    int estimatedSizeForInlining() -> k0
+    boolean isCfCode() -> l0
+    boolean isCfWritableCode() -> m0
+    boolean isDexCode() -> n0
+    boolean isDexWritableCode() -> o0
+    boolean isHorizontalClassMergingCode() -> p0
+    boolean isSharedCodeObject() -> q0
+    boolean verifyNoInputReaders() -> r0
+    com.android.tools.r8.graph.ThrowExceptionCode asThrowExceptionCode() -> s
+com.android.tools.r8.graph.DebugLocalInfo -> com.android.tools.r8.internal.Md:
     com.android.tools.r8.graph.DexString name -> b
     com.android.tools.r8.graph.DexString signature -> d
     com.android.tools.r8.graph.DexType type -> c
     int $r8$clinit -> e
     1:4:void <init>(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):36:39 -> <init>
-    com.android.tools.r8.utils.structural.StructuralItem self() -> K
+    com.android.tools.r8.utils.structural.StructuralItem self() -> L
     1:1:com.android.tools.r8.graph.DexString lambda$specify$0(com.android.tools.r8.graph.DebugLocalInfo):31:31 -> a
     2:4:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):31:33 -> a
     5:10:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap endingLocals(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):74:79 -> a
@@ -20790,8 +20907,8 @@
     com.android.tools.r8.graph.DefaultInstanceInitializerCode INSTANCE -> d
     1:4:void <clinit>():54:57 -> <clinit>
     1:1:void <init>():60:60 -> <init>
-    com.android.tools.r8.graph.DexDebugInfoForWriting getDebugInfoForWriting() -> A
-    int codeSizeInBytes() -> L
+    com.android.tools.r8.graph.DexDebugInfoForWriting getDebugInfoForWriting() -> B
+    int codeSizeInBytes() -> M
     void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection) -> a
     com.android.tools.r8.graph.DexWritableCode rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexItemFactory,boolean) -> a
     void writeKeepRulesForDesugaredLibrary(com.android.tools.r8.dex.CodeToKeep) -> a
@@ -20883,25 +21000,25 @@
     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):360 -> 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):360:362 -> a
     104:104:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.ClassNameMapper):377:377 -> a
-    com.android.tools.r8.graph.CfWritableCode$CfWritableCodeKind getCfWritableCodeKind() -> a0
     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
     3:3:int getIncomingRegisterSize(com.android.tools.r8.graph.ProgramMethod):219:219 -> b
+    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):227:229 -> d
-    1:1:int computeHashCode():179:179 -> e0
-    com.android.tools.r8.graph.CfWritableCode asCfWritableCode() -> f0
+    1:1:int computeHashCode():179:179 -> f0
     boolean computeEquals(java.lang.Object) -> g
-    com.android.tools.r8.graph.DexWritableCode asDexWritableCode() -> g0
-    com.android.tools.r8.graph.DexWritableCode$DexWritableCodeKind getDexWritableCodeKind() -> i
-    int estimatedDexCodeSizeUpperBoundInBytes() -> i0
+    com.android.tools.r8.graph.CfWritableCode asCfWritableCode() -> g0
+    com.android.tools.r8.graph.DexWritableCode asDexWritableCode() -> h0
+    int estimatedDexCodeSizeUpperBoundInBytes() -> j0
+    1:1:com.android.tools.r8.graph.DexWritableCode$DexWritableCodeKind getDexWritableCodeKind():199:199 -> m
     1:1:com.android.tools.r8.graph.DexCode$Try[] getTries():250:250 -> p
     com.android.tools.r8.graph.Code asCode() -> q
     1:1:java.lang.String toString():372:372 -> toString
-    1:1:com.android.tools.r8.graph.DexCode$TryHandler[] getHandlers():209:209 -> u
-    com.android.tools.r8.graph.DexString getHighestSortingString() -> w
-    int getOutgoingRegisterSize() -> y
+    1:1:com.android.tools.r8.graph.DexCode$TryHandler[] getHandlers():209:209 -> 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:
     1:6:void <init>(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Position):388:393 -> <init>
     7:7:void <init>(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Position):387:387 -> <init>
@@ -20918,32 +21035,32 @@
     11:12:void lambda$getInstructionBuilders$0(com.android.tools.r8.ir.conversion.IRBuilder):404:405 -> d
     13:13:void lambda$getInstructionBuilders$0(com.android.tools.r8.ir.conversion.IRBuilder):399:399 -> d
     1:1:java.util.List getInstructionBuilders():397:397 -> f
-com.android.tools.r8.graph.Definition -> com.android.tools.r8.internal.he:
-    com.android.tools.r8.graph.ClasspathOrLibraryClass asClasspathOrLibraryClass() -> G
-    com.android.tools.r8.graph.ProgramField asProgramField() -> J
-    com.android.tools.r8.graph.LibraryMethod asLibraryMethod() -> M
-    boolean isProgramMember() -> N
-    com.android.tools.r8.graph.DexProgramClass asProgramClass() -> Q
-    boolean isProgramClass() -> T
-    com.android.tools.r8.graph.ProgramMethod asProgramMethod() -> U
-    boolean isMethod() -> V
-    boolean isField() -> W
-    boolean isProgramField() -> Y
-    com.android.tools.r8.graph.ClasspathMethod asClasspathMethod() -> Z
+com.android.tools.r8.graph.Definition -> com.android.tools.r8.internal.je:
+    com.android.tools.r8.graph.ClasspathOrLibraryClass asClasspathOrLibraryClass() -> H
+    com.android.tools.r8.graph.ProgramField asProgramField() -> K
+    com.android.tools.r8.graph.LibraryMethod asLibraryMethod() -> N
+    boolean isProgramMember() -> O
+    com.android.tools.r8.graph.DexProgramClass asProgramClass() -> R
+    boolean isProgramClass() -> U
+    com.android.tools.r8.graph.ProgramMethod asProgramMethod() -> V
+    boolean isMethod() -> W
+    boolean isField() -> X
+    boolean isProgramField() -> Z
     com.android.tools.r8.graph.ProgramDerivedContext asProgramDerivedContext(com.android.tools.r8.graph.ProgramDerivedContext) -> a
+    com.android.tools.r8.graph.ClasspathMethod asClasspathMethod() -> a0
     com.android.tools.r8.graph.DexClass getContextClass() -> b
-    com.android.tools.r8.graph.DexClassAndMember asMember() -> b0
     com.android.tools.r8.graph.DexClassAndMethod asMethod() -> c
+    com.android.tools.r8.graph.DexClassAndMember asMember() -> c0
     com.android.tools.r8.graph.DexClassAndField asField() -> d
     com.android.tools.r8.graph.ClasspathOrLibraryDefinition asClasspathOrLibraryDefinition() -> e
     com.android.tools.r8.graph.ProgramDefinition asProgramDefinition() -> f
     boolean isProgramDefinition() -> g
     com.android.tools.r8.graph.DexDefinition getDefinition() -> h
-    boolean isProgramMethod() -> j
-    com.android.tools.r8.graph.LibraryField asLibraryField() -> l
+    boolean isProgramMethod() -> i
+    com.android.tools.r8.graph.LibraryField asLibraryField() -> k
     com.android.tools.r8.graph.ProgramMember asProgramMember() -> o
-    1:1:boolean isMember():56:56 -> v
-    com.android.tools.r8.graph.DexType getContextType() -> x
+    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.DexEncodedAnnotation annotation -> c
     boolean $assertionsDisabled -> e
@@ -20951,54 +21068,57 @@
     int visibility -> b
     1:26:void <clinit>():27:52 -> <clinit>
     1:3:void <init>(int,com.android.tools.r8.graph.DexEncodedAnnotation):63:65 -> <init>
-    com.android.tools.r8.utils.structural.StructuralItem self() -> K
+    com.android.tools.r8.utils.structural.StructuralItem self() -> L
     1:1:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):60:60 -> a
     2:2:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):110:110 -> a
-    3:11:boolean retainCompileTimeAnnotation(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.InternalOptions):114:122 -> a
-    12:12:boolean com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer.isCovariantReturnTypeAnnotation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):268:268 -> a
-    12:12:boolean retainCompileTimeAnnotation(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.InternalOptions):125 -> a
-    13:13:com.android.tools.r8.graph.DexAnnotation createEnclosingClassAnnotation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):133:133 -> a
-    14:18:com.android.tools.r8.graph.DexType getEnclosingClassFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):139:143 -> a
-    19:19:com.android.tools.r8.graph.DexAnnotation createEnclosingMethodAnnotation(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):148:148 -> a
-    20:24:com.android.tools.r8.graph.DexAnnotation createMemberClassesAnnotation(java.util.List,com.android.tools.r8.graph.DexItemFactory):215:219 -> a
-    25:33:com.android.tools.r8.graph.DexAnnotation createMethodParametersAnnotation(com.android.tools.r8.graph.DexValue[],com.android.tools.r8.graph.DexValue[],com.android.tools.r8.graph.DexItemFactory):248:256 -> a
-    34:38:com.android.tools.r8.graph.DexAnnotation createAnnotationDefaultAnnotation(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.DexItemFactory):263:263 -> a
-    39:39:com.android.tools.r8.graph.DexAnnotation createSignatureAnnotation(java.lang.String,com.android.tools.r8.graph.DexItemFactory):271:271 -> a
-    40:67:com.android.tools.r8.graph.DexValue compressSignature(java.lang.String,com.android.tools.r8.graph.DexItemFactory):352:379 -> a
-    40:67:com.android.tools.r8.graph.DexAnnotation createSignatureAnnotation(java.lang.String,com.android.tools.r8.graph.DexItemFactory):272 -> a
-    68:68:com.android.tools.r8.graph.DexValue toDexValue(java.lang.String,com.android.tools.r8.graph.DexItemFactory):387:387 -> a
-    68:68:com.android.tools.r8.graph.DexValue compressSignature(java.lang.String,com.android.tools.r8.graph.DexItemFactory):379 -> a
-    68:68:com.android.tools.r8.graph.DexAnnotation createSignatureAnnotation(java.lang.String,com.android.tools.r8.graph.DexItemFactory):272 -> a
-    69:73:com.android.tools.r8.graph.DexValue compressSignature(java.lang.String,com.android.tools.r8.graph.DexItemFactory):379:383 -> a
-    69:73:com.android.tools.r8.graph.DexAnnotation createSignatureAnnotation(java.lang.String,com.android.tools.r8.graph.DexItemFactory):272 -> a
-    74:74:com.android.tools.r8.graph.DexAnnotation createSignatureAnnotation(java.lang.String,com.android.tools.r8.graph.DexItemFactory):271:271 -> a
-    75:80:java.lang.String getSignature(com.android.tools.r8.graph.DexAnnotation):276:281 -> a
-    81:81:com.android.tools.r8.graph.DexAnnotation createThrowsAnnotation(com.android.tools.r8.graph.DexValue[],com.android.tools.r8.graph.DexItemFactory):291:291 -> a
-    82:84: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):297:299 -> a
-    85:89:com.android.tools.r8.graph.DexValue getSystemValueAnnotationValue(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotation):304:308 -> a
-    90:111:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind getSynthesizedClassAnnotationInfo(com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):409:430 -> a
-    112:113:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind.fromDescriptor(java.lang.String):102:103 -> a
-    112:113:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind getSynthesizedClassAnnotationInfo(com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):429 -> a
-    114:121:com.android.tools.r8.graph.DexAnnotation rewrite(java.util.function.Function):435:442 -> a
+    3:9:boolean retainCompileTimeAnnotation(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.InternalOptions):114:120 -> a
+    10:10:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):444:444 -> a
+    10:10:boolean retainCompileTimeAnnotation(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.InternalOptions):120 -> a
+    11:14:boolean retainCompileTimeAnnotation(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.InternalOptions):123:126 -> a
+    15:15:boolean com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer.isCovariantReturnTypeAnnotation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):268:268 -> a
+    15:15:boolean retainCompileTimeAnnotation(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.InternalOptions):126 -> a
+    16:16:com.android.tools.r8.graph.DexAnnotation createEnclosingClassAnnotation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):134:134 -> a
+    17:21:com.android.tools.r8.graph.DexType getEnclosingClassFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):140:144 -> a
+    22:22:com.android.tools.r8.graph.DexAnnotation createEnclosingMethodAnnotation(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):149:149 -> a
+    23:27:com.android.tools.r8.graph.DexAnnotation createMemberClassesAnnotation(java.util.List,com.android.tools.r8.graph.DexItemFactory):216:220 -> a
+    28:36:com.android.tools.r8.graph.DexAnnotation createMethodParametersAnnotation(com.android.tools.r8.graph.DexValue[],com.android.tools.r8.graph.DexValue[],com.android.tools.r8.graph.DexItemFactory):249:257 -> a
+    37:41:com.android.tools.r8.graph.DexAnnotation createAnnotationDefaultAnnotation(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.DexItemFactory):264:264 -> a
+    42:42:com.android.tools.r8.graph.DexAnnotation createSignatureAnnotation(java.lang.String,com.android.tools.r8.graph.DexItemFactory):272:272 -> a
+    43:70:com.android.tools.r8.graph.DexValue compressSignature(java.lang.String,com.android.tools.r8.graph.DexItemFactory):353:380 -> a
+    43:70:com.android.tools.r8.graph.DexAnnotation createSignatureAnnotation(java.lang.String,com.android.tools.r8.graph.DexItemFactory):273 -> a
+    71:71:com.android.tools.r8.graph.DexValue toDexValue(java.lang.String,com.android.tools.r8.graph.DexItemFactory):388:388 -> a
+    71:71:com.android.tools.r8.graph.DexValue compressSignature(java.lang.String,com.android.tools.r8.graph.DexItemFactory):380 -> a
+    71:71:com.android.tools.r8.graph.DexAnnotation createSignatureAnnotation(java.lang.String,com.android.tools.r8.graph.DexItemFactory):273 -> a
+    72:76:com.android.tools.r8.graph.DexValue compressSignature(java.lang.String,com.android.tools.r8.graph.DexItemFactory):380:384 -> a
+    72:76:com.android.tools.r8.graph.DexAnnotation createSignatureAnnotation(java.lang.String,com.android.tools.r8.graph.DexItemFactory):273 -> a
+    77:77:com.android.tools.r8.graph.DexAnnotation createSignatureAnnotation(java.lang.String,com.android.tools.r8.graph.DexItemFactory):272:272 -> a
+    78:83:java.lang.String getSignature(com.android.tools.r8.graph.DexAnnotation):277:282 -> a
+    84:84:com.android.tools.r8.graph.DexAnnotation createThrowsAnnotation(com.android.tools.r8.graph.DexValue[],com.android.tools.r8.graph.DexItemFactory):292:292 -> a
+    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):103:104 -> 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
-    2:6:com.android.tools.r8.graph.DexMethod getEnclosingMethodFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):154:158 -> b
+    2:6:com.android.tools.r8.graph.DexMethod getEnclosingMethodFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):155:159 -> b
     1:1:int lambda$specify$1(com.android.tools.r8.graph.DexAnnotation):60:60 -> c
-    2:4:com.android.tools.r8.utils.Pair getInnerClassFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):197:199 -> c
+    2:4:com.android.tools.r8.utils.Pair getInnerClassFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):198:200 -> c
     5:5:void com.android.tools.r8.utils.Pair.<init>():20:20 -> c
-    5:5:com.android.tools.r8.utils.Pair getInnerClassFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):199 -> c
-    6:13:com.android.tools.r8.utils.Pair getInnerClassFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):200:207 -> c
-    1:8:java.util.List getMemberClassesFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):225:232 -> d
-    1:1:boolean isEnclosingClassAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):163:163 -> e
-    1:1:com.android.tools.r8.graph.DexType getAnnotationType():79:79 -> e0
+    5:5:com.android.tools.r8.utils.Pair getInnerClassFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):200 -> c
+    6:13:com.android.tools.r8.utils.Pair getInnerClassFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):201:208 -> c
+    1:8:java.util.List getMemberClassesFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):226:233 -> d
+    1:1:boolean isEnclosingClassAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):164:164 -> e
     1:3:boolean equals(java.lang.Object):92:94 -> equals
-    1:1:boolean isEnclosingMethodAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):168:168 -> f
-    1:1:boolean isInnerClassAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):172:172 -> g
-    1:1:boolean isMemberClassesAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):177:177 -> h
+    1:1:boolean isEnclosingMethodAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):169:169 -> f
+    1:1:com.android.tools.r8.graph.DexType getAnnotationType():79:79 -> f0
+    1:1:boolean isInnerClassAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):173:173 -> g
+    1:1:boolean isMemberClassesAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):178:178 -> h
     1:1:int hashCode():84:84 -> hashCode
-    1:1:boolean isSignatureAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):318:318 -> i
+    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.df:
+com.android.tools.r8.graph.DexAnnotation$AnnotatedKind -> com.android.tools.r8.internal.cf:
     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
@@ -21032,8 +21152,8 @@
     4:4:int com.android.tools.r8.graph.DexMethod.acceptCompareTo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.structural.CompareToVisitor):61:61 -> b
     4:4:int lambda$sortParameterAnnotations$2(com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):55 -> b
     1:3:java.util.List sortParameterAnnotations(com.android.tools.r8.utils.structural.CompareToVisitor):54:56 -> c
-    1:1:com.android.tools.r8.graph.DexAnnotationSet getClazzAnnotations():45:45 -> e0
     1:11:boolean equals(java.lang.Object):73:83 -> equals
+    1:1:com.android.tools.r8.graph.DexAnnotationSet getClazzAnnotations():45:45 -> f0
     1:4:int hashCode():88:91 -> hashCode
 com.android.tools.r8.graph.DexAnnotationElement -> com.android.tools.r8.graph.B:
     com.android.tools.r8.graph.DexValue value -> c
@@ -21042,13 +21162,13 @@
     boolean $assertionsDisabled -> e
     1:2:void <clinit>():12:13 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexValue):22:24 -> <init>
-    com.android.tools.r8.utils.structural.StructuralItem self() -> K
+    com.android.tools.r8.utils.structural.StructuralItem self() -> L
     1:1:com.android.tools.r8.graph.DexString lambda$specify$0(com.android.tools.r8.graph.DexAnnotationElement):19:19 -> a
     2:2:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):19:19 -> a
     3:3:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):71:71 -> a
     1:1:com.android.tools.r8.graph.DexValue lambda$specify$1(com.android.tools.r8.graph.DexAnnotationElement):19:19 -> b
-    1:1:com.android.tools.r8.graph.DexValue getValue():38:38 -> e0
     1:3:boolean equals(java.lang.Object):51:53 -> equals
+    1:1:com.android.tools.r8.graph.DexValue getValue():38:38 -> f0
     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
@@ -21063,7 +21183,7 @@
     2:9:void <init>():36:43 -> <init>
     10:10:void <init>(com.android.tools.r8.graph.DexAnnotation[]):46:46 -> <init>
     11:23:void <init>(com.android.tools.r8.graph.DexAnnotation[]):36:48 -> <init>
-    com.android.tools.r8.utils.structural.StructuralItem self() -> K
+    com.android.tools.r8.utils.structural.StructuralItem self() -> L
     1:1:com.android.tools.r8.graph.DexAnnotation[] lambda$specify$0(com.android.tools.r8.graph.DexAnnotationSet):39:39 -> a
     2:2:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):39:39 -> a
     3:3:com.android.tools.r8.graph.DexAnnotationSet create(com.android.tools.r8.graph.DexAnnotation[]):52:52 -> a
@@ -21088,12 +21208,12 @@
     37:60:com.android.tools.r8.graph.DexAnnotationSet methodParametersWithFakeThisArguments(com.android.tools.r8.graph.DexItemFactory):217:240 -> a
     61:71: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:1:int computeHashCode():107:107 -> e0
-    1:1:com.android.tools.r8.graph.DexAnnotationSet empty():88:88 -> f0
+    1:1:int computeHashCode():107:107 -> f0
     1:2:void forEach(java.util.function.Consumer):92:93 -> forEach
     1:3:boolean computeEquals(java.lang.Object):112:114 -> g
-    1:1:com.android.tools.r8.graph.DexAnnotation get(int):56:56 -> g0
-    1:1:com.android.tools.r8.graph.DexAnnotation getFirst():60 -> g0
+    1:1:com.android.tools.r8.graph.DexAnnotationSet empty():88:88 -> g0
+    1:1:com.android.tools.r8.graph.DexAnnotation get(int):56:56 -> h0
+    1:1:com.android.tools.r8.graph.DexAnnotation getFirst():60 -> h0
     1:1:boolean isEmpty():132:132 -> isEmpty
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():70:70 -> n
     1:1:int size():102:102 -> size
@@ -21165,7 +21285,7 @@
     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.ef:
+com.android.tools.r8.graph.DexApplicationReadFlags -> com.android.tools.r8.internal.df:
     boolean hasReadProgramClassFromDex -> a
     boolean hasReadProgramClassFromCf -> b
     boolean hasReadRecordReferenceFromProgramClass -> c
@@ -21173,7 +21293,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.sf:
+com.android.tools.r8.graph.DexByteCodeWriter -> com.android.tools.r8.internal.rf:
     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>
@@ -21209,7 +21329,7 @@
     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.rf:
+com.android.tools.r8.graph.DexByteCodeWriter$OutputStreamProvider -> com.android.tools.r8.internal.qf:
     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.DexString methodName -> e
@@ -21223,7 +21343,7 @@
     1:1:void <clinit>():28:28 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexMethodHandle,java.util.List):62:62 -> <init>
     2:36:void <init>(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexMethodHandle,java.util.List):37:71 -> <init>
-    com.android.tools.r8.utils.structural.StructuralItem self() -> K
+    com.android.tools.r8.utils.structural.StructuralItem self() -> L
     1:11:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):45:55 -> a
     12:12:com.android.tools.r8.graph.DexMethod lambda$specify$0(com.android.tools.r8.graph.DexCallSite):49:49 -> a
     13:18:void setContext(com.android.tools.r8.graph.DexMethod,int):124:129 -> a
@@ -21235,14 +21355,14 @@
     27:27:int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):181:181 -> a
     1:1:int lambda$specify$1(com.android.tools.r8.graph.DexCallSite):50:50 -> b
     1:1:com.android.tools.r8.graph.DexString lambda$specify$2(com.android.tools.r8.graph.DexCallSite):52:52 -> c
-    1:1:java.lang.String toSmaliString():187:187 -> c0
     1:1:com.android.tools.r8.graph.DexProto lambda$specify$3(com.android.tools.r8.graph.DexCallSite):53:53 -> d
+    1:1:java.lang.String toSmaliString():187:187 -> d0
     1:1:com.android.tools.r8.graph.DexMethodHandle lambda$specify$4(com.android.tools.r8.graph.DexCallSite):54:54 -> e
-    1:1:int computeHashCode():137:137 -> e0
     1:1:java.util.Collection lambda$specify$5(com.android.tools.r8.graph.DexCallSite):55:55 -> f
-    1:14:com.android.tools.r8.graph.DexEncodedArray getEncodedArray():297:310 -> f0
+    1:1:int computeHashCode():137:137 -> f0
     boolean computeEquals(java.lang.Object) -> g
-    1:1:java.lang.String getHash():191:191 -> g0
+    1:14:com.android.tools.r8.graph.DexEncodedArray getEncodedArray():297:310 -> g0
+    1:1:java.lang.String getHash():191:191 -> h0
     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:
@@ -21333,35 +21453,35 @@
     474:474:void <init>(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.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>
     475:475:void <init>(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.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:1:void clearNestMembers():1099:1099 -> A0
-    1:2:com.android.tools.r8.graph.DexEncodedField[] clearStaticFields():387:388 -> B0
-    1:2:boolean defaultValuesForStaticFieldsMayTriggerAllocation():994:995 -> C0
-    1:1:java.lang.Iterable directMethods():229:229 -> D0
-    1:1:java.lang.Iterable fields():189:189 -> E0
-    1:1:com.android.tools.r8.graph.ClassAccessFlags getAccessFlags():165:165 -> F0
-    1:2:com.android.tools.r8.graph.DexEncodedMethod getClassInitializer():739:740 -> G0
-    1:1:com.android.tools.r8.references.ClassReference getClassReference():746:746 -> H0
-    1:1:com.android.tools.r8.graph.GenericSignature$ClassSignature getClassSignature():1063:1063 -> I0
-    1:1:com.android.tools.r8.graph.EnclosingMethodAttribute getEnclosingMethodAttribute():1012:1012 -> J0
-    1:2:com.android.tools.r8.graph.InnerClassAttribute getInnerClassAttributeForThisClass():1042:1043 -> K0
-    1:1:java.util.List getInnerClasses():1000:1000 -> L0
-    1:1:com.android.tools.r8.graph.DexTypeList getInterfaces():169:169 -> M0
-    1:5:com.android.tools.r8.graph.DexType getNestHost():1120:1124 -> N0
-    1:1:com.android.tools.r8.graph.MethodCollection getMethodCollection():208:208 -> O
-    1:1:com.android.tools.r8.graph.NestHostClassAttribute getNestHostClassAttribute():1135:1135 -> O0
-    1:1:java.util.List getNestMembersClassAttributes():1143:1143 -> P0
-    1:1:java.lang.String getSimpleName():1158:1158 -> Q0
-    1:1:com.android.tools.r8.graph.DexString getSourceFile():177:177 -> R0
-    com.android.tools.r8.graph.DexLibraryClass asLibraryClass() -> S
-    1:1:com.android.tools.r8.graph.DexType getSuperType():770:770 -> S0
-    1:1:java.lang.String getTypeName():1162:1162 -> T0
-    1:1:boolean hasClassInitializer():774:774 -> U0
-    1:1:com.android.tools.r8.graph.DexEncodedMethod getDefaultInitializer():792:792 -> V0
-    1:1:boolean hasDefaultInitializer():778 -> V0
-    1:1:boolean hasEnclosingMethodAttribute():1008:1008 -> W0
-    1:1:boolean hasInstanceFields():1170:1170 -> X0
-    1:1:boolean hasNestMemberAttributes():1139:1139 -> Y0
-    1:1:boolean hasStaticFields():1166:1166 -> Z0
+    1:1:void clearNestHost():1095:1095 -> A0
+    1:1:void clearNestMembers():1099:1099 -> B0
+    1:2:com.android.tools.r8.graph.DexEncodedField[] clearStaticFields():387:388 -> C0
+    1:2:boolean defaultValuesForStaticFieldsMayTriggerAllocation():994:995 -> D0
+    1:1:java.lang.Iterable directMethods():229:229 -> E0
+    1:1:java.lang.Iterable fields():189:189 -> F0
+    1:1:com.android.tools.r8.graph.ClassAccessFlags getAccessFlags():165:165 -> G0
+    1:2:com.android.tools.r8.graph.DexEncodedMethod getClassInitializer():739:740 -> H0
+    1:1:com.android.tools.r8.references.ClassReference getClassReference():746:746 -> I0
+    1:1:com.android.tools.r8.graph.GenericSignature$ClassSignature getClassSignature():1063:1063 -> J0
+    1:1:com.android.tools.r8.graph.EnclosingMethodAttribute getEnclosingMethodAttribute():1012:1012 -> K0
+    1:2:com.android.tools.r8.graph.InnerClassAttribute getInnerClassAttributeForThisClass():1042:1043 -> L0
+    1:1:java.util.List getInnerClasses():1000:1000 -> M0
+    1:1:com.android.tools.r8.graph.DexTypeList getInterfaces():169:169 -> N0
+    1:5:com.android.tools.r8.graph.DexType getNestHost():1120:1124 -> O0
+    1:1:com.android.tools.r8.graph.MethodCollection getMethodCollection():208:208 -> P
+    1:1:com.android.tools.r8.graph.NestHostClassAttribute getNestHostClassAttribute():1135:1135 -> P0
+    1:1:java.util.List getNestMembersClassAttributes():1143:1143 -> Q0
+    1:1:java.lang.String getSimpleName():1158:1158 -> R0
+    1:1:com.android.tools.r8.graph.DexString getSourceFile():177:177 -> S0
+    com.android.tools.r8.graph.DexLibraryClass asLibraryClass() -> T
+    1:1:com.android.tools.r8.graph.DexType getSuperType():770:770 -> T0
+    1:1:java.lang.String getTypeName():1162:1162 -> U0
+    1:1:boolean hasClassInitializer():774:774 -> V0
+    1:1:com.android.tools.r8.graph.DexEncodedMethod getDefaultInitializer():792:792 -> W0
+    1:1:boolean hasDefaultInitializer():778 -> W0
+    1:1:boolean hasEnclosingMethodAttribute():1008:1008 -> X0
+    1:1:boolean hasInstanceFields():1170:1170 -> Y0
+    1:1:boolean hasNestMemberAttributes():1139:1139 -> 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
@@ -21477,9 +21597,7 @@
     188:188:boolean verifyNoAbstractMethodsOnNonAbstractClasses(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):282:282 -> a
     188:188:boolean isValid(com.android.tools.r8.utils.InternalOptions):1195 -> a
     189:192:boolean isValid(com.android.tools.r8.utils.InternalOptions):1196:1199 -> a
-    1:2:boolean hasStaticSynchronizedMethods():1204:1205 -> a1
-    3:3:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():446:446 -> a1
-    3:3:boolean hasStaticSynchronizedMethods():1205 -> a1
+    1:1:boolean hasStaticFields():1166:1166 -> a1
     void addDependencies(com.android.tools.r8.dex.MixedSectionCollection) -> b
     com.android.tools.r8.graph.DexClass getContextClass() -> b
     1:1:void forEachClassMethodMatching(java.util.function.Predicate,java.util.function.Consumer):159:159 -> b
@@ -21499,7 +21617,9 @@
     30:33:void forEachImmediateSupertypeWithAppliedTypeArguments(java.util.List,java.util.function.BiConsumer):942:945 -> b
     34:34:void setNestMemberAttributes(java.util.List):1147:1147 -> b
     35:39:java.util.List getDirectAndIndirectInstanceFields(com.android.tools.r8.graph.AppView):1185:1189 -> b
-    1:5:java.util.List instanceFields():425:429 -> b1
+    1:2:boolean hasStaticSynchronizedMethods():1204:1205 -> b1
+    3:3:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():446:446 -> b1
+    3:3:boolean hasStaticSynchronizedMethods():1205 -> 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
     5:5:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):418:418 -> c
@@ -21514,7 +21634,7 @@
     21:21:boolean isFinal():656:656 -> c
     21:21:boolean isEffectivelyFinal(com.android.tools.r8.graph.AppView):660 -> c
     22:25:void forEachImmediateSupertype(java.util.function.Consumer):865:868 -> c
-    1:1:boolean isAbstract():648:648 -> c1
+    1:5:java.util.List instanceFields():425:429 -> c1
     1:1:void setDirectMethods(java.util.Collection):249:249 -> d
     2:2:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):253:253 -> d
     2:2:void setDirectMethods(java.util.Collection):249 -> d
@@ -21528,7 +21648,7 @@
     15:16:boolean isResolvable(com.android.tools.r8.graph.AppView):815 -> d
     17:20:boolean isResolvable(com.android.tools.r8.graph.AppView):821:824 -> d
     21:21:boolean lambda$defaultValuesForStaticFieldsMayTriggerAllocation$9(com.android.tools.r8.graph.DexEncodedField):996:996 -> d
-    1:1:boolean isAnnotation():652:652 -> d1
+    1:1:boolean isAbstract():648:648 -> d1
     1:1:com.android.tools.r8.graph.DexEncodedMethod removeMethod(com.android.tools.r8.graph.DexMethod):245:245 -> e
     2:2:void forEachMethod(java.util.function.Consumer):290:290 -> e
     3:3:void com.android.tools.r8.graph.MethodCollection.forEachMethod(java.util.function.Consumer):98:98 -> e
@@ -21553,11 +21673,10 @@
     995:995:boolean com.android.tools.r8.graph.AppInfoWithClassHierarchy.isSerializable(com.android.tools.r8.graph.DexType):446:446 -> e
     995:995:boolean isSerializable(com.android.tools.r8.graph.AppView):828 -> e
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1:4:boolean isAnonymousClass():1084:1087 -> e1
+    1:1:boolean isAnnotation():652:652 -> e1
     1:1:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualMethod(java.util.function.Predicate):565:565 -> f
     2:3:void forEachNestMember(java.util.function.Consumer):1130:1131 -> f
-    com.android.tools.r8.graph.DexClass asDexClass() -> f0
-    boolean isClasspathClass() -> f1
+    1:4:boolean isAnonymousClass():1084:1087 -> f1
     1:1:java.lang.Iterable members(java.util.function.Predicate):203:203 -> g
     2:2:java.lang.Iterable methods(java.util.function.Predicate):220:220 -> g
     2:2:java.lang.Iterable members(java.util.function.Predicate):203 -> g
@@ -21569,72 +21688,72 @@
     5:5:void forEachStaticField(java.util.function.Consumer):335 -> g
     6:6:void forEachStaticFieldMatching(java.util.function.Predicate,java.util.function.Consumer):340:340 -> g
     6:6:void forEachStaticField(java.util.function.Consumer):335 -> g
-    1:1:boolean isEnum():669:669 -> g1
-    2:2:boolean com.android.tools.r8.graph.ClassAccessFlags.isEnum():179:179 -> g1
-    2:2:boolean isEnum():669 -> g1
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    com.android.tools.r8.graph.DexClass asDexClass() -> g0
+    boolean isClasspathClass() -> g1
     1:1:com.android.tools.r8.graph.AccessFlags getAccessFlags():43:43 -> getAccessFlags
     1:1:com.android.tools.r8.origin.Origin getOrigin():761:761 -> getOrigin
     1:1:com.android.tools.r8.graph.DexReference getReference():680:680 -> getReference
     1:1:com.android.tools.r8.graph.DexType getType():766:766 -> getType
     1:1:java.lang.Iterable methods(java.util.function.Predicate):220:220 -> h
-    1:1:boolean isFinal():656:656 -> h1
+    1:1:boolean isEnum():669:669 -> h1
+    2:2:boolean com.android.tools.r8.graph.ClassAccessFlags.isEnum():179:179 -> h1
+    2:2:boolean isEnum():669 -> h1
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:2:void removeEnclosingMethodAttribute(java.util.function.Predicate):1024:1025 -> i
-    1:1:boolean isInANest():1091:1091 -> i1
+    1:1:boolean isFinal():656:656 -> i1
     1:1:boolean isInterface():665:665 -> isInterface
     1:1:void removeInnerClasses(java.util.function.Predicate):1038:1038 -> j
-    boolean isLibraryClass() -> j1
+    1:1:boolean isInANest():1091:1091 -> j1
     1:1:void removeNestMemberAttributes(java.util.function.Predicate):1151:1151 -> k
-    1:3:boolean isLocalClass():1071:1073 -> k1
+    boolean isLibraryClass() -> 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
-    com.android.tools.r8.graph.DexClasspathClass asClasspathClass() -> m
-    boolean isDexClass() -> m0
-    1:1:boolean isNestHost():1112:1112 -> m1
-    1:1:boolean isNestMember():1116:1116 -> n1
-    boolean isNotProgramClass() -> o1
-    1:1:boolean isPublic():725:725 -> p1
-    boolean isStaticMember() -> q0
-    1:1:boolean isRecord():673:673 -> q1
-    2:2:boolean com.android.tools.r8.graph.ClassAccessFlags.isRecord():187:187 -> q1
-    2:2:boolean isRecord():673 -> q1
+    1:3:boolean isLocalClass():1071:1073 -> l1
+    1:3:boolean isMemberClass():1077:1079 -> m1
+    boolean isDexClass() -> n0
+    1:1:boolean isNestHost():1112:1112 -> n1
+    1:1:boolean isNestMember():1116:1116 -> o1
+    boolean isNotProgramClass() -> p1
+    1:1:boolean isPublic():725:725 -> q1
+    boolean isStaticMember() -> r0
+    1:1:boolean isRecord():673:673 -> r1
+    2:2:boolean com.android.tools.r8.graph.ClassAccessFlags.isRecord():187:187 -> r1
+    2:2:boolean isRecord():673 -> r1
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1:3:java.lang.Iterable allImmediateSupertypes():982:984 -> r0
-    4:7:java.lang.Iterable allImmediateSupertypes():983:986 -> r0
-    1:1:java.lang.Iterable members():199:199 -> r1
-    2:2:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):418:418 -> r1
-    2:2:java.lang.Iterable members():199 -> r1
-    1:1:java.util.List allMethodsSorted():294:294 -> s0
-    1:1:java.lang.Iterable methods():216:216 -> s1
-    1:1:java.lang.Iterable classFields():185:185 -> t0
-    1:5:java.util.List staticFields():353:357 -> t1
-    1:1:java.lang.Iterable classMethods():212:212 -> u0
-    1:1:boolean validInterfaceSignatures():872:872 -> u1
-    2:2:java.util.List com.android.tools.r8.graph.GenericSignature$ClassSignature.superInterfaceSignatures():233:233 -> u1
-    2:2:boolean validInterfaceSignatures():872 -> u1
+    1:3:java.lang.Iterable allImmediateSupertypes():982:984 -> s0
+    4:7:java.lang.Iterable allImmediateSupertypes():983:986 -> s0
+    1:1:java.lang.Iterable members():199:199 -> s1
+    2:2:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):418:418 -> s1
+    2:2:java.lang.Iterable members():199 -> s1
+    1:1:java.util.List allMethodsSorted():294:294 -> t0
+    1:1:java.lang.Iterable methods():216:216 -> t1
+    1:1:java.lang.Iterable classFields():185:185 -> u0
+    1:5:java.util.List staticFields():353:357 -> u1
+    1:1:java.lang.Iterable classMethods():212:212 -> v0
+    1:1:boolean validInterfaceSignatures():872:872 -> v1
+    2:2:java.util.List com.android.tools.r8.graph.GenericSignature$ClassSignature.superInterfaceSignatures():233:233 -> v1
+    2:2:boolean validInterfaceSignatures():872 -> v1
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:4:boolean validInterfaceSignatures():872:873 -> u1
-    1:1:void clearClassSignature():1034:1034 -> v0
-    1:4:boolean verifyNoDuplicateFields():502:505 -> v1
-    5:5:boolean verifyNoDuplicateFields():0:0 -> v1
+    3:4:boolean validInterfaceSignatures():872:873 -> v1
+    1:1:void clearClassSignature():1034:1034 -> w0
+    1:4:boolean verifyNoDuplicateFields():502:505 -> w1
+    5:5:boolean verifyNoDuplicateFields():0:0 -> w1
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":511,"2":512,"3":513}}
-    511:511:boolean verifyNoDuplicateFields():505:505 -> v1
-    512:512:boolean verifyNoDuplicateFields():505:505 -> v1
-    513:513:boolean verifyNoDuplicateFields():505:505 -> v1
-    510:510:boolean verifyNoDuplicateFields():505:505 -> v1
-    1:1:void clearEnclosingMethodAttribute():1020:1020 -> w0
-    1:1:java.lang.Iterable virtualMethods():257:257 -> w1
-    1:1:void clearInnerClasses():1030:1030 -> x0
-    1:2:com.android.tools.r8.graph.DexEncodedField[] clearInstanceFields():479:480 -> y0
-    1:1:void clearNestHost():1095:1095 -> z0
-com.android.tools.r8.graph.DexClass$FieldSetter -> com.android.tools.r8.internal.tf:
+    511:511:boolean verifyNoDuplicateFields():505:505 -> w1
+    512:512:boolean verifyNoDuplicateFields():505:505 -> w1
+    513:513:boolean verifyNoDuplicateFields():505:505 -> w1
+    510:510:boolean verifyNoDuplicateFields():505:505 -> w1
+    1:1:void clearEnclosingMethodAttribute():1020:1020 -> x0
+    1:1:java.lang.Iterable virtualMethods():257:257 -> x1
+    1:1:void clearInnerClasses():1030:1030 -> y0
+    1:2:com.android.tools.r8.graph.DexEncodedField[] clearInstanceFields():479:480 -> z0
+com.android.tools.r8.graph.DexClass$FieldSetter -> com.android.tools.r8.internal.sf:
     void setField(int,com.android.tools.r8.graph.DexEncodedField) -> a
 com.android.tools.r8.graph.DexClassAndField -> com.android.tools.r8.graph.K:
     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>
-    1:1:com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo getOptimizationInfo():41:41 -> A
-    boolean isField() -> W
+    boolean isField() -> X
     1:2:com.android.tools.r8.graph.DexClassAndField create(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):20:21 -> a
     3:3:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
     3:3:com.android.tools.r8.graph.DexClassAndField create(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):23 -> a
@@ -21642,12 +21761,13 @@
     7:7:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> a
     7:7:com.android.tools.r8.graph.DexClassAndField create(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):26 -> a
     8:9:com.android.tools.r8.graph.DexClassAndField create(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):26:27 -> a
-    com.android.tools.r8.graph.DexClassAndMember asMember() -> b0
+    com.android.tools.r8.graph.DexClassAndMember asMember() -> c0
     com.android.tools.r8.graph.DexClassAndField asField() -> d
     1:1:com.android.tools.r8.graph.AccessFlags getAccessFlags():10:10 -> getAccessFlags
     1:1:com.android.tools.r8.graph.DexType getType():45:45 -> getType
-    1:1:com.android.tools.r8.graph.FieldAccessFlags getAccessFlags():32:32 -> w
-    1:1:com.android.tools.r8.references.FieldReference getFieldReference():36:36 -> y
+    1:1:com.android.tools.r8.graph.FieldAccessFlags getAccessFlags():32:32 -> v
+    1:1:com.android.tools.r8.references.FieldReference getFieldReference():36:36 -> x
+    1:1:com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo getOptimizationInfo():41:41 -> z
 com.android.tools.r8.graph.DexClassAndMember -> com.android.tools.r8.graph.L:
     com.android.tools.r8.graph.DexClass holder -> b
     com.android.tools.r8.graph.DexEncodedMember definition -> c
@@ -21667,21 +21787,17 @@
     1:1:com.android.tools.r8.graph.DexMember getReference():58:58 -> t
     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 -> x
+    1:1:com.android.tools.r8.graph.DexType getContextType():36:36 -> y
 com.android.tools.r8.graph.DexClassAndMethod -> com.android.tools.r8.graph.M:
     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>
-    1:1:com.android.tools.r8.graph.DexMethodSignature getMethodSignature():54:54 -> A
-    2:2:com.android.tools.r8.graph.DexMethodSignature com.android.tools.r8.graph.DexMethodSignature.create(com.android.tools.r8.graph.DexMethod):17:17 -> A
-    2:2:com.android.tools.r8.graph.DexMethodSignature com.android.tools.r8.graph.DexMethod.getSignature():173 -> A
-    2:2:com.android.tools.r8.graph.DexMethodSignature getMethodSignature():54 -> A
     1:1:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo getOptimizationInfo():59:59 -> B
     1:1:com.android.tools.r8.graph.DexTypeList getParameters():71:71 -> C
     1:1:com.android.tools.r8.graph.DexProto getProto():83:83 -> D
     1:1:com.android.tools.r8.graph.DexType getReturnType():87:87 -> E
-    1:1:boolean isDefaultMethod():37:37 -> I
-    boolean isMethod() -> V
+    1:1:boolean isDefaultMethod():37:37 -> F
+    boolean isMethod() -> W
     1:1:com.android.tools.r8.graph.ProgramMethod asProgramMethodOrNull(com.android.tools.r8.graph.DexClassAndMethod):22:22 -> a
     2:3:com.android.tools.r8.graph.DexClassAndMethod create(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):26:27 -> a
     4:4:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
@@ -21694,19 +21810,23 @@
     12:12:void accept(java.util.function.Consumer,java.util.function.Consumer):118:118 -> a
     1:1:boolean isStructurallyEqualTo(com.android.tools.r8.graph.DexClassAndMethod):41:41 -> b
     2:2:com.android.tools.r8.graph.DexType getParameter(int):67:67 -> b
-    com.android.tools.r8.graph.DexClassAndMember asMember() -> b0
     com.android.tools.r8.graph.DexClassAndMethod asMethod() -> c
+    com.android.tools.r8.graph.DexClassAndMember asMember() -> c0
     1:1:com.android.tools.r8.graph.AccessFlags getAccessFlags():11:11 -> getAccessFlags
-    com.android.tools.r8.graph.DexClassAndMethod asMethodTarget() -> k
+    com.android.tools.r8.graph.DexClassAndMethod asMethodTarget() -> m
     boolean isMethodTarget() -> p
-    1:1:com.android.tools.r8.graph.MethodAccessFlags getAccessFlags():46:46 -> w
-    1:1:com.android.tools.r8.references.MethodReference getMethodReference():50:50 -> y
+    1:1:com.android.tools.r8.graph.MethodAccessFlags getAccessFlags():46:46 -> v
+    1:1:com.android.tools.r8.references.MethodReference getMethodReference():50:50 -> x
+    1:1:com.android.tools.r8.graph.DexMethodSignature getMethodSignature():54:54 -> z
+    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:
     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>
-    com.android.tools.r8.graph.ClasspathOrLibraryClass asClasspathOrLibraryClass() -> G
-    com.android.tools.r8.utils.structural.StructuralItem self() -> K
+    com.android.tools.r8.graph.ClasspathOrLibraryClass asClasspathOrLibraryClass() -> H
+    com.android.tools.r8.utils.structural.StructuralItem self() -> L
     1:1:void accept(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer):72:72 -> a
     2:5:boolean internalClassOrInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):136:139 -> a
     6:18:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):153:165 -> a
@@ -21716,9 +21836,9 @@
     3:3:com.android.tools.r8.graph.DexEncodedField[] lambda$specify$2(com.android.tools.r8.graph.DexClasspathClass):163:163 -> b
     1:1:com.android.tools.r8.graph.DexEncodedField[] lambda$specify$3(com.android.tools.r8.graph.DexClasspathClass):164:164 -> c
     1:1:void forEachClasspathMethodMatching(java.util.function.Predicate,java.util.function.Consumer):81:81 -> d
-    com.android.tools.r8.graph.DexClasspathClass asClasspathClass() -> m
+    com.android.tools.r8.graph.DexClasspathClass asClasspathClass() -> l
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():149:149 -> n
-    boolean isNotProgramClass() -> o1
+    boolean isNotProgramClass() -> p1
     1:1:java.lang.String toString():87:87 -> toString
 com.android.tools.r8.graph.DexCode -> com.android.tools.r8.graph.O:
     boolean $assertionsDisabled -> n
@@ -21736,13 +21856,13 @@
     1:1:void <init>(int,int,int,com.android.tools.r8.code.Instruction[],com.android.tools.r8.graph.DexCode$Try[],com.android.tools.r8.graph.DexCode$TryHandler[],com.android.tools.r8.graph.DexDebugInfo):93:93 -> <init>
     2:2:void <init>(int,int,int,com.android.tools.r8.code.Instruction[],com.android.tools.r8.graph.DexCode$Try[],com.android.tools.r8.graph.DexCode$TryHandler[],com.android.tools.r8.graph.DexDebugInfo):85:85 -> <init>
     3:15:void <init>(int,int,int,com.android.tools.r8.code.Instruction[],com.android.tools.r8.graph.DexCode$Try[],com.android.tools.r8.graph.DexCode$TryHandler[],com.android.tools.r8.graph.DexDebugInfo,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadata):104:116 -> <init>
-    1:7:com.android.tools.r8.graph.DexDebugInfoForWriting getDebugInfoForWriting():576:582 -> A
-    com.android.tools.r8.graph.DexCode asDexCode() -> I
-    com.android.tools.r8.utils.structural.StructuralItem self() -> K
-    1:3:int codeSizeInBytes():635:637 -> L
-    4:5:int computeCodeSizeInBytes():644:645 -> L
-    4:5:int codeSizeInBytes():638 -> L
-    6:6:int codeSizeInBytes():638:638 -> L
+    1:7:com.android.tools.r8.graph.DexDebugInfoForWriting getDebugInfoForWriting():576:582 -> B
+    com.android.tools.r8.graph.DexCode asDexCode() -> J
+    com.android.tools.r8.utils.structural.StructuralItem self() -> L
+    1:3:int codeSizeInBytes():635:637 -> M
+    4:5:int computeCodeSizeInBytes():644:645 -> M
+    4:5:int codeSizeInBytes():638 -> M
+    6:6:int codeSizeInBytes():638:638 -> M
     1:1:int lambda$specify$0(com.android.tools.r8.graph.DexCode):68:68 -> a
     2:8:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):68:74 -> a
     9:9:com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata getMetadata(com.android.tools.r8.code.CfOrDexInstruction):126:126 -> a
@@ -21813,29 +21933,29 @@
     2:5:void setCallSiteContexts(com.android.tools.r8.graph.ProgramMethod):165:168 -> c
     1:1:com.android.tools.r8.graph.DexCode$Try[] lambda$specify$3(com.android.tools.r8.graph.DexCode):71:71 -> d
     1:1:com.android.tools.r8.graph.DexCode$TryHandler[] lambda$specify$4(com.android.tools.r8.graph.DexCode):72:72 -> e
-    1:7:int computeHashCode():334:340 -> e0
     1:1:com.android.tools.r8.graph.DexDebugInfo lambda$specify$5(com.android.tools.r8.graph.DexCode):73:73 -> f
+    1:7:int computeHashCode():334:340 -> f0
     1:1:com.android.tools.r8.code.Instruction[] lambda$specify$6(com.android.tools.r8.graph.DexCode):74:74 -> g
     2:2:boolean computeEquals(java.lang.Object):345:345 -> g
-    com.android.tools.r8.graph.DexWritableCode asDexWritableCode() -> g0
-    com.android.tools.r8.graph.DexWritableCode$DexWritableCodeKind getDexWritableCodeKind() -> i
-    1:1:int estimatedDexCodeSizeUpperBoundInBytes():212:212 -> i0
-    1:1:int estimatedSizeForInlining():207:207 -> j0
-    boolean isDexCode() -> m0
+    com.android.tools.r8.graph.DexWritableCode asDexWritableCode() -> h0
+    1:1:int estimatedDexCodeSizeUpperBoundInBytes():212:212 -> j0
+    1:1:int estimatedSizeForInlining():207:207 -> k0
+    1:1:com.android.tools.r8.graph.DexWritableCode$DexWritableCodeKind getDexWritableCodeKind():135:135 -> m
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():140:140 -> n
-    boolean isDexWritableCode() -> n0
+    boolean isDexCode() -> n0
+    boolean isDexWritableCode() -> o0
     1:1:com.android.tools.r8.graph.DexCode$Try[] getTries():597:597 -> p
     com.android.tools.r8.graph.Code asCode() -> q
-    1:1:com.android.tools.r8.graph.DexDebugInfo getDebugInfo():221:221 -> r0
-    1:1:boolean isEmptyVoidMethod():350:350 -> s0
-    1:1:com.android.tools.r8.graph.DexCode withoutThisParameter():180:180 -> t0
-    2:11:com.android.tools.r8.graph.DexDebugInfo debugInfoWithoutFirstParameter():315:324 -> t0
-    2:11:com.android.tools.r8.graph.DexCode withoutThisParameter():187 -> t0
-    12:12:com.android.tools.r8.graph.DexCode withoutThisParameter():187:187 -> t0
+    1:1:com.android.tools.r8.graph.DexDebugInfo getDebugInfo():221:221 -> s0
+    1:1:boolean isEmptyVoidMethod():350:350 -> t0
     1:1:java.lang.String toString():420:420 -> toString
-    1:1:com.android.tools.r8.graph.DexCode$TryHandler[] getHandlers():587:587 -> u
-    1:1:com.android.tools.r8.graph.DexString getHighestSortingString():592:592 -> w
-    1:1:int getOutgoingRegisterSize():612:612 -> y
+    1:1:com.android.tools.r8.graph.DexCode withoutThisParameter():180:180 -> u0
+    2:11:com.android.tools.r8.graph.DexDebugInfo debugInfoWithoutFirstParameter():315:324 -> u0
+    2:11:com.android.tools.r8.graph.DexCode withoutThisParameter():187 -> u0
+    12:12:com.android.tools.r8.graph.DexCode withoutThisParameter():187:187 -> u0
+    1:1:com.android.tools.r8.graph.DexCode$TryHandler[] getHandlers():587:587 -> v
+    1:1:com.android.tools.r8.graph.DexString getHighestSortingString():592:592 -> x
+    1:1:int getOutgoingRegisterSize():612:612 -> z
 com.android.tools.r8.graph.DexCode$Try -> com.android.tools.r8.graph.O$a:
     boolean $assertionsDisabled -> f
     int instructionCount -> d
@@ -21844,7 +21964,7 @@
     int startAddress -> c
     1:1:void <clinit>():682:682 -> <clinit>
     1:5:void <init>(int,int,int):698:702 -> <init>
-    com.android.tools.r8.utils.structural.StructuralItem self() -> K
+    com.android.tools.r8.utils.structural.StructuralItem self() -> L
     1:1:int lambda$specify$0(com.android.tools.r8.graph.DexCode$Try):693:693 -> a
     2:4:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):693:695 -> a
     5:5:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):742:742 -> a
@@ -21865,7 +21985,7 @@
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():747:747 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.DexCode$TryHandler$TypeAddrPair[],int):758:760 -> <init>
-    com.android.tools.r8.utils.structural.StructuralItem self() -> K
+    com.android.tools.r8.utils.structural.StructuralItem self() -> L
     1:1:int lambda$specify$0(com.android.tools.r8.graph.DexCode$TryHandler):755:755 -> a
     2:2:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):755:755 -> a
     3:3:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):792:792 -> a
@@ -21887,7 +22007,7 @@
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():815:815 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.DexType,int):824:826 -> <init>
-    com.android.tools.r8.utils.structural.StructuralItem self() -> K
+    com.android.tools.r8.utils.structural.StructuralItem self() -> L
     1:1:com.android.tools.r8.graph.DexType access$000(com.android.tools.r8.graph.DexCode$TryHandler$TypeAddrPair):815:815 -> a
     2:2:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):821:821 -> a
     3:3:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.GraphLens):844:844 -> a
@@ -21922,7 +22042,7 @@
     1:1:com.android.tools.r8.graph.DexType getType():840:840 -> getType
     1:1:int hashCode():860:860 -> hashCode
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():836:836 -> n
-com.android.tools.r8.graph.DexDebugEntry -> com.android.tools.r8.internal.wf:
+com.android.tools.r8.graph.DexDebugEntry -> com.android.tools.r8.internal.vf:
     com.android.tools.r8.ir.code.Position callerPosition -> i
     com.android.tools.r8.graph.DexString sourceFile -> d
     boolean $assertionsDisabled -> j
@@ -21999,7 +22119,7 @@
     9:9:void <clinit>():29 -> <clinit>
     10:10:void <clinit>():29:29 -> <clinit>
     1:1:void <init>():20:20 -> <init>
-    com.android.tools.r8.utils.structural.StructuralItem self() -> K
+    com.android.tools.r8.utils.structural.StructuralItem self() -> L
     void accept(com.android.tools.r8.graph.DexDebugEventVisitor) -> a
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens) -> a
     void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection) -> a
@@ -22010,21 +22130,21 @@
     8:8:void internalWriteOn(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):92:92 -> a
     int internalAcceptCompareTo(com.android.tools.r8.graph.DexDebugEvent,com.android.tools.r8.utils.structural.CompareToVisitor) -> b
     void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor) -> b
-    com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame asSetInlineFrame() -> e0
     1:1:boolean equals(java.lang.Object):49:49 -> equals
-    int getCompareToId() -> f0
-    boolean isWritableEvent() -> g0
+    com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame asSetInlineFrame() -> f0
+    int getCompareToId() -> g0
+    boolean isWritableEvent() -> h0
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():65:65 -> n
 com.android.tools.r8.graph.DexDebugEvent$AdvanceLine -> com.android.tools.r8.graph.T:
     int delta -> e
     1:2:void <init>(int):273:274 -> <init>
-    com.android.tools.r8.utils.structural.StructuralItem self() -> K
+    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):269:269 -> a
     2:3:void internalWriteOn(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):285:286 -> a
     4:4:void accept(com.android.tools.r8.graph.DexDebugEventVisitor):291:291 -> a
     1:1:int internalAcceptCompareTo(com.android.tools.r8.graph.DexDebugEvent,com.android.tools.r8.utils.structural.CompareToVisitor):312:312 -> b
     2:2:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):317:317 -> b
-    int getCompareToId() -> f0
+    int getCompareToId() -> g0
     1:1:int hashCode():301:301 -> hashCode
     1:1:java.lang.String toString():0:0 -> toString
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":298,"2":299,"3":300}}
@@ -22037,14 +22157,14 @@
     int delta -> e
     1:1:void <clinit>():117:117 -> <clinit>
     1:2:void <init>(int):133:134 -> <init>
-    com.android.tools.r8.utils.structural.StructuralItem self() -> K
+    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):117:117 -> a
     2:3:void internalWriteOn(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):129:130 -> a
     4:5:void accept(com.android.tools.r8.graph.DexDebugEventVisitor):139:140 -> a
     1:1:int internalAcceptCompareTo(com.android.tools.r8.graph.DexDebugEvent,com.android.tools.r8.utils.structural.CompareToVisitor):162:162 -> b
     2:2:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):167:167 -> b
-    int getCompareToId() -> f0
-    boolean isWritableEvent() -> g0
+    int getCompareToId() -> g0
+    boolean isWritableEvent() -> h0
     1:1:int hashCode():151:151 -> hashCode
     1:1:java.lang.String toString():0:0 -> toString
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":148,"2":149,"3":150}}
@@ -22057,30 +22177,30 @@
     int value -> e
     1:1:void <clinit>():740:740 -> <clinit>
     1:3:void <init>(int):744:746 -> <init>
-    com.android.tools.r8.utils.structural.StructuralItem self() -> K
+    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):740:740 -> a
     2:2:void internalWriteOn(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):767:767 -> a
     3:3:void accept(com.android.tools.r8.graph.DexDebugEventVisitor):772:772 -> a
     1:1:int internalAcceptCompareTo(com.android.tools.r8.graph.DexDebugEvent,com.android.tools.r8.utils.structural.CompareToVisitor):803:803 -> b
     2:2:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):808:808 -> b
     int computeSpecialOpcode(int,int) -> e
-    int getCompareToId() -> f0
-    boolean isWritableEvent() -> g0
-    1:2:int getLineDelta():781:782 -> h0
+    int getCompareToId() -> g0
+    boolean isWritableEvent() -> h0
     1:1:int hashCode():792:792 -> hashCode
-    1:2:int getPCDelta():776:777 -> i0
+    1:2:int getLineDelta():781:782 -> i0
+    1:2:int getPCDelta():776:777 -> j0
     1:1:java.lang.String toString():787:787 -> toString
 com.android.tools.r8.graph.DexDebugEvent$EndLocal -> com.android.tools.r8.graph.V:
     int registerNum -> e
     1:2:void <init>(int):422:423 -> <init>
-    com.android.tools.r8.utils.structural.StructuralItem self() -> K
+    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):418:418 -> a
     2:3:void internalWriteOn(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):434:435 -> a
     4:4:void accept(com.android.tools.r8.graph.DexDebugEventVisitor):440:440 -> a
     1:1:int internalAcceptCompareTo(com.android.tools.r8.graph.DexDebugEvent,com.android.tools.r8.utils.structural.CompareToVisitor):461:461 -> b
     2:2:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):466:466 -> b
-    int getCompareToId() -> f0
-    boolean isWritableEvent() -> g0
+    int getCompareToId() -> g0
+    boolean isWritableEvent() -> h0
     1:1:int hashCode():450:450 -> hashCode
     1:1:java.lang.String toString():0:0 -> toString
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":447,"2":448,"3":449}}
@@ -22091,14 +22211,14 @@
 com.android.tools.r8.graph.DexDebugEvent$RestartLocal -> com.android.tools.r8.graph.W:
     int registerNum -> e
     1:2:void <init>(int):474:475 -> <init>
-    com.android.tools.r8.utils.structural.StructuralItem self() -> K
+    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):470:470 -> a
     2:3:void internalWriteOn(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):486:487 -> a
     4:4:void accept(com.android.tools.r8.graph.DexDebugEventVisitor):492:492 -> a
     1:1:int internalAcceptCompareTo(com.android.tools.r8.graph.DexDebugEvent,com.android.tools.r8.utils.structural.CompareToVisitor):513:513 -> b
     2:2:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):518:518 -> b
-    int getCompareToId() -> f0
-    boolean isWritableEvent() -> g0
+    int getCompareToId() -> g0
+    boolean isWritableEvent() -> h0
     1:1:int hashCode():502:502 -> hashCode
     1:1:java.lang.String toString():0:0 -> toString
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":499,"2":500,"3":501}}
@@ -22110,19 +22230,19 @@
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():221:221 -> <clinit>
     1:1:void <init>():223:223 -> <init>
-    com.android.tools.r8.utils.structural.StructuralItem self() -> K
+    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):221:221 -> a
     2:2:void internalWriteOn(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):234:234 -> a
     3:3:void accept(com.android.tools.r8.graph.DexDebugEventVisitor):239:239 -> a
     void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor) -> b
     1:1:int internalAcceptCompareTo(com.android.tools.r8.graph.DexDebugEvent,com.android.tools.r8.utils.structural.CompareToVisitor):259:259 -> b
-    int getCompareToId() -> f0
-    boolean isWritableEvent() -> g0
+    int getCompareToId() -> g0
+    boolean isWritableEvent() -> h0
     1:1:java.lang.String toString():244:244 -> toString
 com.android.tools.r8.graph.DexDebugEvent$SetFile -> com.android.tools.r8.graph.U$c:
     com.android.tools.r8.graph.DexString fileName -> e
     1:2:void <init>(com.android.tools.r8.graph.DexString):533:534 -> <init>
-    com.android.tools.r8.utils.structural.StructuralItem self() -> K
+    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):529:529 -> a
     2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens):545:545 -> a
     3:3:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
@@ -22132,8 +22252,8 @@
     2:2:int com.android.tools.r8.graph.DexString.acceptCompareTo(com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.structural.CompareToVisitor):65:65 -> b
     2:2:int internalAcceptCompareTo(com.android.tools.r8.graph.DexDebugEvent,com.android.tools.r8.utils.structural.CompareToVisitor):571 -> b
     3:3:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):576:576 -> b
-    int getCompareToId() -> f0
-    boolean isWritableEvent() -> g0
+    int getCompareToId() -> g0
+    boolean isWritableEvent() -> h0
     1:2:int hashCode():560:561 -> hashCode
     1:1:java.lang.String toString():0:0 -> toString
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":557,"2":558,"3":559}}
@@ -22147,7 +22267,7 @@
     com.android.tools.r8.ir.code.Position caller -> f
     1:1:void <clinit>():580:580 -> <clinit>
     1:4:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):589:592 -> <init>
-    com.android.tools.r8.utils.structural.StructuralItem self() -> K
+    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):580:580 -> a
     2:2:com.android.tools.r8.graph.DexMethod lambda$specify$0(com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame):586:586 -> a
     3:3:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):586:586 -> a
@@ -22156,8 +22276,8 @@
     1:1:com.android.tools.r8.ir.code.Position lambda$specify$1(com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame):586:586 -> b
     2:2:int internalAcceptCompareTo(com.android.tools.r8.graph.DexDebugEvent,com.android.tools.r8.utils.structural.CompareToVisitor):617:617 -> b
     3:3:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):622:622 -> b
-    com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame asSetInlineFrame() -> e0
-    int getCompareToId() -> f0
+    com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame asSetInlineFrame() -> f0
+    int getCompareToId() -> g0
     1:1:int hashCode():607:607 -> hashCode
     1:1:java.lang.String toString():602:602 -> toString
 com.android.tools.r8.graph.DexDebugEvent$SetOutlineCallerFrame -> com.android.tools.r8.graph.Z:
@@ -22166,7 +22286,7 @@
     com.android.tools.r8.utils.Int2StructuralItemArrayMap outlinePositions -> f
     1:1:void <clinit>():674:674 -> <clinit>
     1:5:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.Int2StructuralItemArrayMap):684:688 -> <init>
-    com.android.tools.r8.utils.structural.StructuralItem self() -> K
+    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):674:674 -> a
     2:2:com.android.tools.r8.graph.DexMethod lambda$specify$0(com.android.tools.r8.graph.DexDebugEvent$SetOutlineCallerFrame):680:680 -> a
     3:3:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):680:680 -> a
@@ -22174,32 +22294,32 @@
     1:1:com.android.tools.r8.utils.Int2StructuralItemArrayMap lambda$specify$1(com.android.tools.r8.graph.DexDebugEvent$SetOutlineCallerFrame):680:680 -> b
     2:2:int internalAcceptCompareTo(com.android.tools.r8.graph.DexDebugEvent,com.android.tools.r8.utils.structural.CompareToVisitor):721:721 -> b
     3:3:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):726:726 -> b
-    int getCompareToId() -> f0
-    1:1:com.android.tools.r8.graph.DexMethod getOutlineCallee():692:692 -> h0
+    int getCompareToId() -> g0
     1:1:int hashCode():711:711 -> hashCode
-    1:1:com.android.tools.r8.utils.Int2StructuralItemArrayMap getOutlinePositions():696:696 -> i0
+    1:1:com.android.tools.r8.graph.DexMethod getOutlineCallee():692:692 -> i0
+    1:1:com.android.tools.r8.utils.Int2StructuralItemArrayMap getOutlinePositions():696:696 -> j0
     1:1:java.lang.String toString():706:706 -> toString
 com.android.tools.r8.graph.DexDebugEvent$SetOutlineFrame -> com.android.tools.r8.graph.a0:
     1:1:void <init>():641:641 -> <init>
-    com.android.tools.r8.utils.structural.StructuralItem self() -> K
+    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):641:641 -> a
     2:2:void accept(com.android.tools.r8.graph.DexDebugEventVisitor):670:670 -> a
     int internalAcceptCompareTo(com.android.tools.r8.graph.DexDebugEvent,com.android.tools.r8.utils.structural.CompareToVisitor) -> b
     void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor) -> b
-    int getCompareToId() -> f0
+    int getCompareToId() -> g0
     1:1:java.lang.String toString():645:645 -> toString
 com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd -> com.android.tools.r8.graph.b0:
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():171:171 -> <clinit>
     1:1:void <init>():173:173 -> <init>
-    com.android.tools.r8.utils.structural.StructuralItem self() -> K
+    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):171:171 -> a
     2:2:void internalWriteOn(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):184:184 -> a
     3:3:void accept(com.android.tools.r8.graph.DexDebugEventVisitor):189:189 -> a
     void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor) -> b
     1:1:int internalAcceptCompareTo(com.android.tools.r8.graph.DexDebugEvent,com.android.tools.r8.utils.structural.CompareToVisitor):210:210 -> b
-    int getCompareToId() -> f0
-    boolean isWritableEvent() -> g0
+    int getCompareToId() -> g0
+    boolean isWritableEvent() -> h0
     1:1:java.lang.String toString():194:194 -> toString
 com.android.tools.r8.graph.DexDebugEvent$StartLocal -> com.android.tools.r8.graph.U$d:
     com.android.tools.r8.graph.DexString name -> f
@@ -22207,7 +22327,7 @@
     int registerNum -> e
     com.android.tools.r8.graph.DexType type -> g
     1:5:void <init>(int,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):339:343 -> <init>
-    com.android.tools.r8.utils.structural.StructuralItem self() -> K
+    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):321:321 -> a
     2:2:int lambda$spec$0(com.android.tools.r8.graph.DexDebugEvent$StartLocal):329:329 -> a
     3:6:void spec(com.android.tools.r8.utils.structural.StructuralSpecification):329:332 -> a
@@ -22242,8 +22362,8 @@
     3:3:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):414:414 -> b
     1:1:com.android.tools.r8.graph.DexType lambda$spec$2(com.android.tools.r8.graph.DexDebugEvent$StartLocal):331:331 -> c
     1:1:com.android.tools.r8.graph.DexString lambda$spec$3(com.android.tools.r8.graph.DexDebugEvent$StartLocal):332:332 -> d
-    int getCompareToId() -> f0
-    boolean isWritableEvent() -> g0
+    int getCompareToId() -> g0
+    boolean isWritableEvent() -> h0
     1:5:int hashCode():395:399 -> hashCode
     1:1:java.lang.String toString():0:0 -> toString
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":392,"2":393,"3":394}}
@@ -22341,14 +22461,14 @@
     com.android.tools.r8.graph.DexString[] parameters -> e
     1:1:void <clinit>():15:15 -> <clinit>
     1:8:void <init>(int,com.android.tools.r8.graph.DexString[],com.android.tools.r8.graph.DexDebugEvent[]):27:34 -> <init>
-    com.android.tools.r8.utils.structural.StructuralItem self() -> K
+    com.android.tools.r8.utils.structural.StructuralItem self() -> L
     1:1:int lambda$specify$0(com.android.tools.r8.graph.DexDebugInfo):22:22 -> a
     2:4:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):22:24 -> a
     5:9:java.util.List computeEntries(com.android.tools.r8.graph.DexMethod):48:52 -> a
     10:10:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):80:80 -> a
     1:1:com.android.tools.r8.graph.DexString[] lambda$specify$1(com.android.tools.r8.graph.DexDebugInfo):23:23 -> b
     1:1:com.android.tools.r8.graph.DexDebugEvent[] lambda$specify$2(com.android.tools.r8.graph.DexDebugInfo):24:24 -> c
-    1:3:int computeHashCode():57:59 -> e0
+    1:3:int computeHashCode():57:59 -> f0
     1:1:boolean computeEquals(java.lang.Object):64:64 -> g
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():44:44 -> n
     1:1:java.lang.String toString():85:85 -> toString
@@ -22362,7 +22482,7 @@
     com.android.tools.r8.graph.DexDebugInfoForSingleLineMethod INSTANCE -> h
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:void <init>(int,com.android.tools.r8.graph.DexString[],com.android.tools.r8.graph.DexDebugEvent[]):14:14 -> <init>
-    1:1:com.android.tools.r8.graph.DexDebugInfoForSingleLineMethod getInstance():18:18 -> f0
+    1:1:com.android.tools.r8.graph.DexDebugInfoForSingleLineMethod getInstance():18:18 -> g0
 com.android.tools.r8.graph.DexDebugInfoForWriting -> com.android.tools.r8.graph.g0:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():11:11 -> <clinit>
@@ -22407,13 +22527,13 @@
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():15:15 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.DexAnnotationSet):19:21 -> <init>
-    1:1:void clearAnnotations():40:40 -> F
-    1:1:void clearAllAnnotations():44 -> F
-    2:2:void setAnnotations(com.android.tools.r8.graph.DexAnnotationSet):48:48 -> F
-    2:2:void clearAnnotations():40 -> F
-    2:2:void clearAllAnnotations():44 -> F
-    com.android.tools.r8.graph.DexProgramClass asProgramClass() -> Q
-    boolean isProgramClass() -> T
+    1:1:void clearAnnotations():40:40 -> G
+    1:1:void clearAllAnnotations():44 -> G
+    2:2:void setAnnotations(com.android.tools.r8.graph.DexAnnotationSet):48:48 -> G
+    2:2:void clearAnnotations():40 -> G
+    2:2:void clearAllAnnotations():44 -> G
+    com.android.tools.r8.graph.DexProgramClass asProgramClass() -> R
+    boolean isProgramClass() -> U
     1:1:com.android.tools.r8.graph.DexAnnotation$AnnotatedKind com.android.tools.r8.graph.DexAnnotation$AnnotatedKind.from(com.android.tools.r8.graph.DexDefinition):36:36 -> a
     1:1:com.android.tools.r8.graph.DexAnnotation lambda$rewriteAllAnnotations$0(java.util.function.BiFunction,com.android.tools.r8.graph.DexAnnotation):58 -> a
     2:2:com.android.tools.r8.graph.DexAnnotation lambda$rewriteAllAnnotations$0(java.util.function.BiFunction,com.android.tools.r8.graph.DexAnnotation):58:58 -> a
@@ -22432,23 +22552,23 @@
     2:2:java.util.stream.Stream filter(java.util.stream.Stream,java.util.function.Predicate,java.util.function.Function):109:109 -> b
     2:2:java.util.stream.Stream filterDexEncodedMethod(java.util.stream.Stream,java.util.function.Function):130 -> b
     3:3:java.lang.Object lambda$filterDexEncodedMethod$2(java.util.function.Function,com.android.tools.r8.graph.DexDefinition):133:133 -> b
-    1:1:com.android.tools.r8.graph.DexAnnotationSet annotations():34:34 -> e0
-    com.android.tools.r8.graph.DexClass asDexClass() -> f0
-    com.android.tools.r8.graph.DexEncodedField asDexEncodedField() -> g0
-    com.android.tools.r8.graph.DexEncodedMember asDexEncodedMember() -> h0
-    com.android.tools.r8.graph.DexEncodedMethod asDexEncodedMethod() -> i0
-    1:1:void clearAnnotations():40:40 -> j0
-    2:2:void setAnnotations(com.android.tools.r8.graph.DexAnnotationSet):48:48 -> j0
-    2:2:void clearAnnotations():40 -> j0
-    1:1:boolean hasAnnotations():25:25 -> k0
-    1:1:boolean hasAnyAnnotations():30:30 -> l0
-    boolean isDexClass() -> m0
-    boolean isDexEncodedField() -> n0
-    boolean isDexEncodedMember() -> o0
-    boolean isDexEncodedMethod() -> p0
-    boolean isStaticMember() -> q0
-    1:1:com.android.tools.r8.graph.DexType getContextType():149:149 -> x
-com.android.tools.r8.graph.DexDefinitionSupplier -> com.android.tools.r8.internal.xf:
+    1:1:com.android.tools.r8.graph.DexAnnotationSet annotations():34:34 -> f0
+    com.android.tools.r8.graph.DexClass asDexClass() -> g0
+    com.android.tools.r8.graph.DexEncodedField asDexEncodedField() -> h0
+    com.android.tools.r8.graph.DexEncodedMember asDexEncodedMember() -> i0
+    com.android.tools.r8.graph.DexEncodedMethod asDexEncodedMethod() -> j0
+    1:1:void clearAnnotations():40:40 -> k0
+    2:2:void setAnnotations(com.android.tools.r8.graph.DexAnnotationSet):48:48 -> k0
+    2:2:void clearAnnotations():40 -> k0
+    1:1:boolean hasAnnotations():25:25 -> l0
+    1:1:boolean hasAnyAnnotations():30:30 -> m0
+    boolean isDexClass() -> n0
+    boolean isDexEncodedField() -> o0
+    boolean isDexEncodedMember() -> p0
+    boolean isDexEncodedMethod() -> q0
+    boolean isStaticMember() -> r0
+    1:1:com.android.tools.r8.graph.DexType getContextType():149:149 -> y
+com.android.tools.r8.graph.DexDefinitionSupplier -> com.android.tools.r8.internal.wf:
     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
@@ -22466,7 +22586,7 @@
     1:1:void <clinit>():16:16 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationElement[]):29:29 -> <init>
     2:10:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationElement[]):23:31 -> <init>
-    com.android.tools.r8.utils.structural.StructuralItem self() -> K
+    com.android.tools.r8.utils.structural.StructuralItem self() -> L
     1:1:com.android.tools.r8.graph.DexType lambda$specify$0(com.android.tools.r8.graph.DexEncodedAnnotation):26:26 -> a
     2:2:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):26:26 -> a
     3:3:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):45:45 -> a
@@ -22497,15 +22617,15 @@
     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
     1:1:com.android.tools.r8.graph.DexAnnotationElement[] lambda$specify$1(com.android.tools.r8.graph.DexEncodedAnnotation):26:26 -> b
-    1:1:int getNumberOfElements():62:62 -> e0
     1:3:boolean equals(java.lang.Object):86:88 -> equals
-    1:2:void sort():94:95 -> f0
-    3:3:int sortedHashCode():106:106 -> f0
-    3:3:void sort():95 -> f0
-    4:9:void sort():95:100 -> f0
-    10:10:int sortedHashCode():106:106 -> f0
-    10:10:void sort():102 -> f0
-    11:11:void sort():102:102 -> f0
+    1:1:int getNumberOfElements():62:62 -> f0
+    1:2:void sort():94:95 -> g0
+    3:3:int sortedHashCode():106:106 -> g0
+    3:3:void sort():95 -> g0
+    4:9:void sort():95:100 -> g0
+    10:10:int sortedHashCode():106:106 -> g0
+    10:10:void sort():102 -> g0
+    11:11:void sort():102:102 -> g0
     1:1:int hashCode():78:78 -> hashCode
     1:1:com.android.tools.r8.graph.DexAnnotationElement getElement(int):58:58 -> i
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():41:41 -> n
@@ -22541,32 +22661,33 @@
     1:1:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessFlags,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexValue,com.android.tools.r8.androidapi.ComputedApiLevel,boolean,boolean,com.android.tools.r8.graph.DexEncodedField$1):32:32 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessFlags,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexValue,com.android.tools.r8.androidapi.ComputedApiLevel,boolean,boolean):70:70 -> <init>
     3:36:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessFlags,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexValue,com.android.tools.r8.androidapi.ComputedApiLevel,boolean,boolean):43:76 -> <init>
-    1:1:com.android.tools.r8.graph.DexEncodedField$Builder builder():355:355 -> A0
-    1:2:void clearStaticValue():253:254 -> B0
-    1:1:com.android.tools.r8.graph.FieldAccessFlags getAccessFlags():137:137 -> C0
-    1:1:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature getGenericSignature():341:341 -> D0
-    1:1:com.android.tools.r8.kotlin.KotlinFieldLevelInfo getKotlinInfo():127:127 -> E0
-    1:2:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo getMutableOptimizationInfo():116:117 -> F0
-    1:1:com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo getOptimizationInfo():107:107 -> G0
-    1:2:com.android.tools.r8.graph.DexValue getStaticValue():258:259 -> H0
-    1:2:boolean hasExplicitStaticValue():242:243 -> I0
-    1:1:boolean isDeprecated():94:94 -> J0
-    com.android.tools.r8.utils.structural.StructuralItem self() -> K
-    1:1:boolean isEnum():204:204 -> K0
-    2:2:boolean com.android.tools.r8.graph.FieldAccessFlags.isEnum():128:128 -> K0
-    2:2:boolean isEnum():204 -> K0
+    1:1:void clearGenericSignature():351:351 -> A
+    1:1:com.android.tools.r8.graph.DexEncodedField$Builder builder():355:355 -> B0
+    1:2:void clearStaticValue():253:254 -> C0
+    1:1:com.android.tools.r8.graph.FieldAccessFlags getAccessFlags():137:137 -> D0
+    1:1:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature getGenericSignature():341:341 -> E0
+    1:1:com.android.tools.r8.kotlin.KotlinFieldLevelInfo getKotlinInfo():127:127 -> F0
+    1:2:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo getMutableOptimizationInfo():116:117 -> G0
+    1:1:com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo getOptimizationInfo():107:107 -> H0
+    1:2:com.android.tools.r8.graph.DexValue getStaticValue():258:259 -> I0
+    1:2:boolean hasExplicitStaticValue():242:243 -> J0
+    1:1:boolean isDeprecated():94:94 -> K0
+    com.android.tools.r8.utils.structural.StructuralItem self() -> L
+    1:1:boolean isEnum():204:204 -> L0
+    2:2:boolean com.android.tools.r8.graph.FieldAccessFlags.isEnum():128:128 -> L0
+    2:2:boolean isEnum():204 -> L0
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1:1:boolean isInlinableByJavaC():371:371 -> L0
-    1:1:boolean isStatic():213:213 -> M0
-    1:1:boolean isVolatile():238:238 -> N0
-    2:2:boolean com.android.tools.r8.graph.FieldAccessFlags.isVolatile():112:112 -> N0
-    2:2:boolean isVolatile():238 -> N0
+    1:1:boolean isInlinableByJavaC():371:371 -> M0
+    1:1:boolean isStatic():213:213 -> N0
+    1:1:boolean isVolatile():238:238 -> O0
+    2:2:boolean com.android.tools.r8.graph.FieldAccessFlags.isVolatile():112:112 -> O0
+    2:2:boolean isVolatile():238 -> O0
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1:1:void markAsInlinableByJavaC():367:367 -> O0
-    1:1:com.android.tools.r8.kotlin.KotlinFieldLevelInfo getKotlinInfo():127:127 -> P
-    1:1:com.android.tools.r8.kotlin.KotlinMemberLevelInfo getKotlinInfo():32 -> P
-    1:1:com.android.tools.r8.graph.DexEncodedField$Builder syntheticBuilder():363:363 -> P0
-    1:1:com.android.tools.r8.graph.DexType type():90:90 -> Q0
+    1:1:void markAsInlinableByJavaC():367:367 -> 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.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
@@ -22609,23 +22730,22 @@
     1:1:com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo access$300(com.android.tools.r8.graph.DexEncodedField):32:32 -> 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 -> d0
-    com.android.tools.r8.graph.DexEncodedField asDexEncodedField() -> g0
+    1:1:java.lang.String toSourceString():162:162 -> e0
     1:1:com.android.tools.r8.graph.AccessFlags getAccessFlags():32:32 -> getAccessFlags
     1:1:com.android.tools.r8.graph.DexType getType():166:166 -> getType
+    com.android.tools.r8.graph.DexEncodedField asDexEncodedField() -> h0
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():81:81 -> n
-    1:1:boolean isStaticMember():230:230 -> q0
-    1:1:void clearKotlinInfo():132:132 -> r0
-    1:1:com.android.tools.r8.androidapi.ComputedApiLevel getApiLevel():112:112 -> s0
+    1:1:boolean isStaticMember():230:230 -> r0
+    1:1:void clearKotlinInfo():132:132 -> s0
+    1:1:com.android.tools.r8.androidapi.ComputedApiLevel getApiLevel():112:112 -> t0
     1:1:java.lang.String toString():0:0 -> toString
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":154,"2":155,"3":156}}
     154:154:java.lang.String toString():152:152 -> toString
     155:155:java.lang.String toString():152:152 -> toString
     156:156:java.lang.String toString():152:152 -> toString
     153:153:java.lang.String toString():152:152 -> toString
-    1:1:com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo getOptimizationInfo():107:107 -> w0
-    1:1:com.android.tools.r8.ir.optimize.info.MemberOptimizationInfo getOptimizationInfo():32 -> w0
-    1:1:void clearGenericSignature():351:351 -> z
+    1:1:com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo getOptimizationInfo():107:107 -> x0
+    1:1:com.android.tools.r8.ir.optimize.info.MemberOptimizationInfo getOptimizationInfo():32 -> x0
 com.android.tools.r8.graph.DexEncodedField$1 -> com.android.tools.r8.graph.l0:
 com.android.tools.r8.graph.DexEncodedField$Builder -> com.android.tools.r8.graph.m0:
     com.android.tools.r8.graph.DexAnnotationSet annotations -> b
@@ -22667,12 +22787,14 @@
     4:4:com.android.tools.r8.graph.DexEncodedField$Builder setDeprecated(boolean):470:470 -> b
     1:1:com.android.tools.r8.graph.DexEncodedField$Builder disableAndroidApiLevelCheckIf(boolean):480:480 -> c
     1:1:com.android.tools.r8.graph.DexEncodedField$Builder disableAndroidApiLevelCheck():475 -> c
-com.android.tools.r8.graph.DexEncodedMember -> com.android.tools.r8.internal.yf:
+com.android.tools.r8.graph.DexEncodedMember -> com.android.tools.r8.internal.xf:
     com.android.tools.r8.androidapi.ComputedApiLevel apiLevelForDefinition -> e
     boolean d8R8Synthesized -> d
     com.android.tools.r8.graph.DexMember reference -> f
     1:4:void <init>(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.DexAnnotationSet,boolean,com.android.tools.r8.androidapi.ComputedApiLevel):33:36 -> <init>
-    com.android.tools.r8.kotlin.KotlinMemberLevelInfo getKotlinInfo() -> P
+    void clearGenericSignature() -> A
+    1:1:boolean isPrivate():73:73 -> A0
+    com.android.tools.r8.kotlin.KotlinMemberLevelInfo getKotlinInfo() -> Q
     java.lang.Object apply(java.util.function.Function,java.util.function.Function) -> a
     1:1:void accept(java.util.function.Consumer,java.util.function.Consumer):83:83 -> a
     2:2:java.lang.Object lambda$accept$0(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField):85:85 -> a
@@ -22680,19 +22802,17 @@
     1:1:void setApiLevelForDefinition(com.android.tools.r8.androidapi.ComputedApiLevel):103:103 -> e
     1:2:boolean equals(java.lang.Object):115:116 -> equals
     1:1:com.android.tools.r8.graph.DexReference getReference():12:12 -> getReference
-    com.android.tools.r8.graph.DexEncodedMember asDexEncodedMember() -> h0
     1:1:int hashCode():121:121 -> hashCode
-    boolean isDexEncodedMember() -> o0
-    void clearKotlinInfo() -> r0
-    com.android.tools.r8.androidapi.ComputedApiLevel getApiLevel() -> s0
-    1:1:com.android.tools.r8.androidapi.ComputedApiLevel getApiLevelForDefinition():99:99 -> t0
-    1:1:com.android.tools.r8.graph.DexType getHolderType():46:46 -> u0
-    1:1:com.android.tools.r8.graph.DexString getName():50:50 -> v0
-    com.android.tools.r8.ir.optimize.info.MemberOptimizationInfo getOptimizationInfo() -> w0
-    1:1:com.android.tools.r8.graph.DexMember getReference():55:55 -> x0
-    1:1:boolean isD8R8Synthesized():59:59 -> y0
-    void clearGenericSignature() -> z
-    1:1:boolean isPrivate():73:73 -> z0
+    com.android.tools.r8.graph.DexEncodedMember asDexEncodedMember() -> i0
+    boolean isDexEncodedMember() -> p0
+    void clearKotlinInfo() -> s0
+    com.android.tools.r8.androidapi.ComputedApiLevel getApiLevel() -> t0
+    1:1:com.android.tools.r8.androidapi.ComputedApiLevel getApiLevelForDefinition():99:99 -> u0
+    1:1:com.android.tools.r8.graph.DexType getHolderType():46:46 -> v0
+    1:1:com.android.tools.r8.graph.DexString getName():50:50 -> w0
+    com.android.tools.r8.ir.optimize.info.MemberOptimizationInfo getOptimizationInfo() -> x0
+    1:1:com.android.tools.r8.graph.DexMember getReference():55:55 -> y0
+    1:1:boolean isD8R8Synthesized():59:59 -> z0
 com.android.tools.r8.graph.DexEncodedMethod -> com.android.tools.r8.graph.p0:
     com.android.tools.r8.graph.ParameterAnnotationsList parameterAnnotationsList -> i
     com.android.tools.r8.cf.CfVersion classFileVersion -> m
@@ -22715,54 +22835,58 @@
     1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,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,com.android.tools.r8.graph.DexEncodedMethod$1):95:95 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean,com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo,boolean):243:243 -> <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):160:256 -> <init>
-    1:1:boolean belongsToDirectPool():575:575 -> A0
-    2:2:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():215:215 -> A0
-    2:2:boolean belongsToDirectPool():575 -> A0
+    1:1:void clearGenericSignature():1322:1322 -> A
+    1:2:boolean isVirtualMethod():499:500 -> A1
+    3:3:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():215:215 -> A1
+    3:3:boolean isVirtualMethod():500 -> A1
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1:2:void markNotProcessed():719:720 -> A1
-    1:1:boolean belongsToVirtualPool():579:579 -> B0
-    1:2:java.lang.String qualifiedName():829:830 -> B1
-    1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder builder():1340:1340 -> C0
-    1:1:com.android.tools.r8.graph.DexType returnType():345:345 -> C1
-    1:1:void checkIfObsolete():181:181 -> D0
-    1:1:void setObsolete():193:193 -> D1
-    1:1:void clearApiLevelForCode():1275:1275 -> E0
-    1:1:boolean shouldNotHaveCode():789:789 -> E1
-    1:1:void clearAllAnnotations():857:857 -> F
-    2:2:void clearParameterAnnotations():872:872 -> F
-    2:2:void clearAllAnnotations():858 -> F
-    1:2:java.lang.String codeToString():1240:1241 -> F0
-    1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder syntheticBuilder():1332:1332 -> F1
-    1:2:java.lang.String descriptor():834:835 -> G0
-    1:2:void unsetCode():744:745 -> G1
-    1:1:com.android.tools.r8.graph.MethodAccessFlags getAccessFlags():198:198 -> H0
-    1:1:void unsetObsolete():227:227 -> H1
-    1:1:com.android.tools.r8.androidapi.ComputedApiLevel getApiLevelForCode():1271:1271 -> I0
-    1:3:com.android.tools.r8.cf.CfVersion getClassFileVersion():802:804 -> J0
-    com.android.tools.r8.utils.structural.StructuralItem self() -> K
-    1:2:com.android.tools.r8.graph.Code getCode():797:798 -> K0
-    1:1:com.android.tools.r8.graph.DexEncodedMethod$CompilationState getCompilationState():214:214 -> L0
-    1:3:com.android.tools.r8.graph.DexWritableCode getDexWritableCodeOrNull():1326:1328 -> M0
-    1:1:int getFirstNonReceiverArgumentIndex():206:206 -> N0
-    1:1:com.android.tools.r8.graph.GenericSignature$MethodTypeSignature getGenericSignature():1312:1312 -> O0
-    1:1:com.android.tools.r8.kotlin.KotlinMethodLevelInfo getKotlinInfo():584:584 -> P
-    1:1:com.android.tools.r8.kotlin.KotlinMemberLevelInfo getKotlinInfo():95 -> P
-    1:1:com.android.tools.r8.kotlin.KotlinMethodLevelInfo getKotlinInfo():584:584 -> P0
-    1:3:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo getMutableOptimizationInfo():1290:1292 -> Q0
-    1:1:int getNumberOfArguments():210:210 -> R0
-    2:2:int com.android.tools.r8.graph.DexMethod.getNumberOfArguments(boolean):82:82 -> R0
-    2:2:int getNumberOfArguments():210 -> R0
+    1:1:boolean belongsToDirectPool():575:575 -> B0
+    2:2:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():215:215 -> B0
+    2:2:boolean belongsToDirectPool():575 -> B0
       # {"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():1266:1267 -> S0
-    1:1:com.android.tools.r8.graph.ParameterAnnotationsList getParameterAnnotations():880:880 -> T0
-    1:1:java.util.Map getParameterInfo():765:765 -> U0
-    1:1:com.android.tools.r8.graph.DexTypeList getParameters():333:333 -> V0
-    1:1:com.android.tools.r8.graph.DexProto getProto():325:325 -> W0
-    1:1:com.android.tools.r8.graph.DexMethodSignature getSignature():341:341 -> X0
-    2:2:com.android.tools.r8.graph.DexMethodSignature com.android.tools.r8.graph.DexMethodSignature.create(com.android.tools.r8.graph.DexMethod):17:17 -> X0
-    2:2:com.android.tools.r8.graph.DexMethodSignature getSignature():341 -> X0
-    1:2:boolean hasClassFileVersion():812:813 -> Y0
-    1:1:boolean hasCode():793:793 -> Z0
+    1:2:void markNotProcessed():719:720 -> B1
+    1:1:boolean belongsToVirtualPool():579:579 -> C0
+    1:2:java.lang.String qualifiedName():829:830 -> C1
+    1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder builder():1340:1340 -> D0
+    1:1:com.android.tools.r8.graph.DexType returnType():345:345 -> D1
+    1:1:void checkIfObsolete():181:181 -> E0
+    1:1:void setObsolete():193:193 -> E1
+    1:1:void clearApiLevelForCode():1275:1275 -> F0
+    1:1:boolean shouldNotHaveCode():789:789 -> F1
+    1:1:void clearAllAnnotations():857:857 -> G
+    2:2:void clearParameterAnnotations():872:872 -> G
+    2:2:void clearAllAnnotations():858 -> G
+    1:2:java.lang.String codeToString():1240:1241 -> G0
+    1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder syntheticBuilder():1332:1332 -> G1
+    1:2:java.lang.String descriptor():834:835 -> H0
+    1:2:void unsetCode():744:745 -> H1
+    1:1:com.android.tools.r8.graph.MethodAccessFlags getAccessFlags():198:198 -> I0
+    1:1:void unsetObsolete():227:227 -> I1
+    1:1:com.android.tools.r8.androidapi.ComputedApiLevel getApiLevelForCode():1271:1271 -> J0
+    1:3:com.android.tools.r8.cf.CfVersion getClassFileVersion():802:804 -> K0
+    com.android.tools.r8.utils.structural.StructuralItem self() -> L
+    1:2:com.android.tools.r8.graph.Code getCode():797:798 -> L0
+    1:1:com.android.tools.r8.graph.DexEncodedMethod$CompilationState getCompilationState():214:214 -> M0
+    1:3:com.android.tools.r8.graph.DexWritableCode getDexWritableCodeOrNull():1326:1328 -> N0
+    1:1:int getFirstNonReceiverArgumentIndex():206:206 -> O0
+    1:1:com.android.tools.r8.graph.GenericSignature$MethodTypeSignature getGenericSignature():1312:1312 -> P0
+    1:1:com.android.tools.r8.kotlin.KotlinMethodLevelInfo getKotlinInfo():584:584 -> Q
+    1:1:com.android.tools.r8.kotlin.KotlinMemberLevelInfo getKotlinInfo():95 -> Q
+    1:1:com.android.tools.r8.kotlin.KotlinMethodLevelInfo getKotlinInfo():584:584 -> Q0
+    1:3:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo getMutableOptimizationInfo():1290:1292 -> R0
+    1:1:int getNumberOfArguments():210:210 -> S0
+    2:2:int com.android.tools.r8.graph.DexMethod.getNumberOfArguments(boolean):82:82 -> S0
+    2:2:int getNumberOfArguments():210 -> 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():1266:1267 -> T0
+    1:1:com.android.tools.r8.graph.ParameterAnnotationsList getParameterAnnotations():880:880 -> U0
+    1:1:java.util.Map getParameterInfo():765:765 -> V0
+    1:1:com.android.tools.r8.graph.DexTypeList getParameters():333:333 -> W0
+    1:1:com.android.tools.r8.graph.DexProto getProto():325:325 -> X0
+    1:1:com.android.tools.r8.graph.DexMethodSignature getSignature():341:341 -> Y0
+    2:2:com.android.tools.r8.graph.DexMethodSignature com.android.tools.r8.graph.DexMethodSignature.create(com.android.tools.r8.graph.DexMethod):17:17 -> Y0
+    2:2:com.android.tools.r8.graph.DexMethodSignature getSignature():341 -> Y0
+    1:2:boolean hasClassFileVersion():812:813 -> Z0
     1:1:com.android.tools.r8.cf.CfVersion access$200(com.android.tools.r8.graph.DexEncodedMethod):95:95 -> a
     2:2:com.android.tools.r8.graph.DexEncodedMethod$CompilationState access$402(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$CompilationState):95:95 -> a
     3:11:void syntheticSpecify(com.android.tools.r8.utils.structural.StructuralSpecification):280:288 -> a
@@ -22773,220 +22897,208 @@
     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):303 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    29:30:int compareCodeObject(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.Code,com.android.tools.r8.utils.structural.CompareToVisitor):305:306 -> a
-    31:44:int com.android.tools.r8.graph.DexWritableCode.acceptCompareTo(com.android.tools.r8.graph.DexWritableCode,com.android.tools.r8.utils.structural.CompareToVisitor):27:40 -> a
-    31:44:int compareCodeObject(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.Code,com.android.tools.r8.utils.structural.CompareToVisitor):306 -> a
+    29:32:int compareCodeObject(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.Code,com.android.tools.r8.utils.structural.CompareToVisitor):305:308 -> a
+    33:33:int compareCodeObject(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.Code,com.android.tools.r8.utils.structural.CompareToVisitor):300:300 -> a
+    34:38:void hashCodeObject(com.android.tools.r8.graph.Code,com.android.tools.r8.utils.structural.HashingVisitor):316:320 -> a
+    39:42:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):353:356 -> a
+    43:43:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):355:355 -> a
+    44:44:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":773,"2":774,"3":775}}
+    773:773:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):355:355 -> a
+    774:774:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):355:355 -> a
+    775:775:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):355:355 -> a
+    402:405:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):358:361 -> a
+    406:406:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):360:360 -> a
+    407:407:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":780,"2":781,"3":782}}
+    780:780:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):360:360 -> a
+    781:781:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):360:360 -> a
+    782:782:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):360:360 -> a
+    770:772:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):363:365 -> a
+    783:785:boolean isProgramMethod(com.android.tools.r8.graph.DexDefinitionSupplier):369:371 -> a
+    786:786:java.lang.Object apply(java.util.function.Function,java.util.function.Function):384:384 -> a
+    787:790:com.android.tools.r8.graph.DexClassAndMethod asDexClassAndMethod(com.android.tools.r8.graph.DexDefinitionSupplier):388:391 -> a
+    787:790:com.android.tools.r8.graph.DexClassAndMethod asDexClassAndMethodOrNull(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier):412 -> a
+    791:792:com.android.tools.r8.graph.ProgramMethod asProgramMethod(com.android.tools.r8.graph.DexProgramClass):397:398 -> a
+    793:793:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> a
+    793:793:com.android.tools.r8.graph.Code buildInstanceOfCode(com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.utils.InternalOptions):942 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    45:45:int com.android.tools.r8.graph.DexWritableCode.acceptCompareTo(com.android.tools.r8.graph.DexWritableCode,com.android.tools.r8.utils.structural.CompareToVisitor):34:34 -> a
-    45:45:int compareCodeObject(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.Code,com.android.tools.r8.utils.structural.CompareToVisitor):306 -> a
+    794:809:com.android.tools.r8.graph.CfCode buildInstanceOfCfCode(com.android.tools.r8.graph.DexType,boolean):948:963 -> a
+    794:809:com.android.tools.r8.graph.Code buildInstanceOfCode(com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.utils.InternalOptions):943 -> a
+    810:817:com.android.tools.r8.graph.DexCode buildInstanceOfDexCode(com.android.tools.r8.graph.DexType,boolean):967:974 -> a
+    810:817:com.android.tools.r8.graph.Code buildInstanceOfCode(com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.utils.InternalOptions):944 -> a
+    818:818:boolean isOrWillBeInlinedIntoInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):474:474 -> a
+    819:820:boolean willBeInlinedIntoInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):464:465 -> a
+    819:820:boolean isOrWillBeInlinedIntoInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):474 -> a
+    821:821:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):444:444 -> a
+    821:821:boolean willBeInlinedIntoInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):465 -> a
+    821:821:boolean isOrWillBeInlinedIntoInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):474 -> a
+    822:823:boolean willBeInlinedIntoInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):466:467 -> a
+    822:823:boolean isOrWillBeInlinedIntoInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):474 -> a
+    824:825:void setKotlinMemberInfo(com.android.tools.r8.kotlin.KotlinMethodLevelInfo):602:603 -> a
+    826:828: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):623:625 -> a
+    829:829: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):624:624 -> a
+    830:838: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):633:641 -> a
+    839:839: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":2262,"2":2263,"3":2264}}
+    2262:2262: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):641:641 -> a
+    2263:2263: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):641:641 -> a
+    2264: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):641:641 -> 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):641:688 -> 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":2311,"2":2312,"3":2313}}
+    2311:2311: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):688:688 -> a
+    2312:2312: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):688:688 -> a
+    2313:2313: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):688:688 -> a
+    2216:2216: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):688:688 -> a
+    2217:2220: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):673:676 -> a
+    2221:2224: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):666:669 -> a
+    2225:2228: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):659:662 -> a
+    2229:2261: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):652:684 -> a
+    2314:2333:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):693:712 -> a
+    2334:2334:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):709:709 -> a
+    2335:2335:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):706:706 -> a
+    2336:2336:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):703:703 -> a
+    2337:2337:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):700:700 -> a
+    2338:2356:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):697:715 -> a
+    2357:2360:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):724:727 -> a
+    2361:2361:boolean hasParameterInfo():761:761 -> a
+    2361:2361:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):727 -> a
+    2362:2363:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):727:728 -> a
+    2364:2365:void setParameterInfo(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):756:757 -> a
+    2364:2365:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):728 -> a
+    2366:2366:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):730:730 -> a
+    2367:2369: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):738:740 -> a
+    2370:2373:boolean keepLocals(com.android.tools.r8.utils.InternalOptions):749:752 -> a
+    2374:2375:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo getOptimizationInfo():1266:1267 -> a
+    2374:2375:boolean keepLocals(com.android.tools.r8.utils.InternalOptions):752 -> a
+    2376:2376:boolean keepLocals(com.android.tools.r8.utils.InternalOptions):752:752 -> a
+    2377:2377:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):776:776 -> a
+    2378:2380:void downgradeClassFileVersion(com.android.tools.r8.cf.CfVersion):823:825 -> a
+    2381:2381:java.lang.String descriptor(com.android.tools.r8.naming.NamingLens):839:839 -> a
+    2382:2382:java.lang.String descriptor(com.android.tools.r8.naming.NamingLens):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":3230,"2":3231,"3":3232}}
+    3230:3230:java.lang.String descriptor(com.android.tools.r8.naming.NamingLens):840:840 -> a
+    3231:3231:java.lang.String descriptor(com.android.tools.r8.naming.NamingLens):840:840 -> a
+    3232:3232:java.lang.String descriptor(com.android.tools.r8.naming.NamingLens):841:841 -> a
+    3224:3229:java.lang.String descriptor(com.android.tools.r8.naming.NamingLens):842:847 -> a
+    3233:3233:void rewriteAllAnnotations(java.util.function.BiFunction):865:865 -> a
+    3234:3238:void rewriteAllAnnotations(java.util.function.BiFunction):864:868 -> a
+    3239:3239:void setParameterAnnotations(com.android.tools.r8.graph.ParameterAnnotationsList):888:888 -> a
+    3239:3239:void rewriteAllAnnotations(java.util.function.BiFunction):866 -> a
+    3240:3240:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):892:892 -> a
+    3241:3241:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4210,"2":4211,"3":4212}}
+    4210:4210:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):893:893 -> a
+    4211:4211:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):893:893 -> a
+    4212:4212:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):894:894 -> a
+    4136:4138:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):895:897 -> a
+    4139:4139:java.lang.String com.android.tools.r8.graph.DexItem.toSmaliString():44:44 -> a
+    4139:4139:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):897 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    46:46:int compareCodeObject(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.Code,com.android.tools.r8.utils.structural.CompareToVisitor):308:308 -> a
-    47:47:int compareCodeObject(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.Code,com.android.tools.r8.utils.structural.CompareToVisitor):300:300 -> a
-    48:52:void hashCodeObject(com.android.tools.r8.graph.Code,com.android.tools.r8.utils.structural.HashingVisitor):316:320 -> a
-    53:56:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):353:356 -> a
-    57:57:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):355:355 -> a
-    58:58:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":787,"2":788,"3":789}}
-    787:787:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):355:355 -> a
-    788:788:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):355:355 -> a
-    789:789:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):355:355 -> a
-    416:419:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):358:361 -> a
-    420:420:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):360:360 -> a
-    421:421:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":794,"2":795,"3":796}}
-    794:794:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):360:360 -> a
-    795:795:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):360:360 -> a
-    796:796:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):360:360 -> a
-    784:786:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):363:365 -> a
-    797:799:boolean isProgramMethod(com.android.tools.r8.graph.DexDefinitionSupplier):369:371 -> a
-    800:800:java.lang.Object apply(java.util.function.Function,java.util.function.Function):384:384 -> a
-    801:804:com.android.tools.r8.graph.DexClassAndMethod asDexClassAndMethod(com.android.tools.r8.graph.DexDefinitionSupplier):388:391 -> a
-    801:804:com.android.tools.r8.graph.DexClassAndMethod asDexClassAndMethodOrNull(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier):412 -> a
-    805:806:com.android.tools.r8.graph.ProgramMethod asProgramMethod(com.android.tools.r8.graph.DexProgramClass):397:398 -> a
-    807:807:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():471:471 -> a
-    807:807:com.android.tools.r8.graph.Code buildInstanceOfCode(com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.utils.InternalOptions):942 -> a
+    4140:4141:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):897:898 -> a
+    4142:4142:java.lang.String com.android.tools.r8.graph.DexProto.toDescriptorString():118:118 -> a
+    4142:4142:java.lang.String com.android.tools.r8.graph.DexProto.toSmaliString():114 -> a
+    4142:4142:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):898 -> a
+    4143:4149:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):898:904 -> a
+    4150:4205:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):492:547 -> a
+    4150:4205:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):905 -> a
+    4206:4209:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):905:908 -> a
+    4213:4222:com.android.tools.r8.graph.DexCode generateCodeFromTemplate(int,int,com.android.tools.r8.code.Instruction[]):923:932 -> a
+    4223:4225:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):979:981 -> a
+    4226:4226:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> a
+    4226:4226:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):981 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    808:823:com.android.tools.r8.graph.CfCode buildInstanceOfCfCode(com.android.tools.r8.graph.DexType,boolean):948:963 -> a
-    808:823:com.android.tools.r8.graph.Code buildInstanceOfCode(com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.utils.InternalOptions):943 -> a
-    824:831:com.android.tools.r8.graph.DexCode buildInstanceOfDexCode(com.android.tools.r8.graph.DexType,boolean):967:974 -> a
-    824:831:com.android.tools.r8.graph.Code buildInstanceOfCode(com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.utils.InternalOptions):944 -> a
-    832:832:boolean isOrWillBeInlinedIntoInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):474:474 -> a
-    833:834:boolean willBeInlinedIntoInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):464:465 -> a
-    833:834:boolean isOrWillBeInlinedIntoInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):474 -> a
-    835:835:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):444:444 -> a
-    835:835:boolean willBeInlinedIntoInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):465 -> a
-    835:835:boolean isOrWillBeInlinedIntoInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):474 -> a
-    836:837:boolean willBeInlinedIntoInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):466:467 -> a
-    836:837:boolean isOrWillBeInlinedIntoInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):474 -> a
-    838:839:void setKotlinMemberInfo(com.android.tools.r8.kotlin.KotlinMethodLevelInfo):602:603 -> a
-    840:842: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):623:625 -> a
-    843:843: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):624:624 -> a
-    844:852: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):633:641 -> a
-    853:853: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":2276,"2":2277,"3":2278}}
-    2276:2276: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):641:641 -> a
-    2277:2277: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):641:641 -> a
-    2278:2278: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):641:641 -> a
-    1494:1541: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):641:688 -> a
-    1542:1542: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":2325,"2":2326,"3":2327}}
-    2325:2325: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):688:688 -> a
-    2326:2326: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):688:688 -> a
-    2327:2327: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):688:688 -> a
-    2230:2230: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):688:688 -> a
-    2231:2234: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):673:676 -> a
-    2235:2238: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):666:669 -> a
-    2239: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):659:662 -> a
-    2243:2275: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):652:684 -> a
-    2328:2347:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):693:712 -> a
-    2348:2348:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):709:709 -> a
-    2349:2349:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):706:706 -> a
-    2350:2350:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):703:703 -> a
-    2351:2351:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):700:700 -> a
-    2352:2370:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):697:715 -> a
-    2371:2374:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):724:727 -> a
-    2375:2375:boolean hasParameterInfo():761:761 -> a
-    2375:2375:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):727 -> a
-    2376:2377:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):727:728 -> a
-    2378:2379:void setParameterInfo(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):756:757 -> a
-    2378:2379:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):728 -> a
-    2380:2380:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):730:730 -> a
-    2381:2383: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):738:740 -> a
-    2384:2387:boolean keepLocals(com.android.tools.r8.utils.InternalOptions):749:752 -> a
-    2388:2389:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo getOptimizationInfo():1266:1267 -> a
-    2388:2389:boolean keepLocals(com.android.tools.r8.utils.InternalOptions):752 -> a
-    2390:2390:boolean keepLocals(com.android.tools.r8.utils.InternalOptions):752:752 -> a
-    2391:2391:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):776:776 -> a
-    2392:2394:void downgradeClassFileVersion(com.android.tools.r8.cf.CfVersion):823:825 -> a
-    2395:2395:java.lang.String descriptor(com.android.tools.r8.naming.NamingLens):839:839 -> a
-    2396:2396:java.lang.String descriptor(com.android.tools.r8.naming.NamingLens):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":3244,"2":3245,"3":3246}}
-    3244:3244:java.lang.String descriptor(com.android.tools.r8.naming.NamingLens):840:840 -> a
-    3245:3245:java.lang.String descriptor(com.android.tools.r8.naming.NamingLens):840:840 -> a
-    3246:3246:java.lang.String descriptor(com.android.tools.r8.naming.NamingLens):841:841 -> a
-    3238:3243:java.lang.String descriptor(com.android.tools.r8.naming.NamingLens):842:847 -> a
-    3247:3247:void rewriteAllAnnotations(java.util.function.BiFunction):865:865 -> a
-    3248:3252:void rewriteAllAnnotations(java.util.function.BiFunction):864:868 -> a
-    3253:3253:void setParameterAnnotations(com.android.tools.r8.graph.ParameterAnnotationsList):888:888 -> a
-    3253:3253:void rewriteAllAnnotations(java.util.function.BiFunction):866 -> a
-    3254:3254:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):892:892 -> a
-    3255:3255:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4224,"2":4225,"3":4226}}
-    4224:4224:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):893:893 -> a
-    4225:4225:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):893:893 -> a
-    4226:4226:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):894:894 -> a
-    4150:4152:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):895:897 -> a
-    4153:4153:java.lang.String com.android.tools.r8.graph.DexItem.toSmaliString():44:44 -> a
-    4153:4153:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):897 -> a
+    4227:4227:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):982:982 -> a
+    4228:4229:com.android.tools.r8.graph.CfCode toCfCodeThatLogsError(com.android.tools.r8.graph.DexItemFactory):1037:1038 -> a
+    4228:4229:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):982 -> a
+    4230:4230:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4327,"2":4328,"3":4329}}
+    4327:4327:com.android.tools.r8.graph.CfCode toCfCodeThatLogsError(com.android.tools.r8.graph.DexItemFactory):1039:1039 -> a
+    4327:4327:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):982 -> a
+    4328:4328:com.android.tools.r8.graph.CfCode toCfCodeThatLogsError(com.android.tools.r8.graph.DexItemFactory):1039:1039 -> a
+    4328:4328:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):982 -> a
+    4329:4329:com.android.tools.r8.graph.CfCode toCfCodeThatLogsError(com.android.tools.r8.graph.DexItemFactory):1039:1039 -> a
+    4329:4329:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):982 -> a
+    4231:4231:com.android.tools.r8.graph.CfCode toCfCodeThatLogsError(com.android.tools.r8.graph.DexItemFactory):1042:1042 -> a
+    4231:4231:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):982 -> a
+    4232:4243:com.android.tools.r8.graph.CfCode toCfCodeThatLogsError(com.android.tools.r8.graph.DexItemFactory):1040:1051 -> a
+    4232:4243:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):982 -> a
+    4244:4252:com.android.tools.r8.graph.CfCode toCfCodeThatLogsError(com.android.tools.r8.graph.DexItemFactory):1048:1056 -> a
+    4244:4252:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):982 -> a
+    4253:4261:com.android.tools.r8.graph.CfCode toCfCodeThatLogsError(com.android.tools.r8.graph.DexItemFactory):1053:1061 -> a
+    4253:4261:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):982 -> a
+    4262:4266:com.android.tools.r8.graph.CfCode toCfCodeThatLogsError(com.android.tools.r8.graph.DexItemFactory):1059:1063 -> a
+    4262:4266:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):982 -> a
+    4267:4268:boolean isStaticMember():562:563 -> a
+    4267:4268:com.android.tools.r8.graph.CfCode toCfCodeThatLogsError(com.android.tools.r8.graph.DexItemFactory):1064 -> a
+    4267:4268:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):982 -> a
+    4269:4288:com.android.tools.r8.graph.CfCode toCfCodeThatLogsError(com.android.tools.r8.graph.DexItemFactory):1068:1087 -> a
+    4269:4288:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):982 -> a
+    4289:4289:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):983:983 -> a
+    4290:4291:com.android.tools.r8.graph.DexCode toDexCodeThatLogsError(com.android.tools.r8.graph.DexItemFactory):1005:1006 -> a
+    4290:4291:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):983 -> a
+    4292:4292:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4330,"2":4331,"3":4332}}
+    4330:4330:com.android.tools.r8.graph.DexCode toDexCodeThatLogsError(com.android.tools.r8.graph.DexItemFactory):1007:1007 -> a
+    4330:4330:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):983 -> a
+    4331:4331:com.android.tools.r8.graph.DexCode toDexCodeThatLogsError(com.android.tools.r8.graph.DexItemFactory):1007:1007 -> a
+    4331:4331:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):983 -> a
+    4332:4332:com.android.tools.r8.graph.DexCode toDexCodeThatLogsError(com.android.tools.r8.graph.DexItemFactory):1007:1007 -> a
+    4332:4332:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):983 -> a
+    4293:4293:com.android.tools.r8.graph.DexCode toDexCodeThatLogsError(com.android.tools.r8.graph.DexItemFactory):1010:1010 -> a
+    4293:4293:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):983 -> a
+    4294:4304:com.android.tools.r8.graph.DexCode toDexCodeThatLogsError(com.android.tools.r8.graph.DexItemFactory):1008:1018 -> a
+    4294:4304:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):983 -> a
+    4305:4311:com.android.tools.r8.graph.DexCode toDexCodeThatLogsError(com.android.tools.r8.graph.DexItemFactory):1017:1023 -> a
+    4305:4311:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):983 -> a
+    4312:4316:com.android.tools.r8.graph.DexCode toDexCodeThatLogsError(com.android.tools.r8.graph.DexItemFactory):1021:1025 -> a
+    4312:4316:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):983 -> a
+    4317:4323:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):980:986 -> a
+    4324:4324:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):984:984 -> a
+    4325:4325:void setObsolete():193:193 -> a
+    4325:4325:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):987 -> a
+    4326:4326:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):988:988 -> a
+    4333:4337:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):992:996 -> a
+    4338:4343:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):995:1000 -> a
+    4344:4345:com.android.tools.r8.graph.DexEncodedMethod toTypeSubstitutedMethod(com.android.tools.r8.graph.DexMethod):1091:1092 -> a
+    4346:4363:com.android.tools.r8.graph.DexEncodedMethod toTypeSubstitutedMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):1096:1113 -> a
+    4364:4366:com.android.tools.r8.graph.DexEncodedMethod toRenamedHolderMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):1117:1119 -> a
+    4367:4382:com.android.tools.r8.graph.ProgramMethod toPrivateSyntheticMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):1123:1138 -> a
+    4383:4386:void lambda$toPrivateSyntheticMethod$5(com.android.tools.r8.graph.MethodAccessFlags):1133:1136 -> a
+    4387:4387:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1143:1143 -> a
+    4388:4388: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
+    4388:4388:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1143 -> a
+    4389:4395:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1144:1150 -> a
+    4396:4396:void com.android.tools.r8.graph.AccessFlags.demoteFromFinal():234:234 -> a
+    4396:4396:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1150 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4154:4155:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):897:898 -> a
-    4156:4156:java.lang.String com.android.tools.r8.graph.DexProto.toDescriptorString():118:118 -> a
-    4156:4156:java.lang.String com.android.tools.r8.graph.DexProto.toSmaliString():114 -> a
-    4156:4156:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):898 -> a
-    4157:4163:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):898:904 -> a
-    4164:4219:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):492:547 -> a
-    4164:4219:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):905 -> a
-    4220:4223:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):905:908 -> a
-    4227:4236:com.android.tools.r8.graph.DexCode generateCodeFromTemplate(int,int,com.android.tools.r8.code.Instruction[]):923:932 -> a
-    4237:4239:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):979:981 -> a
-    4240:4240:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():471:471 -> a
-    4240:4240:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):981 -> a
+    4397:4404:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1152:1159 -> a
+    4405:4434:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1158:1187 -> a
+    4435:4437:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1186:1188 -> a
+    4438:4443:void lambda$toForwardingMethod$8(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):1162:1167 -> a
+    4444:4462:void lambda$toForwardingMethod$8(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):1166:1184 -> a
+    4463:4485:void lambda$toForwardingMethod$8(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):1163:1185 -> a
+    4486:4491:void lambda$toForwardingMethod$6(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.synthetic.ForwardMethodBuilder):1170:1175 -> a
+    4492:4492:boolean com.android.tools.r8.graph.DexType.isInterface(com.android.tools.r8.graph.DexDefinitionSupplier):366:366 -> a
+    4492:4492:void lambda$toForwardingMethod$6(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.synthetic.ForwardMethodBuilder):1175 -> a
+    4493:4493:void lambda$toForwardingMethod$6(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.synthetic.ForwardMethodBuilder):1171:1171 -> a
+    4494:4501:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1193:1200 -> a
+    4502:4502:void com.android.tools.r8.graph.MethodAccessFlags.unsetAbstract():195:195 -> a
+    4502:4502:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1201 -> a
+    4503:4512:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1204:1213 -> a
+    4513:4519:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1209:1215 -> a
+    4520:4520:com.android.tools.r8.androidapi.ComputedApiLevel getApiLevelForCode():1271:1271 -> a
+    4520:4520:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1215 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4241:4241:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):982:982 -> a
-    4242:4243:com.android.tools.r8.graph.CfCode toCfCodeThatLogsError(com.android.tools.r8.graph.DexItemFactory):1037:1038 -> a
-    4242:4243:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):982 -> a
-    4244:4244:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4341,"2":4342,"3":4343}}
-    4341:4341:com.android.tools.r8.graph.CfCode toCfCodeThatLogsError(com.android.tools.r8.graph.DexItemFactory):1039:1039 -> a
-    4341:4341:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):982 -> a
-    4342:4342:com.android.tools.r8.graph.CfCode toCfCodeThatLogsError(com.android.tools.r8.graph.DexItemFactory):1039:1039 -> a
-    4342:4342:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):982 -> a
-    4343:4343:com.android.tools.r8.graph.CfCode toCfCodeThatLogsError(com.android.tools.r8.graph.DexItemFactory):1039:1039 -> a
-    4343:4343:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):982 -> a
-    4245:4245:com.android.tools.r8.graph.CfCode toCfCodeThatLogsError(com.android.tools.r8.graph.DexItemFactory):1042:1042 -> a
-    4245:4245:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):982 -> a
-    4246:4257:com.android.tools.r8.graph.CfCode toCfCodeThatLogsError(com.android.tools.r8.graph.DexItemFactory):1040:1051 -> a
-    4246:4257:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):982 -> a
-    4258:4266:com.android.tools.r8.graph.CfCode toCfCodeThatLogsError(com.android.tools.r8.graph.DexItemFactory):1048:1056 -> a
-    4258:4266:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):982 -> a
-    4267:4275:com.android.tools.r8.graph.CfCode toCfCodeThatLogsError(com.android.tools.r8.graph.DexItemFactory):1053:1061 -> a
-    4267:4275:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):982 -> a
-    4276:4280:com.android.tools.r8.graph.CfCode toCfCodeThatLogsError(com.android.tools.r8.graph.DexItemFactory):1059:1063 -> a
-    4276:4280:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):982 -> a
-    4281:4282:boolean isStaticMember():562:563 -> a
-    4281:4282:com.android.tools.r8.graph.CfCode toCfCodeThatLogsError(com.android.tools.r8.graph.DexItemFactory):1064 -> a
-    4281:4282:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):982 -> a
-    4283:4302:com.android.tools.r8.graph.CfCode toCfCodeThatLogsError(com.android.tools.r8.graph.DexItemFactory):1068:1087 -> a
-    4283:4302:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):982 -> a
-    4303:4303:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):983:983 -> a
-    4304:4305:com.android.tools.r8.graph.DexCode toDexCodeThatLogsError(com.android.tools.r8.graph.DexItemFactory):1005:1006 -> a
-    4304:4305:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):983 -> a
-    4306:4306:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4344,"2":4345,"3":4346}}
-    4344:4344:com.android.tools.r8.graph.DexCode toDexCodeThatLogsError(com.android.tools.r8.graph.DexItemFactory):1007:1007 -> a
-    4344:4344:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):983 -> a
-    4345:4345:com.android.tools.r8.graph.DexCode toDexCodeThatLogsError(com.android.tools.r8.graph.DexItemFactory):1007:1007 -> a
-    4345:4345:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):983 -> a
-    4346:4346:com.android.tools.r8.graph.DexCode toDexCodeThatLogsError(com.android.tools.r8.graph.DexItemFactory):1007:1007 -> a
-    4346:4346:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):983 -> a
-    4307:4307:com.android.tools.r8.graph.DexCode toDexCodeThatLogsError(com.android.tools.r8.graph.DexItemFactory):1010:1010 -> a
-    4307:4307:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):983 -> a
-    4308:4318:com.android.tools.r8.graph.DexCode toDexCodeThatLogsError(com.android.tools.r8.graph.DexItemFactory):1008:1018 -> a
-    4308:4318:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):983 -> a
-    4319:4325:com.android.tools.r8.graph.DexCode toDexCodeThatLogsError(com.android.tools.r8.graph.DexItemFactory):1017:1023 -> a
-    4319:4325:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):983 -> a
-    4326:4330:com.android.tools.r8.graph.DexCode toDexCodeThatLogsError(com.android.tools.r8.graph.DexItemFactory):1021:1025 -> a
-    4326:4330:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):983 -> a
-    4331:4337:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):980:986 -> a
-    4338:4338:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):984:984 -> a
-    4339:4339:void setObsolete():193:193 -> a
-    4339:4339:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):987 -> a
-    4340:4340:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):988:988 -> a
-    4347:4351:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):992:996 -> a
-    4352:4357:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):995:1000 -> a
-    4358:4359:com.android.tools.r8.graph.DexEncodedMethod toTypeSubstitutedMethod(com.android.tools.r8.graph.DexMethod):1091:1092 -> a
-    4360:4377:com.android.tools.r8.graph.DexEncodedMethod toTypeSubstitutedMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):1096:1113 -> a
-    4378:4380:com.android.tools.r8.graph.DexEncodedMethod toRenamedHolderMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):1117:1119 -> a
-    4381:4385:com.android.tools.r8.graph.ProgramMethod toPrivateSyntheticMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):1123:1127 -> a
-    4386:4386:com.android.tools.r8.graph.DexEncodedMethod$Builder syntheticBuilder(com.android.tools.r8.graph.DexEncodedMethod):1336:1336 -> a
-    4386:4386:com.android.tools.r8.graph.ProgramMethod toPrivateSyntheticMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):1129 -> a
-    4387:4395:com.android.tools.r8.graph.ProgramMethod toPrivateSyntheticMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):1130:1138 -> a
-    4396:4399:void lambda$toPrivateSyntheticMethod$5(com.android.tools.r8.graph.MethodAccessFlags):1133:1136 -> a
-    4400:4400:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1143:1143 -> a
-    4401:4401: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
-    4401:4401:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1143 -> a
-    4402:4408:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1144:1150 -> a
-    4409:4409:void com.android.tools.r8.graph.AccessFlags.demoteFromFinal():234:234 -> a
-    4409:4409:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1150 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4410:4410:com.android.tools.r8.graph.DexEncodedMethod$Builder syntheticBuilder(com.android.tools.r8.graph.DexEncodedMethod):1336:1336 -> a
-    4410:4410:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1152 -> a
-    4411:4417:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1153:1159 -> a
-    4418:4447:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1158:1187 -> a
-    4448:4450:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1186:1188 -> a
-    4451:4456:void lambda$toForwardingMethod$8(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):1162:1167 -> a
-    4457:4475:void lambda$toForwardingMethod$8(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):1166:1184 -> a
-    4476:4498:void lambda$toForwardingMethod$8(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):1163:1185 -> a
-    4499:4504:void lambda$toForwardingMethod$6(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.synthetic.ForwardMethodBuilder):1170:1175 -> a
-    4505:4505:boolean com.android.tools.r8.graph.DexType.isInterface(com.android.tools.r8.graph.DexDefinitionSupplier):366:366 -> a
-    4505:4505:void lambda$toForwardingMethod$6(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.synthetic.ForwardMethodBuilder):1175 -> a
-    4506:4506:void lambda$toForwardingMethod$6(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.synthetic.ForwardMethodBuilder):1171:1171 -> a
-    4507:4514:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1193:1200 -> a
-    4515:4515:void com.android.tools.r8.graph.MethodAccessFlags.unsetAbstract():195:195 -> a
-    4515:4515:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1201 -> a
-    4516:4525:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1204:1213 -> a
-    4526:4532:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1209:1215 -> a
-    4533:4533:com.android.tools.r8.androidapi.ComputedApiLevel getApiLevelForCode():1271:1271 -> a
-    4533:4533:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1215 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4534:4535:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1215:1216 -> a
-    4536:4537:void setOptimizationInfo(com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo):1297:1298 -> a
-    4538:4542:void copyMetadata(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):1302:1306 -> a
-    4543:4543:com.android.tools.r8.androidapi.ComputedApiLevel getApiLevelForCode():1271:1271 -> a
-    4543:4543:void copyMetadata(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):1307 -> a
-    4544:4544:void copyMetadata(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):1307:1307 -> a
-    4545:4546:void setGenericSignature(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature):1316:1317 -> a
-    1:1:boolean hasParameterInfo():761:761 -> a1
+    4521:4522:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1215:1216 -> a
+    4523:4524:void setOptimizationInfo(com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo):1297:1298 -> a
+    4525:4529:void copyMetadata(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):1302:1306 -> a
+    4530:4530:com.android.tools.r8.androidapi.ComputedApiLevel getApiLevelForCode():1271:1271 -> a
+    4530:4530:void copyMetadata(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):1307 -> a
+    4531:4531:void copyMetadata(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):1307:1307 -> a
+    4532:4533:void setGenericSignature(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature):1316:1317 -> a
+    1:1:boolean hasCode():793:793 -> a1
     1:2:com.android.tools.r8.graph.ProgramMethod asProgramMethod(com.android.tools.r8.graph.DexDefinitionSupplier):402:403 -> b
     1:2:com.android.tools.r8.graph.ProgramMethod asProgramMethodOrNull(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier):417 -> b
     3:3:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89:89 -> b
@@ -23014,55 +23126,56 @@
     46:46:void setObsolete():193:193 -> b
     46:46:com.android.tools.r8.graph.DexEncodedMethod toStaticMethodWithoutThis(com.android.tools.r8.graph.AppView):1235 -> b
     47:47:com.android.tools.r8.graph.DexEncodedMethod$Builder builder(com.android.tools.r8.graph.DexEncodedMethod):1344:1344 -> b
-    1:1:boolean isAbstract():426:426 -> b1
+    1:1:boolean hasParameterInfo():761:761 -> b1
     1:1:com.android.tools.r8.graph.ParameterAnnotationsList lambda$syntheticSpecify$0(com.android.tools.r8.graph.DexEncodedMethod):283:283 -> c
     2:2:com.android.tools.r8.graph.DexAnnotation lambda$rewriteAllAnnotations$4(java.util.function.BiFunction,com.android.tools.r8.graph.DexAnnotation):868:868 -> c
-    1:1:boolean isBridge():430:430 -> c1
+    1:1:boolean isAbstract():426:426 -> c1
     1:1:com.android.tools.r8.cf.CfVersion lambda$syntheticSpecify$1(com.android.tools.r8.graph.DexEncodedMethod):284:284 -> d
-    1:2:java.lang.String toSourceString():913:914 -> d0
-    1:2:boolean isClassInitializer():483:484 -> d1
-    3:3:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():215:215 -> d1
-    3:3:boolean isClassInitializer():484 -> d1
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4:4:boolean isClassInitializer():484:484 -> d1
+    1:1:boolean isBridge():430:430 -> d1
     1:1:boolean lambda$syntheticSpecify$2(com.android.tools.r8.graph.DexEncodedMethod):287:287 -> e
-    1:2:boolean isDefaultInitializer():478:479 -> e1
+    1:2:java.lang.String toSourceString():913:914 -> e0
+    1:2:boolean isClassInitializer():483:484 -> e1
+    3:3:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():215:215 -> e1
+    3:3:boolean isClassInitializer():484 -> e1
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    4:4:boolean isClassInitializer():484:484 -> e1
     1:2:void setApiLevelForCode(com.android.tools.r8.androidapi.ComputedApiLevel):1279:1280 -> f
-    1:1:boolean isDefaultMethod():489:489 -> f1
-    1:1:boolean isDeprecated():264:264 -> g1
+    3:3:com.android.tools.r8.graph.DexEncodedMethod$Builder syntheticBuilder(com.android.tools.r8.graph.DexEncodedMethod):1336:1336 -> f
+    1:2:boolean isDefaultInitializer():478:479 -> f1
+    1:1:boolean isDefaultMethod():489:489 -> g1
     1:1:com.android.tools.r8.graph.AccessFlags getAccessFlags():95:95 -> getAccessFlags
-    1:2:boolean isDirectMethod():546:547 -> h1
-    3:3:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():215:215 -> h1
-    3:3:boolean isDirectMethod():547 -> h1
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4:4:boolean isDirectMethod():547:547 -> h1
+    1:1:boolean isDeprecated():264:264 -> h1
     1:1:com.android.tools.r8.graph.DexType getArgumentType(int):202:202 -> i
-    1:1:com.android.tools.r8.graph.DexEncodedMethod asDexEncodedMethod():1256:1256 -> i0
-    1:1:boolean isFinal():434:434 -> i1
-    1:1:com.android.tools.r8.graph.DexAnnotationSet getParameterAnnotation(int):876:876 -> j
-    1:2:boolean isInitializer():450:451 -> j1
-    1:2:boolean isInstanceInitializer():455:456 -> k1
-    3:3:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():215:215 -> k1
-    3:3:boolean isInstanceInitializer():456 -> k1
+    1:2:boolean isDirectMethod():546:547 -> i1
+    3:3:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():215:215 -> i1
+    3:3:boolean isDirectMethod():547 -> i1
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4:4:boolean isInstanceInitializer():456:456 -> k1
-    1:1:boolean hasAnyAnnotations():852:852 -> l0
-    2:2:boolean hasParameterAnnotations():884:884 -> l0
-    2:2:boolean hasAnyAnnotations():852 -> l0
-    1:1:com.android.tools.r8.utils.OptionalBool isLibraryMethodOverride():349:349 -> l1
-    1:1:boolean isNative():438:438 -> m1
+    4:4:boolean isDirectMethod():547:547 -> i1
+    1:1:com.android.tools.r8.graph.DexAnnotationSet getParameterAnnotation(int):876:876 -> j
+    1:1:com.android.tools.r8.graph.DexEncodedMethod asDexEncodedMethod():1256:1256 -> j0
+    1:1:boolean isFinal():434:434 -> j1
+    1:2:boolean isInitializer():450:451 -> k1
+    1:2:boolean isInstanceInitializer():455:456 -> l1
+    3:3:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():215:215 -> l1
+    3:3:boolean isInstanceInitializer():456 -> l1
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    4:4:boolean isInstanceInitializer():456:456 -> l1
+    1:1:boolean hasAnyAnnotations():852:852 -> m0
+    2:2:boolean hasParameterAnnotations():884:884 -> m0
+    2:2:boolean hasAnyAnnotations():852 -> m0
+    1:1:com.android.tools.r8.utils.OptionalBool isLibraryMethodOverride():349:349 -> m1
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():274:274 -> n
-    1:2:boolean isNonAbstractNonNativeMethod():518:519 -> n1
-    1:2:boolean isNonAbstractVirtualMethod():513:514 -> o1
-    1:1:boolean isDexEncodedMethod():1250:1250 -> p0
-    1:2:boolean isNonPrivateVirtualMethod():504:505 -> p1
-    1:2:boolean isStaticMember():562:563 -> q0
-    1:1:boolean isObsolete():187:187 -> q1
-    1:1:void clearKotlinInfo():589:589 -> r0
-    1:1:boolean isOnlyInlinedIntoNestMembers():615:615 -> r1
-    1:2:com.android.tools.r8.androidapi.ComputedApiLevel getApiLevel():1285:1286 -> s0
-    1:2:boolean isPrivateMethod():538:539 -> s1
-    1:2:boolean isProcessed():421:422 -> t1
+    1:1:boolean isNative():438:438 -> n1
+    1:2:boolean isNonAbstractNonNativeMethod():518:519 -> o1
+    1:2:boolean isNonAbstractVirtualMethod():513:514 -> p1
+    1:1:boolean isDexEncodedMethod():1250:1250 -> q0
+    1:2:boolean isNonPrivateVirtualMethod():504:505 -> q1
+    1:2:boolean isStaticMember():562:563 -> r0
+    1:1:boolean isObsolete():187:187 -> r1
+    1:1:void clearKotlinInfo():589:589 -> s0
+    1:1:boolean isOnlyInlinedIntoNestMembers():615:615 -> s1
+    1:2:com.android.tools.r8.androidapi.ComputedApiLevel getApiLevel():1285:1286 -> t0
+    1:2:boolean isPrivateMethod():538:539 -> t1
     1:1:java.lang.String toString():770:770 -> toString
     2:2:java.lang.String toString():0:0 -> toString
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":774,"2":775,"3":776}}
@@ -23070,18 +23183,14 @@
     775:775:java.lang.String toString():771:771 -> toString
     776:776:java.lang.String toString():771:771 -> toString
     773:773:java.lang.String toString():771:771 -> toString
-    1:2:boolean isPublicMethod():528:529 -> u1
-    1:2:boolean isPublicized():523:524 -> v1
-    1:2:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo getOptimizationInfo():1266:1267 -> w0
-    1:2:com.android.tools.r8.ir.optimize.info.MemberOptimizationInfo getOptimizationInfo():95 -> w0
-    1:2:boolean isStatic():556:557 -> w1
-    1:1:boolean isSynchronized():446:446 -> x1
-    1:2:boolean isSyntheticMethod():570:571 -> y1
-    1:1:void clearGenericSignature():1322:1322 -> z
-    1:2:boolean isVirtualMethod():499:500 -> z1
-    3:3:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():215:215 -> z1
-    3:3:boolean isVirtualMethod():500 -> z1
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    1:2:boolean isProcessed():421:422 -> u1
+    1:2:boolean isPublicMethod():528:529 -> v1
+    1:2:boolean isPublicized():523:524 -> w1
+    1:2:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo getOptimizationInfo():1266:1267 -> x0
+    1:2:com.android.tools.r8.ir.optimize.info.MemberOptimizationInfo getOptimizationInfo():95 -> x0
+    1:2:boolean isStatic():556:557 -> x1
+    1:1:boolean isSynchronized():446:446 -> y1
+    1:2:boolean isSyntheticMethod():570:571 -> z1
 com.android.tools.r8.graph.DexEncodedMethod$1 -> com.android.tools.r8.graph.o0:
     int[] $SwitchMap$com$android$tools$r8$ir$optimize$Inliner$Constraint -> b
     int[] $SwitchMap$com$android$tools$r8$graph$DexEncodedMethod$CompilationState -> a
@@ -23177,7 +23286,7 @@
     1549:1549:com.android.tools.r8.graph.DexEncodedMethod$Builder withoutThisParameter():1541:1541 -> h
     1550:1550:com.android.tools.r8.graph.DexEncodedMethod$Builder withoutThisParameter():1541:1541 -> h
     1547:1547:com.android.tools.r8.graph.DexEncodedMethod$Builder withoutThisParameter():1541:1541 -> h
-com.android.tools.r8.graph.DexEncodedMethod$CompilationState$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.zf:
+com.android.tools.r8.graph.DexEncodedMethod$CompilationState$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.yf:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     java.lang.String stringValueOf(int) -> a
@@ -23191,7 +23300,7 @@
     38:38:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,boolean):30:30 -> <init>
     39:39:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,boolean):30:30 -> <init>
     36:36:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,boolean):31:31 -> <init>
-    com.android.tools.r8.utils.structural.StructuralItem self() -> K
+    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):22:22 -> a
     2:2:int acceptCompareTo(com.android.tools.r8.graph.DexField,com.android.tools.r8.utils.structural.CompareToVisitor):176:176 -> a
     2:2:int acceptCompareTo(com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.CompareToVisitor):22 -> a
@@ -23245,16 +23354,16 @@
     3:3:com.android.tools.r8.graph.DexClassAndField com.android.tools.r8.graph.DexClass.lookupClassField(com.android.tools.r8.graph.DexField):535 -> b
     3:3:com.android.tools.r8.graph.DexClassAndField lookupMemberOnClass(com.android.tools.r8.graph.DexClass):84 -> b
     1:1:com.android.tools.r8.graph.DexEncodedField lookupOnClass(com.android.tools.r8.graph.DexClass):79:79 -> c
-    1:1:java.lang.String toSmaliString():195:195 -> c0
-    1:1:java.lang.String toSourceString():200:200 -> d0
-    1:3:int computeHashCode():124:126 -> e0
-    com.android.tools.r8.graph.DexField asDexField() -> f0
+    1:1:java.lang.String toSmaliString():195:195 -> d0
+    1:1:java.lang.String toSourceString():200:200 -> e0
+    1:3:int computeHashCode():124:126 -> f0
     1:5:boolean computeEquals(java.lang.Object):131:135 -> g
+    com.android.tools.r8.graph.DexField asDexField() -> g0
     1:1:com.android.tools.r8.graph.DexType getType():70:70 -> getType
-    boolean isDexField() -> j0
+    boolean isDexField() -> k0
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():66:66 -> n
-    1:1:java.lang.Iterable getReferencedTypes():171:171 -> o0
-    1:5:com.android.tools.r8.references.FieldReference asFieldReference():217:217 -> p0
+    1:1:java.lang.Iterable getReferencedTypes():171:171 -> q0
+    1:5:com.android.tools.r8.references.FieldReference asFieldReference():217:217 -> r0
     1:1:java.lang.String toString():0:0 -> toString
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":144,"2":145,"3":146}}
     144:144:java.lang.String toString():142:142 -> toString
@@ -23270,332 +23379,332 @@
     5:5:void lambda$collectAll$0(com.android.tools.r8.dex.MixedSectionCollection,com.android.tools.r8.graph.DexItem):14:14 -> a
     6:6:void collectAll(com.android.tools.r8.dex.MixedSectionCollection,java.util.Collection):19:19 -> a
     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 -> c0
-    1:1:java.lang.String toSourceString():48:48 -> d0
+    1:1:java.lang.String toSmaliString():44:44 -> d0
+    1:1:java.lang.String toSourceString():48:48 -> e0
 com.android.tools.r8.graph.DexItemFactory -> com.android.tools.r8.graph.v0:
     com.android.tools.r8.graph.DexString assertionErrorDescriptor -> A0
     com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods serviceLoaderMethods -> M4
     com.android.tools.r8.graph.DexString equalsMethodName -> Q
     com.android.tools.r8.graph.DexString throwableArrayDescriptor -> b1
-    com.android.tools.r8.graph.DexType streamType -> F2
-    com.android.tools.r8.graph.DexType javaNioByteOrderType -> g3
-    com.android.tools.r8.graph.DexType byteType -> f1
+    com.android.tools.r8.graph.DexType optionalLongType -> F2
+    com.android.tools.r8.graph.DexType javaIoFileType -> g3
+    com.android.tools.r8.graph.DexType booleanType -> f1
     com.android.tools.r8.graph.DexType serializableType -> G4
     com.android.tools.r8.graph.DexString constructorDescriptor -> I0
     java.util.Set libraryMethodsWithReturnValueDependingOnlyOnArguments -> W4
     com.android.tools.r8.graph.DexString getDeclaredConstructorName -> r0
     com.android.tools.r8.graph.DexString longDescriptor -> A
     java.util.Map types -> c
-    com.android.tools.r8.graph.DexType dalvikFastNativeAnnotation -> x4
-    com.android.tools.r8.graph.DexType classType -> V1
-    com.android.tools.r8.graph.DexType collectionType -> w2
+    com.android.tools.r8.kotlin.Kotlin kotlin -> b4
+    com.android.tools.r8.graph.DexType annotationCovariantReturnTypes -> x4
+    com.android.tools.r8.graph.DexType referenceFieldUpdaterType -> V1
+    com.android.tools.r8.graph.DexType abstractMapSimpleEntryType -> w2
+    com.android.tools.r8.graph.DexItemFactory$CharMembers charMembers -> E3
+    com.android.tools.r8.graph.DexProto deserializeLambdaMethodProto -> l4
     com.android.tools.r8.graph.DexString invokeExactMethodName -> z0
-    com.android.tools.r8.graph.DexType annotationMethodParameters -> p4
-    com.android.tools.r8.graph.DexType enumType -> N1
-    com.android.tools.r8.graph.DexType proxyType -> o2
-    com.android.tools.r8.graph.DexType charSequenceArrayType -> F1
+    com.android.tools.r8.graph.DexType annotationInnerClass -> p4
+    com.android.tools.r8.graph.DexType classArrayType -> N1
+    com.android.tools.r8.graph.DexType invocationHandlerType -> o2
+    com.android.tools.r8.graph.DexType charSequenceType -> F1
     com.android.tools.r8.graph.DexString substringName -> a0
-    com.android.tools.r8.graph.DexItemFactory$ShortMembers shortMembers -> K3
     com.android.tools.r8.graph.DexString hashCodeMethodName -> R
-    java.util.List libraryMembersCollection -> e4
-    com.android.tools.r8.graph.DexType javaLangAnnotationRetentionPolicyType -> g2
+    com.android.tools.r8.graph.DexType stringBufferType -> g2
+    com.android.tools.r8.graph.DexItemFactory$StringMembers stringMembers -> N3
     com.android.tools.r8.graph.DexString finalizeMethodName -> i0
     boolean $assertionsDisabled -> d5
     com.android.tools.r8.graph.DexMethod metafactoryAltMethod -> R4
-    com.android.tools.r8.graph.DexType boxedByteType -> w1
+    com.android.tools.r8.graph.DexType boxedBooleanType -> w1
     com.android.tools.r8.graph.DexString intFieldUpdaterDescriptor -> Q0
     com.android.tools.r8.graph.DexString shortDescriptor -> B
     java.util.Map fields -> d
-    com.android.tools.r8.graph.DexType longSummaryStatisticsConversionsType -> W2
-    com.android.tools.r8.graph.DexType androidUtilSparseArrayType -> x3
-    com.android.tools.r8.graph.DexType byteArrayType -> o1
+    com.android.tools.r8.graph.DexType doubleSummaryStatisticsConversionsType -> W2
+    com.android.tools.r8.graph.DexType androidUtilPropertyType -> x3
+    com.android.tools.r8.graph.DexType booleanArrayType -> o1
     com.android.tools.r8.graph.DexString lambdaInstanceFieldName -> Y0
-    com.android.tools.r8.graph.DexType illegalAccessErrorType -> O2
-    com.android.tools.r8.graph.DexType androidOsBuildType -> p3
-    com.android.tools.r8.graph.DexType booleanType -> e1
+    com.android.tools.r8.graph.DexType throwableType -> O2
+    com.android.tools.r8.graph.DexType javaUtilLoggingLoggerType -> p3
     com.android.tools.r8.graph.DexString identityHashCodeName -> S
-    com.android.tools.r8.graph.DexType javaMathBigIntegerType -> f3
-    com.android.tools.r8.graph.DexType optionalLongType -> E2
+    com.android.tools.r8.graph.DexType timeConversionsJ$Type -> f3
+    com.android.tools.r8.graph.DexType optionalIntType -> E2
     com.android.tools.r8.graph.DexString classArrayDescriptor -> H0
     com.android.tools.r8.graph.DexType enumerationType -> F4
+    com.android.tools.r8.graph.DexItemFactory$ByteMembers byteMembers -> D3
     java.util.Set libraryMethodsReturningNonNull -> V4
     com.android.tools.r8.graph.DexString npeDescriptor -> P0
     com.android.tools.r8.graph.DexString getTypeNameName -> q0
-    com.android.tools.r8.graph.DexType referenceFieldUpdaterType -> U1
-    com.android.tools.r8.graph.DexType abstractMapSimpleEntryType -> v2
+    com.android.tools.r8.graph.DexType strictMathType -> U1
+    com.android.tools.r8.graph.DexType mapEntryType -> v2
     com.android.tools.r8.graph.DexString voidDescriptor -> C
-    com.android.tools.r8.graph.DexType annotationReachabilitySensitive -> w4
+    com.android.tools.r8.graph.DexType annotationCovariantReturnType -> w4
+    com.android.tools.r8.graph.DexItemFactory$FloatMembers floatMembers -> F3
     com.android.tools.r8.graph.DexString invokeMethodName -> y0
-    com.android.tools.r8.graph.DexType classArrayType -> M1
-    com.android.tools.r8.graph.DexType invocationHandlerType -> n2
+    com.android.tools.r8.graph.DexType objectArrayType -> M1
+    com.android.tools.r8.graph.DexType methodTypeType -> n2
     java.util.Map protos -> e
-    com.android.tools.r8.graph.DexType annotationMemberClasses -> o4
+    com.android.tools.r8.graph.DexType annotationEnclosingMethod -> o4
     com.android.tools.r8.graph.DexString enabledFieldName -> a1
-    com.android.tools.r8.graph.DexItemFactory$PrimitiveTypesBoxedTypeFields primitiveTypesBoxedTypeFields -> X3
-    com.android.tools.r8.graph.DexType charSequenceType -> E1
-    com.android.tools.r8.graph.DexType stringBufferType -> f2
+    com.android.tools.r8.graph.DexItemFactory$IntegerMembers integerMembers -> G3
+    com.android.tools.r8.graph.DexType boxedNumberType -> E1
+    com.android.tools.r8.graph.DexType stringBuilderType -> f2
     com.android.tools.r8.graph.DexString equalsIgnoreCaseMethodName -> T
+    com.android.tools.r8.graph.DexString deserializeLambdaMethodName -> j4
     com.android.tools.r8.graph.DexString booleanDescriptor -> u
-    com.android.tools.r8.graph.DexItemFactory$PolymorphicMethods polymorphicMethods -> a4
     com.android.tools.r8.graph.DexString getClassMethodName -> h0
-    com.android.tools.r8.graph.DexItemFactory$BufferMembers bufferMembers -> I3
     com.android.tools.r8.graph.DexMethod metafactoryMethod -> Q4
     com.android.tools.r8.graph.DexString getSimpleNameName -> p0
-    com.android.tools.r8.graph.DexItemFactory$DoubleMembers doubleMembers -> M3
-    com.android.tools.r8.graph.DexType intSummaryStatisticsConversionsType -> V2
-    com.android.tools.r8.graph.DexType androidViewViewType -> w3
-    com.android.tools.r8.graph.DexType boxedBooleanType -> v1
+    com.android.tools.r8.graph.DexType kotlinMetadataType -> V2
+    com.android.tools.r8.graph.DexType androidUtilLogType -> w3
+    com.android.tools.r8.graph.DexType shortArrayType -> v1
     com.android.tools.r8.graph.DexString descriptorSeparator -> D
-    com.android.tools.r8.graph.DexItemFactory$JavaLangReflectArrayMembers javaLangReflectArrayMembers -> S3
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap advanceLines -> h
     com.android.tools.r8.graph.DexString thisName -> X0
-    com.android.tools.r8.graph.DexItemFactory$ConstructorMethods constructorMethods -> Q3
-    com.android.tools.r8.graph.DexType throwableType -> N2
-    com.android.tools.r8.graph.DexType javaUtilSetType -> o3
-    com.android.tools.r8.graph.DexType booleanArrayType -> n1
+    com.android.tools.r8.graph.DexType runtimeExceptionType -> N2
+    com.android.tools.r8.graph.DexType javaUtilLoggingLevelType -> o3
+    com.android.tools.r8.graph.DexType voidType -> n1
     java.util.Map methods -> f
     com.android.tools.r8.graph.DexString stringDescriptor -> C0
     com.android.tools.r8.graph.DexString kindString -> d1
-    com.android.tools.r8.graph.DexType javaIoFileType -> e3
+    com.android.tools.r8.graph.DexType optionalConversionsJ$Type -> e3
     com.android.tools.r8.graph.DexType listIteratorType -> E4
     java.util.Map setFiles -> o
-    com.android.tools.r8.graph.DexType optionalIntType -> D2
+    com.android.tools.r8.graph.DexType optionalDoubleType -> D2
     com.android.tools.r8.graph.DexString methodDescriptor -> K0
     java.util.Set libraryClassesWithoutStaticInitialization -> Y4
-    com.android.tools.r8.graph.DexItemFactory$IllegalArgumentExceptionMethods illegalArgumentExceptionMethods -> W3
+    com.android.tools.r8.graph.DexItemFactory$LongMembers longMembers -> H3
     com.android.tools.r8.graph.DexString getDeclaredFieldName -> t0
-    com.android.tools.r8.graph.DexType annotationCovariantReturnTypes -> v4
-    com.android.tools.r8.graph.DexType strictMathType -> T1
-    com.android.tools.r8.graph.DexType mapEntryType -> u2
-    com.android.tools.r8.graph.DexProto deserializeLambdaMethodProto -> j4
-    com.android.tools.r8.graph.DexItemFactory$CharMembers charMembers -> C3
+    com.android.tools.r8.graph.DexType annotationSynthesizedClass -> v4
+    com.android.tools.r8.graph.DexType mathType -> T1
+    com.android.tools.r8.graph.DexType mapType -> u2
     com.android.tools.r8.com.google.common.collect.BiMap primitiveToBoxed -> O4
-    com.android.tools.r8.graph.DexType annotationInnerClass -> n4
+    com.android.tools.r8.graph.DexType annotationEnclosingClass -> n4
     com.android.tools.r8.graph.DexString concatMethodName -> M
-    com.android.tools.r8.graph.DexType objectArrayType -> L1
-    com.android.tools.r8.graph.DexType methodTypeType -> m2
+    com.android.tools.r8.graph.DexType recordTagType -> L1
+    com.android.tools.r8.graph.DexType methodHandleType -> m2
     com.android.tools.r8.graph.DexString valueOfMethodName -> c0
-    com.android.tools.r8.graph.DexType stringBuilderType -> e2
-    com.android.tools.r8.graph.DexType boxedNumberType -> D1
+    com.android.tools.r8.graph.DexItemFactory$ObjectsMethods objectsMethods -> I3
+    com.android.tools.r8.graph.DexType zipFileType -> e2
+    com.android.tools.r8.graph.DexType boxedShortType -> D1
     com.android.tools.r8.graph.DexString nameMethodName -> k0
     java.util.Map libraryMethodsNonNullParamOrThrow -> T4
-    com.android.tools.r8.graph.DexType shortArrayType -> u1
+    com.android.tools.r8.graph.DexType longArrayType -> u1
     com.android.tools.r8.graph.DexString referenceFieldUpdaterDescriptor -> S0
     com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin setEpilogueBegin -> m
-    com.android.tools.r8.graph.DexType doubleSummaryStatisticsConversionsType -> U2
-    com.android.tools.r8.graph.DexType androidUtilPropertyType -> v3
-    com.android.tools.r8.graph.DexType voidType -> m1
-    com.android.tools.r8.graph.DexType runtimeExceptionType -> M2
-    com.android.tools.r8.graph.DexType javaUtilLoggingLoggerType -> n3
+    com.android.tools.r8.graph.DexType npeType -> U2
+    com.android.tools.r8.graph.DexType androidSystemOsConstantsType -> v3
+    com.android.tools.r8.graph.DexItemFactory$JavaLangSystemMethods javaLangSystemMethods -> W3
+    com.android.tools.r8.graph.DexType shortType -> m1
+    java.util.List libraryMembersCollection -> g4
+    com.android.tools.r8.graph.DexType retentionType -> M2
+    com.android.tools.r8.graph.DexType javaUtilLocaleType -> n3
     com.android.tools.r8.graph.DexString containsMethodName -> N
+    com.android.tools.r8.graph.DexItemFactory$ThrowableMethods throwableMethods -> P3
     java.util.Map setInlineFrames -> q
     com.android.tools.r8.graph.DexString valueString -> c1
     com.android.tools.r8.graph.DexString charSequenceDescriptor -> B0
-    com.android.tools.r8.graph.DexItemFactory$ObjectMembers objectMembers -> H3
-    com.android.tools.r8.graph.DexType optionalDoubleType -> C2
+    com.android.tools.r8.graph.DexType optionalType -> C2
     java.util.concurrent.ConcurrentHashMap classTypeInterfaces -> s
     com.android.tools.r8.graph.DexType iteratorType -> D4
-    com.android.tools.r8.graph.DexType timeConversionsJ$Type -> d3
+    com.android.tools.r8.graph.DexType longSummaryStatisticsConversionsJ$Type -> d3
     com.android.tools.r8.graph.DexString fieldDescriptor -> J0
+    com.android.tools.r8.graph.DexProto twrCloseResourceMethodProto -> i4
     java.util.Set libraryTypesAssumedToBePresent -> X4
     com.android.tools.r8.graph.DexString getFieldName -> s0
     com.android.tools.r8.graph.DexItemFactory$StringConcatFactoryMembers stringConcatFactoryMembers -> N4
-    com.android.tools.r8.graph.DexType mathType -> S1
-    com.android.tools.r8.graph.DexType mapType -> t2
-    com.android.tools.r8.graph.DexType annotationCovariantReturnType -> u4
-    com.android.tools.r8.graph.DexItemFactory$FloatMembers floatMembers -> D3
-    com.android.tools.r8.graph.DexType recordTagType -> K1
-    com.android.tools.r8.graph.DexType methodHandleType -> l2
+    com.android.tools.r8.graph.DexType iterableType -> S1
+    com.android.tools.r8.graph.DexType setType -> t2
+    com.android.tools.r8.graph.DexType annotationThrows -> u4
+    com.android.tools.r8.graph.DexType recordType -> K1
+    com.android.tools.r8.graph.DexType varHandleType -> l2
     com.android.tools.r8.graph.DexString startsWithMethodName -> O
-    com.android.tools.r8.graph.DexItemFactory$EnumMembers enumMembers -> R3
-    com.android.tools.r8.graph.DexType annotationEnclosingMethod -> m4
+    com.android.tools.r8.graph.DexType annotationDefault -> m4
     com.android.tools.r8.graph.DexString endsWithMethodName -> P
     com.android.tools.r8.graph.DexString trimName -> b0
-    com.android.tools.r8.graph.DexItemFactory$IntegerMembers integerMembers -> E3
     com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd setPrologueEnd -> n
-    com.android.tools.r8.graph.DexType zipFileType -> d2
+    com.android.tools.r8.graph.DexType closeableType -> d2
     java.util.concurrent.ConcurrentHashMap referenceTypes -> r
-    com.android.tools.r8.graph.DexType boxedShortType -> C1
+    com.android.tools.r8.graph.DexType boxedLongType -> C1
+    com.android.tools.r8.graph.DexItemFactory$PolymorphicMethods polymorphicMethods -> c4
     com.android.tools.r8.graph.DexString ordinalMethodName -> j0
+    com.android.tools.r8.graph.DexItemFactory$BufferMembers bufferMembers -> K3
     com.android.tools.r8.graph.DexMethod deserializeLambdaMethod -> S4
     com.android.tools.r8.graph.DexString longFieldUpdaterDescriptor -> R0
     java.util.Map strings -> b
-    com.android.tools.r8.graph.DexType kotlinMetadataType -> T2
-    com.android.tools.r8.graph.DexType androidUtilLogType -> u3
-    com.android.tools.r8.graph.DexType longArrayType -> t1
-    com.android.tools.r8.graph.DexItemFactory$AtomicFieldUpdaterMethods atomicFieldUpdaterMethods -> Y3
+    com.android.tools.r8.graph.DexItemFactory$JavaLangReflectArrayMembers javaLangReflectArrayMembers -> U3
+    com.android.tools.r8.graph.DexType noSuchMethodErrorType -> T2
+    com.android.tools.r8.graph.DexType androidOsParcelableCreatorType -> u3
+    com.android.tools.r8.graph.DexType intArrayType -> t1
+    com.android.tools.r8.graph.DexItemFactory$ConstructorMethods constructorMethods -> S3
     com.android.tools.r8.graph.DexString javacLambdaMethodPrefix -> Z0
-    com.android.tools.r8.graph.DexType retentionType -> L2
-    com.android.tools.r8.graph.DexType javaUtilLoggingLevelType -> m3
-    com.android.tools.r8.graph.DexType shortType -> l1
-    com.android.tools.r8.graph.DexItemFactory$AssertionErrorMethods assertionErrorMethods -> O3
+    com.android.tools.r8.graph.DexType intConsumer -> L2
+    com.android.tools.r8.graph.DexType javaUtilListType -> m3
+    com.android.tools.r8.graph.DexType longType -> l1
     com.android.tools.r8.graph.DexType unsafeType -> K4
     com.android.tools.r8.graph.DexString objectArrayDescriptor -> E0
-    com.android.tools.r8.graph.DexType optionalType -> B2
-    com.android.tools.r8.graph.DexType optionalConversionsJ$Type -> c3
+    com.android.tools.r8.graph.DexItemFactory$AndroidUtilSparseArrayMembers androidUtilSparseArrayMembers -> e4
+    com.android.tools.r8.graph.DexType runnableType -> B2
+    com.android.tools.r8.graph.DexType intSummaryStatisticsConversionsJ$Type -> c3
     com.android.tools.r8.graph.DexString compareToIgnoreCaseMethodName -> Y
     com.android.tools.r8.graph.DexString intDescriptor -> z
     com.android.tools.r8.graph.DexType typeDescriptorType -> C4
     com.android.tools.r8.graph.DexString listDescriptor -> M0
-    com.android.tools.r8.graph.DexType fieldType -> Z1
-    com.android.tools.r8.graph.DexItemFactory$LongMembers longMembers -> F3
+    com.android.tools.r8.graph.DexType constructorType -> Z1
     com.android.tools.r8.graph.DexString getDeclaredMethodName -> v0
-    com.android.tools.r8.graph.DexType annotationSynthesizedClass -> t4
-    com.android.tools.r8.graph.DexType iterableType -> R1
-    com.android.tools.r8.graph.DexType setType -> s2
+    com.android.tools.r8.graph.DexType annotationSourceDebugExtension -> t4
+    com.android.tools.r8.graph.DexType collectionsType -> R1
+    com.android.tools.r8.graph.DexType listType -> s2
     com.android.tools.r8.graph.DexItemFactory$ObjectMethodsMembers objectMethodsMembers -> L4
     com.android.tools.r8.graph.DexString notifyMethodName -> I
-    com.android.tools.r8.graph.DexType recordType -> J1
-    com.android.tools.r8.graph.DexType annotationEnclosingClass -> l4
-    com.android.tools.r8.graph.DexType varHandleType -> k2
-    com.android.tools.r8.graph.DexType boxedLongType -> B1
+    com.android.tools.r8.graph.DexItemFactory$ClassMethods classMethods -> R3
+    com.android.tools.r8.graph.DexType objectType -> J1
+    com.android.tools.r8.graph.DexItemFactory$ProxyMethods proxyMethods -> d4
+    com.android.tools.r8.graph.DexItemFactory$AtomicFieldUpdaterMethods atomicFieldUpdaterMethods -> a4
+    com.android.tools.r8.graph.DexType javaIoPrintStreamType -> k2
+    com.android.tools.r8.graph.DexItemFactory$NullPointerExceptionMethods npeMethods -> X3
+    com.android.tools.r8.graph.DexItemFactory$BooleanMembers booleanMembers -> C3
+    com.android.tools.r8.graph.DexType boxedIntType -> B1
     com.android.tools.r8.graph.DexString internMethodName -> e0
-    com.android.tools.r8.graph.DexItemFactory$ObjectsMethods objectsMethods -> G3
-    com.android.tools.r8.graph.DexType closeableType -> c2
+    com.android.tools.r8.graph.DexType autoCloseableType -> c2
     com.android.tools.r8.graph.DexString cloneMethodName -> Z
     com.android.tools.r8.graph.DexString forNameMethodName -> m0
-    com.android.tools.r8.graph.DexType intArrayType -> s1
+    com.android.tools.r8.graph.DexItemFactory$IllegalArgumentExceptionMethods illegalArgumentExceptionMethods -> Y3
+    com.android.tools.r8.graph.DexType floatArrayType -> s1
     com.android.tools.r8.graph.DexString constructorMethodName -> U0
-    com.android.tools.r8.graph.DexType npeType -> S2
-    com.android.tools.r8.graph.DexType androidSystemOsConstantsType -> t3
+    com.android.tools.r8.graph.DexType noClassDefFoundErrorType -> S2
+    com.android.tools.r8.graph.DexType androidOsBundleType -> t3
+    com.android.tools.r8.graph.DexItemFactory$JavaUtilArraysMethods javaUtilArraysMethods -> f4
     com.android.tools.r8.graph.DexString notifyAllMethodName -> J
-    com.android.tools.r8.graph.DexType longType -> k1
-    com.android.tools.r8.graph.DexItemFactory$ThrowableMethods throwableMethods -> N3
-    com.android.tools.r8.graph.DexItemFactory$JavaLangSystemMethods javaLangSystemMethods -> U3
-    com.android.tools.r8.graph.DexType intConsumer -> K2
-    com.android.tools.r8.graph.DexType javaUtilLocaleType -> l3
-    com.android.tools.r8.graph.DexType javaUtilConcurrentTimeUnitType -> j3
-    com.android.tools.r8.graph.DexType doubleConsumer -> I2
+    com.android.tools.r8.graph.DexType intType -> k1
+    com.android.tools.r8.graph.DexType longConsumer -> K2
+    com.android.tools.r8.graph.DexType javaUtilConcurrentTimeUnitType -> l3
+    com.android.tools.r8.graph.DexType javaUtilCollectionsType -> j3
+    com.android.tools.r8.graph.DexItemFactory$ObjectMembers objectMembers -> J3
+    com.android.tools.r8.graph.DexString dalvikAnnotationOptimizationPrefix -> e1
     com.android.tools.r8.graph.DexString objectDescriptor -> D0
     com.android.tools.r8.graph.DexType stringConcatFactoryType -> J4
-    com.android.tools.r8.graph.DexItemFactory$RecordMembers recordMembers -> J3
-    com.android.tools.r8.graph.DexProto twrCloseResourceMethodProto -> g4
-    com.android.tools.r8.graph.DexType longSummaryStatisticsConversionsJ$Type -> b3
+    com.android.tools.r8.graph.DexItemFactory$JavaLangAnnotationRetentionPolicyMembers javaLangAnnotationRetentionPolicyMembers -> V3
+    com.android.tools.r8.graph.DexType doubleSummaryStatisticsConversionsJ$Type -> b3
     com.android.tools.r8.graph.DexString enumDescriptor -> L0
-    com.android.tools.r8.graph.DexType runnableType -> A2
+    com.android.tools.r8.graph.DexType consumerType -> A2
     com.android.tools.r8.graph.DexType objectMethodsType -> B4
-    com.android.tools.r8.graph.DexType constructorType -> Y1
-    com.android.tools.r8.graph.DexType consumerType -> z2
+    com.android.tools.r8.graph.DexType classLoaderType -> Y1
+    com.android.tools.r8.graph.DexType supplierType -> z2
     com.android.tools.r8.graph.DexString getMethodName -> u0
-    com.android.tools.r8.graph.DexType collectionsType -> Q1
-    com.android.tools.r8.graph.DexType listType -> r2
-    java.util.List typeSpecificBuffers -> H2
-    com.android.tools.r8.graph.DexType annotationThrows -> s4
+    com.android.tools.r8.graph.DexType objectsType -> Q1
+    com.android.tools.r8.graph.DexType serviceLoaderConfigurationErrorType -> r2
+    com.android.tools.r8.graph.DexType annotationSignature -> s4
     com.android.tools.r8.graph.DexString isEmptyMethodName -> K
-    com.android.tools.r8.graph.DexType objectType -> I1
-    com.android.tools.r8.graph.DexType javaIoPrintStreamType -> j2
-    com.android.tools.r8.graph.DexString twrCloseResourceMethodName -> f4
-    com.android.tools.r8.graph.DexType annotationDefault -> k4
+    com.android.tools.r8.graph.DexType stringArrayType -> I1
+    com.android.tools.r8.graph.DexItemFactory$EnumMembers enumMembers -> T3
+    com.android.tools.r8.graph.DexType javaLangSystemType -> j2
+    com.android.tools.r8.graph.DexType serializedLambdaType -> k4
     com.android.tools.r8.graph.DexString toStringMethodName -> d0
-    com.android.tools.r8.graph.DexType boxedIntType -> A1
-    com.android.tools.r8.graph.DexType autoCloseableType -> b2
+    com.android.tools.r8.graph.DexType boxedFloatType -> A1
+    com.android.tools.r8.graph.DexType methodType -> b2
     com.android.tools.r8.utils.LRUCacheTable leastUpperBoundOfInterfacesTable -> t
     com.android.tools.r8.graph.DexString desiredAssertionStatusMethodName -> l0
-    com.android.tools.r8.graph.DexType doubleSummaryStatisticsConversionsJ$Type -> Z2
-    com.android.tools.r8.graph.DexType boxedFloatType -> z1
+    com.android.tools.r8.graph.DexType optionalConversionsType -> Z2
+    com.android.tools.r8.graph.DexType boxedDoubleType -> z1
     com.android.tools.r8.graph.DexString newUpdaterName -> T0
-    com.android.tools.r8.graph.DexType noSuchMethodErrorType -> R2
-    com.android.tools.r8.graph.DexType androidOsParcelableCreatorType -> s3
-    com.android.tools.r8.graph.DexType floatArrayType -> r1
+    com.android.tools.r8.graph.DexType icceType -> R2
+    com.android.tools.r8.graph.DexType androidOsBuildVersionType -> s3
+    com.android.tools.r8.graph.DexType doubleArrayType -> r1
     com.android.tools.r8.graph.DexString lengthMethodName -> L
-    com.android.tools.r8.graph.DexType longConsumer -> J2
-    com.android.tools.r8.graph.DexType javaUtilListType -> k3
-    com.android.tools.r8.graph.DexType intType -> j1
-    com.android.tools.r8.graph.DexType javaUtilComparatorType -> i3
+    com.android.tools.r8.graph.DexItemFactory$AssertionErrorMethods assertionErrorMethods -> Q3
+    com.android.tools.r8.graph.DexType doubleConsumer -> J2
+    com.android.tools.r8.graph.DexType javaUtilComparatorType -> k3
+    com.android.tools.r8.graph.DexType floatType -> j1
+    com.android.tools.r8.graph.DexType javaNioByteOrderType -> i3
     com.android.tools.r8.graph.DexType comparableType -> I4
-    com.android.tools.r8.graph.DexType doubleType -> h1
+    com.android.tools.r8.graph.DexType charType -> h1
+    com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods stringBuilderMethods -> A3
+    com.android.tools.r8.graph.DexType bufferType -> H2
     com.android.tools.r8.graph.DexString contentEqualsMethodName -> U
     com.android.tools.r8.graph.DexString byteDescriptor -> v
     com.android.tools.r8.graph.DexString classLoaderDescriptor -> G0
-    com.android.tools.r8.graph.DexItemFactory$AndroidUtilSparseArrayMembers androidUtilSparseArrayMembers -> c4
-    com.android.tools.r8.graph.DexType intSummaryStatisticsConversionsJ$Type -> a3
+    com.android.tools.r8.graph.DexType timeConversionsType -> a3
     com.android.tools.r8.graph.DexType lookupType -> A4
     java.util.Set libraryMethodsReturningReceiver -> U4
     com.android.tools.r8.graph.DexString throwableDescriptor -> O0
     com.android.tools.r8.graph.DexType callSiteType -> z4
-    com.android.tools.r8.graph.DexType classLoaderType -> X1
-    com.android.tools.r8.graph.DexType supplierType -> y2
+    com.android.tools.r8.graph.DexType packageType -> X1
+    com.android.tools.r8.graph.DexType comparatorType -> y2
     boolean skipNameValidationForTesting -> Z4
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap advancePCs -> i
     com.android.tools.r8.graph.DexString boxedDoubleDescriptor -> E
     com.android.tools.r8.graph.DexString assertionsDisabled -> x0
-    com.android.tools.r8.graph.DexType annotationSourceDebugExtension -> r4
-    com.android.tools.r8.graph.DexType objectsType -> P1
-    com.android.tools.r8.graph.DexType serviceLoaderConfigurationErrorType -> q2
-    com.android.tools.r8.graph.DexItemFactory$ClassMethods classMethods -> P3
-    com.android.tools.r8.graph.DexItemFactory$ProxyMethods proxyMethods -> b4
-    com.android.tools.r8.graph.DexItemFactory$NullPointerExceptionMethods npeMethods -> V3
+    java.util.List typeSpecificBuffers -> I2
+    com.android.tools.r8.graph.DexType annotationMethodParameters -> r4
+    com.android.tools.r8.graph.DexType annotationType -> P1
+    com.android.tools.r8.graph.DexType serviceLoaderType -> q2
     com.android.tools.r8.graph.DexString unknownTypeName -> b5
     java.util.Map methodHandles -> g
-    com.android.tools.r8.graph.DexType javaLangSystemType -> i2
-    com.android.tools.r8.graph.DexType stringArrayType -> H1
+    com.android.tools.r8.graph.DexType javaLangReflectArrayType -> i2
+    com.android.tools.r8.graph.DexType stringType -> H1
+    com.android.tools.r8.graph.DexItemFactory$ShortMembers shortMembers -> M3
     com.android.tools.r8.graph.DexString indexOfMethodName -> V
-    com.android.tools.r8.graph.DexItemFactory$BooleanMembers booleanMembers -> A3
     com.android.tools.r8.graph.DexString charDescriptor -> w
     com.android.tools.r8.graph.DexString wrapperFieldName -> g0
-    com.android.tools.r8.graph.DexItemFactory$StringMembers stringMembers -> L3
-    com.android.tools.r8.graph.DexType methodType -> a2
+    com.android.tools.r8.graph.DexType fieldType -> a2
     java.util.IdentityHashMap internalSentinels -> c5
-    com.android.tools.r8.graph.DexType boxedDoubleType -> y1
+    com.android.tools.r8.graph.DexType boxedCharType -> y1
     com.android.tools.r8.graph.DexString getCanonicalNameName -> o0
-    com.android.tools.r8.graph.DexType timeConversionsType -> Y2
+    com.android.tools.r8.graph.DexType longSummaryStatisticsConversionsType -> Y2
+    com.android.tools.r8.graph.DexType androidUtilSparseArrayType -> z3
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap defaults -> j
     java.util.Map unboxPrimitiveMethod -> P4
     com.android.tools.r8.graph.DexString boxedLongDescriptor -> F
-    com.android.tools.r8.graph.DexType doubleArrayType -> q1
+    com.android.tools.r8.graph.DexType charArrayType -> q1
     com.android.tools.r8.graph.DexString temporaryConstructorMethodPrefix -> W0
-    com.android.tools.r8.graph.DexType icceType -> Q2
-    com.android.tools.r8.graph.DexType androidOsBundleType -> r3
+    com.android.tools.r8.graph.DexType illegalArgumentExceptionType -> Q2
+    com.android.tools.r8.graph.DexType androidOsBuildType -> r3
     com.android.tools.r8.graph.DexDebugEvent$SetOutlineFrame setOutlineFrame -> p
-    com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods stringBuilderMethods -> y3
-    com.android.tools.r8.graph.DexItemFactory$JavaUtilArraysMethods javaUtilArraysMethods -> d4
-    com.android.tools.r8.graph.DexType floatType -> i1
-    com.android.tools.r8.graph.DexType charType -> g1
-    com.android.tools.r8.graph.DexType bufferType -> G2
+    com.android.tools.r8.graph.DexType doubleType -> i1
+    com.android.tools.r8.graph.DexType byteType -> g1
+    com.android.tools.r8.graph.DexType streamType -> G2
     com.android.tools.r8.graph.DexType externalizableType -> H4
-    com.android.tools.r8.graph.DexType javaUtilCollectionsType -> h3
+    com.android.tools.r8.graph.DexType javaMathBigIntegerType -> h3
+    com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods stringBufferMethods -> B3
+    com.android.tools.r8.graph.DexItemFactory$RecordMembers recordMembers -> L3
     com.android.tools.r8.graph.DexString classDescriptor -> F0
-    com.android.tools.r8.graph.DexItemFactory$JavaLangAnnotationRetentionPolicyMembers javaLangAnnotationRetentionPolicyMembers -> T3
     com.android.tools.r8.graph.DexString lastIndexOfMethodName -> W
     com.android.tools.r8.graph.DexString doubleDescriptor -> x
-    com.android.tools.r8.graph.DexItemFactory$ByteMembers byteMembers -> B3
     com.android.tools.r8.graph.DexType nullValueType -> a5
     com.android.tools.r8.graph.DexString arraysDescriptor -> N0
-    com.android.tools.r8.graph.DexType packageType -> W1
-    com.android.tools.r8.graph.DexType comparatorType -> x2
+    com.android.tools.r8.graph.DexType classType -> W1
+    com.android.tools.r8.graph.DexType collectionType -> x2
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap endLocals -> k
-    com.android.tools.r8.graph.DexType dalvikCriticalNativeAnnotation -> y4
+    com.android.tools.r8.graph.DexType annotationReachabilitySensitive -> y4
     com.android.tools.r8.graph.DexString boxedNumberDescriptor -> G
     com.android.tools.r8.graph.DexString newInstanceName -> w0
-    com.android.tools.r8.graph.DexType annotationType -> O1
-    com.android.tools.r8.graph.DexType serviceLoaderType -> p2
-    com.android.tools.r8.graph.DexType annotationSignature -> q4
-    com.android.tools.r8.graph.DexType javaLangReflectArrayType -> h2
-    com.android.tools.r8.graph.DexString deserializeLambdaMethodName -> h4
-    com.android.tools.r8.graph.DexType stringType -> G1
-    com.android.tools.r8.graph.DexType serializedLambdaType -> i4
+    com.android.tools.r8.graph.DexType enumType -> O1
+    com.android.tools.r8.graph.DexType proxyType -> p2
+    com.android.tools.r8.graph.DexType annotationMemberClasses -> q4
+    com.android.tools.r8.graph.DexItemFactory$PrimitiveTypesBoxedTypeFields primitiveTypesBoxedTypeFields -> Z3
+    com.android.tools.r8.graph.DexType javaLangAnnotationRetentionPolicyType -> h2
+    com.android.tools.r8.graph.DexItemFactory$DoubleMembers doubleMembers -> O3
+    com.android.tools.r8.graph.DexString twrCloseResourceMethodName -> h4
+    com.android.tools.r8.graph.DexType charSequenceArrayType -> G1
     com.android.tools.r8.graph.DexString convertMethodName -> f0
     com.android.tools.r8.graph.DexString compareToMethodName -> X
     com.android.tools.r8.graph.DexString floatDescriptor -> y
     java.util.Set possibleCompilerSynthesizedTypes -> a
     com.android.tools.r8.graph.DexString getNameName -> n0
-    com.android.tools.r8.kotlin.Kotlin kotlin -> Z3
-    com.android.tools.r8.graph.DexType optionalConversionsType -> X2
-    com.android.tools.r8.graph.DexType boxedCharType -> x1
+    com.android.tools.r8.graph.DexType intSummaryStatisticsConversionsType -> X2
+    com.android.tools.r8.graph.DexType androidViewViewType -> y3
+    com.android.tools.r8.graph.DexType boxedByteType -> x1
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap restartLocals -> l
     com.android.tools.r8.graph.DexString classConstructorMethodName -> V0
     com.android.tools.r8.graph.DexString waitMethodName -> H
-    com.android.tools.r8.graph.DexType illegalArgumentExceptionType -> P2
-    com.android.tools.r8.graph.DexType androidOsBuildVersionType -> q3
-    com.android.tools.r8.graph.DexType charArrayType -> p1
-    com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods stringBufferMethods -> z3
-    1:48:void <clinit>():71:118 -> <clinit>
-    1:1:void <init>():122:122 -> <init>
-    2:650:void <init>():79:727 -> <init>
-    651:737:void <init>():717:803 -> <init>
-    738:754:void <init>():793:809 -> <init>
-    755:842:void <init>():806:893 -> <init>
-    843:843:void <init>():123:123 -> <init>
+    com.android.tools.r8.graph.DexType illegalAccessErrorType -> P2
+    com.android.tools.r8.graph.DexType javaUtilSetType -> q3
+    com.android.tools.r8.graph.DexType byteArrayType -> p1
+    1:50:void <clinit>():71:120 -> <clinit>
+    1:1:void <init>():124:124 -> <init>
+    2:648:void <init>():81:727 -> <init>
+    649:735:void <init>():717:803 -> <init>
+    736:752:void <init>():793:809 -> <init>
+    753:840:void <init>():806:893 -> <init>
+    841:841:void <init>():125:125 -> <init>
     1:1:java.lang.String createMemberString(java.lang.String,com.android.tools.r8.graph.DexType,int):0:0 -> a
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2193,"2":2194,"3":2195}}
     2193:2193:java.lang.String createMemberString(java.lang.String,com.android.tools.r8.graph.DexType,int):2180:2180 -> a
@@ -23606,7 +23715,7 @@
     2184:2184:java.lang.String createMemberString(java.lang.String,com.android.tools.r8.graph.DexType,int):2182 -> a
     2185:2192:java.lang.String createMemberString(java.lang.String,com.android.tools.r8.graph.DexType,int):2182:2189 -> a
     com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame lambda$createSetInlineFrame$8(com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame) -> a
-    2196:2196:boolean isInternalSentinel(com.android.tools.r8.graph.DexItem):127:127 -> a
+    2196:2196:boolean isInternalSentinel(com.android.tools.r8.graph.DexItem):129:129 -> a
     2197:2197: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
     2197:2197:java.util.Optional lambda$createInstanceInitializerWithFreshProto$4(com.android.tools.r8.graph.DexMethod,java.util.function.Predicate,com.android.tools.r8.graph.DexProto):2398 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -23616,7 +23725,7 @@
     2213:2215:com.android.tools.r8.graph.DexMethod lambda$boxedValueOfMethods$0(java.util.Map$Entry):781:783 -> a
     2216:2216:void setSkipNameValidationForTesting(boolean):896:896 -> a
     2217:2217:com.android.tools.r8.graph.DexItem canonicalize(java.util.Map,com.android.tools.r8.graph.DexItem):2159:2159 -> a
-    2218:2218:boolean isInternalSentinel(com.android.tools.r8.graph.DexItem):127:127 -> a
+    2218:2218:boolean isInternalSentinel(com.android.tools.r8.graph.DexItem):129:129 -> a
     2218:2218:com.android.tools.r8.graph.DexItem canonicalize(java.util.Map,com.android.tools.r8.graph.DexItem):2160 -> a
     2219:2220:com.android.tools.r8.graph.DexItem canonicalize(java.util.Map,com.android.tools.r8.graph.DexItem):2160:2161 -> a
     2221:2221:com.android.tools.r8.graph.DexString createString(int,byte[]):2167:2167 -> a
@@ -23736,7 +23845,7 @@
     1:2:com.android.tools.r8.graph.DexType getBoxedForPrimitiveType(com.android.tools.r8.graph.DexType):768:769 -> d
     3:11:com.android.tools.r8.graph.DexType internalCreateType(com.android.tools.r8.graph.DexString):2458:2466 -> d
     12:12:com.android.tools.r8.graph.DexType internalCreateType(com.android.tools.r8.graph.DexString):2463:2463 -> d
-    13:13:boolean isInternalSentinel(com.android.tools.r8.graph.DexItem):127:127 -> d
+    13:13:boolean isInternalSentinel(com.android.tools.r8.graph.DexItem):129:129 -> d
     13:13:com.android.tools.r8.graph.DexType internalCreateType(com.android.tools.r8.graph.DexString):2467 -> d
     14:15:com.android.tools.r8.graph.DexType internalCreateType(com.android.tools.r8.graph.DexString):2467:2468 -> d
     16:17:com.android.tools.r8.graph.DexType createSynthesizedType(java.lang.String):2494:2495 -> d
@@ -23757,7 +23866,7 @@
     2:2:void registerTypeNeededForDesugaring(com.android.tools.r8.graph.DexType):2502:2502 -> h
     1:3:boolean verifyNoCachedTypeElements():2804:2806 -> i
 com.android.tools.r8.graph.DexItemFactory$1 -> com.android.tools.r8.graph.s0:
-com.android.tools.r8.graph.DexItemFactory$AndroidOsBuildMembers -> com.android.tools.r8.internal.Cf:
+com.android.tools.r8.graph.DexItemFactory$AndroidOsBuildMembers -> com.android.tools.r8.internal.Bf:
     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
@@ -23777,7 +23886,7 @@
     com.android.tools.r8.graph.DexField CPU_ABI -> c
     1:23:void <init>(com.android.tools.r8.graph.DexItemFactory):912:934 -> <init>
     1:17:void forEachFinalField(java.util.function.Consumer):938:954 -> a
-com.android.tools.r8.graph.DexItemFactory$AndroidOsBuildVersionMembers -> com.android.tools.r8.internal.Df:
+com.android.tools.r8.graph.DexItemFactory$AndroidOsBuildVersionMembers -> com.android.tools.r8.internal.Cf:
     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
@@ -23785,21 +23894,21 @@
     com.android.tools.r8.graph.DexField SDK -> c
     1:8:void <init>(com.android.tools.r8.graph.DexItemFactory):958:965 -> <init>
     1:5:void forEachFinalField(java.util.function.Consumer):969:973 -> a
-com.android.tools.r8.graph.DexItemFactory$AndroidOsBundleMembers -> com.android.tools.r8.internal.Ef:
+com.android.tools.r8.graph.DexItemFactory$AndroidOsBundleMembers -> com.android.tools.r8.internal.Df:
     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):977:981 -> <init>
     1:2:void forEachFinalField(java.util.function.Consumer):985:986 -> a
-com.android.tools.r8.graph.DexItemFactory$AndroidSystemOsConstantsMembers -> com.android.tools.r8.internal.Ff:
+com.android.tools.r8.graph.DexItemFactory$AndroidSystemOsConstantsMembers -> com.android.tools.r8.internal.Ef:
     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):990:993 -> <init>
     1:2:void forEachFinalField(java.util.function.Consumer):997:998 -> a
-com.android.tools.r8.graph.DexItemFactory$AndroidUtilSparseArrayMembers -> com.android.tools.r8.internal.Gf:
+com.android.tools.r8.graph.DexItemFactory$AndroidUtilSparseArrayMembers -> com.android.tools.r8.internal.Ff:
     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):1025:1029 -> <init>
-com.android.tools.r8.graph.DexItemFactory$AndroidViewViewMembers -> com.android.tools.r8.internal.Hf:
+com.android.tools.r8.graph.DexItemFactory$AndroidViewViewMembers -> com.android.tools.r8.internal.Gf:
     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
@@ -23830,7 +23939,7 @@
     2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1047:1047 -> <init>
     3:14:void <init>(com.android.tools.r8.graph.DexItemFactory):1034:1045 -> <init>
     1:3:void forEachFinalField(java.util.function.Consumer):1051:1053 -> a
-com.android.tools.r8.graph.DexItemFactory$BufferMembers -> com.android.tools.r8.internal.If:
+com.android.tools.r8.graph.DexItemFactory$BufferMembers -> com.android.tools.r8.internal.Hf:
     java.util.List bufferCovariantMethods -> a
     1:12:void <init>(com.android.tools.r8.graph.DexItemFactory):1432:1443 -> <init>
 com.android.tools.r8.graph.DexItemFactory$ByteMembers -> com.android.tools.r8.graph.w0:
@@ -23911,16 +24020,16 @@
     2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1084:1084 -> <init>
     3:6:void <init>(com.android.tools.r8.graph.DexItemFactory):1079:1082 -> <init>
     1:1:void forEachFinalField(java.util.function.Consumer):1088:1088 -> a
-com.android.tools.r8.graph.DexItemFactory$IllegalArgumentExceptionMethods -> com.android.tools.r8.internal.Jf:
+com.android.tools.r8.graph.DexItemFactory$IllegalArgumentExceptionMethods -> com.android.tools.r8.internal.If:
     com.android.tools.r8.graph.DexMethod initWithMessage -> a
     1:5:void <init>(com.android.tools.r8.graph.DexItemFactory):1714:1718 -> <init>
     6:6:void <init>(com.android.tools.r8.graph.DexItemFactory):1717:1717 -> <init>
-com.android.tools.r8.graph.DexItemFactory$IntegerMembers -> com.android.tools.r8.internal.Kf:
+com.android.tools.r8.graph.DexItemFactory$IntegerMembers -> com.android.tools.r8.internal.Jf:
     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):1271:1276 -> <init>
     1:1:void forEachFinalField(java.util.function.Consumer):1280:1280 -> a
-com.android.tools.r8.graph.DexItemFactory$JavaIoFileMembers -> com.android.tools.r8.internal.Lf:
+com.android.tools.r8.graph.DexItemFactory$JavaIoFileMembers -> com.android.tools.r8.internal.Kf:
     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):1092:1095 -> <init>
@@ -23943,12 +24052,12 @@
     2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1630:1630 -> <init>
     3:6:void <init>(com.android.tools.r8.graph.DexItemFactory):1622:1625 -> <init>
     7:12:void <init>(com.android.tools.r8.graph.DexItemFactory):1623:1628 -> <init>
-com.android.tools.r8.graph.DexItemFactory$JavaMathBigIntegerMembers -> com.android.tools.r8.internal.Mf:
+com.android.tools.r8.graph.DexItemFactory$JavaMathBigIntegerMembers -> com.android.tools.r8.internal.Lf:
     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):1104:1108 -> <init>
     1:2:void forEachFinalField(java.util.function.Consumer):1112:1113 -> a
-com.android.tools.r8.graph.DexItemFactory$JavaNioByteOrderMembers -> com.android.tools.r8.internal.Nf:
+com.android.tools.r8.graph.DexItemFactory$JavaNioByteOrderMembers -> com.android.tools.r8.internal.Mf:
     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):1117:1122 -> <init>
@@ -23959,12 +24068,12 @@
     1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1131:1131 -> <init>
     2:6:void <init>(com.android.tools.r8.graph.DexItemFactory):1136:1140 -> <init>
     7:13:void <init>(com.android.tools.r8.graph.DexItemFactory):1138:1144 -> <init>
-com.android.tools.r8.graph.DexItemFactory$JavaUtilComparatorMembers -> com.android.tools.r8.internal.Of:
+com.android.tools.r8.graph.DexItemFactory$JavaUtilComparatorMembers -> com.android.tools.r8.internal.Nf:
     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):1152:1157 -> <init>
     1:2:void forEachFinalField(java.util.function.Consumer):1161:1162 -> a
-com.android.tools.r8.graph.DexItemFactory$JavaUtilConcurrentTimeUnitMembers -> com.android.tools.r8.internal.Pf:
+com.android.tools.r8.graph.DexItemFactory$JavaUtilConcurrentTimeUnitMembers -> com.android.tools.r8.internal.Of:
     com.android.tools.r8.graph.DexField NANOSECONDS -> f
     com.android.tools.r8.graph.DexField MINUTES -> e
     com.android.tools.r8.graph.DexField SECONDS -> g
@@ -23974,13 +24083,13 @@
     com.android.tools.r8.graph.DexField MICROSECONDS -> c
     1:16:void <init>(com.android.tools.r8.graph.DexItemFactory):1166:1181 -> <init>
     1:7:void forEachFinalField(java.util.function.Consumer):1185:1191 -> a
-com.android.tools.r8.graph.DexItemFactory$JavaUtilLocaleMembers -> com.android.tools.r8.internal.Qf:
+com.android.tools.r8.graph.DexItemFactory$JavaUtilLocaleMembers -> com.android.tools.r8.internal.Pf:
     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):1195:1199 -> <init>
     1:3:void forEachFinalField(java.util.function.Consumer):1203:1205 -> a
-com.android.tools.r8.graph.DexItemFactory$JavaUtilLoggingLevelMembers -> com.android.tools.r8.internal.Rf:
+com.android.tools.r8.graph.DexItemFactory$JavaUtilLoggingLevelMembers -> com.android.tools.r8.internal.Qf:
     com.android.tools.r8.graph.DexField WARNING -> f
     com.android.tools.r8.graph.DexField SEVERE -> e
     com.android.tools.r8.graph.DexField FINE -> b
@@ -23989,7 +24098,7 @@
     com.android.tools.r8.graph.DexField FINER -> c
     1:14:void <init>(com.android.tools.r8.graph.DexItemFactory):1209:1222 -> <init>
     1:6:void forEachFinalField(java.util.function.Consumer):1226:1231 -> a
-com.android.tools.r8.graph.DexItemFactory$LibraryMembers -> com.android.tools.r8.internal.Sf:
+com.android.tools.r8.graph.DexItemFactory$LibraryMembers -> com.android.tools.r8.internal.Rf:
     1:1:void <init>():907:907 -> <init>
     void forEachFinalField(java.util.function.Consumer) -> a
 com.android.tools.r8.graph.DexItemFactory$LongMembers -> com.android.tools.r8.graph.H0:
@@ -24000,7 +24109,7 @@
     3:11:void <init>(com.android.tools.r8.graph.DexItemFactory):1237:1245 -> <init>
     12:12:void <init>(com.android.tools.r8.graph.DexItemFactory):1244:1244 -> <init>
     1:1:void forEachFinalField(java.util.function.Consumer):1250:1250 -> a
-com.android.tools.r8.graph.DexItemFactory$NullPointerExceptionMethods -> com.android.tools.r8.internal.Tf:
+com.android.tools.r8.graph.DexItemFactory$NullPointerExceptionMethods -> com.android.tools.r8.internal.Sf:
     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):1706:1711 -> <init>
@@ -24023,7 +24132,7 @@
     2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1388:1388 -> <init>
     3:47:void <init>(com.android.tools.r8.graph.DexItemFactory):1365:1409 -> <init>
     1:12:boolean isObjectMember(com.android.tools.r8.graph.DexMethod):1417:1428 -> a
-com.android.tools.r8.graph.DexItemFactory$ObjectMethodsMembers -> com.android.tools.r8.internal.Uf:
+com.android.tools.r8.graph.DexItemFactory$ObjectMethodsMembers -> com.android.tools.r8.internal.Tf:
     com.android.tools.r8.graph.DexMethod bootstrap -> a
     1:12:void <init>(com.android.tools.r8.graph.DexItemFactory):1344:1355 -> <init>
     13:13:void <init>(com.android.tools.r8.graph.DexItemFactory):1348:1348 -> <init>
@@ -24048,7 +24157,7 @@
     40:47:void <init>(com.android.tools.r8.graph.DexItemFactory):1477:1484 -> <init>
     48:48:void <init>(com.android.tools.r8.graph.DexItemFactory):1482:1482 -> <init>
     1:1:boolean isRequireNonNullMethod(com.android.tools.r8.graph.DexMethod):1489:1489 -> a
-com.android.tools.r8.graph.DexItemFactory$PolymorphicMethods -> com.android.tools.r8.internal.Vf:
+com.android.tools.r8.graph.DexItemFactory$PolymorphicMethods -> com.android.tools.r8.internal.Uf:
     com.android.tools.r8.graph.DexProto compareAndSetSignature -> c
     java.util.Set varHandleMethods -> d
     com.android.tools.r8.graph.DexItemFactory this$0 -> g
@@ -24072,7 +24181,7 @@
     1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):2116:2116 -> <init>
     2:7:void <init>(com.android.tools.r8.graph.DexItemFactory):2120:2125 -> <init>
     8:8:void <init>(com.android.tools.r8.graph.DexItemFactory):2122:2122 -> <init>
-com.android.tools.r8.graph.DexItemFactory$RecordMembers -> com.android.tools.r8.internal.Wf:
+com.android.tools.r8.graph.DexItemFactory$RecordMembers -> com.android.tools.r8.internal.Vf:
     com.android.tools.r8.graph.DexMethod toString -> d
     com.android.tools.r8.graph.DexMethod hashCode -> c
     com.android.tools.r8.graph.DexMethod equals -> b
@@ -24125,7 +24234,7 @@
     2054:2054:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.graph.DexMethod,java.util.List):2021:2021 -> a
     2051:2051:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.graph.DexMethod,java.util.List):2021:2021 -> a
     1:1:boolean isAppendPrimitiveMethod(com.android.tools.r8.graph.DexMethod):1982:1982 -> b
-com.android.tools.r8.graph.DexItemFactory$StringConcatFactoryMembers -> com.android.tools.r8.internal.Xf:
+com.android.tools.r8.graph.DexItemFactory$StringConcatFactoryMembers -> com.android.tools.r8.internal.Wf:
     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):1284:1290 -> <init>
@@ -24177,21 +24286,21 @@
     boolean $assertionsDisabled -> t
     1:1:void <clinit>():22:22 -> <clinit>
     1:28:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.GenericSignature$ClassSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],boolean):43:70 -> <init>
-    com.android.tools.r8.graph.ClasspathOrLibraryClass asClasspathOrLibraryClass() -> G
-    com.android.tools.r8.graph.DexLibraryClass asLibraryClass() -> S
+    com.android.tools.r8.graph.ClasspathOrLibraryClass asClasspathOrLibraryClass() -> H
+    com.android.tools.r8.graph.DexLibraryClass asLibraryClass() -> T
     1:1:void accept(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer):99:99 -> a
     2:7:boolean internalClassOrInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):154:159 -> a
     1:1:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):115:115 -> b
     1:3:boolean verifyLibraryMethod(com.android.tools.r8.graph.DexEncodedMethod):82:84 -> c
-    1:1:java.lang.String toSourceString():109:109 -> d0
-    2:2:java.lang.String toSourceString():0:0 -> d0
+    1:1:java.lang.String toSourceString():109:109 -> e0
+    2:2:java.lang.String toSourceString():0:0 -> e0
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":111,"2":112,"3":113,"4":114}}
-    111:111:java.lang.String toSourceString():109:109 -> d0
-    112:112:java.lang.String toSourceString():109:109 -> d0
-    113:113:java.lang.String toSourceString():109:109 -> d0
-    114:114:java.lang.String toSourceString():109:109 -> d0
+    111:111:java.lang.String toSourceString():109:109 -> e0
+    112:112:java.lang.String toSourceString():109:109 -> e0
+    113:113:java.lang.String toSourceString():109:109 -> e0
+    114:114:java.lang.String toSourceString():109:109 -> e0
     1:2:boolean verifyLibraryField(com.android.tools.r8.graph.DexEncodedField):89:90 -> f
-    boolean isNotProgramClass() -> o1
+    boolean isNotProgramClass() -> p1
     1:1:java.lang.String toString():104:104 -> toString
 com.android.tools.r8.graph.DexMember -> com.android.tools.r8.graph.P0:
     com.android.tools.r8.graph.DexString name -> g
@@ -24204,11 +24313,12 @@
     boolean match(com.android.tools.r8.graph.DexEncodedMember) -> a
     1:1:java.lang.Iterable getReferencedBaseTypes(com.android.tools.r8.graph.DexItemFactory):61:61 -> a
     2:2:com.android.tools.r8.graph.DexType lambda$getReferencedBaseTypes$0(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):61:61 -> a
-    com.android.tools.r8.graph.DexMember asDexMember() -> g0
-    1:1:com.android.tools.r8.graph.DexType getHolderType():41:41 -> m0
-    1:1:com.android.tools.r8.graph.DexString getName():45:45 -> n0
-    java.lang.Iterable getReferencedTypes() -> o0
-    1:1:com.android.tools.r8.graph.DexType getContextType():37:37 -> x
+    com.android.tools.r8.graph.DexMember asDexMember() -> h0
+    boolean isDexMember() -> l0
+    1:1:com.android.tools.r8.graph.DexType getHolderType():41:41 -> o0
+    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.Q0:
     com.android.tools.r8.graph.DexItem annotations -> b
     com.android.tools.r8.graph.DexMember item -> a
@@ -24216,11 +24326,11 @@
     1:1:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):21:21 -> a
     1:3:boolean equals(java.lang.Object):34:36 -> equals
     1:1:int hashCode():26:26 -> hashCode
-com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation -> com.android.tools.r8.internal.Yf:
+com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation -> com.android.tools.r8.internal.Xf:
     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.Zf:
+com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation -> com.android.tools.r8.internal.Yf:
     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.ag:
+com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation -> com.android.tools.r8.internal.Zf:
     1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ParameterAnnotationsList):69:69 -> <init>
 com.android.tools.r8.graph.DexMethod -> com.android.tools.r8.graph.R0:
     com.android.tools.r8.graph.DexProto proto -> i
@@ -24232,7 +24342,7 @@
     39:39:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,boolean):31:31 -> <init>
     40:40:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,boolean):31:31 -> <init>
     36:36:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,boolean):31:31 -> <init>
-    com.android.tools.r8.utils.structural.StructuralItem self() -> K
+    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):22:22 -> a
     2:2:int acceptCompareTo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.structural.CompareToVisitor):61:61 -> a
     2:2:int acceptCompareTo(com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.CompareToVisitor):22 -> a
@@ -24287,42 +24397,42 @@
     2:2:com.android.tools.r8.graph.DexEncodedMember com.android.tools.r8.graph.DexClass.lookupMember(com.android.tools.r8.graph.DexMember):573 -> c
     2:2:com.android.tools.r8.graph.DexEncodedMethod lookupOnClass(com.android.tools.r8.graph.DexClass):133 -> c
     3:3:com.android.tools.r8.graph.DexEncodedMethod lookupOnClass(com.android.tools.r8.graph.DexClass):133:133 -> c
-    1:1:java.lang.String toSmaliString():256:256 -> c0
-    2:2:java.lang.String com.android.tools.r8.graph.DexProto.toDescriptorString():118:118 -> c0
-    2:2:java.lang.String com.android.tools.r8.graph.DexProto.toSmaliString():114 -> c0
-    2:2:java.lang.String toSmaliString():256 -> c0
-    3:3:java.lang.String toSmaliString():256:256 -> c0
-    1:1:java.lang.String toSourceString():261:261 -> d0
-    1:1:int computeHashCode():218:218 -> e0
+    1:1:java.lang.String toSmaliString():256:256 -> d0
+    2:2:java.lang.String com.android.tools.r8.graph.DexProto.toDescriptorString():118:118 -> d0
+    2:2:java.lang.String com.android.tools.r8.graph.DexProto.toSmaliString():114 -> d0
+    2:2:java.lang.String toSmaliString():256 -> d0
+    3:3:java.lang.String toSmaliString():256:256 -> d0
+    1:1:java.lang.String toSourceString():261:261 -> e0
+    1:1:int computeHashCode():218:218 -> f0
     1:5:boolean computeEquals(java.lang.Object):223:227 -> g
-    com.android.tools.r8.graph.DexMethod asDexMethod() -> h0
     1:1:com.android.tools.r8.graph.DexType getParameter(int):86:86 -> i
-    boolean isDexMethod() -> k0
+    com.android.tools.r8.graph.DexMethod asDexMethod() -> i0
+    boolean isDexMethod() -> m0
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():51:51 -> n
-    1:1:java.lang.Iterable getReferencedTypes():213:213 -> o0
-    2:2:java.lang.Iterable com.android.tools.r8.graph.DexProto.getTypes():74:74 -> o0
-    2:2:java.lang.Iterable getReferencedTypes():213 -> o0
+    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 -> o0
-    3:3:java.lang.Iterable com.android.tools.r8.graph.DexProto.getTypes():74 -> o0
-    3:3:java.lang.Iterable getReferencedTypes():213 -> o0
+    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 -> p0
-    13:13:com.android.tools.r8.references.MethodReference asMethodReference():161:161 -> p0
-    1:1:int getArity():169:169 -> q0
-    1:1:com.android.tools.r8.graph.DexTypeList getParameters():90:90 -> r0
-    1:1:com.android.tools.r8.graph.DexProto getProto():94:94 -> s0
-    1:1:com.android.tools.r8.graph.DexType getReturnType():98:98 -> t0
+    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
+    1:1:com.android.tools.r8.graph.DexTypeList getParameters():90:90 -> t0
     1:1:java.lang.String toString():0:0 -> toString
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":150,"2":151,"3":152}}
     150:150:java.lang.String toString():148:148 -> toString
     151:151:java.lang.String toString():148:148 -> toString
     152:152:java.lang.String toString():148:148 -> toString
     149:149:java.lang.String toString():148:148 -> toString
-    1:1:com.android.tools.r8.graph.DexMethodSignature com.android.tools.r8.graph.DexMethodSignature.create(com.android.tools.r8.graph.DexMethod):17:17 -> u0
-    1:1:com.android.tools.r8.graph.DexMethodSignature getSignature():173 -> u0
-    1:1:java.lang.String qualifiedName():251:251 -> v0
-    1:1:java.lang.String toSourceStringWithoutHolder():265:265 -> w0
+    1:1:com.android.tools.r8.graph.DexProto getProto():94:94 -> u0
+    1:1:com.android.tools.r8.graph.DexType getReturnType():98:98 -> v0
+    1:1:com.android.tools.r8.graph.DexMethodSignature com.android.tools.r8.graph.DexMethodSignature.create(com.android.tools.r8.graph.DexMethod):17:17 -> w0
+    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.T0:
     com.android.tools.r8.graph.DexMethodHandle$MethodHandleType type -> e
     boolean $assertionsDisabled -> i
@@ -24331,7 +24441,7 @@
     com.android.tools.r8.graph.DexMember member -> f
     1:1:void <clinit>():17:17 -> <clinit>
     1:5:void <init>(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.DexMember,boolean,com.android.tools.r8.graph.DexMethod):212:216 -> <init>
-    com.android.tools.r8.utils.structural.StructuralItem self() -> K
+    com.android.tools.r8.utils.structural.StructuralItem self() -> L
     1:1: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):221:221 -> a
     2:29:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType com.android.tools.r8.graph.DexMethodHandle$MethodHandleType.fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):88:115 -> a
     2:29: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):221 -> a
@@ -24403,26 +24513,26 @@
     133:137: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 -> c0
-    1:1:int computeHashCode():231:231 -> e0
-    1:1:com.android.tools.r8.graph.DexField asField():307:307 -> f0
-    2:2:boolean isFieldHandle():290:290 -> f0
-    2:2:com.android.tools.r8.graph.DexField asField():307 -> f0
-    3:4:com.android.tools.r8.graph.DexField asField():307:308 -> f0
+    1:1:java.lang.String toSmaliString():286:286 -> d0
+    1:1:int computeHashCode():231:231 -> f0
     1:6:boolean computeEquals(java.lang.Object):236:241 -> g
-    1:1:com.android.tools.r8.graph.DexMethod asMethod():302:302 -> g0
-    2:2:boolean isMethodHandle():294:294 -> g0
-    2:2:com.android.tools.r8.graph.DexMethod asMethod():302 -> g0
-    3:4:com.android.tools.r8.graph.DexMethod asMethod():302:303 -> g0
-    1:1:boolean isFieldHandle():290:290 -> h0
-    1:1:boolean isMethodHandle():294:294 -> i0
-    1:1:boolean isStaticHandle():298:298 -> j0
-    2:2:boolean com.android.tools.r8.graph.DexMethodHandle$MethodHandleType.isStaticPut():129:129 -> j0
-    2:2:boolean isStaticHandle():298 -> j0
-    3:3:boolean isStaticHandle():298:298 -> j0
-    4:4:boolean com.android.tools.r8.graph.DexMethodHandle$MethodHandleType.isStaticGet():133:133 -> j0
-    4:4:boolean isStaticHandle():298 -> j0
-    5:5:boolean isStaticHandle():298:298 -> j0
+    1:1:com.android.tools.r8.graph.DexField asField():307:307 -> g0
+    2:2:boolean isFieldHandle():290:290 -> g0
+    2:2:com.android.tools.r8.graph.DexField asField():307 -> g0
+    3:4:com.android.tools.r8.graph.DexField asField():307:308 -> g0
+    1:1:com.android.tools.r8.graph.DexMethod asMethod():302:302 -> h0
+    2:2:boolean isMethodHandle():294:294 -> h0
+    2:2:com.android.tools.r8.graph.DexMethod asMethod():302 -> h0
+    3:4:com.android.tools.r8.graph.DexMethod asMethod():302:303 -> h0
+    1:1:boolean isFieldHandle():290:290 -> i0
+    1:1:boolean isMethodHandle():294:294 -> j0
+    1:1:boolean isStaticHandle():298:298 -> k0
+    2:2:boolean com.android.tools.r8.graph.DexMethodHandle$MethodHandleType.isStaticPut():129:129 -> k0
+    2:2:boolean isStaticHandle():298 -> k0
+    3:3:boolean isStaticHandle():298:298 -> k0
+    4:4:boolean com.android.tools.r8.graph.DexMethodHandle$MethodHandleType.isStaticGet():133:133 -> k0
+    4:4:boolean isStaticHandle():298 -> k0
+    5:5:boolean isStaticHandle():298:298 -> 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.S0:
@@ -24510,14 +24620,14 @@
 com.android.tools.r8.graph.DexMethodSignature$MethodBased -> com.android.tools.r8.graph.U0:
     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() -> K
+    com.android.tools.r8.utils.structural.StructuralItem self() -> L
     1:1:com.android.tools.r8.graph.DexString getName():110:110 -> b
     1:1:com.android.tools.r8.graph.DexProto getProto():115:115 -> c
 com.android.tools.r8.graph.DexMethodSignature$NameAndProtoBased -> com.android.tools.r8.graph.V0:
     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() -> K
+    com.android.tools.r8.utils.structural.StructuralItem self() -> L
     1:1:com.android.tools.r8.graph.DexString getName():131:131 -> b
     1:1:com.android.tools.r8.graph.DexProto getProto():136:136 -> c
 com.android.tools.r8.graph.DexProgramClass -> com.android.tools.r8.graph.Y0:
@@ -24533,42 +24643,43 @@
     1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.GenericSignature$ClassSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],boolean,com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier,com.android.tools.r8.synthesis.SyntheticMarker):80:80 -> <init>
     2:53:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.GenericSignature$ClassSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],boolean,com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier,com.android.tools.r8.synthesis.SyntheticMarker):51:102 -> <init>
     54:54:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,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):125:125 -> <init>
-    1:1:com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier getChecksumSupplier():825:825 -> A1
-    1:1:com.android.tools.r8.cf.CfVersion getInitialClassFileVersion():747:747 -> B1
-    1:1:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo():483:483 -> C1
-    1:1:com.android.tools.r8.ProgramResource$Kind getOriginKind():365:365 -> D1
-    1:1:com.android.tools.r8.graph.ProgramMethod getProgramClassInitializer():286:286 -> E1
-    1:1:com.android.tools.r8.graph.ProgramMethod getProgramDefaultInitializer():290:290 -> F1
-    2:2:com.android.tools.r8.graph.ProgramMethod getProgramInitializer(com.android.tools.r8.graph.DexType[]):294:294 -> F1
-    2:2:com.android.tools.r8.graph.ProgramMethod getProgramDefaultInitializer():290 -> F1
-    1:1:boolean hasClassFileVersion():743:743 -> G1
-    1:1:boolean hasClassOrMemberAnnotations():606:606 -> H1
-    2:3:boolean hasAnnotations(com.android.tools.r8.graph.MethodCollection):625:626 -> H1
-    2:3:boolean hasClassOrMemberAnnotations():607 -> H1
-    4:6:boolean hasClassOrMemberAnnotations():607:609 -> H1
-    7:7:boolean hasAnnotations(com.android.tools.r8.graph.MethodCollection):627:627 -> H1
-    7:7:boolean hasClassOrMemberAnnotations():607 -> H1
-    1:1:boolean hasFields():593:593 -> I1
-    1:1:boolean hasMethods():597:597 -> J1
-    com.android.tools.r8.utils.structural.StructuralItem self() -> K
+    1:1:long getChecksum():821:821 -> A1
+    1:1:com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier getChecksumSupplier():825:825 -> B1
+    1:1:com.android.tools.r8.cf.CfVersion getInitialClassFileVersion():747:747 -> C1
+    1:1:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo():483:483 -> D1
+    1:1:com.android.tools.r8.ProgramResource$Kind getOriginKind():365:365 -> E1
+    1:1:com.android.tools.r8.graph.ProgramMethod getProgramClassInitializer():286:286 -> F1
+    1:1:com.android.tools.r8.graph.ProgramMethod getProgramDefaultInitializer():290:290 -> G1
+    2:2:com.android.tools.r8.graph.ProgramMethod getProgramInitializer(com.android.tools.r8.graph.DexType[]):294:294 -> G1
+    2:2:com.android.tools.r8.graph.ProgramMethod getProgramDefaultInitializer():290 -> G1
+    1:1:boolean hasClassFileVersion():743:743 -> H1
+    1:1:boolean hasClassOrMemberAnnotations():606:606 -> I1
+    2:3:boolean hasAnnotations(com.android.tools.r8.graph.MethodCollection):625:626 -> I1
+    2:3:boolean hasClassOrMemberAnnotations():607 -> I1
+    4:6:boolean hasClassOrMemberAnnotations():607:609 -> I1
+    7:7:boolean hasAnnotations(com.android.tools.r8.graph.MethodCollection):627:627 -> I1
+    7:7:boolean hasClassOrMemberAnnotations():607 -> I1
+    1:1:boolean hasFields():593:593 -> J1
     1:1:boolean hasMethods():597:597 -> K1
-    1:1:boolean hasMethodsOrFields():601 -> K1
-    2:2:boolean hasMethodsOrFields():601:601 -> K1
-    1:1:boolean hasOnlyInternalizableAnnotations():613:613 -> L1
-    2:3:boolean hasAnnotations(com.android.tools.r8.graph.MethodCollection):625:626 -> L1
-    2:3:boolean hasOnlyInternalizableAnnotations():613 -> L1
-    4:6:boolean hasOnlyInternalizableAnnotations():613:615 -> L1
-    7:7:boolean hasAnnotations(com.android.tools.r8.graph.MethodCollection):627:627 -> L1
-    7:7:boolean hasOnlyInternalizableAnnotations():613 -> L1
-    1:1:boolean isDeprecated():755:755 -> M1
-    1:1:boolean originatesFromClassResource():373:373 -> N1
-    1:1:boolean originatesFromDexResource():369:369 -> O1
-    1:1:java.lang.Iterable programInstanceInitializers():252:252 -> P1
-    com.android.tools.r8.graph.DexProgramClass asProgramClass() -> Q
-    1:1:void setDeprecated():751:751 -> Q1
-    1:5:com.android.tools.r8.synthesis.SyntheticMarker stripSyntheticInputMarker():172:176 -> R1
-    1:1:java.lang.Iterable virtualProgramMethods():243:243 -> S1
-    boolean isProgramClass() -> T
+    com.android.tools.r8.utils.structural.StructuralItem self() -> L
+    1:1:boolean hasMethods():597:597 -> L1
+    1:1:boolean hasMethodsOrFields():601 -> L1
+    2:2:boolean hasMethodsOrFields():601:601 -> L1
+    1:1:boolean hasOnlyInternalizableAnnotations():613:613 -> M1
+    2:3:boolean hasAnnotations(com.android.tools.r8.graph.MethodCollection):625:626 -> M1
+    2:3:boolean hasOnlyInternalizableAnnotations():613 -> M1
+    4:6:boolean hasOnlyInternalizableAnnotations():613:615 -> M1
+    7:7:boolean hasAnnotations(com.android.tools.r8.graph.MethodCollection):627:627 -> M1
+    7:7:boolean hasOnlyInternalizableAnnotations():613 -> M1
+    1:1:boolean isDeprecated():755:755 -> N1
+    1:1:boolean originatesFromClassResource():373:373 -> O1
+    1:1:boolean originatesFromDexResource():369:369 -> P1
+    1:1:java.lang.Iterable programInstanceInitializers():252:252 -> Q1
+    com.android.tools.r8.graph.DexProgramClass asProgramClass() -> R
+    1:1:void setDeprecated():751:751 -> R1
+    1:5:com.android.tools.r8.synthesis.SyntheticMarker stripSyntheticInputMarker():172:176 -> S1
+    1:1:java.lang.Iterable virtualProgramMethods():243:243 -> T1
+    boolean isProgramClass() -> U
     1:5:void com.android.tools.r8.graph.ProgramField.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):18:22 -> a
     1: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(1)"]}
@@ -24704,10 +24815,10 @@
     14:16:void addExtraInterfaces(java.util.List):681 -> d
     17:29:void addExtraInterfacesToSignatureIfPresent(java.util.List):696:708 -> d
     17:29:void addExtraInterfaces(java.util.List):682 -> d
-    1:1:java.lang.String toSourceString():439:439 -> d0
     1:1:com.android.tools.r8.graph.ClassAccessFlags lambda$specify$3(com.android.tools.r8.graph.DexProgramClass):184:184 -> e
     2:2:void forEachProgramFieldMatching(java.util.function.Predicate,java.util.function.Consumer):204:204 -> e
     3:3:com.android.tools.r8.graph.ProgramMethod lambda$directProgramMethods$14(com.android.tools.r8.graph.DexEncodedMethod):235:235 -> e
+    1:1:java.lang.String toSourceString():439:439 -> e0
     1:1:com.android.tools.r8.graph.DexString lambda$specify$4(com.android.tools.r8.graph.DexProgramClass):185:185 -> f
     2:2:com.android.tools.r8.graph.ProgramMethod lambda$directProgramMethods$15(com.android.tools.r8.graph.DexEncodedMethod):239:239 -> f
     3:3:void forEachProgramInstanceInitializerMatching(java.util.function.Predicate,java.util.function.Consumer):271:271 -> f
@@ -24729,12 +24840,11 @@
     1:1:com.android.tools.r8.graph.DexEncodedField[] lambda$specify$9(com.android.tools.r8.graph.DexProgramClass):194:194 -> k
     1:1:java.lang.Iterable directProgramMethods(java.util.function.Predicate):239:239 -> m
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():168:168 -> n
-    boolean isNotProgramClass() -> o1
+    boolean isNotProgramClass() -> p1
     1:1:java.lang.String toString():434:434 -> toString
-    1:1:com.android.tools.r8.graph.DexType getContextType():723:723 -> x
-    1:1:void clearKotlinInfo():493:493 -> x1
-    1:1:java.lang.Iterable directProgramMethods():235:235 -> y1
-    1:1:long getChecksum():821:821 -> z1
+    1:1:com.android.tools.r8.graph.DexType getContextType():723:723 -> y
+    1:1:void clearKotlinInfo():493:493 -> y1
+    1:1:java.lang.Iterable directProgramMethods():235:235 -> z1
 com.android.tools.r8.graph.DexProgramClass$1 -> com.android.tools.r8.graph.X0:
     java.util.Iterator iterator -> c
     com.android.tools.r8.graph.DexProgramClass next -> b
@@ -24753,7 +24863,7 @@
     com.android.tools.r8.graph.DexType returnType -> f
     1:1:void <clinit>():16:16 -> <clinit>
     1:4:void <init>(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList):22:25 -> <init>
-    com.android.tools.r8.utils.structural.StructuralItem self() -> K
+    com.android.tools.r8.utils.structural.StructuralItem self() -> L
     1:1:java.lang.String toDescriptorString(com.android.tools.r8.naming.NamingLens):0:0 -> a
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":131,"2":132,"3":133}}
     131:131:java.lang.String toDescriptorString(com.android.tools.r8.naming.NamingLens):122:122 -> a
@@ -24790,11 +24900,11 @@
     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 -> c0
-    1:1:java.lang.String toSmaliString():114 -> c0
-    1:1:int computeHashCode():58:58 -> e0
-    1:1:com.android.tools.r8.graph.DexType getReturnType():62:62 -> f0
+    1:1:java.lang.String toDescriptorString():118:118 -> d0
+    1:1:java.lang.String toSmaliString():114 -> d0
+    1:1:int computeHashCode():58:58 -> f0
     1:5:boolean computeEquals(java.lang.Object):47:51 -> g
+    1:1:com.android.tools.r8.graph.DexType getReturnType():62:62 -> g0
     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
     1:1:java.lang.String toString():0:0 -> toString
@@ -24815,16 +24925,17 @@
     2:2:boolean isDexType():0:0 -> a
     2:2:java.lang.Object applyPair(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexReference,java.util.function.BiFunction,java.util.function.BiFunction,java.util.function.BiFunction):38 -> a
     3:9:java.lang.Object applyPair(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexReference,java.util.function.BiFunction,java.util.function.BiFunction,java.util.function.BiFunction):39:45 -> a
-    com.android.tools.r8.graph.DexField asDexField() -> f0
-    com.android.tools.r8.graph.DexMember asDexMember() -> g0
-    com.android.tools.r8.graph.DexMethod asDexMethod() -> h0
-    com.android.tools.r8.graph.DexType asDexType() -> i0
-    boolean isDexField() -> j0
-    boolean isDexMethod() -> k0
-    1:1:boolean isDexType():0:0 -> l0
-    1:1:int referenceTypeOrder():87 -> l0
-    2:5:int referenceTypeOrder():90:93 -> l0
-    com.android.tools.r8.graph.DexType getContextType() -> x
+    com.android.tools.r8.graph.DexField asDexField() -> g0
+    com.android.tools.r8.graph.DexMember asDexMember() -> h0
+    com.android.tools.r8.graph.DexMethod asDexMethod() -> i0
+    com.android.tools.r8.graph.DexType asDexType() -> j0
+    boolean isDexField() -> k0
+    boolean isDexMember() -> l0
+    boolean isDexMethod() -> m0
+    1:1:boolean isDexType():0:0 -> n0
+    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.c1:
     com.android.tools.r8.graph.DexString[] EMPTY_ARRAY -> g
     int size -> e
@@ -24833,7 +24944,7 @@
     1:3:void <clinit>():20:22 -> <clinit>
     1:3:void <init>(int,byte[]):28:30 -> <init>
     4:6:void <init>(java.lang.String):33:35 -> <init>
-    com.android.tools.r8.utils.structural.StructuralItem self() -> K
+    com.android.tools.r8.utils.structural.StructuralItem self() -> L
     int countBytes(char) -> a
     1:1:int acceptCompareTo(com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.CompareToVisitor):20:20 -> a
     2:2:int acceptCompareTo(com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.structural.CompareToVisitor):65:65 -> a
@@ -24859,30 +24970,30 @@
     109:112:com.android.tools.r8.graph.DexString toArrayDescriptor(int,com.android.tools.r8.graph.DexItemFactory):536:539 -> 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:1:int computeHashCode():115:115 -> e0
-    1:3:java.lang.String decode():145:147 -> f0
+    1:1:int computeHashCode():115:115 -> f0
     1:3:boolean computeEquals(java.lang.Object):120:122 -> g
-    1:32:int decodedHashCode():191:222 -> g0
-    33:46:int decodedHashCode():205:218 -> g0
-    1:11:java.lang.String dump():430:440 -> h0
-    1:1:boolean isValidClassDescriptor():396:396 -> i0
-    2:13:boolean isValidClassDescriptor(java.lang.String):314:325 -> i0
-    2:13:boolean isValidClassDescriptor():396 -> i0
-    14:14:boolean isValidClassDescriptor(java.lang.String):323:323 -> i0
-    14:14:boolean isValidClassDescriptor():396 -> i0
-    1:1:boolean isValidFieldName():388:388 -> j0
-    2:18:boolean isValidFieldName(java.lang.String):355:371 -> j0
-    2:18:boolean isValidFieldName():388 -> j0
-    19:19:boolean isValidFieldName(java.lang.String):369:369 -> j0
-    19:19:boolean isValidFieldName():388 -> j0
-    1:1:boolean isValidMethodName():380:380 -> k0
-    2:16:boolean isValidMethodName(java.lang.String):333:347 -> k0
-    2:16:boolean isValidMethodName():380 -> k0
-    17:17:boolean isValidMethodName(java.lang.String):345:345 -> k0
-    17:17:boolean isValidMethodName():380 -> k0
-    1:1:com.android.tools.r8.utils.ThrowingCharIterator iterator():74:74 -> l0
-    1:3:java.lang.String toASCIIString():138:140 -> m0
+    1:3:java.lang.String decode():145:147 -> g0
+    1:32:int decodedHashCode():191:222 -> h0
+    33:46:int decodedHashCode():205:218 -> h0
+    1:11:java.lang.String dump():430:440 -> i0
+    1:1:boolean isValidClassDescriptor():396:396 -> j0
+    2:13:boolean isValidClassDescriptor(java.lang.String):314:325 -> j0
+    2:13:boolean isValidClassDescriptor():396 -> j0
+    14:14:boolean isValidClassDescriptor(java.lang.String):323:323 -> j0
+    14:14:boolean isValidClassDescriptor():396 -> j0
+    1:1:boolean isValidFieldName():388:388 -> k0
+    2:18:boolean isValidFieldName(java.lang.String):355:371 -> k0
+    2:18:boolean isValidFieldName():388 -> k0
+    19:19:boolean isValidFieldName(java.lang.String):369:369 -> k0
+    19:19:boolean isValidFieldName():388 -> k0
+    1:1:boolean isValidMethodName():380:380 -> l0
+    2:16:boolean isValidMethodName(java.lang.String):333:347 -> l0
+    2:16:boolean isValidMethodName():380 -> l0
+    17:17:boolean isValidMethodName(java.lang.String):345:345 -> l0
+    17:17:boolean isValidMethodName():380 -> l0
+    1:1:com.android.tools.r8.utils.ThrowingCharIterator iterator():74:74 -> m0
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():50:50 -> n
+    1:3:java.lang.String toASCIIString():138:140 -> n0
     1:3:java.lang.String toString():130:132 -> toString
 com.android.tools.r8.graph.DexString$1 -> com.android.tools.r8.graph.b1:
     com.android.tools.r8.graph.DexString this$0 -> b
@@ -24908,31 +25019,33 @@
     60:60:void <init>(com.android.tools.r8.graph.DexString):51:51 -> <init>
     61:61:void <init>(com.android.tools.r8.graph.DexString):51:51 -> <init>
     57:58:void <init>(com.android.tools.r8.graph.DexString):51:52 -> <init>
-    1:1:boolean isCharType():288:288 -> A0
-    1:1:boolean isClassType():323:323 -> B0
-    1:1:boolean isDoubleType():308:308 -> C0
-    1:1:boolean isFloatType():300:300 -> D0
-    1:1:boolean isIntType():296:296 -> E0
-    1:1:boolean isLegacySynthesizedTypeAllowedDuplication():353:353 -> F0
-    2:3:boolean oldSynthesizedName(java.lang.String):357:358 -> F0
-    2:3:boolean isLegacySynthesizedTypeAllowedDuplication():353 -> F0
-    1:1:boolean isLongType():304:304 -> G0
-    1:2:boolean isNullValueType():312:313 -> H0
-    1:4:boolean isPrimitiveArrayType():334:337 -> I0
-    1:1:boolean isPrimitiveType():272:272 -> J0
-    com.android.tools.r8.utils.structural.StructuralItem self() -> K
-    1:2:boolean isReferenceType():328:329 -> K0
-    1:1:boolean isShortType():292:292 -> L0
-    1:1:boolean isVoidType():276:276 -> M0
-    1:1:boolean isWideType():341:341 -> N0
-    1:4:java.lang.String toBinaryName():179:182 -> O0
-    5:5:java.lang.String toBinaryName():180:180 -> O0
-    6:6:java.lang.String toBinaryName():0:0 -> O0
+    1:1:boolean isBooleanType():280:280 -> A0
+    1:1:boolean isByteType():284:284 -> B0
+    1:1:boolean isCharType():288:288 -> C0
+    1:1:boolean isClassType():323:323 -> D0
+    1:1:boolean isDoubleType():308:308 -> E0
+    1:1:boolean isFloatType():300:300 -> F0
+    1:1:boolean isIntType():296:296 -> G0
+    1:1:boolean isLegacySynthesizedTypeAllowedDuplication():353:353 -> H0
+    2:3:boolean oldSynthesizedName(java.lang.String):357:358 -> H0
+    2:3:boolean isLegacySynthesizedTypeAllowedDuplication():353 -> H0
+    1:1:boolean isLongType():304:304 -> I0
+    1:2:boolean isNullValueType():312:313 -> J0
+    1:4:boolean isPrimitiveArrayType():334:337 -> K0
+    com.android.tools.r8.utils.structural.StructuralItem self() -> L
+    1:1:boolean isPrimitiveType():272:272 -> L0
+    1:2:boolean isReferenceType():328:329 -> M0
+    1:1:boolean isShortType():292:292 -> N0
+    1:1:boolean isVoidType():276:276 -> O0
+    1:1:boolean isWideType():341:341 -> P0
+    1:4:java.lang.String toBinaryName():179:182 -> Q0
+    5:5:java.lang.String toBinaryName():180:180 -> Q0
+    6:6:java.lang.String toBinaryName():0:0 -> Q0
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":189,"3":190}}
-    189:189:java.lang.String toBinaryName():183:183 -> O0
-    190:190:java.lang.String toBinaryName():183:183 -> O0
-    1:1:java.lang.String toDescriptorString():175:175 -> P0
-    1:1:char toShorty():229:229 -> Q0
+    189:189:java.lang.String toBinaryName():183:183 -> Q0
+    190:190:java.lang.String toBinaryName():183:183 -> Q0
+    1:1:java.lang.String toDescriptorString():175:175 -> R0
+    1:1:char toShorty():229:229 -> S0
     1:1:int acceptCompareTo(com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.CompareToVisitor):30:30 -> a
     2:2:int acceptCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.structural.CompareToVisitor):99:99 -> a
     2:2:int acceptCompareTo(com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.CompareToVisitor):30 -> a
@@ -24997,34 +25110,32 @@
     474:475:com.android.tools.r8.graph.DexType replacePackage(java.lang.String,com.android.tools.r8.graph.DexItemFactory):452:453 -> b
     1:3:com.android.tools.r8.graph.DexType withSimpleName(java.lang.String,com.android.tools.r8.graph.DexItemFactory):515:517 -> c
     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 -> c0
-    1:9:java.lang.String toSourceString():217:225 -> d0
-    1:1:int computeHashCode():124:124 -> e0
+    1:1:java.lang.String toSmaliString():235:235 -> d0
+    1:9:java.lang.String toSourceString():217:225 -> e0
+    1:1:int computeHashCode():124:124 -> f0
     1:2:boolean computeEquals(java.lang.Object):129:130 -> g
-    com.android.tools.r8.graph.DexType asDexType() -> i0
-    1:1:com.android.tools.r8.references.ClassReference asClassReference():56:56 -> m0
+    com.android.tools.r8.graph.DexType asDexType() -> j0
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():93:93 -> n
-    1:16:int elementSizeForPrimitiveArrayType():384:399 -> n0
-    17:17:int elementSizeForPrimitiveArrayType():0:0 -> n0
+    1:1:com.android.tools.r8.references.ClassReference asClassReference():56:56 -> o0
+    1:16:int elementSizeForPrimitiveArrayType():384:399 -> p0
+    17:17:int elementSizeForPrimitiveArrayType():0:0 -> p0
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":417,"2":418,"3":419}}
-    417:417:int elementSizeForPrimitiveArrayType():399:399 -> n0
-    418:418:int elementSizeForPrimitiveArrayType():399:399 -> n0
-    419:419:int elementSizeForPrimitiveArrayType():399:399 -> n0
-    416:416:int elementSizeForPrimitiveArrayType():399:399 -> n0
-    1:1:com.android.tools.r8.graph.DexString getDescriptor():114:114 -> o0
-    1:2:java.lang.String getInternalName():522:523 -> p0
-    1:4:java.lang.String getName():503:506 -> q0
-    1:1:int getNumberOfLeadingSquareBrackets():405:405 -> r0
-    1:1:java.lang.String getPackageDescriptor():499:499 -> s0
-    1:1:java.lang.String getPackageName():527:527 -> t0
+    417:417:int elementSizeForPrimitiveArrayType():399:399 -> p0
+    418:418:int elementSizeForPrimitiveArrayType():399:399 -> p0
+    419:419:int elementSizeForPrimitiveArrayType():399:399 -> p0
+    416:416:int elementSizeForPrimitiveArrayType():399:399 -> p0
+    1:1:com.android.tools.r8.graph.DexString getDescriptor():114:114 -> q0
+    1:2:java.lang.String getInternalName():522:523 -> r0
+    1:4:java.lang.String getName():503:506 -> s0
+    1:1:int getNumberOfLeadingSquareBrackets():405:405 -> t0
     1:1:java.lang.String toString():240:240 -> toString
-    1:2:int getRequiredRegisters():118:119 -> u0
-    1:2:java.lang.String getSimpleName():510:511 -> v0
-    1:1:java.lang.String getTypeName():212:212 -> w0
-    com.android.tools.r8.graph.DexType getContextType() -> x
-    1:1:boolean isArrayType():318:318 -> x0
-    1:1:boolean isBooleanType():280:280 -> y0
-    1:1:boolean isByteType():284:284 -> z0
+    1:1:java.lang.String getPackageDescriptor():499:499 -> u0
+    1:1:java.lang.String getPackageName():527:527 -> v0
+    1:2:int getRequiredRegisters():118:119 -> w0
+    1:2:java.lang.String getSimpleName():510:511 -> x0
+    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.e1:
     com.android.tools.r8.graph.DexTypeList theEmptyTypeList -> c
     com.android.tools.r8.graph.DexType[] values -> b
@@ -25033,7 +25144,7 @@
     1:3:void <clinit>():23:25 -> <clinit>
     1:2:void <init>():37:38 -> <init>
     3:5:void <init>(com.android.tools.r8.graph.DexType[]):41:43 -> <init>
-    com.android.tools.r8.utils.structural.StructuralItem self() -> K
+    com.android.tools.r8.utils.structural.StructuralItem self() -> L
     1:1:com.android.tools.r8.graph.DexType[] lambda$specify$0(com.android.tools.r8.graph.DexTypeList):30:30 -> a
     2:2:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):30:30 -> a
     3:7:com.android.tools.r8.graph.DexTypeList map(java.util.function.Function):75:79 -> a
@@ -25053,8 +25164,8 @@
     16:16:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):246 -> a
     16:16:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):114 -> a
     17:17:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):120:120 -> a
-    1:1:com.android.tools.r8.graph.DexTypeList empty():34:34 -> e0
     1:2:boolean equals(java.lang.Object):128:129 -> equals
+    1:1:com.android.tools.r8.graph.DexTypeList empty():34:34 -> f0
     1:2:void forEach(java.util.function.Consumer):102:103 -> forEach
     1:1:int hashCode():109:109 -> hashCode
     1:1:com.android.tools.r8.graph.DexType get(int):59:59 -> i
@@ -25063,7 +25174,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.hg:
+com.android.tools.r8.graph.DexTypeUtils -> com.android.tools.r8.internal.gg:
     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
@@ -25078,21 +25189,22 @@
     com.android.tools.r8.graph.DexValue[] EMPTY_ARRAY -> b
     1:1:void <clinit>():145:145 -> <clinit>
     1:1:void <init>():34:34 -> <init>
-    boolean isDexValueBoolean() -> A0
-    boolean isDexValueByte() -> B0
-    boolean isDexValueChar() -> C0
-    boolean isDexValueDouble() -> D0
-    boolean isDexValueFloat() -> E0
-    boolean isDexValueInt() -> F0
-    boolean isDexValueLong() -> G0
-    boolean isDexValueNumber() -> H0
-    boolean isDexValueShort() -> I0
-    boolean isDexValueString() -> J0
-    com.android.tools.r8.utils.structural.StructuralItem self() -> K
-    boolean isDexValueType() -> K0
-    boolean isNestedDexValue() -> L0
-    boolean mayHaveSideEffects() -> M0
-    void sort() -> N0
+    com.android.tools.r8.graph.DexValue$DexValueKind getValueKind() -> A0
+    boolean isDexValueBoolean() -> B0
+    boolean isDexValueByte() -> C0
+    boolean isDexValueChar() -> D0
+    boolean isDexValueDouble() -> E0
+    boolean isDexValueFloat() -> F0
+    boolean isDexValueInt() -> G0
+    boolean isDexValueLong() -> H0
+    boolean isDexValueNumber() -> I0
+    boolean isDexValueShort() -> J0
+    boolean isDexValueString() -> K0
+    com.android.tools.r8.utils.structural.StructuralItem self() -> L
+    boolean isDexValueType() -> L0
+    boolean isNestedDexValue() -> M0
+    boolean mayHaveSideEffects() -> N0
+    void sort() -> O0
     com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo) -> a
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection) -> a
     com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.DexItemFactory) -> a
@@ -25113,38 +25225,38 @@
     int internalAcceptCompareTo(com.android.tools.r8.graph.DexValue,com.android.tools.r8.utils.structural.CompareToVisitor) -> b
     void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor) -> b
     1:1:boolean isDefault(com.android.tools.r8.graph.DexType):412:412 -> b
-    java.lang.Object asAsmEncodedObject() -> e0
-    com.android.tools.r8.graph.DexValue$DexItemBasedValueString asDexItemBasedValueString() -> f0
-    com.android.tools.r8.graph.DexValue$DexValueAnnotation asDexValueAnnotation() -> g0
-    com.android.tools.r8.graph.DexValue$DexValueArray asDexValueArray() -> h0
-    com.android.tools.r8.graph.DexValue$DexValueBoolean asDexValueBoolean() -> i0
-    com.android.tools.r8.graph.DexValue$DexValueByte asDexValueByte() -> j0
-    com.android.tools.r8.graph.DexValue$DexValueChar asDexValueChar() -> k0
-    com.android.tools.r8.graph.DexValue$DexValueDouble asDexValueDouble() -> l0
-    com.android.tools.r8.graph.DexValue$DexValueEnum asDexValueEnum() -> m0
+    java.lang.Object asAsmEncodedObject() -> f0
+    com.android.tools.r8.graph.DexValue$DexItemBasedValueString asDexItemBasedValueString() -> g0
+    com.android.tools.r8.graph.DexValue$DexValueAnnotation asDexValueAnnotation() -> h0
+    com.android.tools.r8.graph.DexValue$DexValueArray asDexValueArray() -> i0
+    com.android.tools.r8.graph.DexValue$DexValueBoolean asDexValueBoolean() -> j0
+    com.android.tools.r8.graph.DexValue$DexValueByte asDexValueByte() -> k0
+    com.android.tools.r8.graph.DexValue$DexValueChar asDexValueChar() -> l0
+    com.android.tools.r8.graph.DexValue$DexValueDouble asDexValueDouble() -> m0
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():121:121 -> n
-    com.android.tools.r8.graph.DexValue$DexValueField asDexValueField() -> n0
-    com.android.tools.r8.graph.DexValue$DexValueFloat asDexValueFloat() -> o0
-    com.android.tools.r8.graph.DexValue$DexValueInt asDexValueInt() -> p0
-    com.android.tools.r8.graph.DexValue$DexValueLong asDexValueLong() -> q0
-    com.android.tools.r8.graph.DexValue$DexValueMethod asDexValueMethod() -> r0
-    com.android.tools.r8.graph.DexValue$DexValueMethodHandle asDexValueMethodHandle() -> s0
-    com.android.tools.r8.graph.DexValue$DexValueMethodType asDexValueMethodType() -> t0
-    com.android.tools.r8.graph.DexValue$DexValueNumber asDexValueNumber() -> u0
-    com.android.tools.r8.graph.DexValue$DexValueShort asDexValueShort() -> v0
-    com.android.tools.r8.graph.DexValue$DexValueString asDexValueString() -> w0
-    com.android.tools.r8.graph.DexValue$DexValueType asDexValueType() -> x0
-    java.lang.Object getBoxedValue() -> y0
-    com.android.tools.r8.graph.DexValue$DexValueKind getValueKind() -> z0
+    com.android.tools.r8.graph.DexValue$DexValueEnum asDexValueEnum() -> n0
+    com.android.tools.r8.graph.DexValue$DexValueField asDexValueField() -> o0
+    com.android.tools.r8.graph.DexValue$DexValueFloat asDexValueFloat() -> p0
+    com.android.tools.r8.graph.DexValue$DexValueInt asDexValueInt() -> q0
+    com.android.tools.r8.graph.DexValue$DexValueLong asDexValueLong() -> r0
+    com.android.tools.r8.graph.DexValue$DexValueMethod asDexValueMethod() -> s0
+    com.android.tools.r8.graph.DexValue$DexValueMethodHandle asDexValueMethodHandle() -> t0
+    com.android.tools.r8.graph.DexValue$DexValueMethodType asDexValueMethodType() -> u0
+    com.android.tools.r8.graph.DexValue$DexValueNumber asDexValueNumber() -> v0
+    com.android.tools.r8.graph.DexValue$DexValueShort asDexValueShort() -> w0
+    com.android.tools.r8.graph.DexValue$DexValueString asDexValueString() -> x0
+    com.android.tools.r8.graph.DexValue$DexValueType asDexValueType() -> y0
+    java.lang.Object getBoxedValue() -> z0
 com.android.tools.r8.graph.DexValue$1 -> com.android.tools.r8.graph.f1:
 com.android.tools.r8.graph.DexValue$DexItemBasedValueString -> com.android.tools.r8.graph.g1:
     boolean $assertionsDisabled -> e
     com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo nameComputationInfo -> d
     1:1:void <clinit>():1274:1274 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):1289:1290 -> <init>
-    boolean isNestedDexValue() -> L0
-    void sort() -> N0
-    1:1:com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo getNameComputationInfo():1313:1313 -> P0
+    1:1:com.android.tools.r8.graph.DexValue$DexValueKind getValueKind():1333:1333 -> A0
+    boolean isNestedDexValue() -> M0
+    void sort() -> O0
+    1:1:com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo getNameComputationInfo():1313:1313 -> Q0
     1:3:int compareAndCheckValueStrings(com.android.tools.r8.graph.DexValue,com.android.tools.r8.graph.DexValue,com.android.tools.r8.utils.structural.CompareToVisitor):1279:1281 -> a
     4:4:boolean com.android.tools.r8.graph.DexValue.isDexItemBasedValueString():0:0 -> a
     4:4:int compareAndCheckValueStrings(com.android.tools.r8.graph.DexValue,com.android.tools.r8.graph.DexValue,com.android.tools.r8.utils.structural.CompareToVisitor):1281 -> a
@@ -25159,14 +25271,14 @@
     14:14:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1360:1360 -> a
     1:1:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):1295:1295 -> b
     2:6:int internalAcceptCompareTo(com.android.tools.r8.graph.DexValue,com.android.tools.r8.utils.structural.CompareToVisitor):1300:1304 -> b
-    1:1:java.lang.Object asAsmEncodedObject():1328:1328 -> e0
-    com.android.tools.r8.graph.DexValue$DexItemBasedValueString asDexItemBasedValueString() -> f0
-    1:1:com.android.tools.r8.graph.DexValue$DexValueKind getValueKind():1333:1333 -> z0
+    1:1:java.lang.Object asAsmEncodedObject():1328:1328 -> f0
+    com.android.tools.r8.graph.DexValue$DexItemBasedValueString asDexItemBasedValueString() -> g0
 com.android.tools.r8.graph.DexValue$DexValueAnnotation -> com.android.tools.r8.graph.h1:
     com.android.tools.r8.graph.DexEncodedAnnotation value -> c
     1:2:void <init>(com.android.tools.r8.graph.DexEncodedAnnotation):1688:1689 -> <init>
-    com.android.tools.r8.utils.structural.StructuralItem self() -> K
-    1:1:void sort():1754:1754 -> N0
+    1:1:com.android.tools.r8.graph.DexValue$DexValueKind getValueKind():1708:1708 -> A0
+    com.android.tools.r8.utils.structural.StructuralItem self() -> L
+    1:1:void sort():1754:1754 -> O0
     1:1:int acceptCompareTo(com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.CompareToVisitor):1684:1684 -> a
     2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):1723:1723 -> a
     3:3:com.android.tools.r8.ir.analysis.value.AbstractValue toAbstractValue(com.android.tools.r8.ir.analysis.value.AbstractValueFactory):1728:1728 -> a
@@ -25174,9 +25286,9 @@
     6:6:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.DexItemFactory):1739:1739 -> a
     1:1:int internalAcceptCompareTo(com.android.tools.r8.graph.DexValue,com.android.tools.r8.utils.structural.CompareToVisitor):1694:1694 -> b
     2:2:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):1699:1699 -> b
-    1:1:java.lang.Object asAsmEncodedObject():1749:1749 -> e0
     1:3:boolean equals(java.lang.Object):1767:1769 -> equals
-    com.android.tools.r8.graph.DexValue$DexValueAnnotation asDexValueAnnotation() -> g0
+    1:1:java.lang.Object asAsmEncodedObject():1749:1749 -> f0
+    com.android.tools.r8.graph.DexValue$DexValueAnnotation asDexValueAnnotation() -> h0
     1:1:int hashCode():1759:1759 -> hashCode
     1:1:java.lang.String toString():0:0 -> toString
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1778,"2":1779,"3":1780}}
@@ -25184,14 +25296,14 @@
     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
-    1:1:java.lang.Object getBoxedValue():1744:1744 -> y0
-    1:1:com.android.tools.r8.graph.DexValue$DexValueKind getValueKind():1708:1708 -> z0
+    1:1:java.lang.Object getBoxedValue():1744:1744 -> z0
 com.android.tools.r8.graph.DexValue$DexValueArray -> com.android.tools.r8.graph.i1$a:
     com.android.tools.r8.graph.DexValue[] values -> c
     1:2:void <init>(com.android.tools.r8.graph.DexValue[]):1579:1580 -> <init>
-    com.android.tools.r8.utils.structural.StructuralItem self() -> K
-    1:2:void sort():1646:1647 -> N0
-    1:1:com.android.tools.r8.graph.DexValue[] getValues():1600:1600 -> O0
+    1:1:com.android.tools.r8.graph.DexValue$DexValueKind getValueKind():1605:1605 -> A0
+    com.android.tools.r8.utils.structural.StructuralItem self() -> L
+    1:2:void sort():1646:1647 -> O0
+    1:1:com.android.tools.r8.graph.DexValue[] getValues():1600:1600 -> P0
     1:1:int acceptCompareTo(com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.CompareToVisitor):1575:1575 -> a
     2:3:void forEachElement(java.util.function.Consumer):1594:1595 -> a
     4:5:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):1610:1611 -> a
@@ -25207,18 +25319,17 @@
     3:3:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):1590:1590 -> b
     4:4:void com.android.tools.r8.utils.structural.HashingVisitor.visitItemArray(com.android.tools.r8.utils.structural.StructuralItem[]):32:32 -> b
     4:4:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):1590 -> b
-    1:1:java.lang.Object asAsmEncodedObject():1641:1641 -> e0
     1:3:boolean equals(java.lang.Object):1661:1663 -> equals
-    com.android.tools.r8.graph.DexValue$DexValueArray asDexValueArray() -> h0
+    1:1:java.lang.Object asAsmEncodedObject():1641:1641 -> f0
     1:1:int hashCode():1653:1653 -> hashCode
+    com.android.tools.r8.graph.DexValue$DexValueArray asDexValueArray() -> i0
     1:1:java.lang.String toString():0:0 -> toString
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1672,"2":1673,"3":1674}}
     1672:1672:java.lang.String toString():1670:1670 -> toString
     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
-    1:1:java.lang.Object getBoxedValue():1631:1631 -> y0
-    1:1:com.android.tools.r8.graph.DexValue$DexValueKind getValueKind():1605:1605 -> z0
+    1:1:java.lang.Object getBoxedValue():1631:1631 -> z0
 com.android.tools.r8.graph.DexValue$DexValueBoolean -> com.android.tools.r8.graph.i1$b:
     com.android.tools.r8.graph.DexValue$DexValueBoolean TRUE -> d
     com.android.tools.r8.graph.DexValue$DexValueBoolean FALSE -> e
@@ -25226,31 +25337,32 @@
     boolean value -> c
     1:4:void <clinit>():1871:1874 -> <clinit>
     1:2:void <init>(boolean):1878:1879 -> <init>
-    boolean isDexValueBoolean() -> A0
-    1:1:long getRawValue():1912:1912 -> O0
-    1:1:com.android.tools.r8.graph.DexValue$DexValueBoolean access$000():1869:1869 -> P0
-    1:1:boolean getValue():1897:1897 -> Q0
+    1:1:com.android.tools.r8.graph.DexValue$DexValueKind getValueKind():1902:1902 -> A0
+    boolean isDexValueBoolean() -> B0
+    1:1:long getRawValue():1912:1912 -> P0
+    1:1:com.android.tools.r8.graph.DexValue$DexValueBoolean access$000():1869:1869 -> Q0
+    1:1:boolean getValue():1897:1897 -> R0
     1:1:com.android.tools.r8.graph.DexValue$DexValueBoolean create(boolean):1883:1883 -> a
     2:2:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.DexItemFactory):1907:1907 -> a
     3:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1932:1932 -> a
     4:4:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):1961:1961 -> a
     1:1:int internalAcceptCompareTo(com.android.tools.r8.graph.DexValue,com.android.tools.r8.utils.structural.CompareToVisitor):1888:1888 -> b
     2:2:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):1893:1893 -> b
-    1:1:java.lang.Object asAsmEncodedObject():1937:1937 -> e0
     1:1:boolean equals(java.lang.Object):1950:1950 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():1937:1937 -> f0
     1:1:int hashCode():1942:1942 -> hashCode
-    com.android.tools.r8.graph.DexValue$DexValueBoolean asDexValueBoolean() -> i0
+    com.android.tools.r8.graph.DexValue$DexValueBoolean asDexValueBoolean() -> j0
     1:1:java.lang.String toString():1955:1955 -> toString
-    1:1:java.lang.Object getBoxedValue():1927:1927 -> y0
-    1:1:com.android.tools.r8.graph.DexValue$DexValueKind getValueKind():1902:1902 -> z0
+    1:1:java.lang.Object getBoxedValue():1927:1927 -> z0
 com.android.tools.r8.graph.DexValue$DexValueByte -> com.android.tools.r8.graph.i1$c:
     byte value -> c
     com.android.tools.r8.graph.DexValue$DexValueByte DEFAULT -> d
     1:1:void <clinit>():471:471 -> <clinit>
     1:2:void <init>(byte):475:476 -> <init>
-    boolean isDexValueByte() -> B0
-    1:1:long getRawValue():509:509 -> O0
-    1:1:byte getValue():494:494 -> P0
+    1:1:com.android.tools.r8.graph.DexValue$DexValueKind getValueKind():499:499 -> A0
+    boolean isDexValueByte() -> C0
+    1:1:long getRawValue():509:509 -> P0
+    1:1:byte getValue():494:494 -> Q0
     1:1:com.android.tools.r8.graph.DexValue$DexValueByte create(byte):480:480 -> a
     2:2:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.DexItemFactory):504:504 -> a
     3:4:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):529:530 -> a
@@ -25259,26 +25371,26 @@
     6:6:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):559:559 -> a
     1:1:int internalAcceptCompareTo(com.android.tools.r8.graph.DexValue,com.android.tools.r8.utils.structural.CompareToVisitor):485:485 -> b
     2:2:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):490:490 -> b
-    1:1:java.lang.Object asAsmEncodedObject():535:535 -> e0
     1:1:boolean equals(java.lang.Object):548:548 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():535:535 -> f0
     1:1:int hashCode():540:540 -> hashCode
-    com.android.tools.r8.graph.DexValue$DexValueByte asDexValueByte() -> j0
+    com.android.tools.r8.graph.DexValue$DexValueByte asDexValueByte() -> k0
     1:1:java.lang.String toString():0:0 -> toString
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":555,"2":556,"3":557}}
     555:555:java.lang.String toString():553:553 -> toString
     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
-    1:1:java.lang.Object getBoxedValue():524:524 -> y0
-    1:1:com.android.tools.r8.graph.DexValue$DexValueKind getValueKind():499:499 -> z0
+    1:1:java.lang.Object getBoxedValue():524:524 -> z0
 com.android.tools.r8.graph.DexValue$DexValueChar -> com.android.tools.r8.graph.i1$d:
     com.android.tools.r8.graph.DexValue$DexValueChar DEFAULT -> d
     char value -> c
     1:1:void <clinit>():657:657 -> <clinit>
     1:2:void <init>(char):660:661 -> <init>
-    boolean isDexValueChar() -> C0
-    1:1:long getRawValue():694:694 -> O0
-    1:1:char getValue():679:679 -> P0
+    1:1:com.android.tools.r8.graph.DexValue$DexValueKind getValueKind():684:684 -> A0
+    boolean isDexValueChar() -> D0
+    1:1:long getRawValue():694:694 -> P0
+    1:1:char getValue():679:679 -> Q0
     1:1:com.android.tools.r8.graph.DexValue$DexValueChar create(char):665:665 -> a
     2:2:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.DexItemFactory):689:689 -> a
     3:4:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):714:715 -> a
@@ -25290,26 +25402,26 @@
     9:9:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):747:747 -> a
     1:1:int internalAcceptCompareTo(com.android.tools.r8.graph.DexValue,com.android.tools.r8.utils.structural.CompareToVisitor):670:670 -> b
     2:2:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):675:675 -> b
-    1:1:java.lang.Object asAsmEncodedObject():723:723 -> e0
     1:1:boolean equals(java.lang.Object):736:736 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():723:723 -> f0
     1:1:int hashCode():728:728 -> hashCode
-    com.android.tools.r8.graph.DexValue$DexValueChar asDexValueChar() -> k0
+    com.android.tools.r8.graph.DexValue$DexValueChar asDexValueChar() -> l0
     1:1:java.lang.String toString():0:0 -> toString
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":743,"2":744,"3":745}}
     743:743:java.lang.String toString():741:741 -> toString
     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
-    1:1:java.lang.Object getBoxedValue():709:709 -> y0
-    1:1:com.android.tools.r8.graph.DexValue$DexValueKind getValueKind():684:684 -> z0
+    1:1:java.lang.Object getBoxedValue():709:709 -> z0
 com.android.tools.r8.graph.DexValue$DexValueDouble -> com.android.tools.r8.graph.i1$e:
     com.android.tools.r8.graph.DexValue$DexValueDouble DEFAULT -> d
     double value -> c
     1:1:void <clinit>():1034:1034 -> <clinit>
     1:2:void <init>(double):1038:1039 -> <init>
-    boolean isDexValueDouble() -> D0
-    1:1:long getRawValue():1072:1072 -> O0
-    1:1:double getValue():1057:1057 -> P0
+    1:1:com.android.tools.r8.graph.DexValue$DexValueKind getValueKind():1062:1062 -> A0
+    boolean isDexValueDouble() -> E0
+    1:1:long getRawValue():1072:1072 -> P0
+    1:1:double getValue():1057:1057 -> Q0
     1:1:com.android.tools.r8.graph.DexValue$DexValueDouble create(double):1043:1043 -> a
     2:2:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.DexItemFactory):1067:1067 -> a
     3:4:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1092:1093 -> a
@@ -25321,22 +25433,22 @@
     9:9:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):1107 -> a
     1:1:int internalAcceptCompareTo(com.android.tools.r8.graph.DexValue,com.android.tools.r8.utils.structural.CompareToVisitor):1048:1048 -> b
     2:2:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):1053:1053 -> b
-    1:1:java.lang.Object asAsmEncodedObject():1101:1101 -> e0
     1:2:boolean equals(java.lang.Object):1120:1121 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():1101:1101 -> f0
     1:1:int hashCode():1112:1112 -> hashCode
-    com.android.tools.r8.graph.DexValue$DexValueDouble asDexValueDouble() -> l0
+    com.android.tools.r8.graph.DexValue$DexValueDouble asDexValueDouble() -> m0
     1:1:java.lang.String toString():0:0 -> toString
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1128,"2":1129,"3":1130}}
     1128:1128:java.lang.String toString():1126:1126 -> toString
     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
-    1:1:java.lang.Object getBoxedValue():1087:1087 -> y0
-    1:1:com.android.tools.r8.graph.DexValue$DexValueKind getValueKind():1062:1062 -> z0
+    1:1:java.lang.Object getBoxedValue():1087:1087 -> z0
 com.android.tools.r8.graph.DexValue$DexValueEnum -> com.android.tools.r8.graph.j1:
     1:1:void <init>(com.android.tools.r8.graph.DexField):1494:1494 -> <init>
-    boolean isNestedDexValue() -> L0
-    void sort() -> N0
+    1:1:com.android.tools.r8.graph.DexValue$DexValueKind getValueKind():1509:1509 -> A0
+    boolean isNestedDexValue() -> M0
+    void sort() -> O0
     1:1:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexValue$NestedDexValue.getType(com.android.tools.r8.graph.DexItemFactory):1145:1145 -> a
     1:1:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.DexItemFactory):1491 -> a
     2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):1514:1514 -> a
@@ -25345,12 +25457,12 @@
     2:2:int com.android.tools.r8.graph.DexField.acceptCompareTo(com.android.tools.r8.graph.DexField,com.android.tools.r8.utils.structural.CompareToVisitor):176:176 -> b
     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() -> m0
-    1:1:com.android.tools.r8.graph.DexValue$DexValueKind getValueKind():1509:1509 -> z0
+    com.android.tools.r8.graph.DexValue$DexValueEnum asDexValueEnum() -> n0
 com.android.tools.r8.graph.DexValue$DexValueField -> com.android.tools.r8.graph.k1:
     1:1:void <init>(com.android.tools.r8.graph.DexField):1410:1410 -> <init>
-    boolean isNestedDexValue() -> L0
-    void sort() -> N0
+    1:1:com.android.tools.r8.graph.DexValue$DexValueKind getValueKind():1425:1425 -> A0
+    boolean isNestedDexValue() -> M0
+    void sort() -> O0
     1:1:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexValue$NestedDexValue.getType(com.android.tools.r8.graph.DexItemFactory):1145:1145 -> a
     1:1:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.DexItemFactory):1407 -> a
     2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):1430:1430 -> a
@@ -25359,16 +25471,16 @@
     2:2:int com.android.tools.r8.graph.DexField.acceptCompareTo(com.android.tools.r8.graph.DexField,com.android.tools.r8.utils.structural.CompareToVisitor):176:176 -> b
     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() -> n0
-    1:1:com.android.tools.r8.graph.DexValue$DexValueKind getValueKind():1425:1425 -> z0
+    com.android.tools.r8.graph.DexValue$DexValueField asDexValueField() -> o0
 com.android.tools.r8.graph.DexValue$DexValueFloat -> com.android.tools.r8.graph.i1$f:
     float value -> c
     com.android.tools.r8.graph.DexValue$DexValueFloat DEFAULT -> d
     1:1:void <clinit>():937:937 -> <clinit>
     1:2:void <init>(float):940:941 -> <init>
-    boolean isDexValueFloat() -> E0
-    1:1:long getRawValue():974:974 -> O0
-    1:1:float getValue():959:959 -> P0
+    1:1:com.android.tools.r8.graph.DexValue$DexValueKind getValueKind():964:964 -> A0
+    boolean isDexValueFloat() -> F0
+    1:1:long getRawValue():974:974 -> P0
+    1:1:float getValue():959:959 -> Q0
     1:1:com.android.tools.r8.graph.DexValue$DexValueFloat create(float):945:945 -> a
     2:2:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.DexItemFactory):969:969 -> a
     3:4:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):994:995 -> a
@@ -25380,44 +25492,43 @@
     9:9:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):1009 -> a
     1:1:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):950:950 -> b
     2:2:int internalAcceptCompareTo(com.android.tools.r8.graph.DexValue,com.android.tools.r8.utils.structural.CompareToVisitor):955:955 -> b
-    1:1:java.lang.Object asAsmEncodedObject():1003:1003 -> e0
     1:2:boolean equals(java.lang.Object):1022:1023 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():1003:1003 -> f0
     1:1:int hashCode():1014:1014 -> hashCode
-    com.android.tools.r8.graph.DexValue$DexValueFloat asDexValueFloat() -> o0
+    com.android.tools.r8.graph.DexValue$DexValueFloat asDexValueFloat() -> p0
     1:1:java.lang.String toString():0:0 -> toString
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1030,"2":1031,"3":1032}}
     1030:1030:java.lang.String toString():1028:1028 -> toString
     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
-    1:1:java.lang.Object getBoxedValue():989:989 -> y0
-    1:1:com.android.tools.r8.graph.DexValue$DexValueKind getValueKind():964:964 -> z0
+    1:1:java.lang.Object getBoxedValue():989:989 -> z0
 com.android.tools.r8.graph.DexValue$DexValueInt -> com.android.tools.r8.graph.i1$g:
     int value -> c
     com.android.tools.r8.graph.DexValue$DexValueInt DEFAULT -> d
     1:1:void <clinit>():753:753 -> <clinit>
     1:2:void <init>(int):756:757 -> <init>
-    boolean isDexValueInt() -> F0
-    1:1:long getRawValue():790:790 -> O0
-    1:1:int getValue():775:775 -> P0
+    1:1:com.android.tools.r8.graph.DexValue$DexValueKind getValueKind():780:780 -> A0
+    boolean isDexValueInt() -> G0
+    1:1:long getRawValue():790:790 -> P0
+    1:1:int getValue():775:775 -> Q0
     1:1:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.DexItemFactory):785:785 -> a
     2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):800:800 -> a
     3:3:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):839:839 -> a
     1:1:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):766:766 -> b
     2:2:int internalAcceptCompareTo(com.android.tools.r8.graph.DexValue,com.android.tools.r8.utils.structural.CompareToVisitor):771:771 -> b
-    1:1:java.lang.Object asAsmEncodedObject():815:815 -> e0
     1:1:boolean equals(java.lang.Object):828:828 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():815:815 -> f0
     1:1:int hashCode():820:820 -> hashCode
     1:1:com.android.tools.r8.graph.DexValue$DexValueInt create(int):761:761 -> i
-    com.android.tools.r8.graph.DexValue$DexValueInt asDexValueInt() -> p0
+    com.android.tools.r8.graph.DexValue$DexValueInt asDexValueInt() -> q0
     1:1:java.lang.String toString():0:0 -> toString
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":835,"2":836,"3":837}}
     835:835:java.lang.String toString():833:833 -> toString
     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
-    1:1:java.lang.Object getBoxedValue():795:795 -> y0
-    1:1:com.android.tools.r8.graph.DexValue$DexValueKind getValueKind():780:780 -> z0
+    1:1:java.lang.Object getBoxedValue():795:795 -> z0
 com.android.tools.r8.graph.DexValue$DexValueKind -> com.android.tools.r8.graph.l1:
     com.android.tools.r8.graph.DexValue$DexValueKind ENUM -> p
     com.android.tools.r8.graph.DexValue$DexValueKind ARRAY -> q
@@ -25447,9 +25558,10 @@
     com.android.tools.r8.graph.DexValue$DexValueLong DEFAULT -> d
     1:1:void <clinit>():845:845 -> <clinit>
     1:2:void <init>(long):848:849 -> <init>
-    boolean isDexValueLong() -> G0
-    1:1:long getRawValue():882:882 -> O0
-    1:1:long getValue():867:867 -> P0
+    1:1:com.android.tools.r8.graph.DexValue$DexValueKind getValueKind():872:872 -> A0
+    boolean isDexValueLong() -> H0
+    1:1:long getRawValue():882:882 -> P0
+    1:1:long getValue():867:867 -> Q0
     1:1:com.android.tools.r8.graph.DexValue$DexValueLong create(long):853:853 -> a
     2:2:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.DexItemFactory):877:877 -> a
     3:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):902:902 -> a
@@ -25458,22 +25570,22 @@
     5:5:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):931 -> a
     1:1:int internalAcceptCompareTo(com.android.tools.r8.graph.DexValue,com.android.tools.r8.utils.structural.CompareToVisitor):858:858 -> b
     2:2:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):863:863 -> b
-    1:1:java.lang.Object asAsmEncodedObject():907:907 -> e0
     1:1:boolean equals(java.lang.Object):920:920 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():907:907 -> f0
     1:1:int hashCode():912:912 -> hashCode
-    com.android.tools.r8.graph.DexValue$DexValueLong asDexValueLong() -> q0
+    com.android.tools.r8.graph.DexValue$DexValueLong asDexValueLong() -> r0
     1:1:java.lang.String toString():0:0 -> toString
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":927,"2":928,"3":929}}
     927:927:java.lang.String toString():925:925 -> toString
     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
-    1:1:java.lang.Object getBoxedValue():897:897 -> y0
-    1:1:com.android.tools.r8.graph.DexValue$DexValueKind getValueKind():872:872 -> z0
+    1:1:java.lang.Object getBoxedValue():897:897 -> z0
 com.android.tools.r8.graph.DexValue$DexValueMethod -> com.android.tools.r8.graph.m1:
     1:1:void <init>(com.android.tools.r8.graph.DexMethod):1452:1452 -> <init>
-    boolean isNestedDexValue() -> L0
-    void sort() -> N0
+    1:1:com.android.tools.r8.graph.DexValue$DexValueKind getValueKind():1467:1467 -> A0
+    boolean isNestedDexValue() -> M0
+    void sort() -> O0
     1:1:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexValue$NestedDexValue.getType(com.android.tools.r8.graph.DexItemFactory):1145:1145 -> a
     1:1:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.DexItemFactory):1449 -> a
     2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):1472:1472 -> a
@@ -25494,38 +25606,38 @@
     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() -> r0
-    1:1:com.android.tools.r8.graph.DexValue$DexValueKind getValueKind():1467:1467 -> z0
+    com.android.tools.r8.graph.DexValue$DexValueMethod asDexValueMethod() -> s0
 com.android.tools.r8.graph.DexValue$DexValueMethodHandle -> com.android.tools.r8.graph.n1:
     1:1:void <init>(com.android.tools.r8.graph.DexMethodHandle):1968:1968 -> <init>
-    boolean isNestedDexValue() -> L0
-    void sort() -> N0
+    1:1:com.android.tools.r8.graph.DexValue$DexValueKind getValueKind():1993:1993 -> A0
+    boolean isNestedDexValue() -> M0
+    void sort() -> O0
     1:1:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexValue$NestedDexValue.getType(com.android.tools.r8.graph.DexItemFactory):1145:1145 -> a
     1:1:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.DexItemFactory):1965 -> a
     2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):1998:1998 -> a
     3:3:com.android.tools.r8.ir.analysis.value.AbstractValue toAbstractValue(com.android.tools.r8.ir.analysis.value.AbstractValueFactory):2003:2003 -> a
     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() -> s0
-    1:1:com.android.tools.r8.graph.DexValue$DexValueKind getValueKind():1993:1993 -> z0
+    com.android.tools.r8.graph.DexValue$DexValueMethodHandle asDexValueMethodHandle() -> t0
 com.android.tools.r8.graph.DexValue$DexValueMethodType -> com.android.tools.r8.graph.o1:
     1:1:void <init>(com.android.tools.r8.graph.DexProto):1536:1536 -> <init>
-    boolean isNestedDexValue() -> L0
-    void sort() -> N0
+    1:1:com.android.tools.r8.graph.DexValue$DexValueKind getValueKind():1561:1561 -> A0
+    boolean isNestedDexValue() -> M0
+    void sort() -> O0
     1:1:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexValue$NestedDexValue.getType(com.android.tools.r8.graph.DexItemFactory):1145:1145 -> a
     1:1:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.DexItemFactory):1533 -> a
     2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):1566:1566 -> a
     3:3:com.android.tools.r8.ir.analysis.value.AbstractValue toAbstractValue(com.android.tools.r8.ir.analysis.value.AbstractValueFactory):1571:1571 -> a
     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() -> t0
-    1:1:com.android.tools.r8.graph.DexValue$DexValueKind getValueKind():1561:1561 -> z0
+    com.android.tools.r8.graph.DexValue$DexValueMethodType asDexValueMethodType() -> u0
 com.android.tools.r8.graph.DexValue$DexValueNull -> com.android.tools.r8.graph.p1:
     com.android.tools.r8.graph.DexValue NULL -> c
     boolean $assertionsDisabled -> d
     1:3:void <clinit>():1780:1782 -> <clinit>
     1:1:void <init>():1785:1785 -> <init>
-    long getRawValue() -> O0
+    1:1:com.android.tools.r8.graph.DexValue$DexValueKind getValueKind():1806:1806 -> A0
+    long getRawValue() -> P0
     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
@@ -25533,21 +25645,20 @@
     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
-    java.lang.Object asAsmEncodedObject() -> e0
     1:1:boolean equals(java.lang.Object):1854:1854 -> equals
+    java.lang.Object asAsmEncodedObject() -> f0
     1:1:java.lang.String toString():1859:1859 -> toString
-    java.lang.Object getBoxedValue() -> y0
-    1:1:com.android.tools.r8.graph.DexValue$DexValueKind getValueKind():1806:1806 -> z0
+    java.lang.Object getBoxedValue() -> z0
 com.android.tools.r8.graph.DexValue$DexValueNumber -> com.android.tools.r8.graph.q1:
     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>
-    boolean isDexValueNumber() -> H0
-    com.android.tools.r8.utils.structural.StructuralItem com.android.tools.r8.graph.DexValue$SimpleDexValue.self() -> K
+    boolean isDexValueNumber() -> I0
+    com.android.tools.r8.utils.structural.StructuralItem com.android.tools.r8.graph.DexValue$SimpleDexValue.self() -> L
       # {"id":"com.android.tools.r8.synthesized"}
-    boolean mayHaveSideEffects() -> M0
-    void sort() -> N0
-    long getRawValue() -> O0
+    boolean mayHaveSideEffects() -> N0
+    void sort() -> O0
+    long getRawValue() -> P0
     1:1:int com.android.tools.r8.graph.DexValue$SimpleDexValue.acceptCompareTo(com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.CompareToVisitor):427:427 -> a
     1:1:int com.android.tools.r8.graph.DexValue$SimpleDexValue.acceptCompareTo(com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.CompareToVisitor):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
@@ -25561,23 +25672,24 @@
     5:5:void com.android.tools.r8.graph.DexValue$SimpleDexValue.writeIntegerTo(com.android.tools.r8.graph.DexValue$DexValueKind,long,int,com.android.tools.r8.dex.DexOutputBuffer):444 -> a
     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() -> u0
+    com.android.tools.r8.graph.DexValue$DexValueNumber asDexValueNumber() -> v0
 com.android.tools.r8.graph.DexValue$DexValueShort -> com.android.tools.r8.graph.i1$i:
     com.android.tools.r8.graph.DexValue$DexValueShort DEFAULT -> d
     short value -> c
     1:1:void <clinit>():565:565 -> <clinit>
     1:2:void <init>(short):568:569 -> <init>
-    boolean isDexValueShort() -> I0
-    1:1:long getRawValue():602:602 -> O0
-    1:1:short getValue():587:587 -> P0
+    1:1:com.android.tools.r8.graph.DexValue$DexValueKind getValueKind():592:592 -> A0
+    boolean isDexValueShort() -> J0
+    1:1:long getRawValue():602:602 -> P0
+    1:1:short getValue():587:587 -> Q0
     1:1:com.android.tools.r8.graph.DexValue$DexValueShort create(short):573:573 -> a
     2:2:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.DexItemFactory):597:597 -> a
     3:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):622:622 -> a
     4:4:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):651:651 -> a
     1:1:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):578:578 -> b
     2:2:int internalAcceptCompareTo(com.android.tools.r8.graph.DexValue,com.android.tools.r8.utils.structural.CompareToVisitor):583:583 -> b
-    1:1:java.lang.Object asAsmEncodedObject():627:627 -> e0
     1:1:boolean equals(java.lang.Object):640:640 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():627:627 -> f0
     1:1:int hashCode():632:632 -> hashCode
     1:1:java.lang.String toString():0:0 -> toString
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":647,"2":648,"3":649}}
@@ -25585,14 +25697,14 @@
     648:648:java.lang.String toString():645:645 -> toString
     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() -> v0
-    1:1:java.lang.Object getBoxedValue():617:617 -> y0
-    1:1:com.android.tools.r8.graph.DexValue$DexValueKind getValueKind():592:592 -> z0
+    com.android.tools.r8.graph.DexValue$DexValueShort asDexValueShort() -> w0
+    1:1:java.lang.Object getBoxedValue():617:617 -> z0
 com.android.tools.r8.graph.DexValue$DexValueString -> com.android.tools.r8.graph.i1$j:
     1:1:void <init>(com.android.tools.r8.graph.DexString):1203:1203 -> <init>
-    boolean isDexValueString() -> J0
-    boolean isNestedDexValue() -> L0
-    void sort() -> N0
+    1:1:com.android.tools.r8.graph.DexValue$DexValueKind getValueKind():1242:1242 -> A0
+    boolean isDexValueString() -> K0
+    boolean isNestedDexValue() -> M0
+    void sort() -> O0
     1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):1222:1222 -> a
     2:2:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
     2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):1222 -> a
@@ -25603,14 +25715,14 @@
     2:6:int internalAcceptCompareTo(com.android.tools.r8.graph.DexValue,com.android.tools.r8.utils.structural.CompareToVisitor):1213:1217 -> b
     7:7:int com.android.tools.r8.graph.DexString.acceptCompareTo(com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.structural.CompareToVisitor):65:65 -> b
     7:7: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 -> e0
-    com.android.tools.r8.graph.DexValue$DexValueString asDexValueString() -> w0
-    1:1:com.android.tools.r8.graph.DexValue$DexValueKind getValueKind():1242:1242 -> z0
+    1:1:java.lang.Object asAsmEncodedObject():1237:1237 -> f0
+    com.android.tools.r8.graph.DexValue$DexValueString asDexValueString() -> x0
 com.android.tools.r8.graph.DexValue$DexValueType -> com.android.tools.r8.graph.i1$k:
     1:1:void <init>(com.android.tools.r8.graph.DexType):1368:1368 -> <init>
-    boolean isDexValueType() -> K0
-    boolean isNestedDexValue() -> L0
-    void sort() -> N0
+    1:1:com.android.tools.r8.graph.DexValue$DexValueKind getValueKind():1383:1383 -> A0
+    boolean isDexValueType() -> L0
+    boolean isNestedDexValue() -> M0
+    void sort() -> O0
     1:1:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexValue$NestedDexValue.getType(com.android.tools.r8.graph.DexItemFactory):1145:1145 -> a
     1:1:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.DexItemFactory):1365 -> a
     2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):1388:1388 -> a
@@ -25630,16 +25742,15 @@
     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 -> b
     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() -> x0
-    1:1:com.android.tools.r8.graph.DexValue$DexValueKind getValueKind():1383:1383 -> z0
+    com.android.tools.r8.graph.DexValue$DexValueType asDexValueType() -> y0
 com.android.tools.r8.graph.DexValue$NestedDexValue -> com.android.tools.r8.graph.i1$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>
-    com.android.tools.r8.utils.structural.StructuralItem self() -> K
-    boolean isNestedDexValue() -> L0
-    void sort() -> N0
-    1:1:com.android.tools.r8.graph.IndexedDexItem getValue():1149:1149 -> O0
+    com.android.tools.r8.utils.structural.StructuralItem self() -> L
+    boolean isNestedDexValue() -> M0
+    void sort() -> O0
+    1:1:com.android.tools.r8.graph.IndexedDexItem getValue():1149:1149 -> P0
     1:1:int acceptCompareTo(com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.CompareToVisitor):1130:1130 -> a
     2:2:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.DexItemFactory):1145:1145 -> a
     3:4:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1154:1155 -> a
@@ -25648,14 +25759,14 @@
     6:6:void com.android.tools.r8.dex.DexOutputBuffer.rewind(int):154:154 -> a
     6:6:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1157 -> a
     7:8:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1158:1159 -> a
-    1:1:java.lang.Object asAsmEncodedObject():1169:1169 -> e0
-    2:2:java.lang.Object asAsmEncodedObject():0:0 -> e0
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1172,"2":1173,"3":1174}}
-    1172:1172:java.lang.Object asAsmEncodedObject():1169:1169 -> e0
-    1173:1173:java.lang.Object asAsmEncodedObject():1169:1169 -> e0
-    1174:1174:java.lang.Object asAsmEncodedObject():1169:1169 -> e0
-    1171:1171:java.lang.Object asAsmEncodedObject():1169:1169 -> e0
     1:3:boolean equals(java.lang.Object):1187:1189 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():1169:1169 -> f0
+    2:2:java.lang.Object asAsmEncodedObject():0:0 -> f0
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1172,"2":1173,"3":1174}}
+    1172:1172:java.lang.Object asAsmEncodedObject():1169:1169 -> f0
+    1173:1173:java.lang.Object asAsmEncodedObject():1169:1169 -> f0
+    1174:1174:java.lang.Object asAsmEncodedObject():1169:1169 -> f0
+    1171:1171:java.lang.Object asAsmEncodedObject():1169:1169 -> f0
     1:1:int hashCode():1179:1179 -> hashCode
     1:1:java.lang.String toString():0:0 -> toString
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1198,"2":1199,"3":1200}}
@@ -25663,17 +25774,18 @@
     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
-    1:1:java.lang.Object getBoxedValue():1164:1164 -> y0
-    2:2:java.lang.Object getBoxedValue():0:0 -> y0
+    1:1:java.lang.Object getBoxedValue():1164:1164 -> z0
+    2:2:java.lang.Object getBoxedValue():0:0 -> z0
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1167,"2":1168,"3":1169}}
-    1167:1167:java.lang.Object getBoxedValue():1164:1164 -> y0
-    1168:1168:java.lang.Object getBoxedValue():1164:1164 -> y0
-    1169:1169:java.lang.Object getBoxedValue():1164:1164 -> y0
-    1166:1166:java.lang.Object getBoxedValue():1164:1164 -> y0
-com.android.tools.r8.graph.DexWritableCode -> com.android.tools.r8.graph.r1:
-    com.android.tools.r8.graph.DexDebugInfoForWriting getDebugInfoForWriting() -> A
-    com.android.tools.r8.graph.DexCode asDexCode() -> I
-    int codeSizeInBytes() -> L
+    1167:1167:java.lang.Object getBoxedValue():1164:1164 -> z0
+    1168:1168:java.lang.Object getBoxedValue():1164:1164 -> z0
+    1169:1169:java.lang.Object getBoxedValue():1164:1164 -> z0
+    1166:1166:java.lang.Object getBoxedValue():1164:1164 -> z0
+com.android.tools.r8.graph.DexWritableCode -> com.android.tools.r8.graph.s1:
+    1:1:void <clinit>():18:18 -> <clinit>
+    com.android.tools.r8.graph.DexDebugInfoForWriting getDebugInfoForWriting() -> B
+    com.android.tools.r8.graph.DexCode asDexCode() -> J
+    int codeSizeInBytes() -> M
     void acceptHashing(com.android.tools.r8.utils.structural.HashingVisitor) -> a
     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
     void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection) -> a
@@ -25681,15 +25793,36 @@
     com.android.tools.r8.graph.DexWritableCode rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexItemFactory,boolean) -> a
     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) -> a
     void writeKeepRulesForDesugaredLibrary(com.android.tools.r8.dex.CodeToKeep) -> a
+    1:17:int acceptCompareTo(com.android.tools.r8.graph.DexWritableCode,com.android.tools.r8.utils.structural.CompareToVisitor):32:48 -> a
+    18:18:int acceptCompareTo(com.android.tools.r8.graph.DexWritableCode,com.android.tools.r8.utils.structural.CompareToVisitor):45:45 -> a
+    19:19:boolean com.android.tools.r8.graph.Code.isThrowExceptionCode():0:0 -> a
+    19:19:int acceptCompareTo(com.android.tools.r8.graph.DexWritableCode,com.android.tools.r8.utils.structural.CompareToVisitor):45 -> a
+    20:21:int acceptCompareTo(com.android.tools.r8.graph.DexWritableCode,com.android.tools.r8.utils.structural.CompareToVisitor):45:46 -> a
+    22:22:int acceptCompareTo(com.android.tools.r8.graph.DexWritableCode,com.android.tools.r8.utils.structural.CompareToVisitor):39:39 -> a
     int getIncomingRegisterSize(com.android.tools.r8.graph.ProgramMethod) -> b
     void setCallSiteContexts(com.android.tools.r8.graph.ProgramMethod) -> c
-    com.android.tools.r8.graph.DexWritableCode$DexWritableCodeKind getDexWritableCodeKind() -> i
+    com.android.tools.r8.graph.DexWritableCode$DexWritableCodeKind getDexWritableCodeKind() -> m
     com.android.tools.r8.graph.DexCode$Try[] getTries() -> p
     com.android.tools.r8.graph.Code asCode() -> q
-    com.android.tools.r8.graph.DexCode$TryHandler[] getHandlers() -> u
-    com.android.tools.r8.graph.DexString getHighestSortingString() -> w
-    int getOutgoingRegisterSize() -> y
-com.android.tools.r8.graph.DirectMappedDexApplication -> com.android.tools.r8.graph.u1:
+    com.android.tools.r8.graph.ThrowExceptionCode asThrowExceptionCode() -> s
+    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.r1:
+    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.kg:
+    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
+    com.android.tools.r8.graph.DexWritableCode$DexWritableCodeKind DEFAULT_INSTANCE_INITIALIZER -> c
+    com.android.tools.r8.graph.DexWritableCode$DexWritableCodeKind DEFAULT -> b
+    1:4:void <clinit>():21:24 -> <clinit>
+    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.v1:
     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
@@ -25749,8 +25882,8 @@
       # {"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.s1:
-com.android.tools.r8.graph.DirectMappedDexApplication$Builder -> com.android.tools.r8.graph.t1:
+com.android.tools.r8.graph.DirectMappedDexApplication$1 -> com.android.tools.r8.graph.t1:
+com.android.tools.r8.graph.DirectMappedDexApplication$Builder -> com.android.tools.r8.graph.u1:
     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
@@ -25778,7 +25911,7 @@
     1:7:void commitPendingClasspathClasses():261:267 -> f
     1:7:java.util.List getClasspathClasses():272 -> f
     8:8:java.util.List getClasspathClasses():273:273 -> f
-com.android.tools.r8.graph.EnclosingMethodAttribute -> com.android.tools.r8.graph.v1:
+com.android.tools.r8.graph.EnclosingMethodAttribute -> com.android.tools.r8.graph.w1:
     int $r8$clinit -> d
     com.android.tools.r8.graph.DexType enclosingClass -> a
     com.android.tools.r8.graph.DexMethod enclosingMethod -> b
@@ -25830,17 +25963,17 @@
     200:200:java.lang.String toString():98:98 -> toString
     201:201:java.lang.String toString():98:98 -> toString
     202:202:java.lang.String toString():98:98 -> toString
-com.android.tools.r8.graph.FieldAccessFlags -> com.android.tools.r8.graph.x1:
+com.android.tools.r8.graph.FieldAccessFlags -> com.android.tools.r8.graph.y1:
     boolean $assertionsDisabled -> f
     int $r8$clinit -> g
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>(int,int):44:44 -> <init>
-    com.android.tools.r8.utils.structural.StructuralItem self() -> K
+    com.android.tools.r8.utils.structural.StructuralItem self() -> L
     1:1:com.android.tools.r8.graph.FieldAccessFlags copy():53:53 -> P
     1:1:int com.android.tools.r8.graph.AccessFlags.materialize():74:74 -> Q
     1:1:int getAsCfAccessFlags():103 -> Q
-    1:1:int com.android.tools.r8.graph.AccessFlags.materialize():74:74 -> S
-    1:1:int getAsDexAccessFlags():108 -> S
+    1:1:int com.android.tools.r8.graph.AccessFlags.materialize():74:74 -> R
+    1:1:int getAsDexAccessFlags():108 -> R
     1:1:boolean isEnum():128:128 -> T
     1:1:boolean isTransient():120:120 -> U
     1:1:boolean isVolatile():112:112 -> V
@@ -25856,7 +25989,7 @@
     3:3:void <init>(int):40:40 -> m
     3:3:com.android.tools.r8.graph.FieldAccessFlags fromSharedAccessFlags(int):90 -> m
     com.android.tools.r8.graph.AccessFlags self() -> y
-com.android.tools.r8.graph.FieldAccessFlags$Builder -> com.android.tools.r8.graph.w1:
+com.android.tools.r8.graph.FieldAccessFlags$Builder -> com.android.tools.r8.graph.x1:
     1:1:void <init>():138:138 -> <init>
     com.android.tools.r8.graph.AccessFlags$BuilderBase self() -> a
     1:1:com.android.tools.r8.graph.AccessFlags com.android.tools.r8.graph.AccessFlags$BuilderBase.build():365:365 -> c
@@ -25982,7 +26115,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.y1:
+com.android.tools.r8.graph.FieldResolutionResult$FailedFieldResolutionResult -> com.android.tools.r8.graph.z1:
     com.android.tools.r8.graph.FieldResolutionResult$FailedFieldResolutionResult INSTANCE -> a
     1:1:void <clinit>():154:154 -> <clinit>
     1:1:void <init>():152:152 -> <init>
@@ -25990,7 +26123,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.z1:
+com.android.tools.r8.graph.FieldResolutionResult$SuccessfulFieldResolutionResult -> com.android.tools.r8.graph.A1:
     com.android.tools.r8.graph.DexClass initialResolutionHolder -> a
     com.android.tools.r8.graph.DexClass resolvedHolder -> b
     com.android.tools.r8.graph.DexEncodedField resolvedField -> c
@@ -26013,7 +26146,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.A1:
+com.android.tools.r8.graph.FieldResolutionResult$UnknownFieldResolutionResult -> com.android.tools.r8.graph.B1:
     com.android.tools.r8.graph.FieldResolutionResult$UnknownFieldResolutionResult INSTANCE -> a
     1:1:void <clinit>():179:179 -> <clinit>
     1:1:void <init>():177:177 -> <init>
@@ -26048,7 +26181,7 @@
     88:88:com.android.tools.r8.graph.DexField getInitClassField(com.android.tools.r8.graph.DexType):24:24 -> a
     89:89:com.android.tools.r8.graph.DexField getInitClassField(com.android.tools.r8.graph.DexType):24:24 -> a
     82:82: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.C1:
+com.android.tools.r8.graph.GenericSignature -> com.android.tools.r8.graph.D1:
     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
@@ -26071,8 +26204,8 @@
     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.B1:
-com.android.tools.r8.graph.GenericSignature$ArrayTypeSignature -> com.android.tools.r8.graph.C1$a:
+com.android.tools.r8.graph.GenericSignature$1 -> com.android.tools.r8.graph.C1:
+com.android.tools.r8.graph.GenericSignature$ArrayTypeSignature -> com.android.tools.r8.graph.D1$a:
     com.android.tools.r8.graph.GenericSignature$TypeSignature elementSignature -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():660:660 -> <clinit>
@@ -26085,14 +26218,14 @@
     2:2:com.android.tools.r8.graph.GenericSignature$ArrayTypeSignature toArrayTypeSignature():696 -> g
     com.android.tools.r8.graph.GenericSignature$ArrayTypeSignature asArrayTypeSignature() -> h
     boolean isArrayTypeSignature() -> m
-com.android.tools.r8.graph.GenericSignature$BaseTypeSignature -> com.android.tools.r8.graph.D1:
+com.android.tools.r8.graph.GenericSignature$BaseTypeSignature -> com.android.tools.r8.graph.E1:
     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() -> d
     1:2:com.android.tools.r8.graph.GenericSignature$ArrayTypeSignature toArrayTypeSignature():773:774 -> g
-com.android.tools.r8.graph.GenericSignature$ClassSignature -> com.android.tools.r8.graph.C1$b:
+com.android.tools.r8.graph.GenericSignature$ClassSignature -> com.android.tools.r8.graph.D1$b:
     java.util.List formalTypeParameters -> a
     com.android.tools.r8.graph.GenericSignature$ClassTypeSignature superClassSignature -> b
     java.util.List superInterfaceSignatures -> c
@@ -26112,7 +26245,7 @@
     1:1:com.android.tools.r8.graph.GenericSignature$ClassTypeSignature superClassSignature():229:229 -> h
     1:1:java.util.List superInterfaceSignatures():233:233 -> i
     1:1:java.lang.String toString():287:287 -> toString
-com.android.tools.r8.graph.GenericSignature$ClassSignature$ClassSignatureBuilder -> com.android.tools.r8.graph.E1:
+com.android.tools.r8.graph.GenericSignature$ClassSignature$ClassSignatureBuilder -> com.android.tools.r8.graph.F1:
     java.util.List formalTypeParameters -> a
     com.android.tools.r8.graph.GenericSignature$ClassTypeSignature superClassSignature -> b
     java.util.List superInterfaceSignatures -> c
@@ -26123,7 +26256,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.C1$c:
+com.android.tools.r8.graph.GenericSignature$ClassTypeSignature -> com.android.tools.r8.graph.D1$c:
     com.android.tools.r8.graph.GenericSignature$ClassTypeSignature enclosingTypeSignature -> d
     java.util.List typeArguments -> c
     boolean $assertionsDisabled -> e
@@ -26141,11 +26274,11 @@
     boolean isClassTypeSignature() -> n
     1:1:com.android.tools.r8.graph.DexType type():601:601 -> r
     1:1:java.util.List typeArguments():605:605 -> s
-com.android.tools.r8.graph.GenericSignature$DexDefinitionSignature -> com.android.tools.r8.graph.C1$d:
+com.android.tools.r8.graph.GenericSignature$DexDefinitionSignature -> com.android.tools.r8.graph.D1$d:
     1:1:boolean hasNoSignature():152:152 -> a
     boolean isInvalid() -> b
     boolean hasSignature() -> c
-com.android.tools.r8.graph.GenericSignature$FieldTypeSignature -> com.android.tools.r8.graph.C1$e:
+com.android.tools.r8.graph.GenericSignature$FieldTypeSignature -> com.android.tools.r8.graph.D1$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>
@@ -26165,7 +26298,7 @@
     boolean isTypeVariableSignature() -> p
     1:1:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature noSignature():491:491 -> q
     1:1:java.lang.String toString():487:487 -> toString
-com.android.tools.r8.graph.GenericSignature$FormalTypeParameter -> com.android.tools.r8.graph.C1$f:
+com.android.tools.r8.graph.GenericSignature$FormalTypeParameter -> com.android.tools.r8.graph.D1$f:
     java.util.List interfaceBounds -> c
     java.lang.String name -> a
     com.android.tools.r8.graph.GenericSignature$FieldTypeSignature classBound -> b
@@ -26174,7 +26307,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.C1$g:
+com.android.tools.r8.graph.GenericSignature$MethodTypeSignature -> com.android.tools.r8.graph.D1$g:
     java.util.List typeSignatures -> b
     com.android.tools.r8.graph.GenericSignature$MethodTypeSignature NO_METHOD_TYPE_SIGNATURE -> e
     java.util.List formalTypeParameters -> a
@@ -26192,7 +26325,7 @@
     1:1:com.android.tools.r8.graph.GenericSignature$MethodTypeSignature noSignature():809:809 -> f
     1:1:com.android.tools.r8.graph.GenericSignature$ReturnType returnType():835:835 -> g
     1:1:java.lang.String toString():889:889 -> toString
-com.android.tools.r8.graph.GenericSignature$Parser -> com.android.tools.r8.graph.F1:
+com.android.tools.r8.graph.GenericSignature$Parser -> com.android.tools.r8.graph.G1:
     char[] buffer -> d
     com.android.tools.r8.graph.DexItemFactory factory -> f
     boolean $assertionsDisabled -> g
@@ -26265,27 +26398,27 @@
     1:16:com.android.tools.r8.graph.GenericSignature$TypeSignature updateTypeSignature():1265:1280 -> j
     17:19:com.android.tools.r8.graph.GenericSignature$TypeSignature updateTypeSignature():1274:1276 -> j
     1:7:com.android.tools.r8.graph.GenericSignature$TypeVariableSignature updateTypeVariableSignature():1255:1261 -> k
-com.android.tools.r8.graph.GenericSignature$ReturnType -> com.android.tools.r8.graph.C1$h:
+com.android.tools.r8.graph.GenericSignature$ReturnType -> com.android.tools.r8.graph.D1$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.G1:
+com.android.tools.r8.graph.GenericSignature$StarFieldTypeSignature -> com.android.tools.r8.graph.H1:
     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() -> o
     1:1:com.android.tools.r8.graph.GenericSignature$StarFieldTypeSignature access$1000():532:532 -> r
-com.android.tools.r8.graph.GenericSignature$TypeSignature -> com.android.tools.r8.graph.C1$i:
+com.android.tools.r8.graph.GenericSignature$TypeSignature -> com.android.tools.r8.graph.D1$i:
     1:1:void <init>():383:383 -> <init>
     com.android.tools.r8.graph.GenericSignature$BaseTypeSignature asBaseTypeSignature() -> d
     com.android.tools.r8.graph.GenericSignature$FieldTypeSignature asFieldTypeSignature() -> e
     boolean isFieldTypeSignature() -> f
     com.android.tools.r8.graph.GenericSignature$ArrayTypeSignature toArrayTypeSignature() -> g
-com.android.tools.r8.graph.GenericSignature$TypeVariableSignature -> com.android.tools.r8.graph.C1$j:
+com.android.tools.r8.graph.GenericSignature$TypeVariableSignature -> com.android.tools.r8.graph.D1$j:
     java.lang.String typeVariable -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():711:711 -> <clinit>
@@ -26296,14 +26429,14 @@
     1:1:com.android.tools.r8.graph.GenericSignature$ArrayTypeSignature toArrayTypeSignature():743:743 -> g
     com.android.tools.r8.graph.GenericSignature$TypeVariableSignature asTypeVariableSignature() -> j
     boolean isTypeVariableSignature() -> p
-com.android.tools.r8.graph.GenericSignature$WildcardIndicator -> com.android.tools.r8.graph.C1$k:
+com.android.tools.r8.graph.GenericSignature$WildcardIndicator -> com.android.tools.r8.graph.D1$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.H1:
+com.android.tools.r8.graph.GenericSignatureContextBuilder -> com.android.tools.r8.graph.I1:
     java.util.Map formalsInfo -> a
     java.util.Map enclosingInfo -> b
     int $r8$clinit -> d
@@ -26333,7 +26466,7 @@
     82:82:void lambda$create$0(java.util.Map,com.android.tools.r8.graph.ProgramMethod):158:158 -> a
     83:84:com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext computeTypeParameterContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,java.util.function.Predicate):203:204 -> a
     85:89:com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext computeTypeParameterContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,java.util.function.Predicate,boolean):213:217 -> a
-    90:90:boolean com.android.tools.r8.graph.AppView.hasLiveness():657:657 -> a
+    90:90:boolean com.android.tools.r8.graph.AppView.hasLiveness():659:659 -> a
     90:90:com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext computeTypeParameterContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,java.util.function.Predicate,boolean):222 -> a
     91:99:com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext computeTypeParameterContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,java.util.function.Predicate,boolean):223:231 -> a
     100:100:java.util.List com.android.tools.r8.graph.GenericSignature$ClassSignature.getFormalTypeParameters():258:258 -> a
@@ -26354,7 +26487,7 @@
     163:163:boolean hasGenericTypeVariables(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,java.util.function.Predicate):297 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     164:164:boolean hasGenericTypeVariables(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,java.util.function.Predicate):297:297 -> a
-com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext -> com.android.tools.r8.graph.H1$a:
+com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext -> com.android.tools.r8.graph.I1$a:
     java.util.Map prunedParametersWithBounds -> a
     com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext EMPTY -> c
     java.util.Set liveParameters -> b
@@ -26374,7 +26507,7 @@
     25:38:com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext addPrunedSubstitutions(java.util.Map):110:123 -> a
     39:40: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.I1:
+com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterSubstitutions -> com.android.tools.r8.graph.J1:
     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
@@ -26406,7 +26539,7 @@
     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
     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.L1:
+com.android.tools.r8.graph.GenericSignatureCorrectnessHelper -> com.android.tools.r8.graph.M1:
     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
@@ -26416,7 +26549,7 @@
     1:1:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper createForInitialCheck(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GenericSignatureContextBuilder):101:101 -> a
     2:8:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult run(java.util.List):110:116 -> a
     9:26:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateSignaturesForClass(com.android.tools.r8.graph.DexProgramClass):122:139 -> a
-    27:27:boolean com.android.tools.r8.graph.AppView.hasLiveness():657:657 -> a
+    27:27:boolean com.android.tools.r8.graph.AppView.hasLiveness():659:659 -> a
     27:27: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)"]}
     28:37:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateSignaturesForClass(com.android.tools.r8.graph.DexProgramClass):139:148 -> a
@@ -26431,7 +26564,7 @@
     77:77:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateSignaturesForClass(com.android.tools.r8.graph.DexProgramClass):185:185 -> a
     78:78: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
     79:80: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
-    81:81:boolean com.android.tools.r8.graph.AppView.hasLiveness():657:657 -> a
+    81:81:boolean com.android.tools.r8.graph.AppView.hasLiveness():659:659 -> a
     81:81: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)"]}
     82:92: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
@@ -26442,7 +26575,7 @@
     95:102: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
     103:103: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
     104:107: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
-    108:108:boolean com.android.tools.r8.graph.AppView.hasLiveness():657:657 -> a
+    108:108:boolean com.android.tools.r8.graph.AppView.hasLiveness():659:659 -> a
     108:108: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)"]}
     109:118: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
@@ -26458,10 +26591,10 @@
     137:139:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluate(java.util.function.Supplier,java.util.function.Function,java.util.function.Consumer):225:227 -> a
     140:140: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.J1:
+com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$1 -> com.android.tools.r8.graph.K1:
     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.K1:
+com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$GenericSignatureContextEvaluator -> com.android.tools.r8.graph.L1:
     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
@@ -26597,7 +26730,7 @@
 # {"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.L1$a:
+com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult -> com.android.tools.r8.graph.M1$a:
     com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult[] $VALUES -> g
     com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult INVALID_SUPER_TYPE -> b
     boolean $assertionsDisabled -> h
@@ -26611,7 +26744,7 @@
     2:2:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult combine(com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult):66:66 -> a
     1:1:boolean isValid():58:58 -> b
     1:1:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult[] values():49:49 -> c
-com.android.tools.r8.graph.GenericSignatureEnqueuerAnalysis -> com.android.tools.r8.graph.M1:
+com.android.tools.r8.graph.GenericSignatureEnqueuerAnalysis -> com.android.tools.r8.graph.N1:
     com.android.tools.r8.shaking.Enqueuer$EnqueuerDefinitionSupplier enqueuerDefinitionSupplier -> a
     java.util.Set processedSignatures -> b
     boolean $assertionsDisabled -> c
@@ -26631,7 +26764,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.N1:
+com.android.tools.r8.graph.GenericSignatureFormatDiagnostic -> com.android.tools.r8.graph.O1:
     com.android.tools.r8.origin.Origin origin -> b
     com.android.tools.r8.position.Position position -> c
     java.lang.String message -> d
@@ -26643,7 +26776,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.O1:
+com.android.tools.r8.graph.GenericSignaturePartialTypeArgumentApplier -> com.android.tools.r8.graph.P1:
     java.util.function.BiPredicate enclosingPruned -> b
     com.android.tools.r8.graph.GenericSignature$ClassTypeSignature objectArgument -> e
     com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext typeParameterContext -> a
@@ -26670,13 +26803,13 @@
     15:15:com.android.tools.r8.graph.GenericSignature$FormalTypeParameter visitFormalTypeParameter(com.android.tools.r8.graph.GenericSignature$FormalTypeParameter):106:106 -> a
     16:16:com.android.tools.r8.graph.GenericSignature$FormalTypeParameter visitFormalTypeParameter(com.android.tools.r8.graph.GenericSignature$FormalTypeParameter):105:105 -> a
     17:20:java.util.List visitInterfaceBounds(java.util.List):112:115 -> a
-    21:21:java.util.List com.android.tools.r8.utils.ListUtils.mapOrElse(java.util.List,java.util.function.Function):168:168 -> a
+    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: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):168:168 -> a
+    32:32:java.util.List com.android.tools.r8.utils.ListUtils.mapOrElse(java.util.List,java.util.function.Function):176:176 -> a
     32:32:java.util.List visitTypeArguments(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.util.List):137 -> a
     33:36:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature visitClassBound(com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):147:150 -> a
     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
@@ -26706,7 +26839,7 @@
     385:385:com.android.tools.r8.graph.GenericSignature$ClassTypeSignature visitSuperClass(com.android.tools.r8.graph.GenericSignature$ClassTypeSignature):210:210 -> a
     1:1:com.android.tools.r8.graph.GenericSignature$ClassTypeSignature visitSuperInterface(com.android.tools.r8.graph.GenericSignature$ClassTypeSignature):142:142 -> b
     2:5:java.util.List visitThrowsSignatures(java.util.List):172:175 -> b
-    6:6:java.util.List com.android.tools.r8.utils.ListUtils.mapOrElse(java.util.List,java.util.function.Function):168:168 -> b
+    6:6:java.util.List com.android.tools.r8.utils.ListUtils.mapOrElse(java.util.List,java.util.function.Function):176:176 -> b
     6:6:java.util.List visitThrowsSignatures(java.util.List):175 -> b
     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
@@ -26714,17 +26847,17 @@
       # {"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):168:168 -> c
+    5:5:java.util.List com.android.tools.r8.utils.ListUtils.mapOrElse(java.util.List,java.util.function.Function):176:176 -> c
     5:5:java.util.List visitFormalTypeParameters(java.util.List):197 -> c
     1:4:java.util.List visitMethodTypeSignatures(java.util.List):202:205 -> d
-    5:5:java.util.List com.android.tools.r8.utils.ListUtils.mapOrElse(java.util.List,java.util.function.Function):168:168 -> d
+    5:5:java.util.List com.android.tools.r8.utils.ListUtils.mapOrElse(java.util.List,java.util.function.Function):176:176 -> d
     5:5:java.util.List visitMethodTypeSignatures(java.util.List):205 -> d
     1:4:java.util.List visitSuperInterfaces(java.util.List):121:124 -> e
-    5:5:java.util.List com.android.tools.r8.utils.ListUtils.mapOrElse(java.util.List,java.util.function.Function):168:168 -> e
+    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):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.P1:
+com.android.tools.r8.graph.GenericSignaturePrinter -> com.android.tools.r8.graph.Q1:
     com.android.tools.r8.naming.NamingLens namingLens -> a
     java.util.function.Predicate isTypeMissing -> b
     java.lang.StringBuilder sb -> c
@@ -26758,7 +26891,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.S1:
+com.android.tools.r8.graph.GenericSignatureTypeRewriter -> com.android.tools.r8.graph.T1:
     com.android.tools.r8.graph.GenericSignature$ClassTypeSignature objectTypeSignature -> e
     java.util.function.Predicate wasPruned -> b
     java.util.function.Function lookupType -> c
@@ -26786,8 +26919,8 @@
     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.Q1:
-com.android.tools.r8.graph.GenericSignatureTypeRewriter$GenericSignatureRewriter -> com.android.tools.r8.graph.R1:
+com.android.tools.r8.graph.GenericSignatureTypeRewriter$1 -> com.android.tools.r8.graph.R1:
+com.android.tools.r8.graph.GenericSignatureTypeRewriter$GenericSignatureRewriter -> com.android.tools.r8.graph.S1:
     com.android.tools.r8.graph.GenericSignatureTypeRewriter this$0 -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():83:83 -> <clinit>
@@ -26820,11 +26953,11 @@
     29:39:com.android.tools.r8.graph.GenericSignature$ReturnType visitReturnType(com.android.tools.r8.graph.GenericSignature$ReturnType):197:207 -> a
     40:43:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature visitClassBound(com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):223:226 -> a
     44:47:java.util.List visitInterfaceBounds(java.util.List):231:234 -> a
-    48:48:java.util.List com.android.tools.r8.utils.ListUtils.mapOrElse(java.util.List,java.util.function.Function):168:168 -> a
+    48:48:java.util.List com.android.tools.r8.utils.ListUtils.mapOrElse(java.util.List,java.util.function.Function):176:176 -> a
     48:48:java.util.List visitInterfaceBounds(java.util.List):234 -> a
     49:49:com.android.tools.r8.graph.GenericSignature$ClassTypeSignature visitEnclosing(com.android.tools.r8.graph.GenericSignature$ClassTypeSignature,com.android.tools.r8.graph.GenericSignature$ClassTypeSignature):245:245 -> a
     50:60:java.util.List visitTypeArguments(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.util.List):251:261 -> a
-    61:61:java.util.List com.android.tools.r8.utils.ListUtils.mapOrElse(java.util.List,java.util.function.Function):168:168 -> a
+    61:61:java.util.List com.android.tools.r8.utils.ListUtils.mapOrElse(java.util.List,java.util.function.Function):176:176 -> a
     61:61:java.util.List visitTypeArguments(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.util.List):261 -> a
     62:62:java.util.List visitTypeArguments(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.util.List):259:259 -> a
     63:64:com.android.tools.r8.graph.DexType visitType(com.android.tools.r8.graph.DexType):273:274 -> a
@@ -26841,21 +26974,21 @@
     6:6:com.android.tools.r8.graph.GenericSignature$ClassTypeSignature visitSuperInterface(com.android.tools.r8.graph.GenericSignature$ClassTypeSignature):179 -> b
     7:7:com.android.tools.r8.graph.GenericSignature$ClassTypeSignature visitSuperInterface(com.android.tools.r8.graph.GenericSignature$ClassTypeSignature):179:179 -> b
     8:12:java.util.List visitThrowsSignatures(java.util.List):214:218 -> b
-    13:13:java.util.List com.android.tools.r8.utils.ListUtils.mapOrElse(java.util.List,java.util.function.Function):168:168 -> b
+    13:13:java.util.List com.android.tools.r8.utils.ListUtils.mapOrElse(java.util.List,java.util.function.Function):176:176 -> b
     13:13:java.util.List visitThrowsSignatures(java.util.List):218 -> b
     14:16:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature lambda$visitTypeArguments$3(com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):264:266 -> b
     1:7:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature visitFieldTypeSignature(com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):103:109 -> c
     8:11:java.util.List visitFormalTypeParameters(java.util.List):125:128 -> c
-    12:12:java.util.List com.android.tools.r8.utils.ListUtils.mapOrElse(java.util.List,java.util.function.Function):168:168 -> c
+    12:12:java.util.List com.android.tools.r8.utils.ListUtils.mapOrElse(java.util.List,java.util.function.Function):176:176 -> c
     12:12:java.util.List visitFormalTypeParameters(java.util.List):128 -> c
     1:4:java.util.List visitMethodTypeSignatures(java.util.List):184:187 -> d
-    5:5:java.util.List com.android.tools.r8.utils.ListUtils.mapOrElse(java.util.List,java.util.function.Function):168:168 -> d
+    5:5:java.util.List com.android.tools.r8.utils.ListUtils.mapOrElse(java.util.List,java.util.function.Function):176:176 -> d
     5:5:java.util.List visitMethodTypeSignatures(java.util.List):187 -> d
     1:4:java.util.List visitSuperInterfaces(java.util.List):158:161 -> e
-    5:5:java.util.List com.android.tools.r8.utils.ListUtils.mapOrElse(java.util.List,java.util.function.Function):168:168 -> e
+    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.T1:
+com.android.tools.r8.graph.GenericSignatureTypeVisitor -> com.android.tools.r8.graph.U1:
     java.util.function.BiConsumer visitedTypeConsumer -> b
     com.android.tools.r8.graph.ProgramDefinition context -> a
     boolean $assertionsDisabled -> c
@@ -26880,12 +27013,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.U1:
+com.android.tools.r8.graph.GenericSignatureUtils -> com.android.tools.r8.graph.V1:
     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.V1:
+com.android.tools.r8.graph.GenericSignatureValidationDiagnostic -> com.android.tools.r8.graph.W1:
     com.android.tools.r8.origin.Origin origin -> b
     com.android.tools.r8.position.Position position -> c
     java.lang.String message -> d
@@ -26910,7 +27043,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.W1:
+com.android.tools.r8.graph.GenericSignatureVisitor -> com.android.tools.r8.graph.X1:
     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
@@ -26923,7 +27056,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.j2:
+com.android.tools.r8.graph.GraphLens -> com.android.tools.r8.graph.k2:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():54:54 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.GraphLens$1):54:54 -> <init>
@@ -26984,17 +27117,17 @@
     67:69:java.util.Set rewriteReferences(java.util.Set):595:597 -> a
     70:88:java.util.Map rewriteReferenceKeys(java.util.Map,java.util.function.BiFunction):604:622 -> a
     89:94:void lambda$rewriteReferenceKeys$3(java.util.Map,java.util.Map,com.android.tools.r8.graph.DexReference,java.lang.Object):608:613 -> a
-    95:97:java.util.ArrayList com.android.tools.r8.utils.ListUtils.newArrayList(java.lang.Object,java.lang.Object):186:188 -> a
+    95:97:java.util.ArrayList com.android.tools.r8.utils.ListUtils.newArrayList(java.lang.Object,java.lang.Object):194:196 -> a
     95:97:void lambda$rewriteReferenceKeys$3(java.util.Map,java.util.Map,com.android.tools.r8.graph.DexReference,java.lang.Object):617 -> a
     98:99:void lambda$rewriteReferenceKeys$3(java.util.Map,java.util.Map,com.android.tools.r8.graph.DexReference,java.lang.Object):617:618 -> a
     100:102:void lambda$rewriteReferenceKeys$4(java.util.function.BiFunction,java.util.Map,com.android.tools.r8.graph.DexReference,java.util.List):624:626 -> a
     103:105:com.android.tools.r8.com.google.common.collect.ImmutableMap rewriteFieldKeys(java.util.Map):642:644 -> a
     106:106:void lambda$rewriteFieldKeys$5(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexField,java.lang.Object):643:643 -> a
     107:123:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):669:685 -> a
-    124:124:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):264:264 -> a
+    124:124:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):265:265 -> a
     124:124:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):685 -> a
-    125:125:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexType):260:260 -> a
-    125:125:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):264 -> a
+    125:125:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexType):261:261 -> a
+    125:125:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):265 -> a
     125:125:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):685 -> a
     126:132:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):688:694 -> a
     133:133:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):0:0 -> a
@@ -27033,7 +27166,7 @@
     boolean isContextFreeForMethods() -> f
     boolean isIdentityLens() -> g
     boolean isNonIdentityLens() -> h
-com.android.tools.r8.graph.GraphLens$1 -> com.android.tools.r8.graph.X1:
+com.android.tools.r8.graph.GraphLens$1 -> com.android.tools.r8.graph.Y1:
 com.android.tools.r8.graph.GraphLens$Builder -> com.android.tools.r8.internal.Wk:
     com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneRepresentativeMap methodMap -> b
     java.util.Map typeMap -> c
@@ -27041,7 +27174,7 @@
     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.Y1:
+com.android.tools.r8.graph.GraphLens$ClearCodeRewritingGraphLens -> com.android.tools.r8.graph.Z1:
     1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens):959:959 -> <init>
     1:1:com.android.tools.r8.graph.DexType getOriginalType(com.android.tools.r8.graph.DexType):964:964 -> a
     2:2:com.android.tools.r8.graph.DexField getOriginalFieldSignature(com.android.tools.r8.graph.DexField):974:974 -> a
@@ -27056,7 +27189,7 @@
     1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod):997:997 -> d
     com.android.tools.r8.graph.DexMethod internalGetPreviousMethodSignature(com.android.tools.r8.graph.DexMethod) -> f
     1:1:boolean isContextFreeForMethods():1035:1035 -> f
-com.android.tools.r8.graph.GraphLens$FieldLookupResult -> com.android.tools.r8.graph.a2:
+com.android.tools.r8.graph.GraphLens$FieldLookupResult -> com.android.tools.r8.graph.b2:
     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>
@@ -27070,7 +27203,7 @@
     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.Z1:
+com.android.tools.r8.graph.GraphLens$FieldLookupResult$Builder -> com.android.tools.r8.graph.a2:
     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>
@@ -27085,7 +27218,7 @@
     1:2:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder setReference(com.android.tools.r8.graph.DexMember):0 -> b
       # {"id":"com.android.tools.r8.synthesized"}
     3:3: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.b2:
+com.android.tools.r8.graph.GraphLens$IdentityGraphLens -> com.android.tools.r8.graph.c2:
     com.android.tools.r8.graph.GraphLens$IdentityGraphLens INSTANCE -> b
     boolean $assertionsDisabled -> c
     1:3:void <clinit>():853:855 -> <clinit>
@@ -27118,11 +27251,11 @@
     boolean isIdentityLens() -> g
     boolean isNonIdentityLens() -> h
     1:1:com.android.tools.r8.graph.GraphLens$IdentityGraphLens access$400():853:853 -> i
-com.android.tools.r8.graph.GraphLens$LookupFieldContinuation -> com.android.tools.r8.graph.c2:
+com.android.tools.r8.graph.GraphLens$LookupFieldContinuation -> com.android.tools.r8.graph.d2:
     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.d2:
+com.android.tools.r8.graph.GraphLens$LookupMethodContinuation -> com.android.tools.r8.graph.e2:
     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.f2:
+com.android.tools.r8.graph.GraphLens$MemberLookupResult -> com.android.tools.r8.graph.g2:
     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>
@@ -27133,18 +27266,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.e2:
+com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder -> com.android.tools.r8.graph.f2:
     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.h2:
+com.android.tools.r8.graph.GraphLens$MethodLookupResult -> com.android.tools.r8.graph.i2:
     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.g2:
+com.android.tools.r8.graph.GraphLens$MethodLookupResult$Builder -> com.android.tools.r8.graph.h2:
     com.android.tools.r8.graph.RewrittenPrototypeDescription prototypeChanges -> c
     com.android.tools.r8.ir.code.Invoke$Type type -> d
     boolean $assertionsDisabled -> e
@@ -27162,7 +27295,7 @@
     1:2: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
     1:2: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.i2:
+com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens -> com.android.tools.r8.graph.j2:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     java.util.Map arrayTypeCache -> d
     boolean $assertionsDisabled -> e
@@ -27258,7 +27391,7 @@
     29:29:java.util.List getSubclasses(com.android.tools.r8.graph.DexProgramClass):121:121 -> 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.k2:
+com.android.tools.r8.graph.IndexedDexItem -> com.android.tools.r8.graph.l2:
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:void <init>():9:9 -> <init>
@@ -27337,7 +27470,7 @@
     260:260:java.lang.String toString():127:127 -> toString
 com.android.tools.r8.graph.InstantiatedSubTypeInfo -> com.android.tools.r8.internal.Do:
     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.l2:
+com.android.tools.r8.graph.InvalidCode -> com.android.tools.r8.graph.m2:
     com.android.tools.r8.graph.InvalidCode INSTANCE -> d
     1:1:void <clinit>():13:13 -> <clinit>
     1:1:void <init>():23:23 -> <init>
@@ -27346,10 +27479,10 @@
     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
-    1:1:int computeHashCode():66:66 -> e0
+    1:1:int computeHashCode():66:66 -> f0
     boolean computeEquals(java.lang.Object) -> g
-    1:1:int estimatedDexCodeSizeUpperBoundInBytes():56:56 -> i0
-    1:1:com.android.tools.r8.graph.Code getInstance():16:16 -> r0
+    1:1:int estimatedDexCodeSizeUpperBoundInBytes():56:56 -> j0
+    1:1:com.android.tools.r8.graph.Code getInstance():16:16 -> s0
     1:1:java.lang.String toString():42:42 -> toString
 com.android.tools.r8.graph.JarApplicationReader -> com.android.tools.r8.internal.Ot:
     com.android.tools.r8.graph.ApplicationReaderMap applicationReaderMap -> e
@@ -27401,7 +27534,7 @@
     3:4:com.android.tools.r8.graph.DexType getTypeFromName(java.lang.String):57:58 -> g
     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 -> g
     5:5:com.android.tools.r8.graph.DexType getTypeFromName(java.lang.String):58 -> g
-com.android.tools.r8.graph.JarClassFileReader -> com.android.tools.r8.graph.q2:
+com.android.tools.r8.graph.JarClassFileReader -> com.android.tools.r8.graph.r2:
     java.util.function.Consumer classConsumer -> b
     com.android.tools.r8.graph.JarApplicationReader application -> a
     boolean $assertionsDisabled -> e
@@ -27482,7 +27615,7 @@
     7:9: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
     11:15: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
     1:1:com.android.tools.r8.graph.FieldAccessFlags createFieldAccessFlags(int):150:150 -> c
-com.android.tools.r8.graph.JarClassFileReader$CreateAnnotationVisitor -> com.android.tools.r8.graph.m2:
+com.android.tools.r8.graph.JarClassFileReader$CreateAnnotationVisitor -> com.android.tools.r8.graph.n2:
     java.util.List values -> e
     java.util.List names -> d
     com.android.tools.r8.graph.JarApplicationReader application -> b
@@ -27507,7 +27640,7 @@
     96:96:com.android.tools.r8.graph.DexValue$DexValueArray getDexValueArray(java.lang.Object):1080:1080 -> a
     96:96:com.android.tools.r8.graph.DexValue getDexValue(java.lang.Object):1108 -> a
     96:96:void visit(java.lang.String,java.lang.Object):983 -> a
-com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor -> com.android.tools.r8.graph.n2:
+com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor -> com.android.tools.r8.graph.o2:
     com.android.tools.r8.graph.ClassKind classKind -> d
     com.android.tools.r8.graph.DexType superType -> l
     com.android.tools.r8.graph.DexType type -> j
@@ -27641,7 +27774,7 @@
     2016:2016:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():45:45 -> a
     2016:2016:void visitSource(java.lang.String,java.lang.String):398 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2017:2020: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):239:242 -> a
+    2017:2020: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
     2017:2020:void visitSource(java.lang.String,java.lang.String):397 -> a
     2021:2021:void visitSource(java.lang.String,java.lang.String):396:396 -> a
     2022:2030:com.android.tools.r8.org.objectweb.asm.FieldVisitor visitField(int,java.lang.String,java.lang.String,java.lang.String,java.lang.Object):405:413 -> a
@@ -27763,7 +27896,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.o2:
+com.android.tools.r8.graph.JarClassFileReader$CreateFieldVisitor -> com.android.tools.r8.graph.p2:
     java.lang.String desc -> f
     java.lang.Object value -> g
     boolean $assertionsDisabled -> j
@@ -27793,7 +27926,7 @@
     61:64:java.util.List getAnnotations():733:736 -> a
     61:64:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):653 -> a
     65:65:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):653:653 -> a
-com.android.tools.r8.graph.JarClassFileReader$CreateMethodVisitor -> com.android.tools.r8.graph.p2:
+com.android.tools.r8.graph.JarClassFileReader$CreateMethodVisitor -> com.android.tools.r8.graph.q2:
     java.util.List parameterFlags -> r
     int annotableParameterCount -> o
     java.util.List parameterNames -> q
@@ -27834,7 +27967,7 @@
     1:3:void visitEnd():884:886 -> c
     4:5:boolean classRequiresCode():876:877 -> c
     4:5:void visitEnd():886 -> c
-    6:6:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1838:1838 -> c
+    6:6:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1837:1837 -> c
     6:6:boolean classRequiresCode():877 -> c
     6:6:void visitEnd():886 -> c
     7:9:boolean classRequiresCode():877:879 -> c
@@ -27869,7 +28002,7 @@
     byte[] classCache -> a
     java.util.List codeList -> c
     1:8:void <init>():1112:1119 -> <init>
-com.android.tools.r8.graph.LazyCfCode -> com.android.tools.r8.graph.w2:
+com.android.tools.r8.graph.LazyCfCode -> com.android.tools.r8.graph.x2:
     com.android.tools.r8.graph.CfCode code -> f
     com.android.tools.r8.graph.JarApplicationReader application -> e
     boolean $assertionsDisabled -> i
@@ -27879,10 +28012,10 @@
     1:1:void <clinit>():91:91 -> <clinit>
     1:12:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.JarClassFileReader$ReparseContext,com.android.tools.r8.graph.JarApplicationReader):100:111 -> <init>
     13:16:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.JarClassFileReader$ReparseContext,com.android.tools.r8.graph.JarApplicationReader):101:104 -> <init>
-    1:2:com.android.tools.r8.graph.CfCode asCfCode():135:136 -> E
-    3:3:void com.android.tools.r8.utils.ExceptionUtils.withOriginAttachmentHandler(com.android.tools.r8.origin.Origin,java.lang.Runnable):225:225 -> E
-    3:3:com.android.tools.r8.graph.CfCode asCfCode():136 -> E
-    4:5:com.android.tools.r8.graph.CfCode asCfCode():138:139 -> E
+    1:2:com.android.tools.r8.graph.CfCode asCfCode():135:136 -> F
+    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():136 -> F
+    4:5:com.android.tools.r8.graph.CfCode asCfCode():138:139 -> F
     1:1:com.android.tools.r8.graph.Code getCodeAsInlining(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):172:172 -> a
     2:2:void parseCode(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,boolean):188:188 -> a
     3:25:com.android.tools.r8.graph.LazyCfCode$DebugParsingOptions getParsingOptions(com.android.tools.r8.graph.JarApplicationReader,boolean):1038:1060 -> a
@@ -27900,24 +28033,24 @@
     43:43:void registerCodeReferencesForDesugaring(com.android.tools.r8.graph.ClasspathMethod,com.android.tools.r8.graph.UseRegistry):273:273 -> a
     44:44:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.ClassNameMapper):288:288 -> 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):1084:1084 -> a
-    1:1:int computeHashCode():211:211 -> e0
-    1:1:com.android.tools.r8.graph.CfWritableCode asCfWritableCode():144:144 -> f0
+    1:1:int computeHashCode():211:211 -> f0
     1:1:boolean computeEquals(java.lang.Object):216:216 -> g
-    com.android.tools.r8.graph.LazyCfCode asLazyCfCode() -> h0
+    1:1:com.android.tools.r8.graph.CfWritableCode asCfWritableCode():144:144 -> g0
     1:1:boolean estimatedSizeForInliningAtMost(int):231:231 -> i
-    1:1:int estimatedDexCodeSizeUpperBoundInBytes():236:236 -> i0
-    1:1:int estimatedSizeForInlining():226:226 -> j0
-    boolean isCfCode() -> k0
-    boolean isCfWritableCode() -> l0
-    1:1:boolean verifyNoInputReaders():1065:1065 -> q0
-    1:20:void internalParseCode():148:167 -> r0
-    21:27:boolean verifyNoReparseContext(com.android.tools.r8.graph.DexClass):1070:1076 -> r0
-    21:27:void internalParseCode():167 -> r0
-    28:28:void internalParseCode():164:164 -> r0
-    1:2:void markReachabilitySensitive():114:115 -> s0
+    com.android.tools.r8.graph.LazyCfCode asLazyCfCode() -> i0
+    1:1:int estimatedDexCodeSizeUpperBoundInBytes():236:236 -> j0
+    1:1:int estimatedSizeForInlining():226:226 -> k0
+    boolean isCfCode() -> l0
+    boolean isCfWritableCode() -> m0
+    1:1:boolean verifyNoInputReaders():1065:1065 -> r0
+    1:20:void internalParseCode():148:167 -> s0
+    21:27:boolean verifyNoReparseContext(com.android.tools.r8.graph.DexClass):1070:1076 -> s0
+    21:27:void internalParseCode():167 -> s0
+    28:28:void internalParseCode():164:164 -> s0
+    1:2:void markReachabilitySensitive():114:115 -> t0
     1:1:java.lang.String toString():283:283 -> toString
-com.android.tools.r8.graph.LazyCfCode$1 -> com.android.tools.r8.graph.r2:
-com.android.tools.r8.graph.LazyCfCode$ClassCodeVisitor -> com.android.tools.r8.graph.s2:
+com.android.tools.r8.graph.LazyCfCode$1 -> com.android.tools.r8.graph.s2:
+com.android.tools.r8.graph.LazyCfCode$ClassCodeVisitor -> com.android.tools.r8.graph.t2:
     java.util.function.BiFunction codeLocator -> d
     com.android.tools.r8.graph.JarApplicationReader application -> e
     com.android.tools.r8.graph.LazyCfCode$DebugParsingOptions debugParsingOptions -> h
@@ -27931,7 +28064,7 @@
     boolean localInfo -> b
     int asmReaderOptions -> c
     1:4:void <init>(boolean,boolean,int):180:183 -> <init>
-com.android.tools.r8.graph.LazyCfCode$DefaultCodeLocator -> com.android.tools.r8.graph.t2:
+com.android.tools.r8.graph.LazyCfCode$DefaultCodeLocator -> com.android.tools.r8.graph.u2:
     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):295:295 -> <init>
@@ -27940,9 +28073,9 @@
     1:1:java.lang.Object apply(java.lang.Object,java.lang.Object):295:295 -> apply
     2:2:com.android.tools.r8.graph.LazyCfCode apply(java.lang.String,java.lang.String):307:307 -> apply
     2:2:java.lang.Object apply(java.lang.Object,java.lang.Object):295 -> apply
-com.android.tools.r8.graph.LazyCfCode$JsrEncountered -> com.android.tools.r8.graph.u2:
+com.android.tools.r8.graph.LazyCfCode$JsrEncountered -> com.android.tools.r8.graph.v2:
     1:1:void <init>(java.lang.String):95:95 -> <init>
-com.android.tools.r8.graph.LazyCfCode$MethodCodeVisitor -> com.android.tools.r8.graph.v2:
+com.android.tools.r8.graph.LazyCfCode$MethodCodeVisitor -> com.android.tools.r8.graph.w2:
     int maxLocals -> n
     java.util.List localVariables -> r
     java.util.List tryCatchRanges -> q
@@ -28578,7 +28711,7 @@
     764:768:void visitVarInsn(int,int):739:743 -> d
     769:798:void visitVarInsn(int,int):735:764 -> d
     799:799:void visitVarInsn(int,int):755:755 -> d
-com.android.tools.r8.graph.LazyLoadedDexApplication -> com.android.tools.r8.graph.z2:
+com.android.tools.r8.graph.LazyLoadedDexApplication -> com.android.tools.r8.graph.A2:
     com.android.tools.r8.utils.LibraryClassCollection libraryClasses -> k
     boolean $assertionsDisabled -> l
     com.android.tools.r8.utils.ClasspathClassCollection classpathClasses -> j
@@ -28615,8 +28748,8 @@
     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.x2:
-com.android.tools.r8.graph.LazyLoadedDexApplication$AllClasses -> com.android.tools.r8.graph.y2:
+com.android.tools.r8.graph.LazyLoadedDexApplication$1 -> com.android.tools.r8.graph.y2:
+com.android.tools.r8.graph.LazyLoadedDexApplication$AllClasses -> com.android.tools.r8.graph.z2:
     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
@@ -28630,7 +28763,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.z2$a:
+com.android.tools.r8.graph.LazyLoadedDexApplication$Builder -> com.android.tools.r8.graph.A2$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
@@ -28643,9 +28776,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.Ez:
+com.android.tools.r8.graph.LibraryDefinition -> com.android.tools.r8.internal.Jz:
     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.A2:
+com.android.tools.r8.graph.LibraryField -> com.android.tools.r8.graph.B2:
     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>
@@ -28653,21 +28786,21 @@
     3:3:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
     3:3:com.android.tools.r8.graph.DexLibraryClass getHolder():17 -> a
     4:5:com.android.tools.r8.graph.DexLibraryClass getHolder():17:18 -> a
-    com.android.tools.r8.graph.LibraryField asLibraryField() -> l
+    com.android.tools.r8.graph.LibraryField asLibraryField() -> k
     1:1:com.android.tools.r8.graph.DexClass getHolder():7:7 -> r
-com.android.tools.r8.graph.LibraryMember -> com.android.tools.r8.internal.Gz:
+com.android.tools.r8.graph.LibraryMember -> com.android.tools.r8.internal.Lz:
     com.android.tools.r8.graph.DexLibraryClass getHolder() -> a
-com.android.tools.r8.graph.LibraryMethod -> com.android.tools.r8.graph.B2:
+com.android.tools.r8.graph.LibraryMethod -> com.android.tools.r8.graph.C2:
     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>
-    com.android.tools.r8.graph.LibraryMethod asLibraryMethod() -> M
+    com.android.tools.r8.graph.LibraryMethod asLibraryMethod() -> N
     1:2:com.android.tools.r8.graph.DexLibraryClass getHolder():16:17 -> a
     3:3:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
     3:3:com.android.tools.r8.graph.DexLibraryClass getHolder():17 -> a
     4:5:com.android.tools.r8.graph.DexLibraryClass getHolder():17:18 -> a
     1:1:com.android.tools.r8.graph.DexClass getHolder():7:7 -> r
-com.android.tools.r8.graph.LookupCompletenessHelper -> com.android.tools.r8.graph.C2:
+com.android.tools.r8.graph.LookupCompletenessHelper -> com.android.tools.r8.graph.D2:
     java.util.Set pinnedMethods -> c
     com.android.tools.r8.graph.PinnedPredicate pinnedPredicate -> a
     java.util.Set pinnedInstantiations -> b
@@ -28686,24 +28819,24 @@
     24:24:com.android.tools.r8.graph.LookupResult$LookupResultSuccess$LookupResultCollectionState computeCollectionState(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppInfoWithClassHierarchy):57 -> a
     25:31:boolean isMethodKeptInSuperTypeOrIsLibrary(com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppInfoWithClassHierarchy):73:79 -> a
     25:31:com.android.tools.r8.graph.LookupResult$LookupResultSuccess$LookupResultCollectionState computeCollectionState(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppInfoWithClassHierarchy):57 -> a
-com.android.tools.r8.graph.LookupLambdaTarget -> com.android.tools.r8.internal.oB:
+com.android.tools.r8.graph.LookupLambdaTarget -> com.android.tools.r8.internal.tB:
     com.android.tools.r8.graph.DexClassAndMethod method -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():9:9 -> <clinit>
     1:5:void <init>(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexClassAndMethod):14:18 -> <init>
     1:1:void accept(java.util.function.Consumer,java.util.function.Consumer):34:34 -> a
     2:2:com.android.tools.r8.graph.DexClassAndMethod getImplementationMethod():38:38 -> a
-    boolean isLambdaTarget() -> i
+    boolean isLambdaTarget() -> j
     com.android.tools.r8.graph.LookupLambdaTarget asLambdaTarget() -> n
-com.android.tools.r8.graph.LookupResult -> com.android.tools.r8.graph.G2:
+com.android.tools.r8.graph.LookupResult -> com.android.tools.r8.graph.H2:
     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.D2:
-com.android.tools.r8.graph.LookupResult$LookupResultFailure -> com.android.tools.r8.graph.E2:
+com.android.tools.r8.graph.LookupResult$1 -> com.android.tools.r8.graph.E2:
+com.android.tools.r8.graph.LookupResult$LookupResultFailure -> com.android.tools.r8.graph.F2:
     com.android.tools.r8.graph.LookupResult$LookupResultFailure INSTANCE -> a
     1:1:void <clinit>():195:195 -> <clinit>
     1:1:void <init>():197:197 -> <init>
@@ -28711,7 +28844,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.G2$a:
+com.android.tools.r8.graph.LookupResult$LookupResultSuccess -> com.android.tools.r8.graph.H2$a:
     java.util.List lambdaTargets -> b
     com.android.tools.r8.graph.LookupResult$LookupResultSuccess$LookupResultCollectionState state -> d
     java.util.List methodsCausingFailure -> c
@@ -28732,7 +28865,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.F2:
+com.android.tools.r8.graph.LookupResult$LookupResultSuccess$Builder -> com.android.tools.r8.graph.G2:
     java.util.List lambdaTargets -> b
     com.android.tools.r8.graph.LookupResult$LookupResultSuccess$LookupResultCollectionState state -> d
     java.util.List methodsCausingFailure -> c
@@ -28743,13 +28876,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.qB:
+com.android.tools.r8.graph.LookupTarget -> com.android.tools.r8.internal.vB:
     void accept(java.util.function.Consumer,java.util.function.Consumer) -> a
-    boolean isLambdaTarget() -> i
-    com.android.tools.r8.graph.DexClassAndMethod asMethodTarget() -> k
+    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.iC:
+com.android.tools.r8.graph.MemberResolutionResult -> com.android.tools.r8.internal.nC:
     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
@@ -28759,28 +28892,28 @@
     boolean isFailedResolution() -> h
     boolean isFieldResolutionResult() -> i
     boolean isSuccessfulMemberResolutionResult() -> j
-com.android.tools.r8.graph.MethodAccessFlags -> com.android.tools.r8.graph.I2:
+com.android.tools.r8.graph.MethodAccessFlags -> com.android.tools.r8.graph.J2:
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>(int,int):61:61 -> <init>
-    com.android.tools.r8.utils.structural.StructuralItem self() -> K
+    com.android.tools.r8.utils.structural.StructuralItem self() -> L
     1:1:com.android.tools.r8.graph.MethodAccessFlags$Builder builder():65:65 -> P
     1:1:com.android.tools.r8.graph.MethodAccessFlags copy():70:70 -> Q
-    1:1:com.android.tools.r8.graph.MethodAccessFlags createPublicStaticSynthetic():83:83 -> S
-    1:1:void demoteFromBridge():151:151 -> T
-    1:1:int com.android.tools.r8.graph.AccessFlags.materialize():74:74 -> U
-    1:1:int getAsCfAccessFlags():109 -> U
-    1:2:int getAsDexAccessFlags():114:115 -> V
-    3:3:void unsetSynchronized():135:135 -> V
-    3:3:int getAsDexAccessFlags():116 -> V
-    4:4:void setDeclaredSynchronized():239:239 -> V
-    4:4:int getAsDexAccessFlags():117 -> V
-    5:5:int com.android.tools.r8.graph.AccessFlags.materialize():74:74 -> V
-    5:5:int getAsDexAccessFlags():119 -> V
-    1:1:boolean isAbstract():179:179 -> W
-    1:1:boolean isBridge():139:139 -> X
-    1:1:boolean isConstructor():215:215 -> Y
-    1:1:boolean isNative():167:167 -> Z
+    1:1:com.android.tools.r8.graph.MethodAccessFlags createForClassInitializer():79:79 -> R
+    1:1:com.android.tools.r8.graph.MethodAccessFlags createPublicStaticSynthetic():83:83 -> T
+    1:1:void demoteFromBridge():151:151 -> U
+    1:1:int com.android.tools.r8.graph.AccessFlags.materialize():74:74 -> V
+    1:1:int getAsCfAccessFlags():109 -> V
+    1:2:int getAsDexAccessFlags():114:115 -> W
+    3:3:void unsetSynchronized():135:135 -> W
+    3:3:int getAsDexAccessFlags():116 -> W
+    4:4:void setDeclaredSynchronized():239:239 -> W
+    4:4:int getAsDexAccessFlags():117 -> W
+    5:5:int com.android.tools.r8.graph.AccessFlags.materialize():74:74 -> W
+    5:5:int getAsDexAccessFlags():119 -> W
+    1:1:boolean isAbstract():179:179 -> X
+    1:1:boolean isBridge():139:139 -> Y
+    1:1:boolean isConstructor():215:215 -> Z
     1:1:com.android.tools.r8.graph.MethodAccessFlags fromCfAccessFlags(int,boolean):94:94 -> a
     2:2:void <init>(int):57:57 -> a
     2:2:com.android.tools.r8.graph.MethodAccessFlags fromCfAccessFlags(int,boolean):95 -> a
@@ -28791,19 +28924,19 @@
     5:5:void setConstructor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):223 -> a
     6:6:void setConstructor():219:219 -> a
     6:6:void setConstructor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):224 -> a
-    1:1:boolean isStrict():199:199 -> a0
+    1:1:boolean isNative():167:167 -> a0
     1:3:com.android.tools.r8.graph.MethodAccessFlags fromSharedAccessFlags(int,boolean):88:90 -> b
-    1:1:boolean isSynchronized():123:123 -> b0
+    1:1:boolean isStrict():199:199 -> b0
     1:9:java.util.List getNames():32:40 -> c
-    1:1:boolean isVarargs():155:155 -> c0
-    1:1:void setAbstract():183:183 -> d0
+    1:1:boolean isSynchronized():123:123 -> c0
+    1:1:boolean isVarargs():155:155 -> d0
     1:9:java.util.List getPredicates():45:53 -> e
-    1:1:void setBridge():143:143 -> e0
-    1:1:void setNative():171:171 -> f0
-    1:1:void unsetAbstract():195:195 -> g0
-    1:1:void unsetBridge():147:147 -> h0
-    1:1:void unsetConstructor():229:229 -> i0
-    1:1:void unsetDeclaredSynchronized():243:243 -> j0
+    1:1:void setAbstract():183:183 -> e0
+    1:1:void setBridge():143:143 -> f0
+    1:1:void setNative():171:171 -> g0
+    1:1:void unsetAbstract():195:195 -> h0
+    1:1:void unsetBridge():147:147 -> i0
+    1:1:void unsetConstructor():229:229 -> j0
     1:1:com.android.tools.r8.graph.MethodAccessFlags fromDexAccessFlags(int):99:99 -> k
     2:2:void <init>(int):57:57 -> k
     2:2:com.android.tools.r8.graph.MethodAccessFlags fromDexAccessFlags(int):99 -> k
@@ -28813,9 +28946,10 @@
     4:4:com.android.tools.r8.graph.MethodAccessFlags fromDexAccessFlags(int):101 -> k
     5:5:void unsetDeclaredSynchronized():243:243 -> k
     5:5:com.android.tools.r8.graph.MethodAccessFlags fromDexAccessFlags(int):102 -> k
-    1:1:void unsetVarargs():163:163 -> k0
+    1:1:void unsetDeclaredSynchronized():243:243 -> k0
+    1:1:void unsetVarargs():163:163 -> l0
     com.android.tools.r8.graph.AccessFlags self() -> y
-com.android.tools.r8.graph.MethodAccessFlags$Builder -> com.android.tools.r8.graph.H2:
+com.android.tools.r8.graph.MethodAccessFlags$Builder -> com.android.tools.r8.graph.I2:
     1:1:void <init>():249:249 -> <init>
     com.android.tools.r8.graph.AccessFlags$BuilderBase self() -> a
     1:5:com.android.tools.r8.graph.AccessFlags$BuilderBase com.android.tools.r8.graph.AccessFlags$BuilderBase.setPrivate(boolean):325:329 -> a
@@ -28857,7 +28991,7 @@
     1:2:com.android.tools.r8.graph.AccessFlags$BuilderBase com.android.tools.r8.graph.AccessFlags$BuilderBase.setSynthetic():360:361 -> 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.CC:
+com.android.tools.r8.graph.MethodAccessInfoCollection -> com.android.tools.r8.internal.HC:
     java.util.Map directInvokes -> a
     java.util.Map interfaceInvokes -> b
     java.util.Map staticInvokes -> c
@@ -28879,8 +29013,8 @@
     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.xC:
-com.android.tools.r8.graph.MethodAccessInfoCollection$Builder -> com.android.tools.r8.internal.yC:
+com.android.tools.r8.graph.MethodAccessInfoCollection$1 -> com.android.tools.r8.internal.CC:
+com.android.tools.r8.graph.MethodAccessInfoCollection$Builder -> com.android.tools.r8.internal.DC:
     java.util.Map directInvokes -> a
     java.util.Map interfaceInvokes -> b
     java.util.Map staticInvokes -> c
@@ -28932,17 +29066,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.zC:
+com.android.tools.r8.graph.MethodAccessInfoCollection$ConcurrentBuilder -> com.android.tools.r8.internal.EC:
     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.AC:
+com.android.tools.r8.graph.MethodAccessInfoCollection$IdentityBuilder -> com.android.tools.r8.internal.FC:
     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.BC:
+com.android.tools.r8.graph.MethodAccessInfoCollection$Modifier -> com.android.tools.r8.internal.GC:
     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.J2:
+com.android.tools.r8.graph.MethodArrayBacking -> com.android.tools.r8.graph.K2:
     com.android.tools.r8.graph.DexEncodedMethod[] virtualMethods -> b
     com.android.tools.r8.graph.DexEncodedMethod[] directMethods -> a
     boolean $assertionsDisabled -> c
@@ -29036,7 +29170,7 @@
     1:2:boolean verifyNoDuplicateMethods():27:28 -> j
     3:3:void com.android.tools.r8.graph.MethodCollectionBacking.forEachMethod(java.util.function.Consumer):42:42 -> j
     3:3:boolean verifyNoDuplicateMethods():28 -> j
-com.android.tools.r8.graph.MethodCollection -> com.android.tools.r8.graph.K2:
+com.android.tools.r8.graph.MethodCollection -> com.android.tools.r8.graph.L2:
     com.android.tools.r8.graph.DexClass holder -> a
     com.android.tools.r8.graph.MethodCollectionBacking backing -> b
     com.android.tools.r8.graph.DexEncodedMethod cachedClassInitializer -> c
@@ -29187,7 +29321,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.L2:
+com.android.tools.r8.graph.MethodCollectionBacking -> com.android.tools.r8.graph.M2:
     1:1:void <init>():15:15 -> <init>
     void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod) -> a
     void addDirectMethods(java.util.Collection) -> a
@@ -29227,7 +29361,7 @@
     int size() -> g
     boolean verify() -> h
     java.lang.Iterable virtualMethods() -> i
-com.android.tools.r8.graph.MethodMapBacking -> com.android.tools.r8.graph.M2:
+com.android.tools.r8.graph.MethodMapBacking -> com.android.tools.r8.graph.N2:
     boolean $assertionsDisabled -> b
     java.util.SortedMap methodMap -> a
     1:1:void <clinit>():21:21 -> <clinit>
@@ -29388,7 +29522,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.R2:
+com.android.tools.r8.graph.MethodResolutionResult -> com.android.tools.r8.graph.S2:
     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
@@ -29416,8 +29550,8 @@
     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.N2:
-com.android.tools.r8.graph.MethodResolutionResult$ArrayCloneMethodResult -> com.android.tools.r8.graph.O2:
+com.android.tools.r8.graph.MethodResolutionResult$1 -> com.android.tools.r8.graph.O2:
+com.android.tools.r8.graph.MethodResolutionResult$ArrayCloneMethodResult -> com.android.tools.r8.graph.P2:
     com.android.tools.r8.graph.MethodResolutionResult$ArrayCloneMethodResult INSTANCE -> a
     1:1:void <clinit>():840:840 -> <clinit>
     1:1:void <init>():842:842 -> <init>
@@ -29435,16 +29569,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.P2:
+com.android.tools.r8.graph.MethodResolutionResult$ClassNotFoundResult -> com.android.tools.r8.graph.Q2:
     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.Q2:
+com.android.tools.r8.graph.MethodResolutionResult$EmptyResult -> com.android.tools.r8.graph.R2:
     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.R2$a:
+com.android.tools.r8.graph.MethodResolutionResult$FailedResolutionResult -> com.android.tools.r8.graph.S2$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
@@ -29464,13 +29598,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.S2:
+com.android.tools.r8.graph.MethodResolutionResult$FailedResolutionWithCausingMethods -> com.android.tools.r8.graph.T2:
     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.T2:
+com.android.tools.r8.graph.MethodResolutionResult$IllegalAccessOrNoSuchMethodResult -> com.android.tools.r8.graph.U2:
     com.android.tools.r8.graph.DexClass initialResolutionHolder -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():972:972 -> <clinit>
@@ -29482,17 +29616,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.U2:
+com.android.tools.r8.graph.MethodResolutionResult$IncompatibleClassResult -> com.android.tools.r8.graph.V2:
     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.R2$b:
+com.android.tools.r8.graph.MethodResolutionResult$NoSuchMethodResult -> com.android.tools.r8.graph.S2$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.R2$c:
+com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult -> com.android.tools.r8.graph.S2$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
@@ -29591,35 +29725,35 @@
     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.rE:
+com.android.tools.r8.graph.NamingLensComparable -> com.android.tools.r8.internal.wE:
     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.zE:
+com.android.tools.r8.graph.NestHostClassAttribute -> com.android.tools.r8.internal.EE:
     com.android.tools.r8.graph.DexType nestHost -> b
     int $r8$clinit -> d
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():13:13 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.DexType):21:22 -> <init>
-    com.android.tools.r8.utils.structural.StructuralItem self() -> K
+    com.android.tools.r8.utils.structural.StructuralItem self() -> L
     1:1:com.android.tools.r8.graph.DexType lambda$specify$0(com.android.tools.r8.graph.NestHostClassAttribute):18:18 -> a
     2:2:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):18:18 -> a
     3:3:com.android.tools.r8.graph.DexType getNestHost():26:26 -> a
     4:5:void write(com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.naming.NamingLens):34:35 -> a
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():45:45 -> n
-com.android.tools.r8.graph.NestMemberClassAttribute -> com.android.tools.r8.internal.AE:
+com.android.tools.r8.graph.NestMemberClassAttribute -> com.android.tools.r8.internal.FE:
     com.android.tools.r8.graph.DexType nestMember -> b
     int $r8$clinit -> d
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():15:15 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.DexType):23:24 -> <init>
-    com.android.tools.r8.utils.structural.StructuralItem self() -> K
+    com.android.tools.r8.utils.structural.StructuralItem self() -> L
     1:1:com.android.tools.r8.graph.DexType lambda$specify$0(com.android.tools.r8.graph.NestMemberClassAttribute):20:20 -> a
     2:2:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):20:20 -> a
     3:3:com.android.tools.r8.graph.DexType getNestMember():32:32 -> a
     4:5:void write(com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.naming.NamingLens):36:37 -> a
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():47:47 -> n
-com.android.tools.r8.graph.NestedGraphLens -> com.android.tools.r8.graph.V2:
+com.android.tools.r8.graph.NestedGraphLens -> com.android.tools.r8.graph.W2:
     boolean $assertionsDisabled -> m
     java.util.function.Function methodMap -> g
     com.android.tools.r8.utils.collections.EmptyBidirectionalOneToOneMap EMPTY_METHOD_MAP -> k
@@ -29702,8 +29836,8 @@
     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.ObjectAllocationInfoCollection -> com.android.tools.r8.internal.FH:
-com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl -> com.android.tools.r8.internal.JH:
+com.android.tools.r8.graph.ObjectAllocationInfoCollection -> com.android.tools.r8.internal.KH:
+com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl -> com.android.tools.r8.internal.OH:
     java.util.Map classesWithAllocationSiteTracking -> a
     java.util.Set annotationsWithUnknownSubtypeHierarchy -> c
     java.util.Set interfacesWithUnknownSubtypeHierarchy -> d
@@ -29742,8 +29876,8 @@
     9:9:boolean lambda$removeAllocationsForPrunedItems$7(java.util.Set,com.android.tools.r8.graph.DexProgramClass):259:259 -> c
     1:2:boolean isInstantiatedDirectlyOrHasInstantiatedSubtype(com.android.tools.r8.graph.DexProgramClass):98:99 -> d
     1:1:boolean isInterfaceWithUnknownSubtypeHierarchy(com.android.tools.r8.graph.DexProgramClass):119:119 -> e
-com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$1 -> com.android.tools.r8.internal.GH:
-com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder -> com.android.tools.r8.internal.IH:
+com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$1 -> com.android.tools.r8.internal.LH:
+com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder -> com.android.tools.r8.internal.NH:
     com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder$Data data -> h
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():286:286 -> <clinit>
@@ -29834,14 +29968,14 @@
     1:1:java.util.Set lambda$recordDirectAllocationSite$0(com.android.tools.r8.graph.DexProgramClass):359:359 -> f
     1:1:java.util.Set lambda$rewrittenWithLens$7(com.android.tools.r8.graph.DexProgramClass):488:488 -> g
     1:3:void markNoLongerInstantiated(com.android.tools.r8.graph.DexProgramClass):452:454 -> h
-com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder$Data -> com.android.tools.r8.internal.HH:
+com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder$Data -> com.android.tools.r8.internal.MH:
     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.nI:
+com.android.tools.r8.graph.ObjectToOffsetMapping -> com.android.tools.r8.internal.sI:
     com.android.tools.r8.ir.conversion.LensCodeRewriterUtils lensCodeRewriter -> e
     boolean $assertionsDisabled -> p
     com.android.tools.r8.graph.AppView appView -> b
@@ -29920,12 +30054,12 @@
     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.lI:
+com.android.tools.r8.graph.ObjectToOffsetMapping$1 -> com.android.tools.r8.internal.qI:
     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.mI:
+com.android.tools.r8.graph.ObjectToOffsetMapping$ProgramClassDepthsMemoized -> com.android.tools.r8.internal.rI:
     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>
@@ -29953,7 +30087,7 @@
     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.uI:
+com.android.tools.r8.graph.OffsetToObjectMapping -> com.android.tools.r8.internal.zI:
     com.android.tools.r8.graph.DexProto[] protos -> c
     com.android.tools.r8.graph.DexMethodHandle[] methodHandles -> h
     boolean $assertionsDisabled -> i
@@ -29993,7 +30127,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.W2:
+com.android.tools.r8.graph.ParameterAnnotationsList -> com.android.tools.r8.graph.X2:
     com.android.tools.r8.graph.ParameterAnnotationsList EMPTY_PARAMETER_ANNOTATIONS_LIST -> d
     boolean $assertionsDisabled -> e
     com.android.tools.r8.graph.DexAnnotationSet[] values -> b
@@ -30001,7 +30135,7 @@
     1:4:void <clinit>():41:44 -> <clinit>
     1:3:void <init>():58:60 -> <init>
     4:9:void <init>(com.android.tools.r8.graph.DexAnnotationSet[],int):63:68 -> <init>
-    com.android.tools.r8.utils.structural.StructuralItem self() -> K
+    com.android.tools.r8.utils.structural.StructuralItem self() -> L
     1:1:com.android.tools.r8.graph.DexAnnotationSet[] lambda$specify$0(com.android.tools.r8.graph.ParameterAnnotationsList):51:51 -> a
     2:2:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):51:51 -> a
     3:3:com.android.tools.r8.graph.ParameterAnnotationsList create(com.android.tools.r8.graph.DexAnnotationSet[],int):77:77 -> a
@@ -30024,10 +30158,10 @@
     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:1:int countNonMissing():161:161 -> e0
     1:3:boolean equals(java.lang.Object):115:117 -> equals
-    1:1:com.android.tools.r8.graph.ParameterAnnotationsList empty():55:55 -> f0
-    1:7:com.android.tools.r8.graph.ParameterAnnotationsList withFakeThisParameter():210:216 -> g0
+    1:1:int countNonMissing():161:161 -> f0
+    1:1:com.android.tools.r8.graph.ParameterAnnotationsList empty():55:55 -> g0
+    1:7:com.android.tools.r8.graph.ParameterAnnotationsList withFakeThisParameter():210:216 -> h0
     1:1:int hashCode():107:107 -> hashCode
     1:5:com.android.tools.r8.graph.DexAnnotationSet get(int):184:188 -> i
     1:1:boolean isEmpty():136:136 -> isEmpty
@@ -30035,9 +30169,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.EJ:
+com.android.tools.r8.graph.PinnedPredicate -> com.android.tools.r8.internal.NJ:
     boolean isPinned(com.android.tools.r8.graph.DexDefinition) -> a
-com.android.tools.r8.graph.ProgramClassVisitor -> com.android.tools.r8.internal.HK:
+com.android.tools.r8.graph.ProgramClassVisitor -> com.android.tools.r8.internal.QK:
     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>
@@ -30049,8 +30183,8 @@
     18:19:void accept(com.android.tools.r8.graph.DexClass):61:62 -> a
     20:21:void run(com.android.tools.r8.graph.DexProgramClass[]):66:67 -> a
     void visit(com.android.tools.r8.graph.DexClass) -> b
-com.android.tools.r8.graph.ProgramDefinition -> com.android.tools.r8.internal.JK:
-    1:1:void clearAllAnnotations():37:37 -> F
+com.android.tools.r8.graph.ProgramDefinition -> com.android.tools.r8.internal.SK:
+    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
     com.android.tools.r8.graph.DexProgramClass getContextClass() -> b
@@ -30061,21 +30195,21 @@
     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.KK:
-    1:1:boolean isProgramContext():12:12 -> H
-com.android.tools.r8.graph.ProgramDexCode -> com.android.tools.r8.internal.LK:
+com.android.tools.r8.graph.ProgramDerivedContext -> com.android.tools.r8.internal.TK:
+    1:1:boolean isProgramContext():12:12 -> I
+com.android.tools.r8.graph.ProgramDexCode -> com.android.tools.r8.internal.UK:
     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.X2:
+com.android.tools.r8.graph.ProgramField -> com.android.tools.r8.graph.Y2:
     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>
-    com.android.tools.r8.graph.ProgramField asProgramField() -> J
-    1:1:com.android.tools.r8.kotlin.KotlinFieldLevelInfo getKotlinInfo():74:74 -> P
-    1:1:com.android.tools.r8.kotlin.KotlinMemberLevelInfo getKotlinInfo():10 -> P
+    com.android.tools.r8.graph.ProgramField asProgramField() -> K
+    1:1:com.android.tools.r8.kotlin.KotlinFieldLevelInfo getKotlinInfo():74:74 -> Q
+    1:1:com.android.tools.r8.kotlin.KotlinMemberLevelInfo getKotlinInfo():10 -> Q
     1:3:com.android.tools.r8.graph.DexProgramClass getHolder():67:69 -> a
     1:1:com.android.tools.r8.graph.DexProgramClass getContextClass():37:37 -> b
     1:1:com.android.tools.r8.graph.DexClass getContextClass():10 -> b
@@ -30084,19 +30218,19 @@
     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.OK:
-    com.android.tools.r8.kotlin.KotlinMemberLevelInfo getKotlinInfo() -> P
+com.android.tools.r8.graph.ProgramMember -> com.android.tools.r8.internal.XK:
+    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
-    1:1:void clearGenericSignature():27:27 -> z
-com.android.tools.r8.graph.ProgramMethod -> com.android.tools.r8.graph.Y2:
+com.android.tools.r8.graph.ProgramMethod -> com.android.tools.r8.graph.Z2:
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():22:22 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):26:26 -> <init>
-    boolean isProgramMember() -> N
-    1:1:com.android.tools.r8.kotlin.KotlinMethodLevelInfo getKotlinInfo():172:172 -> P
-    1:1:com.android.tools.r8.kotlin.KotlinMemberLevelInfo getKotlinInfo():22 -> P
-    com.android.tools.r8.graph.ProgramMethod asProgramMethod() -> U
+    boolean isProgramMember() -> O
+    1:1:com.android.tools.r8.kotlin.KotlinMethodLevelInfo getKotlinInfo():172:172 -> Q
+    1:1:com.android.tools.r8.kotlin.KotlinMemberLevelInfo getKotlinInfo():22 -> Q
+    com.android.tools.r8.graph.ProgramMethod asProgramMethod() -> V
     1:2:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.AppView):30:31 -> a
     3:6:void registerCodeReferences(com.android.tools.r8.graph.UseRegistry):114:117 -> a
     7:7:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
@@ -30158,7 +30292,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     com.android.tools.r8.graph.ProgramMember asProgramMember() -> o
     1:1:com.android.tools.r8.graph.DexClass getHolder():22:22 -> r
-com.android.tools.r8.graph.ProgramPackage -> com.android.tools.r8.internal.TK:
+com.android.tools.r8.graph.ProgramPackage -> com.android.tools.r8.internal.cL:
     java.util.Set classes -> c
     java.lang.String packageDescriptor -> b
     boolean $assertionsDisabled -> d
@@ -30184,11 +30318,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.UK:
+com.android.tools.r8.graph.ProgramPackageCollection -> com.android.tools.r8.internal.dL:
     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.xN:
+com.android.tools.r8.graph.PrunedItems -> com.android.tools.r8.internal.GN:
     com.android.tools.r8.graph.DexApplication prunedApp -> a
     java.util.Set noLongerSyntheticItems -> c
     java.util.Set removedClasses -> d
@@ -30217,8 +30351,8 @@
     2:2:boolean hasRemovedMembers():87 -> j
     1:1:boolean hasRemovedMethods():91:91 -> k
     1:4:boolean isEmpty():44:47 -> l
-com.android.tools.r8.graph.PrunedItems$1 -> com.android.tools.r8.internal.vN:
-com.android.tools.r8.graph.PrunedItems$Builder -> com.android.tools.r8.internal.wN:
+com.android.tools.r8.graph.PrunedItems$1 -> com.android.tools.r8.internal.EN:
+com.android.tools.r8.graph.PrunedItems$Builder -> com.android.tools.r8.internal.FN:
     com.android.tools.r8.graph.DexApplication prunedApp -> a
     java.util.Set noLongerSyntheticItems -> c
     java.util.Set removedClasses -> d
@@ -30235,7 +30369,7 @@
     1:2:com.android.tools.r8.graph.PrunedItems$Builder addRemovedClasses(java.util.Set):133:134 -> b
     1:1:com.android.tools.r8.graph.PrunedItems$Builder setRemovedClasses(java.util.Set):149:149 -> c
     1:1:com.android.tools.r8.graph.PrunedItems$Builder setRemovedMethods(java.util.Set):154:154 -> d
-com.android.tools.r8.graph.RewrittenPrototypeDescription -> com.android.tools.r8.graph.f3:
+com.android.tools.r8.graph.RewrittenPrototypeDescription -> com.android.tools.r8.graph.g3:
     java.util.List extraParameters -> a
     com.android.tools.r8.graph.RewrittenPrototypeDescription NONE -> d
     com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection argumentInfoCollection -> b
@@ -30298,8 +30432,8 @@
     2:2:int numberOfExtraParameters():685:685 -> j
     2:2:boolean requiresRewritingAtCallSite():702 -> j
     3:4:boolean requiresRewritingAtCallSite():702:703 -> j
-com.android.tools.r8.graph.RewrittenPrototypeDescription$1 -> com.android.tools.r8.graph.Z2:
-com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo -> com.android.tools.r8.graph.b3:
+com.android.tools.r8.graph.RewrittenPrototypeDescription$1 -> com.android.tools.r8.graph.a3:
+com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo -> com.android.tools.r8.graph.c3:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo NO_INFO -> a
     1:3:void <clinit>():41:43 -> <clinit>
@@ -30308,14 +30442,14 @@
     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$RewrittenTypeInfo asRewrittenTypeInfo() -> b
-com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo$1 -> com.android.tools.r8.graph.a3:
+com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo$1 -> com.android.tools.r8.graph.b3:
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():44:44 -> <clinit>
     1:1:void <init>():44:44 -> <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):48:48 -> a
     1:1:int hashCode():65:65 -> hashCode
-com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection -> com.android.tools.r8.graph.c3:
+com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection -> com.android.tools.r8.graph.d3:
     com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection EMPTY -> b
     boolean $assertionsDisabled -> c
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap argumentInfos -> a
@@ -30389,7 +30523,7 @@
     3:3:int numberOfRemovedArguments():387 -> h
     1:1:int hashCode():439:439 -> hashCode
     1:1:int size():403:403 -> i
-com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection$Builder -> com.android.tools.r8.graph.c3$a:
+com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection$Builder -> com.android.tools.r8.graph.d3$a:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap argumentInfos -> a
     1:1:void <clinit>():446:446 -> <clinit>
@@ -30397,7 +30531,7 @@
     1:5:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection$Builder addArgumentInfo(int,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo):451:455 -> a
     6:9:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection build():460:463 -> a
     10:10:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection build():461:461 -> a
-com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo -> com.android.tools.r8.graph.d3:
+com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo -> com.android.tools.r8.graph.e3:
     com.android.tools.r8.graph.DexType type -> d
     boolean $assertionsDisabled -> e
     com.android.tools.r8.ir.analysis.value.SingleValue singleValue -> c
@@ -30419,7 +30553,7 @@
     1:5:boolean equals(java.lang.Object):192:196 -> equals
     1:1:boolean hasSingleValue():147:147 -> f
     1:1:int hashCode():201:201 -> hashCode
-com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo$Builder -> com.android.tools.r8.graph.d3$a:
+com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo$Builder -> com.android.tools.r8.graph.e3$a:
     com.android.tools.r8.ir.analysis.value.SingleValue singleValue -> a
     com.android.tools.r8.graph.DexType type -> b
     boolean $assertionsDisabled -> c
@@ -30428,7 +30562,7 @@
     1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo$Builder setSingleValue(com.android.tools.r8.ir.analysis.value.SingleValue):119:119 -> a
     2:2:com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo$Builder setType(com.android.tools.r8.graph.DexType):124:124 -> a
     3:4:com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo build():129:130 -> a
-com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo -> com.android.tools.r8.graph.e3:
+com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo -> com.android.tools.r8.graph.f3:
     com.android.tools.r8.graph.DexType newType -> d
     com.android.tools.r8.graph.DexType oldType -> c
     boolean $assertionsDisabled -> f
@@ -30466,7 +30600,7 @@
     1:1:boolean hasBeenChangedToReturnVoid():245:245 -> f
     1:1:boolean hasSingleValue():249:249 -> g
     1:1:int hashCode():303:303 -> hashCode
-com.android.tools.r8.graph.RewrittenPrototypeDescriptionMethodOptimizationInfoFixer -> com.android.tools.r8.internal.RR:
+com.android.tools.r8.graph.RewrittenPrototypeDescriptionMethodOptimizationInfoFixer -> com.android.tools.r8.internal.aS:
     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>
@@ -30524,7 +30658,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.iT:
+com.android.tools.r8.graph.SmaliWriter -> com.android.tools.r8.internal.rT:
     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
@@ -30533,17 +30667,17 @@
     19:21:void writeMethod(com.android.tools.r8.graph.ProgramMethod,java.io.PrintStream):71:73 -> a
     1:3:void writeClassFooter(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream):64:66 -> b
     1:13:void writeClassHeader(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream):45:57 -> c
-com.android.tools.r8.graph.SortedProgramPackage -> com.android.tools.r8.internal.rT:
+com.android.tools.r8.graph.SortedProgramPackage -> com.android.tools.r8.internal.AT:
     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.sT:
+com.android.tools.r8.graph.SortedProgramPackageCollection -> com.android.tools.r8.internal.BT:
     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.yV:
+com.android.tools.r8.graph.SubtypingInfo -> com.android.tools.r8.internal.HV:
     java.util.Map typeInfo -> b
     java.util.Map subtypeMap -> c
     java.util.Set NO_DIRECT_SUBTYPE -> d
@@ -30583,7 +30717,7 @@
     1:1:boolean lambda$allImmediateImplementsSubtypes$3(com.android.tools.r8.graph.DexType):219:219 -> h
     1:1:java.util.Set lambda$populateSuperType$0(com.android.tools.r8.graph.DexType):60:60 -> i
     1:3:java.util.Set subtypes(com.android.tools.r8.graph.DexType):166:168 -> j
-com.android.tools.r8.graph.SubtypingInfo$TypeInfo -> com.android.tools.r8.internal.xV:
+com.android.tools.r8.graph.SubtypingInfo$TypeInfo -> com.android.tools.r8.internal.GV:
     java.util.Set directSubtypes -> c
     com.android.tools.r8.graph.DexType type -> a
     int hierarchyLevel -> b
@@ -30611,17 +30745,63 @@
     515:515:java.lang.String toString():255:255 -> toString
     516:516:java.lang.String toString():255:255 -> toString
     517:517:java.lang.String toString():255:255 -> toString
-com.android.tools.r8.graph.SuccessfulMemberResolutionResult -> com.android.tools.r8.internal.zV:
+com.android.tools.r8.graph.SuccessfulMemberResolutionResult -> com.android.tools.r8.internal.IV:
     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.ThrowNullCode -> com.android.tools.r8.graph.h3:
+com.android.tools.r8.graph.ThrowExceptionCode -> com.android.tools.r8.graph.h3:
+    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
+    int codeSizeInBytes() -> M
+    void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection) -> a
+    int getRegisterSize(com.android.tools.r8.graph.ProgramMethod) -> a
+    com.android.tools.r8.graph.DexWritableCode rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexItemFactory,boolean) -> a
+    void writeKeepRulesForDesugaredLibrary(com.android.tools.r8.dex.CodeToKeep) -> a
+    1:1:com.android.tools.r8.graph.ThrowExceptionCode create(com.android.tools.r8.graph.DexType):35:35 -> a
+    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
+    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.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
+    int getIncomingRegisterSize(com.android.tools.r8.graph.ProgramMethod) -> b
+    void setCallSiteContexts(com.android.tools.r8.graph.ProgramMethod) -> c
+    1:1:int computeHashCode():91:91 -> f0
+    1:5:boolean computeEquals(java.lang.Object):99:103 -> g
+    com.android.tools.r8.graph.DexWritableCode asDexWritableCode() -> h0
+    int estimatedDexCodeSizeUpperBoundInBytes() -> j0
+    1:1:com.android.tools.r8.graph.DexWritableCode$DexWritableCodeKind getDexWritableCodeKind():113:113 -> m
+    boolean isDexWritableCode() -> o0
+    1:1:com.android.tools.r8.graph.DexCode$Try[] getTries():148:148 -> p
+    com.android.tools.r8.graph.Code asCode() -> q
+    boolean isSharedCodeObject() -> q0
+    com.android.tools.r8.graph.ThrowExceptionCode asThrowExceptionCode() -> s
+    1:1:java.lang.String toString():230:230 -> toString
+    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.j3:
     com.android.tools.r8.graph.ThrowNullCode INSTANCE -> d
     1:1:void <clinit>():35:35 -> <clinit>
     1:1:void <init>():37:37 -> <init>
-    com.android.tools.r8.graph.DexDebugInfoForWriting getDebugInfoForWriting() -> A
-    int codeSizeInBytes() -> L
+    com.android.tools.r8.graph.DexDebugInfoForWriting getDebugInfoForWriting() -> B
+    int codeSizeInBytes() -> M
     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
     void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection) -> a
     void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry) -> a
@@ -30640,27 +30820,27 @@
     11:14: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):233:236 -> a
     15:16: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):247:248 -> a
     17:17:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.ClassNameMapper):263:263 -> a
-    com.android.tools.r8.graph.CfWritableCode$CfWritableCodeKind getCfWritableCodeKind() -> a0
     1:1:int getIncomingRegisterSize(com.android.tools.r8.graph.ProgramMethod):136:136 -> b
+    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):140:142 -> d
-    1:1:int computeHashCode():96:96 -> e0
-    com.android.tools.r8.graph.CfWritableCode asCfWritableCode() -> f0
+    1:1:int computeHashCode():96:96 -> f0
     boolean computeEquals(java.lang.Object) -> g
-    com.android.tools.r8.graph.DexWritableCode asDexWritableCode() -> g0
-    com.android.tools.r8.graph.DexWritableCode$DexWritableCodeKind getDexWritableCodeKind() -> i
-    int estimatedDexCodeSizeUpperBoundInBytes() -> i0
-    boolean isCfWritableCode() -> l0
-    boolean isDexWritableCode() -> n0
+    com.android.tools.r8.graph.CfWritableCode asCfWritableCode() -> g0
+    com.android.tools.r8.graph.DexWritableCode asDexWritableCode() -> h0
+    int estimatedDexCodeSizeUpperBoundInBytes() -> j0
+    1:1:com.android.tools.r8.graph.DexWritableCode$DexWritableCodeKind getDexWritableCodeKind():116:116 -> m
+    boolean isCfWritableCode() -> m0
+    boolean isDexWritableCode() -> o0
     1:1:com.android.tools.r8.graph.DexCode$Try[] getTries():159:159 -> p
-    boolean isSharedCodeObject() -> p0
     com.android.tools.r8.graph.Code asCode() -> q
-    1:1:com.android.tools.r8.graph.ThrowNullCode get():40:40 -> r0
+    boolean isSharedCodeObject() -> q0
+    1:1:com.android.tools.r8.graph.ThrowNullCode get():40:40 -> s0
     1:1:java.lang.String toString():258:258 -> toString
-    1:1:com.android.tools.r8.graph.DexCode$TryHandler[] getHandlers():126:126 -> u
-    com.android.tools.r8.graph.DexString getHighestSortingString() -> w
-    int getOutgoingRegisterSize() -> y
-com.android.tools.r8.graph.ThrowNullCode$ThrowNullSourceCode -> com.android.tools.r8.graph.g3:
+    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.i3:
     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
@@ -30668,7 +30848,7 @@
     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.sW:
+com.android.tools.r8.graph.ThrowingInitClassLens -> com.android.tools.r8.internal.BW:
     com.android.tools.r8.graph.ThrowingInitClassLens INSTANCE -> a
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>():13:13 -> <init>
@@ -30687,7 +30867,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.JW:
+com.android.tools.r8.graph.TopDownClassHierarchyTraversal -> com.android.tools.r8.internal.SW:
     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
@@ -30731,7 +30911,7 @@
     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.i3:
+com.android.tools.r8.graph.TreeFixerBase -> com.android.tools.r8.graph.k3:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     java.util.Map programClassCache -> c
     com.android.tools.r8.graph.AppView appView -> a
@@ -30816,13 +30996,13 @@
     16:16:java.util.List fixupInnerClassAttributes(java.util.List):205 -> b
     17:28:java.util.List fixupInnerClassAttributes(java.util.List):206:217 -> b
     29:36:java.util.List fixupInnerClassAttributes(java.util.List):216:223 -> b
-    37:37:boolean com.android.tools.r8.utils.InternalOptions.isTreeShakingEnabled():602:602 -> b
+    37:37:boolean com.android.tools.r8.utils.InternalOptions.isTreeShakingEnabled():604:604 -> b
     37:37:java.util.List fixupInnerClassAttributes(java.util.List):223 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     38:44:java.util.List fixupInnerClassAttributes(java.util.List):223:229 -> b
     45:45:java.util.List fixupInnerClassAttributes(java.util.List):227:227 -> b
     1:10:java.util.List fixupNestMemberAttributes(java.util.List):270:279 -> c
-com.android.tools.r8.graph.UseRegistry -> com.android.tools.r8.graph.j3:
+com.android.tools.r8.graph.UseRegistry -> com.android.tools.r8.graph.l3:
     com.android.tools.r8.graph.Definition context -> b
     com.android.tools.r8.utils.TraversalContinuation continuation -> c
     com.android.tools.r8.graph.AppView appView -> a
@@ -30880,12 +31060,12 @@
     void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod) -> g
     void registerStaticFieldWrite(com.android.tools.r8.graph.DexField) -> g
     1:1:void registerStaticFieldWriteFromMethodHandle(com.android.tools.r8.graph.DexField):128:128 -> h
-com.android.tools.r8.graph.UseRegistry$MethodHandleUse -> com.android.tools.r8.internal.gY:
+com.android.tools.r8.graph.UseRegistry$MethodHandleUse -> com.android.tools.r8.internal.pY:
     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.hY:
+com.android.tools.r8.graph.UseRegistryWithResult -> com.android.tools.r8.internal.qY:
     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:1:java.lang.Object getResult():21:21 -> e
@@ -30896,7 +31076,7 @@
     com.android.tools.r8.androidapi.AndroidApiLevelCompute apiCompute -> b
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():18:18 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute):24:27 -> <init>
+    1:4:void <init>(com.android.tools.r8.graph.AppView):24:27 -> <init>
     void lambda$notifyMarkVirtualDispatchTargetAsLive$0(com.android.tools.r8.graph.LookupLambdaTarget) -> a
     1:1:void processNewlyLiveField(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition):32:32 -> a
     2:2:void processNewlyLiveMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):37:37 -> a
@@ -30910,7 +31090,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.G9:
+com.android.tools.r8.graph.analysis.ClassInitializerAssertionEnablingAnalysis -> com.android.tools.r8.internal.I9:
     com.android.tools.r8.ir.optimize.info.OptimizationFeedback feedback -> b
     com.android.tools.r8.graph.DexString kotlinAssertionsEnabled -> c
     java.util.List jacocoInstructionSequence -> f
@@ -30997,14 +31177,15 @@
 com.android.tools.r8.graph.analysis.EnqueuerFieldAccessAnalysis -> com.android.tools.r8.internal.ih:
 com.android.tools.r8.graph.analysis.GetArrayOfMissingTypeVerifyErrorWorkaround -> com.android.tools.r8.internal.Rk:
     com.android.tools.r8.shaking.Enqueuer enqueuer -> b
+    com.android.tools.r8.androidapi.AndroidApiLevelCompute apiLevelCompute -> c
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> a
-    1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer):40:42 -> <init>
-    1:3:boolean com.android.tools.r8.graph.analysis.GetArrayOfMissingTypeVerifyErrorWorkaround.isNoop(com.android.tools.r8.graph.AppView):54:56 -> a
-    1:3:void register(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer):47 -> a
-    4:4:void register(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer):48:48 -> a
-    5:6:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod):62:63 -> a
-    7:23:boolean isUnsafeToUseFieldOnDalvik(com.android.tools.r8.graph.DexField):76:92 -> a
-    1:2:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod):70:71 -> b
+    1:4:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer):42:45 -> <init>
+    1:3:boolean com.android.tools.r8.graph.analysis.GetArrayOfMissingTypeVerifyErrorWorkaround.isNoop(com.android.tools.r8.graph.AppView):57:59 -> a
+    1:3:void register(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer):50 -> a
+    4:4:void register(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer):51:51 -> a
+    5:6:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod):65:66 -> a
+    7:21:boolean isUnsafeToUseFieldOnDalvik(com.android.tools.r8.graph.DexField):79:93 -> a
+    1:2:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod):73:74 -> b
 com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis -> com.android.tools.r8.internal.Mn:
     java.util.Map mapping -> b
     com.android.tools.r8.graph.AppView appView -> a
@@ -31033,18 +31214,18 @@
     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():471:471 -> a
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> 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
     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.U5:
+com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata -> com.android.tools.r8.internal.X5:
     boolean isReadForWrite -> a
     1:2:void <init>(boolean):22:23 -> <init>
     1:1:com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata$Builder builder():27:27 -> a
     1:1:boolean isReadForWrite():35:35 -> b
-com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata$Builder -> com.android.tools.r8.internal.T5:
+com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata$Builder -> com.android.tools.r8.internal.W5:
     boolean isReadForWrite -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():38:38 -> <clinit>
@@ -31054,7 +31235,7 @@
     2:2:com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata build():52 -> a
     3:4:com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata build():52:53 -> a
     1:1:com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata$Builder setIsReadForWrite():47:47 -> b
-com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadata -> com.android.tools.r8.internal.W5:
+com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadata -> com.android.tools.r8.internal.Z5:
     java.util.Map backing -> a
     com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadata EMPTY -> b
     boolean $assertionsDisabled -> c
@@ -31063,14 +31244,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.V5:
+com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadata$Builder -> com.android.tools.r8.internal.Y5:
     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.X5:
+com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider -> com.android.tools.r8.internal.a6:
     java.util.Map backing -> a
     com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider EMPTY -> b
     1:2:void <clinit>():21:22 -> <clinit>
@@ -31078,7 +31259,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.X5$a:
+com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider$Builder -> com.android.tools.r8.internal.a6$a:
     java.util.Map builders -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():46:46 -> <clinit>
@@ -31086,10 +31267,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.nC:
+com.android.tools.r8.graph.classmerging.MergedClasses -> com.android.tools.r8.internal.sC:
     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.oC:
+com.android.tools.r8.graph.classmerging.MergedClassesCollection -> com.android.tools.r8.internal.tC:
     java.util.List collection -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():15:15 -> <clinit>
@@ -31097,7 +31278,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.aZ:
+com.android.tools.r8.graph.classmerging.VerticallyMergedClasses -> com.android.tools.r8.internal.jZ:
     com.android.tools.r8.utils.collections.BidirectionalManyToOneMap mergedClasses -> a
     com.android.tools.r8.utils.collections.BidirectionalManyToOneMap mergedInterfaces -> b
     boolean $assertionsDisabled -> c
@@ -31128,7 +31309,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.Y9:
+com.android.tools.r8.horizontalclassmerging.ClassInstanceFieldsMerger -> com.android.tools.r8.internal.aa:
     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
@@ -31182,7 +31363,7 @@
     2:2:boolean lambda$fixAccessFlags$4(com.android.tools.r8.graph.DexEncodedField):123 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:1:void setClassIdField(com.android.tools.r8.graph.DexEncodedField):129:129 -> c
-com.android.tools.r8.horizontalclassmerging.ClassMerger -> com.android.tools.r8.internal.fa:
+com.android.tools.r8.horizontalclassmerging.ClassMerger -> com.android.tools.r8.internal.ha:
     com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder classMethodsBuilder -> f
     boolean $assertionsDisabled -> n
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> d
@@ -31213,23 +31394,18 @@
     15:15:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withName(java.lang.String,com.android.tools.r8.graph.DexItemFactory):318 -> a
     15:15:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeStaticClassInitializers(com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):124 -> a
     15:15:void mergeDirectMethods(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):110 -> a
-    16:21:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeStaticClassInitializers(com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):125:130 -> a
-    16:21:void mergeDirectMethods(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):110 -> a
-    22:22:com.android.tools.r8.graph.MethodAccessFlags com.android.tools.r8.graph.MethodAccessFlags.createForClassInitializer():79:79 -> a
-    22:22:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeStaticClassInitializers(com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):131 -> a
-    22:22:void mergeDirectMethods(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):110 -> a
-    23:36:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeStaticClassInitializers(com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):131:144 -> a
-    23:36:void mergeDirectMethods(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):110 -> a
-    37:37:void mergeDirectMethods(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):111:111 -> a
-    38:42:void lambda$mergeDirectMethods$1(com.android.tools.r8.graph.ProgramMethod):151:155 -> a
-    43:54:void lambda$mergeDirectMethods$1(com.android.tools.r8.graph.ProgramMethod):153:164 -> a
-    55:55:void lambda$mergeInstanceInitializers$2(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder,com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger):191:191 -> a
-    56:56:void lambda$mergeVirtualMethods$3(com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger):205:205 -> a
-    57:57:boolean lambda$fixNestMemberAttributes$5(com.android.tools.r8.graph.NestMemberClassAttribute):253:253 -> a
-    58:58:void lambda$mergeInterfaces$6(java.util.function.Consumer,com.android.tools.r8.graph.DexProgramClass):277:277 -> a
-    59:59:void lambda$mergeInterfaces$7(java.util.function.Consumer):277:277 -> a
-    60:62:void lambda$mergeInterfaces$8(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexProgramClass):280:282 -> a
-    63:63:void lambda$mergeInterfaces$9(java.util.Set,com.android.tools.r8.graph.DexProgramClass):288:288 -> a
+    16:35:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeStaticClassInitializers(com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):125:144 -> a
+    16:35:void mergeDirectMethods(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):110 -> a
+    36:36:void mergeDirectMethods(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):111:111 -> a
+    37:41:void lambda$mergeDirectMethods$1(com.android.tools.r8.graph.ProgramMethod):151:155 -> a
+    42:53:void lambda$mergeDirectMethods$1(com.android.tools.r8.graph.ProgramMethod):153:164 -> a
+    54:54:void lambda$mergeInstanceInitializers$2(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder,com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger):191:191 -> a
+    55:55:void lambda$mergeVirtualMethods$3(com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger):205:205 -> a
+    56:56:boolean lambda$fixNestMemberAttributes$5(com.android.tools.r8.graph.NestMemberClassAttribute):253:253 -> a
+    57:57:void lambda$mergeInterfaces$6(java.util.function.Consumer,com.android.tools.r8.graph.DexProgramClass):277:277 -> a
+    58:58:void lambda$mergeInterfaces$7(java.util.function.Consumer):277:277 -> a
+    59:61:void lambda$mergeInterfaces$8(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexProgramClass):280:282 -> a
+    62:62:void lambda$mergeInterfaces$9(java.util.Set,com.android.tools.r8.graph.DexProgramClass):288:288 -> a
     1:2:com.android.tools.r8.graph.DexMethod renameDirectMethod(com.android.tools.r8.graph.ProgramMethod):178:179 -> 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):180 -> b
@@ -31250,7 +31426,7 @@
     21:21:void com.android.tools.r8.horizontalclassmerging.ClassMerger.appendClassIdField():210:210 -> b
     21:21:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeFields():295 -> b
     21:21:void mergeGroup(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):319 -> b
-    22:22:boolean com.android.tools.r8.graph.AppView.hasLiveness():657:657 -> b
+    22:22:boolean com.android.tools.r8.graph.AppView.hasLiveness():659:659 -> b
     22:22:void com.android.tools.r8.horizontalclassmerging.ClassMerger.appendClassIdField():210 -> b
     22:22:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeFields():295 -> b
     22:22:void mergeGroup(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):319 -> b
@@ -31291,8 +31467,8 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:3:void mergeStaticFields():307:309 -> g
     1:3:void mergeVirtualMethods():204:206 -> h
-com.android.tools.r8.horizontalclassmerging.ClassMerger$1 -> com.android.tools.r8.internal.da:
-com.android.tools.r8.horizontalclassmerging.ClassMerger$Builder -> com.android.tools.r8.internal.ea:
+com.android.tools.r8.horizontalclassmerging.ClassMerger$1 -> com.android.tools.r8.internal.fa:
+com.android.tools.r8.horizontalclassmerging.ClassMerger$Builder -> com.android.tools.r8.internal.ga:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.horizontalclassmerging.IRCodeProvider codeProvider -> b
     boolean $assertionsDisabled -> e
@@ -31317,7 +31493,7 @@
     36:36:com.android.tools.r8.horizontalclassmerging.ClassMerger build(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder):379 -> a
     37:37:com.android.tools.r8.horizontalclassmerging.ClassMerger build(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder):382:382 -> a
     38:38:boolean lambda$build$3(com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger):376:376 -> a
-com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder -> com.android.tools.r8.internal.ga:
+com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder -> com.android.tools.r8.internal.ia:
     java.util.List virtualMethods -> b
     java.util.List directMethods -> c
     java.util.Set reservedMethods -> a
@@ -31330,7 +31506,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.Da:
+com.android.tools.r8.horizontalclassmerging.ClassStaticFieldsMerger -> com.android.tools.r8.internal.Fa:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.horizontalclassmerging.MergeGroup group -> c
@@ -31346,7 +31522,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.nd:
+com.android.tools.r8.horizontalclassmerging.ConstructorEntryPoint -> com.android.tools.r8.internal.pd:
     boolean $assertionsDisabled -> o
     com.android.tools.r8.graph.DexField classIdField -> m
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap typeConstructors -> n
@@ -31403,7 +31579,7 @@
     58:58:com.android.tools.r8.shaking.KeepInfoCollection com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection.mutate(java.util.function.Consumer):495:495 -> a
     58:58:void run(com.android.tools.r8.shaking.RuntimeTypeCheckInfo,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):127 -> a
     59:61:void run(com.android.tools.r8.shaking.RuntimeTypeCheckInfo,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):134:134 -> a
-    62:62:void com.android.tools.r8.graph.AppView.rewriteWithLensAndApplication(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DirectMappedDexApplication):736:736 -> a
+    62:62:void com.android.tools.r8.graph.AppView.rewriteWithLensAndApplication(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DirectMappedDexApplication):738:738 -> a
     62:62:void run(com.android.tools.r8.shaking.RuntimeTypeCheckInfo,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):134 -> a
     63:69:void run(com.android.tools.r8.shaking.RuntimeTypeCheckInfo,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):138:144 -> a
     70:70:com.android.tools.r8.graph.PrunedItems$Builder com.android.tools.r8.graph.PrunedItems.builder():36:36 -> a
@@ -31741,7 +31917,7 @@
     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():310:310 -> a
+    7:7:int com.android.tools.r8.utils.InternalOptions.minimumVerificationSizeLimitInBytes():312:312 -> 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:8:com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger$Builder add(com.android.tools.r8.graph.ProgramMethod):200:200 -> a
@@ -31769,7 +31945,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.mC:
+com.android.tools.r8.horizontalclassmerging.MergeGroup -> com.android.tools.r8.internal.rC:
     com.android.tools.r8.utils.collections.BidirectionalManyToOneMap instanceFieldMap -> e
     com.android.tools.r8.graph.DexProgramClass target -> d
     boolean $assertionsDisabled -> f
@@ -31821,7 +31997,7 @@
     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():504:504 -> 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
@@ -31864,23 +32040,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.UD:
+com.android.tools.r8.horizontalclassmerging.MultiClassPolicy -> com.android.tools.r8.internal.ZD:
     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.VD:
+com.android.tools.r8.horizontalclassmerging.MultiClassPolicyWithPreprocessing -> com.android.tools.r8.internal.aE:
     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.WD:
+com.android.tools.r8.horizontalclassmerging.MultiClassSameReferencePolicy -> com.android.tools.r8.internal.bE:
     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.KJ:
+com.android.tools.r8.horizontalclassmerging.Policy -> com.android.tools.r8.internal.TJ:
     int numberOfRemovedInterfaces -> b
     boolean $assertionsDisabled -> c
     int numberOfRemovedClasses -> a
@@ -31902,7 +32078,7 @@
     boolean isMultiClassPolicyWithPreprocessing() -> h
     boolean isSingleClassPolicy() -> i
     boolean shouldSkipPolicy() -> j
-com.android.tools.r8.horizontalclassmerging.PolicyExecutor -> com.android.tools.r8.internal.LJ:
+com.android.tools.r8.horizontalclassmerging.PolicyExecutor -> com.android.tools.r8.internal.UJ:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():20:20 -> <clinit>
     1:1:void <init>():20:20 -> <init>
@@ -31922,7 +32098,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.MJ:
+com.android.tools.r8.horizontalclassmerging.PolicyScheduler -> com.android.tools.r8.internal.VJ:
     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
@@ -31963,12 +32139,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.SS:
+com.android.tools.r8.horizontalclassmerging.SingleClassPolicy -> com.android.tools.r8.internal.bT:
     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.wV:
+com.android.tools.r8.horizontalclassmerging.SubtypingForrestForClasses -> com.android.tools.r8.internal.FV:
     java.util.Map subtypeMap -> c
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Collection roots -> b
@@ -31996,13 +32172,13 @@
     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
     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.SV:
+com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass -> com.android.tools.r8.internal.bW:
     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.QV:
-com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass$Builder -> com.android.tools.r8.internal.RV:
+com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass$1 -> com.android.tools.r8.internal.ZV:
+com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass$Builder -> com.android.tools.r8.internal.aW:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():45:45 -> <clinit>
@@ -32015,7 +32191,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.YW:
+com.android.tools.r8.horizontalclassmerging.TreeFixer -> com.android.tools.r8.internal.hX:
     boolean $assertionsDisabled -> n
     com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses mergedClasses -> g
     com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder lensBuilder -> i
@@ -32107,7 +32283,7 @@
     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.pZ:
+com.android.tools.r8.horizontalclassmerging.VirtualMethodEntryPoint -> com.android.tools.r8.internal.yZ:
     com.android.tools.r8.graph.DexMethod superMethod -> o
     boolean $assertionsDisabled -> p
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap mappedMethods -> m
@@ -32127,7 +32303,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.sZ:
+com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger -> com.android.tools.r8.internal.BZ:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.horizontalclassmerging.MergeGroup group -> c
@@ -32192,7 +32368,7 @@
     1:1:boolean lambda$getAccessFlags$4(com.android.tools.r8.graph.MethodAccessFlags):137:137 -> e
     2:9:boolean isTrivial():166:173 -> e
     1:1:boolean lambda$getAccessFlags$5(com.android.tools.r8.graph.MethodAccessFlags):140:140 -> f
-com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger$Builder -> com.android.tools.r8.internal.rZ:
+com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger$Builder -> com.android.tools.r8.internal.AZ:
     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
@@ -32200,7 +32376,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.O9:
+com.android.tools.r8.horizontalclassmerging.code.ClassInitializerMerger -> com.android.tools.r8.internal.Q9:
     com.android.tools.r8.com.google.common.collect.ImmutableList classInitializers -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():54:54 -> <clinit>
@@ -32219,15 +32395,15 @@
     39:39:com.android.tools.r8.androidapi.ComputedApiLevel lambda$getApiReferenceLevel$3(com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.graph.ProgramMethod):108:108 -> a
     1:1:boolean isEmpty():74:74 -> b
     2:2:java.lang.Boolean lambda$getCode$1(com.android.tools.r8.graph.ProgramMethod):83:83 -> b
-com.android.tools.r8.horizontalclassmerging.code.ClassInitializerMerger$1 -> com.android.tools.r8.internal.K9:
-com.android.tools.r8.horizontalclassmerging.code.ClassInitializerMerger$Builder -> com.android.tools.r8.internal.L9:
+com.android.tools.r8.horizontalclassmerging.code.ClassInitializerMerger$1 -> com.android.tools.r8.internal.M9:
+com.android.tools.r8.horizontalclassmerging.code.ClassInitializerMerger$Builder -> com.android.tools.r8.internal.N9:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.com.google.common.collect.ImmutableList$Builder classInitializers -> a
     1:1:void <clinit>():111:111 -> <clinit>
     1:3:void <init>():111:113 -> <init>
     1:3:void add(com.android.tools.r8.graph.ProgramMethod):116:118 -> a
     4:4:com.android.tools.r8.horizontalclassmerging.code.ClassInitializerMerger build():122:122 -> a
-com.android.tools.r8.horizontalclassmerging.code.ClassInitializerMerger$CfCodeBuilder -> com.android.tools.r8.internal.M9:
+com.android.tools.r8.horizontalclassmerging.code.ClassInitializerMerger$CfCodeBuilder -> com.android.tools.r8.internal.O9:
     com.android.tools.r8.horizontalclassmerging.code.ClassInitializerMerger this$0 -> c
     int maxLocals -> b
     int maxStack -> a
@@ -32244,7 +32420,7 @@
     23:27:void lambda$buildInstructions$0(java.util.List,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.ProgramMethod):150 -> a
     28:43: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):166:181 -> a
     28:43:void lambda$buildInstructions$0(java.util.List,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.ProgramMethod):150 -> a
-com.android.tools.r8.horizontalclassmerging.code.ClassInitializerMerger$IRProvider -> com.android.tools.r8.internal.N9:
+com.android.tools.r8.horizontalclassmerging.code.ClassInitializerMerger$IRProvider -> com.android.tools.r8.internal.P9:
     boolean $assertionsDisabled -> f
     com.android.tools.r8.graph.DexMethod syntheticMethodReference -> e
     com.android.tools.r8.com.google.common.collect.ImmutableList classInitializers -> d
@@ -32263,11 +32439,11 @@
     88:88:void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry):299:299 -> a
     89:89:void registerCodeReferencesForDesugaring(com.android.tools.r8.graph.ClasspathMethod,com.android.tools.r8.graph.UseRegistry):304:304 -> a
     90:90:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.ClassNameMapper):314:314 -> a
-    1:1:int computeHashCode():279:279 -> e0
+    1:1:int computeHashCode():279:279 -> f0
     1:1:boolean computeEquals(java.lang.Object):284:284 -> g
-    1:1:int estimatedDexCodeSizeUpperBoundInBytes():289:289 -> i0
+    1:1:int estimatedDexCodeSizeUpperBoundInBytes():289:289 -> j0
     1:1:java.lang.String toString():309:309 -> toString
-com.android.tools.r8.horizontalclassmerging.code.ConstructorEntryPointSynthesizedCode -> com.android.tools.r8.internal.od:
+com.android.tools.r8.horizontalclassmerging.code.ConstructorEntryPointSynthesizedCode -> com.android.tools.r8.internal.qd:
     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
@@ -32278,9 +32454,9 @@
     1:1:com.android.tools.r8.ir.conversion.SourceCode lambda$getSourceCodeProvider$0(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Position):36:36 -> a
     2:2:java.util.function.Consumer getRegistryCallback(com.android.tools.r8.graph.DexClassAndMethod):42:42 -> a
     3:6:void registerReachableDefinitions(com.android.tools.r8.graph.UseRegistry):46:49 -> a
-    boolean isHorizontalClassMergingCode() -> o0
-    1:1:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():35:35 -> r0
-com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter -> com.android.tools.r8.internal.ZV:
+    boolean isHorizontalClassMergingCode() -> p0
+    1:1:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():35:35 -> s0
+com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter -> com.android.tools.r8.internal.iW:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.List methods -> c
     com.android.tools.r8.horizontalclassmerging.IRCodeProvider codeProvider -> b
@@ -32288,14 +32464,14 @@
     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):321:321 -> a
+    8:8:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing):319:319 -> 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.XV:
-com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder -> com.android.tools.r8.internal.YV:
+com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$1 -> com.android.tools.r8.internal.gW:
+com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder -> com.android.tools.r8.internal.hW:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.List methods -> c
     com.android.tools.r8.horizontalclassmerging.IRCodeProvider codeProvider -> b
@@ -32304,7 +32480,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.qZ:
+com.android.tools.r8.horizontalclassmerging.code.VirtualMethodEntryPointSynthesizedCode -> com.android.tools.r8.internal.zZ:
     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
@@ -32323,7 +32499,7 @@
     14:14:void lambda$getRegistryCallback$1(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.UseRegistry):57 -> a
     15:15:void com.android.tools.r8.horizontalclassmerging.code.VirtualMethodEntryPointSynthesizedCode.registerReachableDefinitions(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.UseRegistry):71:71 -> a
     15:15:void lambda$getRegistryCallback$1(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.UseRegistry):57 -> a
-    boolean isHorizontalClassMergingCode() -> o0
+    boolean isHorizontalClassMergingCode() -> p0
 com.android.tools.r8.horizontalclassmerging.policies.AllInstantiatedOrUninstantiated -> com.android.tools.r8.internal.v1:
     com.android.tools.r8.graph.AppView appView -> d
     boolean $assertionsDisabled -> e
@@ -32332,33 +32508,33 @@
     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.a9:
+com.android.tools.r8.horizontalclassmerging.policies.CheckAbstractClasses -> com.android.tools.r8.internal.c9:
     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.Z8:
+com.android.tools.r8.horizontalclassmerging.policies.CheckAbstractClasses$AbstractClassification -> com.android.tools.r8.internal.b9:
     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.q9:
+com.android.tools.r8.horizontalclassmerging.policies.CheckSyntheticClasses -> com.android.tools.r8.internal.s9:
     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>
     1:1:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):26:26 -> a
-    2:2:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):264:264 -> a
+    2:2:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):265:265 -> a
     2:2:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):26 -> a
-    3:3:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexType):260:260 -> a
-    3:3:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):264 -> a
+    3:3:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexType):261:261 -> a
+    3:3:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):265 -> a
     3:3:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):26 -> a
     4:4:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):29:29 -> a
-    5:5:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):264:264 -> a
+    5:5:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):265:265 -> a
     5:5:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):29 -> a
-    6:6:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexType):260:260 -> a
-    6:6:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):264 -> a
+    6:6:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexType):261:261 -> a
+    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.pj:
@@ -32374,7 +32550,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.Rz:
+com.android.tools.r8.horizontalclassmerging.policies.LimitClassGroups -> com.android.tools.r8.internal.Wz:
     boolean $assertionsDisabled -> e
     int maxGroupSize -> d
     1:1:void <clinit>():16:16 -> <clinit>
@@ -32389,7 +32565,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.Sz:
+com.android.tools.r8.horizontalclassmerging.policies.LimitInterfaceGroups -> com.android.tools.r8.internal.Xz:
     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
@@ -32402,7 +32578,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.jD:
+com.android.tools.r8.horizontalclassmerging.policies.MinimizeInstanceFieldCasts -> com.android.tools.r8.internal.oD:
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():20:20 -> <clinit>
     1:1:void <init>():20:20 -> <init>
@@ -32414,19 +32590,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.JE:
+com.android.tools.r8.horizontalclassmerging.policies.NoAnnotationClasses -> com.android.tools.r8.internal.OE:
     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:java.lang.String getName():18:18 -> e
-com.android.tools.r8.horizontalclassmerging.policies.NoCheckDiscard -> com.android.tools.r8.internal.KE:
+com.android.tools.r8.horizontalclassmerging.policies.NoCheckDiscard -> com.android.tools.r8.internal.PE:
     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.LE:
+com.android.tools.r8.horizontalclassmerging.policies.NoClassAnnotationCollisions -> com.android.tools.r8.internal.QE:
     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
@@ -32454,7 +32630,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.OE:
+com.android.tools.r8.horizontalclassmerging.policies.NoClassInitializerCycles -> com.android.tools.r8.internal.TE:
     com.android.tools.r8.graph.AppView appView -> d
     boolean $assertionsDisabled -> g
     java.util.Map allGroups -> e
@@ -32498,7 +32674,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.NE:
+com.android.tools.r8.horizontalclassmerging.policies.NoClassInitializerCycles$Tracer -> com.android.tools.r8.internal.SE:
     com.android.tools.r8.horizontalclassmerging.MergeGroup group -> a
     com.android.tools.r8.horizontalclassmerging.policies.NoClassInitializerCycles this$0 -> h
     java.util.Set seenClassInitializers -> c
@@ -32530,7 +32706,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.ME:
+com.android.tools.r8.horizontalclassmerging.policies.NoClassInitializerCycles$Tracer$TracerUseRegistry -> com.android.tools.r8.internal.RE:
     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
@@ -32601,13 +32777,13 @@
     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:16:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):564:565 -> g
-com.android.tools.r8.horizontalclassmerging.policies.NoClassInitializerWithObservableSideEffects -> com.android.tools.r8.internal.PE:
+com.android.tools.r8.horizontalclassmerging.policies.NoClassInitializerWithObservableSideEffects -> com.android.tools.r8.internal.UE:
     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.QE:
+com.android.tools.r8.horizontalclassmerging.policies.NoConstructorCollisions -> com.android.tools.r8.internal.VE:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> e
     com.android.tools.r8.graph.AppView appView -> d
     boolean $assertionsDisabled -> f
@@ -32632,7 +32808,7 @@
     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.RE:
+com.android.tools.r8.horizontalclassmerging.policies.NoDeadEnumLiteMaps -> com.android.tools.r8.internal.WE:
     java.util.Set deadEnumLiteMaps -> d
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():17:17 -> <clinit>
@@ -32640,7 +32816,7 @@
     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.SE:
+com.android.tools.r8.horizontalclassmerging.policies.NoDeadLocks -> com.android.tools.r8.internal.XE:
     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
@@ -32648,7 +32824,7 @@
     2:4:boolean lambda$apply$0(java.util.Collection,com.android.tools.r8.graph.DexProgramClass):36:38 -> a
     5:29:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.MergeGroup):31:55 -> a
     1:1:java.lang.String getName():62:62 -> e
-com.android.tools.r8.horizontalclassmerging.policies.NoDefaultInterfaceMethodCollisions -> com.android.tools.r8.internal.UE:
+com.android.tools.r8.horizontalclassmerging.policies.NoDefaultInterfaceMethodCollisions -> com.android.tools.r8.internal.ZE:
     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>
@@ -32703,13 +32879,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.TE:
+com.android.tools.r8.horizontalclassmerging.policies.NoDefaultInterfaceMethodCollisions$InterfaceInfo -> com.android.tools.r8.internal.YE:
     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.VE:
+com.android.tools.r8.horizontalclassmerging.policies.NoDefaultInterfaceMethodMerging -> com.android.tools.r8.internal.aF:
     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>
@@ -32726,7 +32902,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.WE:
+com.android.tools.r8.horizontalclassmerging.policies.NoDifferentApiReferenceLevel -> com.android.tools.r8.internal.bF:
     com.android.tools.r8.graph.AppView appView -> e
     boolean enableApiCallerIdentification -> f
     boolean $assertionsDisabled -> g
@@ -32737,7 +32913,7 @@
     1:2: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.XE:
+com.android.tools.r8.horizontalclassmerging.policies.NoDirectRuntimeTypeChecks -> com.android.tools.r8.internal.cF:
     com.android.tools.r8.synthesis.SyntheticItems syntheticItems -> f
     com.android.tools.r8.utils.InternalOptions options -> d
     boolean $assertionsDisabled -> g
@@ -32745,10 +32921,10 @@
     1:1:void <clinit>():15:15 -> <clinit>
     1:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode,com.android.tools.r8.shaking.RuntimeTypeCheckInfo):26:30 -> <init>
     1:2:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):35:36 -> a
-    3:3:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):264:264 -> a
+    3:3:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):265:265 -> a
     3:3:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):36 -> a
-    4:4:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexType):260:260 -> a
-    4:4:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):264 -> a
+    4:4:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexType):261:261 -> a
+    4:4:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):265 -> a
     4:4:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):36 -> a
     5:5:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):36:36 -> a
     6:6:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):0:0 -> a
@@ -32759,7 +32935,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.YE:
+com.android.tools.r8.horizontalclassmerging.policies.NoEnums -> com.android.tools.r8.internal.dF:
     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>
@@ -32768,12 +32944,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.ZE:
+com.android.tools.r8.horizontalclassmerging.policies.NoFailedResolutionTargets -> com.android.tools.r8.internal.eF:
     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.aF:
+com.android.tools.r8.horizontalclassmerging.policies.NoIllegalInlining -> com.android.tools.r8.internal.fF:
     com.android.tools.r8.graph.AppView appView -> d
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():18:18 -> <clinit>
@@ -32788,7 +32964,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.bF:
+com.android.tools.r8.horizontalclassmerging.policies.NoIndirectRuntimeTypeChecks -> com.android.tools.r8.internal.gF:
     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
@@ -32808,15 +32984,15 @@
     6:12: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:1:java.lang.String getName():73:73 -> e
-com.android.tools.r8.horizontalclassmerging.policies.NoInnerClasses -> com.android.tools.r8.internal.cF:
+com.android.tools.r8.horizontalclassmerging.policies.NoInnerClasses -> com.android.tools.r8.internal.hF:
     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.dF:
+com.android.tools.r8.horizontalclassmerging.policies.NoInstanceFieldAnnotations -> com.android.tools.r8.internal.iF:
     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.eF:
+com.android.tools.r8.horizontalclassmerging.policies.NoInstanceInitializerMerging -> com.android.tools.r8.internal.jF:
     com.android.tools.r8.graph.AppView appView -> d
     com.android.tools.r8.horizontalclassmerging.IRCodeProvider codeProvider -> e
     boolean $assertionsDisabled -> f
@@ -32852,14 +33028,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.fF:
+com.android.tools.r8.horizontalclassmerging.policies.NoInterfaces -> com.android.tools.r8.internal.kF:
     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.gF:
+com.android.tools.r8.horizontalclassmerging.policies.NoKeepRules -> com.android.tools.r8.internal.lF:
     java.util.Set dontMergeTypes -> g
     com.android.tools.r8.shaking.KeepInfoCollection keepInfo -> e
     com.android.tools.r8.graph.AppView appView -> d
@@ -32871,7 +33047,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.hF:
+com.android.tools.r8.horizontalclassmerging.policies.NoKotlinMetadata -> com.android.tools.r8.internal.mF:
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>():13:13 -> <init>
@@ -32881,26 +33057,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.iF:
+com.android.tools.r8.horizontalclassmerging.policies.NoNativeMethods -> com.android.tools.r8.internal.nF:
     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.jF:
+com.android.tools.r8.horizontalclassmerging.policies.NoServiceLoaders -> com.android.tools.r8.internal.oF:
     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.kF:
+com.android.tools.r8.horizontalclassmerging.policies.NoVerticallyMergedClasses -> com.android.tools.r8.internal.pF:
     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.lF:
+com.android.tools.r8.horizontalclassmerging.policies.NoVirtualMethodMerging -> com.android.tools.r8.internal.qF:
     com.android.tools.r8.graph.AppView appView -> d
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():33:33 -> <clinit>
@@ -32924,7 +33100,7 @@
     52:52:boolean hasNonAbstractDefinitionInSuperInterface(java.lang.Iterable,com.android.tools.r8.graph.ProgramMethod):118 -> a
     53:58: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.mF:
+com.android.tools.r8.horizontalclassmerging.policies.NoWeakerAccessPrivileges -> com.android.tools.r8.internal.rF:
     com.android.tools.r8.optimize.argumentpropagation.utils.ProgramClassesBidirectedGraph graph -> d
     java.util.Map stronglyConnectedComponentsCache -> i
     com.android.tools.r8.graph.ImmediateProgramSubtypingInfo immediateSubtypingInfo -> e
@@ -32960,12 +33136,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.GF:
+com.android.tools.r8.horizontalclassmerging.policies.NotMatchedByNoHorizontalClassMerging -> com.android.tools.r8.internal.LF:
     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.xI:
+com.android.tools.r8.horizontalclassmerging.policies.OnlyDirectlyConnectedOrUnrelatedInterfaces -> com.android.tools.r8.internal.CI:
     com.android.tools.r8.graph.AppView appView -> d
     boolean $assertionsDisabled -> g
     com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode mode -> e
@@ -32985,7 +33161,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.wI:
+com.android.tools.r8.horizontalclassmerging.policies.OnlyDirectlyConnectedOrUnrelatedInterfaces$MergeGroupWithInfo -> com.android.tools.r8.internal.BI:
     com.android.tools.r8.horizontalclassmerging.MergeGroup group -> a
     java.util.Set superInterfaces -> c
     java.util.Set subInterfaces -> d
@@ -32998,7 +33174,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.pK:
+com.android.tools.r8.horizontalclassmerging.policies.PreserveMethodCharacteristics -> com.android.tools.r8.internal.yK:
     com.android.tools.r8.graph.AppView appView -> d
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():30:30 -> <clinit>
@@ -33009,7 +33185,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.nK:
+com.android.tools.r8.horizontalclassmerging.policies.PreserveMethodCharacteristics$MethodCharacteristics -> com.android.tools.r8.internal.wK:
     com.android.tools.r8.utils.OptionalBool isLibraryMethodOverride -> c
     com.android.tools.r8.graph.MethodAccessFlags accessFlags -> a
     boolean isAssumeNoSideEffectsMethod -> b
@@ -33022,14 +33198,14 @@
     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.oK:
+com.android.tools.r8.horizontalclassmerging.policies.PreserveMethodCharacteristics$TargetGroup -> com.android.tools.r8.internal.xK:
     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.yK:
+com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions -> com.android.tools.r8.internal.HK:
     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
@@ -33056,45 +33232,45 @@
     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.qK:
-com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$DexClassSignaturesCache -> com.android.tools.r8.internal.rK:
+com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$1 -> com.android.tools.r8.internal.zK:
+com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$DexClassSignaturesCache -> com.android.tools.r8.internal.AK:
     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.sK:
+com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$DispatchSignature -> com.android.tools.r8.internal.BK:
     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.tK:
+com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$InterfaceDefaultSignaturesCache -> com.android.tools.r8.internal.CK:
     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.uK:
+com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$MethodCategory -> com.android.tools.r8.internal.DK:
     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.vK:
+com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$ParentClassSignaturesCache -> com.android.tools.r8.internal.EK:
     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.wK:
+com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$ReservedInterfaceSignaturesFor -> com.android.tools.r8.internal.FK:
     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.xK:
+com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$SignaturesCache -> com.android.tools.r8.internal.GK:
     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.LQ:
+com.android.tools.r8.horizontalclassmerging.policies.RespectPackageBoundaries -> com.android.tools.r8.internal.UQ:
     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
@@ -33117,7 +33293,7 @@
     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:java.lang.String getName():127:127 -> e
-com.android.tools.r8.horizontalclassmerging.policies.SameFeatureSplit -> com.android.tools.r8.internal.dS:
+com.android.tools.r8.horizontalclassmerging.policies.SameFeatureSplit -> com.android.tools.r8.internal.mS:
     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
@@ -33126,14 +33302,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.fS:
+com.android.tools.r8.horizontalclassmerging.policies.SameInstanceFields -> com.android.tools.r8.internal.oS:
     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.eS:
+com.android.tools.r8.horizontalclassmerging.policies.SameInstanceFields$InstanceFieldInfo -> com.android.tools.r8.internal.nS:
     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>
@@ -33142,46 +33318,46 @@
     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.gS:
+com.android.tools.r8.horizontalclassmerging.policies.SameMainDexGroup -> com.android.tools.r8.internal.pS:
     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.hS:
+com.android.tools.r8.horizontalclassmerging.policies.SameNestHost -> com.android.tools.r8.internal.qS:
     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.iS:
+com.android.tools.r8.horizontalclassmerging.policies.SameParentClass -> com.android.tools.r8.internal.rS:
     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.cW:
+com.android.tools.r8.horizontalclassmerging.policies.SyntheticItemsPolicy -> com.android.tools.r8.internal.lW:
     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>
     1:1:com.android.tools.r8.horizontalclassmerging.policies.SyntheticItemsPolicy$ClassKind com.android.tools.r8.horizontalclassmerging.policies.SyntheticItemsPolicy.getMergeKey(com.android.tools.r8.graph.DexProgramClass):33:33 -> a
     1:1:java.lang.Object getMergeKey(com.android.tools.r8.graph.DexProgramClass):15 -> a
-    2:2:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):264:264 -> a
+    2:2:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):265:265 -> a
     2:2:com.android.tools.r8.horizontalclassmerging.policies.SyntheticItemsPolicy$ClassKind com.android.tools.r8.horizontalclassmerging.policies.SyntheticItemsPolicy.getMergeKey(com.android.tools.r8.graph.DexProgramClass):33 -> a
     2:2:java.lang.Object getMergeKey(com.android.tools.r8.graph.DexProgramClass):15 -> a
-    3:3:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexType):260:260 -> a
-    3:3:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):264 -> a
+    3:3:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexType):261:261 -> a
+    3:3:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):265 -> a
     3:3:com.android.tools.r8.horizontalclassmerging.policies.SyntheticItemsPolicy$ClassKind com.android.tools.r8.horizontalclassmerging.policies.SyntheticItemsPolicy.getMergeKey(com.android.tools.r8.graph.DexProgramClass):33 -> a
     3:3:java.lang.Object getMergeKey(com.android.tools.r8.graph.DexProgramClass):15 -> a
     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.bW:
+com.android.tools.r8.horizontalclassmerging.policies.SyntheticItemsPolicy$ClassKind -> com.android.tools.r8.internal.kW:
     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.EY:
+com.android.tools.r8.horizontalclassmerging.policies.VerifyPolicyAlwaysSatisfied -> com.android.tools.r8.internal.NY:
     com.android.tools.r8.horizontalclassmerging.SingleClassPolicy policy -> d
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():10:10 -> <clinit>
@@ -33194,14 +33370,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.RS:
+com.android.tools.r8.horizontalclassmerging.policies.deadlock.SingleCallerInformation -> com.android.tools.r8.internal.aT:
     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):41:43 -> <init>
     1:1:com.android.tools.r8.horizontalclassmerging.policies.deadlock.SingleCallerInformation$Builder builder(com.android.tools.r8.graph.AppView):47:47 -> a
     2:2:com.android.tools.r8.graph.ProgramMethod getSingleCaller(com.android.tools.r8.graph.ProgramMethod):51:51 -> a
     3:3:com.android.tools.r8.graph.ProgramMethod getSingleClassInitializerCaller(com.android.tools.r8.graph.DexProgramClass):55:55 -> a
-com.android.tools.r8.horizontalclassmerging.policies.deadlock.SingleCallerInformation$Builder -> com.android.tools.r8.internal.QS:
+com.android.tools.r8.horizontalclassmerging.policies.deadlock.SingleCallerInformation$Builder -> com.android.tools.r8.internal.ZS:
     java.util.Map clinitCallers -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.utils.collections.ProgramMethodMap callers -> b
@@ -33214,7 +33390,7 @@
     13:13:void lambda$build$2(java.util.Map,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):85:85 -> a
     14:14:void lambda$build$3(java.util.Map,com.android.tools.r8.graph.DexProgramClass,java.util.Optional):85:85 -> a
     15:15:void processMethod(com.android.tools.r8.graph.ProgramMethod):90:90 -> a
-com.android.tools.r8.horizontalclassmerging.policies.deadlock.SingleCallerInformation$Builder$InvokeExtractor -> com.android.tools.r8.internal.PS:
+com.android.tools.r8.horizontalclassmerging.policies.deadlock.SingleCallerInformation$Builder$InvokeExtractor -> com.android.tools.r8.internal.YS:
     com.android.tools.r8.horizontalclassmerging.policies.deadlock.SingleCallerInformation$Builder this$0 -> f
     com.android.tools.r8.graph.AppView appView -> e
     boolean $assertionsDisabled -> g
@@ -33275,7 +33451,7 @@
     4:4:void com.android.tools.r8.horizontalclassmerging.policies.deadlock.SingleCallerInformation$Builder$InvokeExtractor.triggerClassInitializerIfNotAlreadyTriggeredInContext(com.android.tools.r8.graph.DexProgramClass):129:129 -> g
     4:4:void triggerClassInitializerIfNotAlreadyTriggeredInContext(com.android.tools.r8.graph.DexType):123 -> g
     5:6:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):252:253 -> g
-com.android.tools.r8.inspector.internal.ClassInspectorImpl -> com.android.tools.r8.internal.X9:
+com.android.tools.r8.inspector.internal.ClassInspectorImpl -> com.android.tools.r8.internal.Z9:
     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>
@@ -33304,7 +33480,7 @@
     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.MC:
+com.android.tools.r8.inspector.internal.MethodInspectorImpl -> com.android.tools.r8.internal.RC:
     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
@@ -33314,7 +33490,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.wY:
+com.android.tools.r8.inspector.internal.ValueInspectorImpl -> com.android.tools.r8.internal.FY:
     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>
@@ -33384,73 +33560,73 @@
     1:3:java.lang.StringBuilder com.android.tools.r8.ApiLevelException$$InternalSyntheticOutline$170$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.ApplicationReader$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.g2:
+com.android.tools.r8.internal.ApiReferenceStubber$ReferencesToApiLevelUseRegistry$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.d2:
+# {"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$170$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.ApplicationReader$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.j2:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     1:4:java.lang.String com.android.tools.r8.dex.ApplicationReader$$InternalSyntheticOutline$170$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.v2:
+com.android.tools.r8.internal.ArchiveClassFileProvider$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.y2:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     1:5:java.lang.String com.android.tools.r8.ArchiveClassFileProvider$$InternalSyntheticOutline$170$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.K3:
+com.android.tools.r8.internal.AvailableApiExceptions$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.N3:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     1:6:void com.android.tools.r8.androidapi.AvailableApiExceptions$$InternalSyntheticOutline$170$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.M3:
+com.android.tools.r8.internal.BackportedMethodListCommand$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.P3:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     1:3:java.lang.String com.android.tools.r8.BackportedMethodListCommand$$InternalSyntheticOutline$170$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.N3:
+com.android.tools.r8.internal.BackportedMethodListCommand$Builder$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.Q3:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     1:5:java.lang.String com.android.tools.r8.BackportedMethodListCommand$Builder$$InternalSyntheticOutline$170$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.e4:
+com.android.tools.r8.internal.BasicBlock$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.h4:
 # {"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$170$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.N4:
+com.android.tools.r8.internal.BisectState$Range$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.Q4:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     1:3:java.lang.String com.android.tools.r8.bisect.BisectState$Range$$InternalSyntheticOutline$170$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.C6:
-# {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
-# {"id":"com.android.tools.r8.synthesized"}
-    1:3:com.android.tools.r8.graph.DexType com.android.tools.r8.cf.code.CfConstClass$$InternalSyntheticOutline$170$37c66abd9d2a2dc03f27fba98790669ca793ab689546056e468f3d38bbb416c6$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.CfSourceCode$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.f8:
+com.android.tools.r8.internal.CfSourceCode$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.h8:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     1:6:java.lang.String com.android.tools.r8.ir.conversion.CfSourceCode$$InternalSyntheticOutline$170$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.c9:
+com.android.tools.r8.internal.CheckCast$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.e9:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     1:3:void com.android.tools.r8.code.CheckCast$$InternalSyntheticOutline$170$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.Af:
+com.android.tools.r8.internal.DexFileMergerHelper$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.zf:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     1:3:java.lang.StringBuilder com.android.tools.r8.DexFileMergerHelper$$InternalSyntheticOutline$170$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.dg:
+com.android.tools.r8.internal.DexOutputBuffer$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.cg:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     1:5:java.lang.StringBuilder com.android.tools.r8.dex.DexOutputBuffer$$InternalSyntheticOutline$170$2fa3327658a3747aa1eac19934d5e19eadcfd88a0fe905e3e2553d0deedbdab7$0.m(java.lang.String,int,java.lang.String):0:4 -> a
@@ -33475,18 +33651,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.CI:
+com.android.tools.r8.internal.OptimizationFeedbackSimple$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.HI:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     1:3:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple$$InternalSyntheticOutline$170$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.hU:
+com.android.tools.r8.internal.StatelessLibraryMethodModelCollection$$ExternalSyntheticThrowCCEIfNotNull0 -> com.android.tools.r8.internal.qU:
 # {"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
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.ir.analysis.ClassInitializationAnalysis -> com.android.tools.r8.internal.F9:
+com.android.tools.r8.ir.analysis.ClassInitializationAnalysis -> com.android.tools.r8.internal.H9:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.code.DominatorTree dominatorTree -> c
     boolean $assertionsDisabled -> e
@@ -33505,12 +33681,12 @@
     1:1:void notifyCodeHasChanged():217:217 -> b
     2:4:void com.android.tools.r8.ir.analysis.ClassInitializationAnalysis.returnMarkingColor():227:229 -> b
     2:4:void notifyCodeHasChanged():218 -> b
-com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption -> com.android.tools.r8.internal.C9:
+com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption -> com.android.tools.r8.internal.E9:
     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.D9:
+com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$InstructionUtils -> com.android.tools.r8.internal.F9:
     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
@@ -33549,12 +33725,12 @@
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> b
     2:2:boolean forStaticGetOrPut(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):480 -> b
     3:10:boolean forStaticGetOrPut(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):480:487 -> b
-com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query -> com.android.tools.r8.internal.E9:
+com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query -> com.android.tools.r8.internal.G9:
     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.bf:
+com.android.tools.r8.ir.analysis.DeterminismAnalysis -> com.android.tools.r8.internal.af:
     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
@@ -33610,7 +33786,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.rX:
+com.android.tools.r8.ir.analysis.TypeChecker -> com.android.tools.r8.internal.AX:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.analysis.VerifyTypesHelper verifyTypesHelper -> b
     boolean $assertionsDisabled -> c
@@ -33633,7 +33809,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.yY:
+com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis -> com.android.tools.r8.internal.HY:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.utils.InternalOptions options -> d
@@ -33718,7 +33894,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.xY:
+com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis$TrackedValuesState -> com.android.tools.r8.internal.GY:
     java.util.Set trackedValues -> b
     com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis$TrackedValuesState EMPTY -> c
     boolean hasTrackedValueEscaped -> a
@@ -33726,21 +33902,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.FY:
+com.android.tools.r8.ir.analysis.VerifyTypesHelper -> com.android.tools.r8.internal.OY:
     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.q5:
+com.android.tools.r8.ir.analysis.constant.Bottom -> com.android.tools.r8.internal.t5:
     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.Wc:
+com.android.tools.r8.ir.analysis.constant.ConstLatticeElement -> com.android.tools.r8.internal.Yc:
     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
@@ -33755,7 +33931,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.bd:
+com.android.tools.r8.ir.analysis.constant.ConstRangeLatticeElement -> com.android.tools.r8.internal.dd:
     com.android.tools.r8.ir.code.Value value -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():8:8 -> <clinit>
@@ -33783,7 +33959,7 @@
     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.zT:
+com.android.tools.r8.ir.analysis.constant.SparseConditionalConstantPropagation -> com.android.tools.r8.internal.IT:
     java.util.Deque ssaEdges -> d
     java.util.Map mapping -> c
     com.android.tools.r8.graph.AppView appView -> a
@@ -33870,14 +34046,14 @@
     117:130:void com.android.tools.r8.ir.analysis.constant.SparseConditionalConstantPropagation.addFlowEdgesForJumpInstruction(com.android.tools.r8.ir.code.JumpInstruction):234:247 -> b
     117:130:void visitInstruction(com.android.tools.r8.ir.code.Instruction):180 -> b
     131:136:void setExecutableEdge(int,int):253:258 -> b
-com.android.tools.r8.ir.analysis.constant.Top -> com.android.tools.r8.internal.HW:
+com.android.tools.r8.ir.analysis.constant.Top -> com.android.tools.r8.internal.QW:
     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.vY:
+com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph -> com.android.tools.r8.internal.EY:
     java.util.Map nodes -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():27:27 -> <clinit>
@@ -33889,7 +34065,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.uY:
+com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph$Node -> com.android.tools.r8.internal.DY:
     java.util.Set predecessors -> c
     java.util.Set successors -> d
     com.android.tools.r8.ir.code.Value value -> a
@@ -33904,7 +34080,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.l4:
+com.android.tools.r8.ir.analysis.equivalence.BasicBlockBehavioralSubsumption -> com.android.tools.r8.internal.o4:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.ProgramMethod context -> b
     boolean $assertionsDisabled -> c
@@ -34166,7 +34342,7 @@
     27:27:boolean isValueOnlyUsedToWriteField(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramField):62 -> a
     28:28:boolean isValueOnlyUsedToWriteField(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramField):51:51 -> a
     29:32:boolean enqueueUsersForAnalysis(com.android.tools.r8.ir.code.Value,com.android.tools.r8.utils.WorkList):75:78 -> a
-com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor -> com.android.tools.r8.internal.gX:
+com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor -> com.android.tools.r8.internal.pX:
     java.util.Map readFields -> c
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Map writtenFields -> d
@@ -34270,7 +34446,7 @@
     1:1:java.util.Set access$300(com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor):45:45 -> d
     1:1:java.util.Set access$400(com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor):45:45 -> e
     1:1:com.android.tools.r8.utils.collections.ProgramMethodSet access$500(com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor):45:45 -> f
-com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor$TrivialFieldAccessUseRegistry -> com.android.tools.r8.internal.fX:
+com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor$TrivialFieldAccessUseRegistry -> com.android.tools.r8.internal.oX:
     com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor this$0 -> e
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():302:302 -> <clinit>
@@ -34319,13 +34495,13 @@
     void registerTypeReference(com.android.tools.r8.graph.DexType) -> f
     void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod) -> g
     1:1:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):426:426 -> g
-com.android.tools.r8.ir.analysis.fieldaccess.state.BottomFieldState -> com.android.tools.r8.internal.t5:
+com.android.tools.r8.ir.analysis.fieldaccess.state.BottomFieldState -> com.android.tools.r8.internal.w5:
     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.yc:
+com.android.tools.r8.ir.analysis.fieldaccess.state.ConcreteArrayTypeFieldState -> com.android.tools.r8.internal.Ac:
     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
@@ -34341,7 +34517,7 @@
     8:8:com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.value.AbstractValue):42 -> a
     9:9:com.android.tools.r8.ir.analysis.fieldaccess.state.UnknownFieldState com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState.unknown():18:18 -> a
     9:9:com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.value.AbstractValue):42 -> a
-com.android.tools.r8.ir.analysis.fieldaccess.state.ConcreteClassTypeFieldState -> com.android.tools.r8.internal.Bc:
+com.android.tools.r8.ir.analysis.fieldaccess.state.ConcreteClassTypeFieldState -> com.android.tools.r8.internal.Dc:
     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
@@ -34360,10 +34536,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.Dc:
+com.android.tools.r8.ir.analysis.fieldaccess.state.ConcreteFieldState -> com.android.tools.r8.internal.Fc:
     1:1:void <init>():8:8 -> <init>
     boolean isConcrete() -> d
-com.android.tools.r8.ir.analysis.fieldaccess.state.ConcretePrimitiveTypeFieldState -> com.android.tools.r8.internal.Nc:
+com.android.tools.r8.ir.analysis.fieldaccess.state.ConcretePrimitiveTypeFieldState -> 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.fieldaccess.state.FieldState create(com.android.tools.r8.ir.analysis.value.AbstractValue):20:20 -> a
@@ -34384,7 +34560,7 @@
     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.Qc:
+com.android.tools.r8.ir.analysis.fieldaccess.state.ConcreteReferenceTypeFieldState -> com.android.tools.r8.internal.Sc:
     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
@@ -34395,7 +34571,7 @@
     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.OX:
+com.android.tools.r8.ir.analysis.fieldaccess.state.UnknownFieldState -> com.android.tools.r8.internal.XX:
     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>
@@ -34412,7 +34588,7 @@
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.KnownFieldSet asKnownFieldSet() -> b
     boolean isEmpty() -> c
     boolean isKnownFieldSet() -> d
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.ConcreteMutableFieldSet -> com.android.tools.r8.internal.Ic:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.ConcreteMutableFieldSet -> com.android.tools.r8.internal.Kc:
     java.util.Set fields -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():21:21 -> <clinit>
@@ -34620,7 +34796,7 @@
 com.android.tools.r8.ir.analysis.fieldvalueanalysis.KnownFieldSet -> com.android.tools.r8.internal.px:
     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.jU:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValueAnalysis -> com.android.tools.r8.internal.sU:
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$Builder builder -> i
     boolean $assertionsDisabled -> k
     java.util.Map computedValues -> j
@@ -34714,7 +34890,7 @@
     93:93:boolean com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValueAnalysis.valuesArrayIndexMatchesOrdinal(int,com.android.tools.r8.ir.analysis.value.objectstate.ObjectState):364:364 -> d
     93:93:com.android.tools.r8.ir.analysis.value.SingleFieldValue internalComputeSingleEnumFieldValueForValuesArray(com.android.tools.r8.ir.code.Value):284 -> d
     94:135:com.android.tools.r8.ir.analysis.value.SingleFieldValue internalComputeSingleEnumFieldValueForValuesArray(com.android.tools.r8.ir.code.Value):287:328 -> d
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues -> com.android.tools.r8.internal.pU:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues -> com.android.tools.r8.internal.yU:
     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
@@ -34722,25 +34898,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.kU:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$Builder -> com.android.tools.r8.internal.tU:
     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.mU:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EmptyStaticValues -> com.android.tools.r8.internal.vU:
     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.lU:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EmptyStaticValues$Builder -> com.android.tools.r8.internal.uU:
     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.oU:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EnumStaticFieldValues -> com.android.tools.r8.internal.xU:
     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.nU:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EnumStaticFieldValues$Builder -> com.android.tools.r8.internal.wU:
     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
@@ -34755,7 +34931,7 @@
     12:19:void recordStaticField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.graph.DexItemFactory):66:73 -> a
     20:20:void recordStaticField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.graph.DexItemFactory):72:72 -> a
     21:26:com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues build():80:85 -> a
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.UnknownFieldSet -> com.android.tools.r8.internal.NX:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.UnknownFieldSet -> com.android.tools.r8.internal.WX:
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.UnknownFieldSet INSTANCE -> a
     1:1:void <clinit>():16:16 -> <clinit>
     1:1:void <init>():18:18 -> <init>
@@ -34771,12 +34947,12 @@
 com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractTransferFunction -> com.android.tools.r8.internal.m1:
     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.Cd:
+com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult -> com.android.tools.r8.internal.Ed:
     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.Ad:
+com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult$FailedDataflowAnalysisResult -> com.android.tools.r8.internal.Cd:
     1:1:void <init>():65:65 -> <init>
-com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult$SuccessfulDataflowAnalysisResult -> com.android.tools.r8.internal.Bd:
+com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult$SuccessfulDataflowAnalysisResult -> com.android.tools.r8.internal.Dd:
     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
@@ -34822,7 +34998,7 @@
     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.VW:
+com.android.tools.r8.ir.analysis.framework.intraprocedural.TransferFunctionResult -> com.android.tools.r8.internal.eX:
     com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState asAbstractState() -> a
     boolean isFailedTransferResult() -> b
     boolean isAbstractState() -> c
@@ -34860,13 +35036,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.DE:
+com.android.tools.r8.ir.analysis.inlining.NeverSimpleInliningConstraint -> com.android.tools.r8.internal.IE:
     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.FF:
+com.android.tools.r8.ir.analysis.inlining.NotEqualToNumberSimpleInliningConstraint -> com.android.tools.r8.internal.KF:
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>(int,long):10:10 -> <init>
@@ -34875,7 +35051,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.JF:
+com.android.tools.r8.ir.analysis.inlining.NullSimpleInliningConstraint -> com.android.tools.r8.internal.OF:
     com.android.tools.r8.ir.analysis.type.Nullability nullability -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():20:20 -> <clinit>
@@ -34903,7 +35079,7 @@
     30:30: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):62 -> a
     31:44:boolean isSatisfied(com.android.tools.r8.ir.code.InvokeMethod):67:80 -> a
     45:45:com.android.tools.r8.ir.analysis.inlining.SimpleInliningArgumentConstraint withArgumentIndex(int,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):86:86 -> a
-com.android.tools.r8.ir.analysis.inlining.NumberSimpleInliningConstraint -> com.android.tools.r8.internal.TF:
+com.android.tools.r8.ir.analysis.inlining.NumberSimpleInliningConstraint -> com.android.tools.r8.internal.YF:
     long rawValue -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():16:16 -> <clinit>
@@ -34916,14 +35092,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.IS:
+com.android.tools.r8.ir.analysis.inlining.SimpleInliningArgumentConstraint -> com.android.tools.r8.internal.RS:
     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.JS:
+com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint -> com.android.tools.r8.internal.SS:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:void <init>():14:14 -> <init>
@@ -34972,7 +35148,7 @@
     boolean isConjunction() -> e
     boolean isDisjunction() -> f
     boolean isNever() -> g
-com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintAnalysis -> com.android.tools.r8.internal.LS:
+com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintAnalysis -> com.android.tools.r8.internal.US:
     com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory factory -> a
     java.util.Set seen -> d
     com.android.tools.r8.utils.InternalOptions options -> c
@@ -35064,10 +35240,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.KS:
+com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintAnalysis$1 -> com.android.tools.r8.internal.TS:
     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.MS:
+com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintConjunction -> com.android.tools.r8.internal.VS:
     java.util.List constraints -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():16:16 -> <clinit>
@@ -35097,7 +35273,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.NS:
+com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintDisjunction -> com.android.tools.r8.internal.WS:
     java.util.List constraints -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():16:16 -> <clinit>
@@ -35127,7 +35303,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.OS:
+com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory -> com.android.tools.r8.internal.XS:
     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
@@ -35146,7 +35322,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.Mz:
+com.android.tools.r8.ir.analysis.modeling.LibraryMethodReadSetModeling -> com.android.tools.r8.internal.Rz:
     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
@@ -35166,7 +35342,7 @@
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.proto.ProtoReferences):43:43 -> <init>
     2:6:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.proto.ProtoReferences):41:45 -> <init>
     1:1:void clearDeadEnumLiteMaps():59:59 -> a
-    2:2:boolean com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.isEnumLiteProtoShrinkingEnabled():1578:1578 -> a
+    2:2:boolean com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.isEnumLiteProtoShrinkingEnabled():1577:1577 -> 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
@@ -35300,7 +35476,7 @@
     287:287:boolean lambda$computeEnableAggressiveBuilderOptimization$0(com.android.tools.r8.graph.DexClass):97:97 -> a
     288:295:boolean deferDeadProtoBuilders(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,java.util.function.BooleanSupplier):172:179 -> a
     296:301:void rewriteDeadBuilderReferencesFromDynamicMethods(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):193:198 -> a
-    302:302:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing):321:321 -> a
+    302:302:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing):319:319 -> a
     302:302:void rewriteDeadBuilderReferencesFromDynamicMethods(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):198 -> a
     303:313:void rewriteDeadBuilderReferencesFromDynamicMethods(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):199:209 -> a
     314:315: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
@@ -35465,7 +35641,7 @@
     104:109:void lambda$forEachDynamicMethod$1(com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer,com.android.tools.r8.graph.DexProgramClass):137:142 -> a
     110:110:void lambda$forEachDynamicMethod$2(com.android.tools.r8.ir.desugar.LambdaDescriptor):146:146 -> a
     111:114:com.android.tools.r8.ir.code.InvokeMethod getNewMessageInfoInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.ProtoReferences):232:235 -> a
-com.android.tools.r8.ir.analysis.proto.ProtoEnqueuerUseRegistry -> com.android.tools.r8.internal.UM:
+com.android.tools.r8.ir.analysis.proto.ProtoEnqueuerUseRegistry -> com.android.tools.r8.internal.dN:
     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>
@@ -35490,7 +35666,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 -> f
-com.android.tools.r8.ir.analysis.proto.ProtoEnumSwitchMapRemover -> com.android.tools.r8.internal.VM:
+com.android.tools.r8.ir.analysis.proto.ProtoEnumSwitchMapRemover -> com.android.tools.r8.internal.eN:
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> a
     java.util.Map staticFieldValuesMap -> b
     java.util.Map staticFieldValuesMapDelayed -> c
@@ -35505,7 +35681,7 @@
     8:12:boolean isProtoEnum(com.android.tools.r8.graph.DexProgramClass):48:52 -> a
     13:24:com.android.tools.r8.ir.analysis.value.SingleNumberValue getOrdinal(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedField):57:68 -> a
     25:30:com.android.tools.r8.ir.analysis.value.SingleNumberValue getOrdinal(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedField):67:72 -> a
-com.android.tools.r8.ir.analysis.proto.ProtoInliningReasonStrategy -> com.android.tools.r8.internal.aN:
+com.android.tools.r8.ir.analysis.proto.ProtoInliningReasonStrategy -> com.android.tools.r8.internal.jN:
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> b
     com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy parent -> a
     boolean $assertionsDisabled -> c
@@ -35554,7 +35730,7 @@
     41: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.conversion.MethodProcessor):50 -> a
     42:45: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):83:86 -> a
     42:45: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.conversion.MethodProcessor):50 -> a
-com.android.tools.r8.ir.analysis.proto.ProtoReferences -> com.android.tools.r8.internal.qN:
+com.android.tools.r8.ir.analysis.proto.ProtoReferences -> com.android.tools.r8.internal.zN:
     com.android.tools.r8.graph.DexType generatedMessageLiteExtendableMessageType -> l
     com.android.tools.r8.graph.DexType generatedMessageLiteBuilderType -> j
     com.android.tools.r8.graph.DexType methodToInvokeType -> n
@@ -35604,28 +35780,28 @@
     6:6:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences.isAbstractGeneratedMessageLiteBuilder(com.android.tools.r8.graph.DexProgramClass):141:141 -> c
     6:6:boolean isGeneratedMessageLiteBuilder(com.android.tools.r8.graph.DexProgramClass):183 -> c
     1:1:boolean isMessageInfoConstructionMethod(com.android.tools.r8.graph.DexMethod):187:187 -> d
-com.android.tools.r8.ir.analysis.proto.ProtoReferences$1 -> com.android.tools.r8.internal.kN:
-com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedExtensionMethods -> com.android.tools.r8.internal.lN:
+com.android.tools.r8.ir.analysis.proto.ProtoReferences$1 -> com.android.tools.r8.internal.tN:
+com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedExtensionMethods -> com.android.tools.r8.internal.uN:
     com.android.tools.r8.graph.DexMethod constructorWithClass -> b
     com.android.tools.r8.graph.DexMethod constructor -> a
     1:1:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.analysis.proto.ProtoReferences$1):194:194 -> <init>
     2:6:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):199:203 -> <init>
     7:19:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):201:213 -> <init>
     20:20:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):211:211 -> <init>
-com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteBuilderMethods -> com.android.tools.r8.internal.mN:
+com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteBuilderMethods -> com.android.tools.r8.internal.vN:
     com.android.tools.r8.graph.DexMethod constructorMethod -> a
     1:1:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.analysis.proto.ProtoReferences$1):288:288 -> <init>
     2:6:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):293:297 -> <init>
     7:14:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):295:302 -> <init>
     15:15:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):300:300 -> <init>
-com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteExtendableBuilderMethods -> com.android.tools.r8.internal.nN:
+com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteExtendableBuilderMethods -> com.android.tools.r8.internal.wN:
     com.android.tools.r8.graph.DexMethod constructorMethod -> b
     com.android.tools.r8.graph.DexMethod buildPartialMethod -> a
     1:1:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.analysis.proto.ProtoReferences$1):307:307 -> <init>
     2:6:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):312:316 -> <init>
     7:14:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):314:321 -> <init>
     15:15:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):319:319 -> <init>
-com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteMethods -> com.android.tools.r8.internal.oN:
+com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteMethods -> com.android.tools.r8.internal.xN:
     com.android.tools.r8.graph.DexMethod newSingularGeneratedExtension -> e
     com.android.tools.r8.graph.DexMethod newRepeatedGeneratedExtension -> d
     com.android.tools.r8.graph.DexMethod dynamicMethodBridgeMethodWithObject -> c
@@ -35639,7 +35815,7 @@
     32:39:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):255:262 -> <init>
     40:55:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):260:275 -> <init>
     56:56:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):273:273 -> <init>
-com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers -> com.android.tools.r8.internal.pN:
+com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers -> com.android.tools.r8.internal.yN:
     com.android.tools.r8.graph.DexField newMutableInstanceField -> f
     com.android.tools.r8.graph.DexField newBuilderField -> e
     com.android.tools.r8.graph.DexField setMemoizedIsInitializedField -> g
@@ -35649,7 +35825,7 @@
     com.android.tools.r8.graph.DexField getMemoizedIsInitializedField -> c
     1:1:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.analysis.proto.ProtoReferences$1):327:327 -> <init>
     2:19:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):337:354 -> <init>
-com.android.tools.r8.ir.analysis.proto.ProtoShrinker -> com.android.tools.r8.internal.rN:
+com.android.tools.r8.ir.analysis.proto.ProtoShrinker -> com.android.tools.r8.internal.AN:
     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
@@ -35664,27 +35840,27 @@
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.proto.ProtoReferences):30:30 -> <init>
     2:28:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.proto.ProtoReferences):28:54 -> <init>
     1:7:com.android.tools.r8.ir.analysis.proto.ProtoShrinker create(com.android.tools.r8.graph.AppView):58:64 -> a
-    8:8:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():500:500 -> a
+    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():1559:1563 -> a
+    14:18:void com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.disable():1558:1562 -> 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():920:920 -> a
+    24:24:void com.android.tools.r8.utils.InternalOptions.checkAssertionsEnabled():919:919 -> 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():921:921 -> a
+    26:26:void com.android.tools.r8.utils.InternalOptions.checkAssertionsEnabled():920:920 -> a
     26:26:void setDeadProtoTypes(java.util.Set):83 -> a
-com.android.tools.r8.ir.analysis.proto.ProtoUtils -> com.android.tools.r8.internal.uN:
+com.android.tools.r8.ir.analysis.proto.ProtoUtils -> com.android.tools.r8.internal.DN:
     boolean $assertionsDisabled -> a
     int $r8$clinit -> b
     1:1:void <clinit>():11:11 -> <clinit>
     1:3:com.android.tools.r8.ir.code.Value getInfoValueFromMessageInfoConstructionInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.ProtoReferences):17:19 -> a
     1:3:com.android.tools.r8.ir.code.Value getObjectsValueFromMessageInfoConstructionInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.ProtoReferences):24:26 -> b
-com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder -> com.android.tools.r8.internal.FN:
+com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder -> com.android.tools.r8.internal.ON:
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> b
     com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory factory -> a
     boolean $assertionsDisabled -> c
@@ -35740,7 +35916,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.CN:
+com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$1 -> com.android.tools.r8.internal.LN:
     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
@@ -35752,7 +35928,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.DN:
+com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$2 -> com.android.tools.r8.internal.MN:
     com.android.tools.r8.ir.code.Value val$objectsValue -> c
     com.android.tools.r8.ir.code.InstructionIterator val$instructionIterator -> b
     int expectedNextIndex -> a
@@ -35767,10 +35943,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.EN:
+com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$InvalidRawMessageInfoException -> com.android.tools.r8.internal.NN:
     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.GN:
+com.android.tools.r8.ir.analysis.proto.RawMessageInfoEncoder -> com.android.tools.r8.internal.PN:
     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
@@ -35794,7 +35970,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.Id:
+com.android.tools.r8.ir.analysis.proto.schema.DeadProtoFieldObject -> com.android.tools.r8.internal.Kd:
     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>
@@ -35805,12 +35981,12 @@
     40:40:java.lang.String toString():37:37 -> toString
     41:41:java.lang.String toString():37:37 -> toString
     38:38:java.lang.String toString():37:37 -> toString
-com.android.tools.r8.ir.analysis.proto.schema.LiveProtoFieldObject -> com.android.tools.r8.internal.yA:
+com.android.tools.r8.ir.analysis.proto.schema.LiveProtoFieldObject -> com.android.tools.r8.internal.DA:
     com.android.tools.r8.graph.DexField field -> a
     1:2:void <init>(com.android.tools.r8.graph.DexField):23:24 -> <init>
     com.android.tools.r8.ir.analysis.proto.schema.LiveProtoFieldObject asLiveProtoFieldObject() -> a
     1:2:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):34:35 -> a
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():471:471 -> a
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> a
     3:3: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
     3:3:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):35 -> a
     4:7:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):36:39 -> a
@@ -35821,7 +35997,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.TM:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension -> com.android.tools.r8.internal.cN:
     com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory factory -> c
     java.util.Set dynamicMethodsWithTracedProtoObjects -> h
     com.android.tools.r8.graph.AppView appView -> a
@@ -35955,7 +36131,7 @@
     443:465:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo getOrCreateProtoMessageInfo(com.android.tools.r8.graph.DexType):662:684 -> a
     1:25:void populateExtensionGraph(com.android.tools.r8.shaking.Enqueuer):218:242 -> b
     26:26:java.util.Set lambda$populateExtensionGraphWithExtensionFieldDefinition$3(com.android.tools.r8.graph.DexType):354:354 -> b
-com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo -> com.android.tools.r8.internal.WM:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo -> com.android.tools.r8.internal.fN:
     com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType type -> b
     java.util.List objects -> d
     boolean $assertionsDisabled -> e
@@ -36020,11 +36196,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.XM:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldObject -> com.android.tools.r8.internal.gN:
     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.YM:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType -> com.android.tools.r8.internal.hN:
     boolean isMapFieldWithProto2EnumValue -> e
     boolean hasHasBit -> f
     boolean $assertionsDisabled -> g
@@ -36054,7 +36230,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.ZM:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory -> com.android.tools.r8.internal.iN:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap fieldTypes -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():10:10 -> <clinit>
@@ -36063,7 +36239,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.eN:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo -> com.android.tools.r8.internal.nN:
     java.util.LinkedList hasBitsObjects -> d
     java.util.LinkedList oneOfObjects -> e
     int flags -> b
@@ -36084,8 +36260,8 @@
     1:1:int numberOfHasBitsObjects():245:245 -> j
     1:1:int numberOfOneOfObjects():249:249 -> k
     1:9:java.lang.String toString():254:262 -> toString
-com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo$1 -> com.android.tools.r8.internal.bN:
-com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo$Builder -> com.android.tools.r8.internal.cN:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo$1 -> com.android.tools.r8.internal.kN:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo$Builder -> com.android.tools.r8.internal.lN:
     java.util.LinkedList hasBitsObjects -> d
     java.util.LinkedList oneOfObjects -> e
     boolean $assertionsDisabled -> f
@@ -36124,10 +36300,10 @@
     89:96:void removeUnusedSharedData():165:172 -> c
     97:97:void removeUnusedSharedData():171:171 -> c
     98:99:void removeUnusedSharedData():84:85 -> c
-com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo$ProtoMessageInfoBuilderException -> com.android.tools.r8.internal.dN:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo$ProtoMessageInfoBuilderException -> com.android.tools.r8.internal.mN:
     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.fN:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoObject -> com.android.tools.r8.internal.oN:
     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
@@ -36136,18 +36312,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.gN:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoObjectFromInvokeStatic -> com.android.tools.r8.internal.pN:
     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.hN:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoObjectFromStaticGet -> com.android.tools.r8.internal.qN:
     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.iN:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfFieldType -> com.android.tools.r8.internal.rN:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:void <init>(int,boolean,boolean,boolean,boolean,boolean):20:20 -> <init>
@@ -36159,7 +36335,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.jN:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair -> com.android.tools.r8.internal.sN:
     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>
@@ -36167,7 +36343,7 @@
     2:3:void forEach(java.util.function.Consumer):29:30 -> a
     1:1:com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldObject getOneOfObject():21:21 -> b
     1:1:java.util.stream.Stream stream():34:34 -> c
-com.android.tools.r8.ir.analysis.proto.schema.ProtoTypeObject -> com.android.tools.r8.internal.sN:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoTypeObject -> com.android.tools.r8.internal.BN:
     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
@@ -36178,7 +36354,7 @@
     4:4:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):26 -> a
     com.android.tools.r8.ir.analysis.proto.schema.ProtoTypeObject asProtoTypeObject() -> d
     1:1:com.android.tools.r8.graph.DexType getType():21:21 -> g
-com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis -> com.android.tools.r8.internal.P9:
+com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis -> com.android.tools.r8.internal.R9:
     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
@@ -36188,7 +36364,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.b3:
+com.android.tools.r8.ir.analysis.type.ArrayTypeElement -> com.android.tools.r8.internal.e3:
     com.android.tools.r8.ir.analysis.type.NullabilityVariants variants -> g
     boolean $assertionsDisabled -> h
     com.android.tools.r8.ir.analysis.type.TypeElement memberTypeLattice -> f
@@ -36221,14 +36397,14 @@
     boolean isArrayType() -> r
     1:1:java.lang.String toString():113:113 -> toString
     1:1:boolean isPrimitiveArrayType():62:62 -> z
-com.android.tools.r8.ir.analysis.type.BooleanTypeElement -> com.android.tools.r8.internal.o5:
+com.android.tools.r8.ir.analysis.type.BooleanTypeElement -> com.android.tools.r8.internal.r5:
     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 -> H
     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.B5:
+com.android.tools.r8.ir.analysis.type.BottomTypeElement -> com.android.tools.r8.internal.E5:
     com.android.tools.r8.ir.analysis.type.BottomTypeElement INSTANCE -> c
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>():6:6 -> <init>
@@ -36236,21 +36412,21 @@
     1:1:com.android.tools.r8.ir.analysis.type.BottomTypeElement getInstance():15:15 -> G
     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.R5:
+com.android.tools.r8.ir.analysis.type.ByteTypeElement -> com.android.tools.r8.internal.U5:
     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 -> H
     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.W8:
+com.android.tools.r8.ir.analysis.type.CharTypeElement -> com.android.tools.r8.internal.Y8:
     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 -> H
     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.Ma:
+com.android.tools.r8.ir.analysis.type.ClassTypeElement -> com.android.tools.r8.internal.Oa:
     com.android.tools.r8.graph.DexType type -> i
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.AppView appView -> g
@@ -36328,7 +36504,7 @@
     boolean isClassType() -> s
     1:16:java.lang.String toString():159:174 -> toString
     17:26:java.lang.String toString():167:176 -> toString
-com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker -> com.android.tools.r8.internal.Ka:
+com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker -> com.android.tools.r8.internal.Ma:
     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
@@ -36346,11 +36522,11 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     6:17:boolean merge(com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker):358:369 -> a
     1:2:boolean knownIfBothAreKnown():353:354 -> b
-com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceWithMarker -> com.android.tools.r8.internal.La:
+com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceWithMarker -> com.android.tools.r8.internal.Na:
     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):378:380 -> <init>
-com.android.tools.r8.ir.analysis.type.DestructivePhiTypeUpdater -> com.android.tools.r8.internal.pe:
+com.android.tools.r8.ir.analysis.type.DestructivePhiTypeUpdater -> com.android.tools.r8.internal.re:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> c
     java.util.function.Function mapping -> b
@@ -36634,14 +36810,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.nB:
+com.android.tools.r8.ir.analysis.type.LongTypeElement -> com.android.tools.r8.internal.sB:
     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 -> H
     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.HF:
+com.android.tools.r8.ir.analysis.type.NotNullDynamicType -> com.android.tools.r8.internal.MF:
     com.android.tools.r8.ir.analysis.type.NotNullDynamicType INSTANCE -> c
     boolean $assertionsDisabled -> d
     1:3:void <clinit>():21:23 -> <clinit>
@@ -36654,7 +36830,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.KF:
+com.android.tools.r8.ir.analysis.type.Nullability -> com.android.tools.r8.internal.PF:
     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
@@ -36674,7 +36850,7 @@
     1:1:boolean isNullable():49:49 -> h
     1:1:com.android.tools.r8.ir.analysis.type.Nullability maybeNull():99:99 -> i
     1:13:java.lang.String toString():108:120 -> toString
-com.android.tools.r8.ir.analysis.type.NullabilityVariants -> com.android.tools.r8.internal.LF:
+com.android.tools.r8.ir.analysis.type.NullabilityVariants -> com.android.tools.r8.internal.QF:
     boolean $assertionsDisabled -> e
     com.android.tools.r8.ir.analysis.type.ReferenceTypeElement maybeNullVariant -> a
     com.android.tools.r8.ir.analysis.type.ReferenceTypeElement bottomVariant -> d
@@ -36686,7 +36862,7 @@
     4:12:void set(com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.ReferenceTypeElement):26:34 -> a
     13:21:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement get(com.android.tools.r8.ir.analysis.type.Nullability):39:47 -> a
     22:35:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement getOrCreateElement(com.android.tools.r8.ir.analysis.type.Nullability,java.util.function.BiFunction):53:66 -> a
-com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement -> com.android.tools.r8.internal.CK:
+com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement -> com.android.tools.r8.internal.LK:
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():13:13 -> <clinit>
     1:1:void <init>():13:13 -> <init>
@@ -36739,10 +36915,10 @@
     82:82:com.android.tools.r8.graph.DexType toDexType(com.android.tools.r8.graph.DexItemFactory):60:60 -> b
     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
-com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement$1 -> com.android.tools.r8.internal.BK:
+com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement$1 -> com.android.tools.r8.internal.KK:
     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.JP:
+com.android.tools.r8.ir.analysis.type.ReferenceTypeElement -> com.android.tools.r8.internal.SP:
     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
@@ -36765,20 +36941,20 @@
     com.android.tools.r8.ir.analysis.type.ReferenceTypeElement asReferenceType() -> d
     1:1:boolean equals(java.lang.Object):113:113 -> equals
     1:1:int hashCode():118:118 -> hashCode
-com.android.tools.r8.ir.analysis.type.ReferenceTypeElement$NullElement -> com.android.tools.r8.internal.IP:
+com.android.tools.r8.ir.analysis.type.ReferenceTypeElement$NullElement -> com.android.tools.r8.internal.RP:
     1:1:void <init>(com.android.tools.r8.ir.analysis.type.Nullability):14:14 -> <init>
     1:1:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement getOrCreateVariant(com.android.tools.r8.ir.analysis.type.Nullability):19:19 -> a
     1:1:boolean equals(java.lang.Object):50:50 -> equals
     1:1:int hashCode():42:42 -> hashCode
     1:1:java.lang.String toString():37:37 -> toString
-com.android.tools.r8.ir.analysis.type.ShortTypeElement -> com.android.tools.r8.internal.ES:
+com.android.tools.r8.ir.analysis.type.ShortTypeElement -> com.android.tools.r8.internal.NS:
     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 -> H
     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.ZS:
+com.android.tools.r8.ir.analysis.type.SinglePrimitiveTypeElement -> com.android.tools.r8.internal.iT:
     com.android.tools.r8.ir.analysis.type.SinglePrimitiveTypeElement INSTANCE -> d
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:void <init>():12:12 -> <init>
@@ -36786,7 +36962,7 @@
     1:1:com.android.tools.r8.ir.analysis.type.SinglePrimitiveTypeElement getInstance():16:16 -> G
     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.KW:
+com.android.tools.r8.ir.analysis.type.TopTypeElement -> com.android.tools.r8.internal.TW:
     com.android.tools.r8.ir.analysis.type.TopTypeElement INSTANCE -> c
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>():6:6 -> <init>
@@ -36794,7 +36970,7 @@
     1:1:com.android.tools.r8.ir.analysis.type.TopTypeElement getInstance():15:15 -> G
     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.nX:
+com.android.tools.r8.ir.analysis.type.TypeAnalysis -> com.android.tools.r8.internal.wX:
     java.util.Deque worklist -> d
     com.android.tools.r8.graph.AppView appView -> c
     boolean $assertionsDisabled -> e
@@ -36819,7 +36995,7 @@
     1:4:void widening(com.android.tools.r8.ir.code.IRCode):56:59 -> b
     5:5:boolean verifyValuesUpToDate(java.lang.Iterable):82:82 -> b
     1:1:void widening(java.lang.Iterable):63:63 -> c
-com.android.tools.r8.ir.analysis.type.TypeElement -> com.android.tools.r8.internal.tX:
+com.android.tools.r8.ir.analysis.type.TypeElement -> com.android.tools.r8.internal.CX:
     boolean $assertionsDisabled -> a
     int $r8$clinit -> b
     1:1:void <clinit>():20:20 -> <clinit>
@@ -36933,7 +37109,7 @@
     8:8:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isBottom():0:0 -> y
     8:8:boolean isPreciseType():371 -> y
     boolean isPrimitiveArrayType() -> z
-com.android.tools.r8.ir.analysis.type.WidePrimitiveTypeElement -> com.android.tools.r8.internal.EZ:
+com.android.tools.r8.ir.analysis.type.WidePrimitiveTypeElement -> com.android.tools.r8.internal.NZ:
     com.android.tools.r8.ir.analysis.type.WidePrimitiveTypeElement INSTANCE -> d
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:void <init>():12:12 -> <init>
@@ -37017,7 +37193,7 @@
     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.D5:
+com.android.tools.r8.ir.analysis.value.BottomValue -> com.android.tools.r8.internal.G5:
     com.android.tools.r8.ir.analysis.value.BottomValue INSTANCE -> c
     1:1:void <clinit>():13:13 -> <clinit>
     1:1:void <init>():15:15 -> <init>
@@ -37026,7 +37202,7 @@
     1:1:int hashCode():43:43 -> hashCode
     1:1:java.lang.String toString():48:48 -> toString
     boolean isNonTrivial() -> y
-com.android.tools.r8.ir.analysis.value.ConstantOrNonConstantNumberValue -> com.android.tools.r8.internal.jd:
+com.android.tools.r8.ir.analysis.value.ConstantOrNonConstantNumberValue -> com.android.tools.r8.internal.ld:
     boolean containsInt(int) -> a
     com.android.tools.r8.utils.OptionalBool isSubsetOf(int[]) -> a
     boolean mayOverlapWith(com.android.tools.r8.ir.analysis.value.ConstantOrNonConstantNumberValue) -> a
@@ -37035,14 +37211,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.pF:
+com.android.tools.r8.ir.analysis.value.NonConstantNumberValue -> com.android.tools.r8.internal.uF:
     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.IF:
+com.android.tools.r8.ir.analysis.value.NullOrAbstractValue -> com.android.tools.r8.internal.NF:
     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
@@ -37067,7 +37243,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.OF:
+com.android.tools.r8.ir.analysis.value.NumberFromIntervalValue -> com.android.tools.r8.internal.TF:
     long maxInclusive -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():13:13 -> <clinit>
@@ -37096,7 +37272,7 @@
     1:2:int hashCode():92:93 -> hashCode
     1:1:java.lang.String toString():99:99 -> toString
     boolean isNonTrivial() -> y
-com.android.tools.r8.ir.analysis.value.NumberFromSetValue -> com.android.tools.r8.internal.RF:
+com.android.tools.r8.ir.analysis.value.NumberFromSetValue -> com.android.tools.r8.internal.WF:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet numbers -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():17:17 -> <clinit>
@@ -37119,8 +37295,8 @@
     com.android.tools.r8.ir.analysis.value.NumberFromSetValue asNumberFromSetValue() -> i
     1:7:java.lang.String toString():110:116 -> toString
     boolean isNonTrivial() -> y
-com.android.tools.r8.ir.analysis.value.NumberFromSetValue$1 -> com.android.tools.r8.internal.PF:
-com.android.tools.r8.ir.analysis.value.NumberFromSetValue$Builder -> com.android.tools.r8.internal.QF:
+com.android.tools.r8.ir.analysis.value.NumberFromSetValue$1 -> com.android.tools.r8.internal.UF:
+com.android.tools.r8.ir.analysis.value.NumberFromSetValue$Builder -> com.android.tools.r8.internal.VF:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet numbers -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():119:119 -> <clinit>
@@ -37129,7 +37305,7 @@
     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.TS:
+com.android.tools.r8.ir.analysis.value.SingleConstClassValue -> com.android.tools.r8.internal.cT:
     com.android.tools.r8.graph.DexType type -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():30:30 -> <clinit>
@@ -37180,13 +37356,13 @@
     136:136:java.lang.String toString():65:65 -> toString
     137:137:java.lang.String toString():65:65 -> toString
     138:138:java.lang.String toString():65:65 -> toString
-com.android.tools.r8.ir.analysis.value.SingleConstValue -> com.android.tools.r8.internal.US:
+com.android.tools.r8.ir.analysis.value.SingleConstValue -> com.android.tools.r8.internal.dT:
     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
     com.android.tools.r8.ir.analysis.value.SingleConstValue asSingleConstValue() -> n
-com.android.tools.r8.ir.analysis.value.SingleDexItemBasedStringValue -> com.android.tools.r8.internal.WS:
+com.android.tools.r8.ir.analysis.value.SingleDexItemBasedStringValue -> com.android.tools.r8.internal.fT:
     boolean $assertionsDisabled -> e
     com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo nameComputationInfo -> d
     com.android.tools.r8.graph.DexReference item -> c
@@ -37211,7 +37387,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.XS:
+com.android.tools.r8.ir.analysis.value.SingleFieldValue -> com.android.tools.r8.internal.gT:
     com.android.tools.r8.graph.DexField field -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():34:34 -> <clinit>
@@ -37235,7 +37411,7 @@
     1:11:com.android.tools.r8.ir.analysis.value.SingleValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):139:149 -> 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.YS:
+com.android.tools.r8.ir.analysis.value.SingleNumberValue -> com.android.tools.r8.internal.hT:
     long value -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():24:24 -> <clinit>
@@ -37275,7 +37451,7 @@
     1:1:boolean isFalse():51:51 -> x
     1:1:boolean com.android.tools.r8.ir.analysis.value.SingleNumberValue.isFalse():51:51 -> z
     1:1:boolean isSingleBoolean():46 -> z
-com.android.tools.r8.ir.analysis.value.SingleStatefulFieldValue -> com.android.tools.r8.internal.aT:
+com.android.tools.r8.ir.analysis.value.SingleStatefulFieldValue -> com.android.tools.r8.internal.jT:
     com.android.tools.r8.ir.analysis.value.objectstate.ObjectState state -> e
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():11:11 -> <clinit>
@@ -37295,7 +37471,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.bT:
+com.android.tools.r8.ir.analysis.value.SingleStatelessFieldValue -> com.android.tools.r8.internal.kT:
     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
@@ -37308,7 +37484,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.cT:
+com.android.tools.r8.ir.analysis.value.SingleStringValue -> com.android.tools.r8.internal.lT:
     com.android.tools.r8.graph.DexString string -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():26:26 -> <clinit>
@@ -37331,7 +37507,7 @@
     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.eT:
+com.android.tools.r8.ir.analysis.value.SingleValue -> com.android.tools.r8.internal.nT:
     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
@@ -37343,7 +37519,7 @@
     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.gU:
+com.android.tools.r8.ir.analysis.value.StatefulObjectValue -> com.android.tools.r8.internal.pU:
     com.android.tools.r8.ir.analysis.value.objectstate.ObjectState state -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():12:12 -> <clinit>
@@ -37365,7 +37541,7 @@
     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.WX:
+com.android.tools.r8.ir.analysis.value.UnknownValue -> com.android.tools.r8.internal.fY:
     com.android.tools.r8.ir.analysis.value.UnknownValue INSTANCE -> c
     1:1:void <clinit>():13:13 -> <clinit>
     1:1:void <init>():15:15 -> <init>
@@ -37411,7 +37587,7 @@
     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.sF:
+com.android.tools.r8.ir.analysis.value.objectstate.NonEmptyObjectState -> com.android.tools.r8.internal.xF:
     java.util.Map state -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():18:18 -> <clinit>
@@ -37423,7 +37599,7 @@
     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.jI:
+com.android.tools.r8.ir.analysis.value.objectstate.ObjectState -> com.android.tools.r8.internal.oI:
     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
@@ -37433,7 +37609,7 @@
     1:1:int getKnownArrayLength():68:68 -> b
     boolean hasKnownArrayLength() -> c
     boolean isEmpty() -> d
-com.android.tools.r8.ir.analysis.value.objectstate.ObjectState$Builder -> com.android.tools.r8.internal.iI:
+com.android.tools.r8.ir.analysis.value.objectstate.ObjectState$Builder -> com.android.tools.r8.internal.nI:
     java.util.Map state -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():79:79 -> <clinit>
@@ -37443,7 +37619,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.kI:
+com.android.tools.r8.ir.analysis.value.objectstate.ObjectStateAnalysis -> com.android.tools.r8.internal.pI:
     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
@@ -37575,7 +37751,7 @@
     com.android.tools.r8.ir.code.And asAnd() -> n
     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.x2:
+com.android.tools.r8.ir.code.Argument -> com.android.tools.r8.internal.A2:
     int $r8$clinit -> l
     boolean knownToBeBoolean -> j
     boolean $assertionsDisabled -> k
@@ -37604,13 +37780,13 @@
     2:7:int getIndex():40 -> m2
     8:9:int getIndex():40:41 -> m2
     com.android.tools.r8.ir.code.Argument asArgument() -> o
-com.android.tools.r8.ir.code.Argument$Builder -> com.android.tools.r8.internal.w2:
+com.android.tools.r8.ir.code.Argument$Builder -> com.android.tools.r8.internal.z2:
     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.R2:
+com.android.tools.r8.ir.code.ArithmeticBinop -> com.android.tools.r8.internal.U2:
     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>
@@ -37663,10 +37839,10 @@
     boolean isArithmeticBinop() -> i1
     com.android.tools.r8.ir.code.ArithmeticBinop asArithmeticBinop() -> p
     com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode() -> r2
-com.android.tools.r8.ir.code.ArithmeticBinop$1 -> com.android.tools.r8.internal.Q2:
+com.android.tools.r8.ir.code.ArithmeticBinop$1 -> com.android.tools.r8.internal.T2:
     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.S2:
+com.android.tools.r8.ir.code.ArrayAccess -> com.android.tools.r8.internal.V2:
     1:1:void <init>(com.android.tools.r8.ir.code.Value,java.util.List):16:16 -> <init>
     1:1:boolean instructionInstanceCanThrow():47:47 -> c1
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isNewArrayEmpty():0:0 -> c1
@@ -37678,7 +37854,7 @@
     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() -> q
-com.android.tools.r8.ir.code.ArrayGet -> com.android.tools.r8.internal.W2:
+com.android.tools.r8.ir.code.ArrayGet -> com.android.tools.r8.internal.Z2:
     boolean $assertionsDisabled -> j
     com.android.tools.r8.ir.code.MemberType type -> i
     1:1:void <clinit>():35:35 -> <clinit>
@@ -37781,7 +37957,7 @@
     boolean throwsOnNullInput() -> l2
     1:1:com.android.tools.r8.ir.code.ArrayAccess withMemberType(com.android.tools.r8.ir.code.MemberType):268:268 -> o2
     com.android.tools.r8.ir.code.ArrayGet asArrayGet() -> r
-com.android.tools.r8.ir.code.ArrayLength -> com.android.tools.r8.internal.X2:
+com.android.tools.r8.ir.code.ArrayLength -> com.android.tools.r8.internal.a3:
     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 -> P0
     boolean hasInvariantOutType() -> W0
@@ -37809,7 +37985,7 @@
     boolean throwsOnNullInput() -> l2
     1:1:com.android.tools.r8.ir.code.Value array():40:40 -> m2
     com.android.tools.r8.ir.code.ArrayLength asArrayLength() -> s
-com.android.tools.r8.ir.code.ArrayPut -> com.android.tools.r8.internal.a3:
+com.android.tools.r8.ir.code.ArrayPut -> com.android.tools.r8.internal.d3:
     boolean $assertionsDisabled -> j
     com.android.tools.r8.ir.code.MemberType type -> i
     1:1:void <clinit>():29:29 -> <clinit>
@@ -37864,7 +38040,7 @@
     boolean throwsOnNullInput() -> l2
     1:1:com.android.tools.r8.ir.code.ArrayAccess withMemberType(com.android.tools.r8.ir.code.MemberType):246:246 -> o2
     com.android.tools.r8.ir.code.ArrayPut asArrayPut() -> t
-com.android.tools.r8.ir.code.Assume -> com.android.tools.r8.internal.r3:
+com.android.tools.r8.ir.code.Assume -> com.android.tools.r8.internal.u3:
     com.android.tools.r8.ir.code.Assume$DynamicTypeAssumption dynamicTypeAssumption -> i
     boolean $assertionsDisabled -> l
     com.android.tools.r8.ir.code.Instruction origin -> k
@@ -37904,7 +38080,7 @@
     1:1:void unsetDynamicTypeAssumption():122:122 -> r2
     1:16:java.lang.String toString():272:287 -> toString
     com.android.tools.r8.ir.code.Assume asAssume() -> u
-com.android.tools.r8.ir.code.Assume$DynamicTypeAssumption -> com.android.tools.r8.internal.p3:
+com.android.tools.r8.ir.code.Assume$DynamicTypeAssumption -> com.android.tools.r8.internal.s3:
     com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound dynamicType -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():290:290 -> <clinit>
@@ -37914,14 +38090,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.q3:
+com.android.tools.r8.ir.code.Assume$NonNullAssumption -> com.android.tools.r8.internal.t3:
     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.s3:
+com.android.tools.r8.ir.code.AssumeAndCheckCastAliasedValueConfiguration -> com.android.tools.r8.internal.v3:
     com.android.tools.r8.ir.code.AssumeAndCheckCastAliasedValueConfiguration INSTANCE -> a
     boolean $assertionsDisabled -> b
     1:3:void <clinit>():9:11 -> <clinit>
@@ -37939,7 +38115,7 @@
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> b
     2:2:boolean isIntroducingAnAlias(com.android.tools.r8.ir.code.Instruction):22 -> b
     3:3:boolean isIntroducingAnAlias(com.android.tools.r8.ir.code.Instruction):22:22 -> b
-com.android.tools.r8.ir.code.BasicBlock -> com.android.tools.r8.internal.k4:
+com.android.tools.r8.ir.code.BasicBlock -> com.android.tools.r8.internal.n4:
     int color -> n
     int estimatedPredecessorsCount -> l
     int unfilledPredecessorsCount -> m
@@ -37997,13 +38173,13 @@
     37:54:void swapSuccessorsByIndex(int,int):376:393 -> a
     55:62:void replacePredecessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):510:517 -> a
     63:66:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):521:524 -> a
-    67:68:boolean com.android.tools.r8.utils.ListUtils.verifyListIsOrdered(java.util.List):237:238 -> a
+    67:68:boolean com.android.tools.r8.utils.ListUtils.verifyListIsOrdered(java.util.List):245:246 -> a
     67:68:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):524 -> a
     69:70:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.get(int):606:606 -> a
     69:70:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.get(int):32 -> a
-    69:70:boolean com.android.tools.r8.utils.ListUtils.verifyListIsOrdered(java.util.List):238 -> a
+    69:70:boolean com.android.tools.r8.utils.ListUtils.verifyListIsOrdered(java.util.List):246 -> a
     69:70:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):524 -> a
-    71:71:boolean com.android.tools.r8.utils.ListUtils.verifyListIsOrdered(java.util.List):238:238 -> a
+    71:71:boolean com.android.tools.r8.utils.ListUtils.verifyListIsOrdered(java.util.List):246:246 -> a
     71:71:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):524 -> a
     72:77:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):524:529 -> a
     78:78:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.listIterator():192:192 -> a
@@ -38295,7 +38471,7 @@
     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.f4:
+com.android.tools.r8.ir.code.BasicBlock$1 -> com.android.tools.r8.internal.i4:
     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
@@ -38306,14 +38482,14 @@
     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.g4:
-com.android.tools.r8.ir.code.BasicBlock$EdgeType -> com.android.tools.r8.internal.h4:
+com.android.tools.r8.ir.code.BasicBlock$BasicBlockChangeListener -> com.android.tools.r8.internal.j4:
+com.android.tools.r8.ir.code.BasicBlock$EdgeType -> com.android.tools.r8.internal.k4:
     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.i4:
+com.android.tools.r8.ir.code.BasicBlock$PhiEquivalence -> com.android.tools.r8.internal.l4:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():1985:1985 -> <clinit>
     1:1:void <init>():1985:1985 -> <init>
@@ -38324,13 +38500,13 @@
     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.j4:
+com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.m4:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():471:471 -> a
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> 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.m4:
+com.android.tools.r8.ir.code.BasicBlockInstructionIterator -> com.android.tools.r8.internal.p4:
     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>
@@ -38341,7 +38517,7 @@
     1:1:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.BasicBlockInstructionIterator.next():43:43 -> next
     1:1:java.lang.Object next():9 -> next
     1:1:com.android.tools.r8.ir.code.Instruction previous():33:33 -> previous
-com.android.tools.r8.ir.code.BasicBlockInstructionListIterator -> com.android.tools.r8.internal.n4:
+com.android.tools.r8.ir.code.BasicBlockInstructionListIterator -> com.android.tools.r8.internal.q4:
     java.util.ListIterator listIterator -> c
     com.android.tools.r8.ir.code.Instruction current -> d
     boolean $assertionsDisabled -> g
@@ -38537,7 +38713,7 @@
     1:1:void set(java.lang.Object):38:38 -> set
     2:5:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.set(com.android.tools.r8.ir.code.Instruction):161:164 -> set
     2:5:void set(java.lang.Object):38 -> set
-com.android.tools.r8.ir.code.BasicBlockIterator -> com.android.tools.r8.internal.p4:
+com.android.tools.r8.ir.code.BasicBlockIterator -> com.android.tools.r8.internal.s4:
     java.util.ListIterator listIterator -> c
     com.android.tools.r8.ir.code.IRCode code -> b
     com.android.tools.r8.ir.code.BasicBlock current -> d
@@ -38559,7 +38735,7 @@
     1:1:void set(java.lang.Object):10:10 -> set
     2:2:void com.android.tools.r8.ir.code.BasicBlockIterator.set(com.android.tools.r8.ir.code.BasicBlock):73:73 -> set
     2:2:void set(java.lang.Object):10 -> set
-com.android.tools.r8.ir.code.Binop -> com.android.tools.r8.internal.K4:
+com.android.tools.r8.ir.code.Binop -> com.android.tools.r8.internal.N4:
     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() -> W0
@@ -38587,7 +38763,7 @@
     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() -> v
-com.android.tools.r8.ir.code.CanonicalPositions -> com.android.tools.r8.internal.c6:
+com.android.tools.r8.ir.code.CanonicalPositions -> com.android.tools.r8.internal.f6:
     java.util.Map canonicalPositions -> b
     boolean $assertionsDisabled -> f
     com.android.tools.r8.ir.code.Position callerPosition -> a
@@ -38612,7 +38788,7 @@
     45:45:com.android.tools.r8.ir.code.Position getExceptionalExitPosition(boolean,java.util.function.Supplier,com.android.tools.r8.graph.DexMethod):126 -> a
     46:49:com.android.tools.r8.ir.code.Position getExceptionalExitPosition(boolean,java.util.function.Supplier,com.android.tools.r8.graph.DexMethod):126:129 -> a
     1:1:com.android.tools.r8.ir.code.Position getCanonical(com.android.tools.r8.ir.code.Position):63:63 -> b
-com.android.tools.r8.ir.code.CatchHandlers -> com.android.tools.r8.internal.f6:
+com.android.tools.r8.ir.code.CatchHandlers -> com.android.tools.r8.internal.i6:
     java.util.List guards -> b
     java.util.Set uniqueTargets -> d
     java.util.List targets -> c
@@ -38642,18 +38818,18 @@
     1:1:boolean isEmpty():55:55 -> isEmpty
     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.d6:
+com.android.tools.r8.ir.code.CatchHandlers$1 -> com.android.tools.r8.internal.g6:
     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.e6:
+com.android.tools.r8.ir.code.CatchHandlers$CatchHandler -> com.android.tools.r8.internal.h6:
     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.e9:
+com.android.tools.r8.ir.code.CheckCast -> com.android.tools.r8.internal.g9:
     int $r8$clinit -> l
     com.android.tools.r8.graph.DexType type -> i
     boolean ignoreCompatRules -> j
@@ -38705,7 +38881,7 @@
     boolean isCheckCast() -> q1
     1:1:java.lang.String toString():195:195 -> toString
     com.android.tools.r8.ir.code.CheckCast asCheckCast() -> w
-com.android.tools.r8.ir.code.CheckCast$Builder -> com.android.tools.r8.internal.d9:
+com.android.tools.r8.ir.code.CheckCast$Builder -> com.android.tools.r8.internal.f9:
     com.android.tools.r8.ir.code.Value object -> d
     com.android.tools.r8.graph.DexType castType -> c
     1:1:void <init>():275:275 -> <init>
@@ -38716,7 +38892,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.lb:
+com.android.tools.r8.ir.code.Cmp -> com.android.tools.r8.internal.nb:
     boolean $assertionsDisabled -> k
     com.android.tools.r8.ir.code.Cmp$Bias bias -> j
     1:1:void <clinit>():26:26 -> <clinit>
@@ -38782,12 +38958,12 @@
     139:140:java.lang.String toString():113:114 -> toString
     141:163:java.lang.String toString():109:131 -> toString
     com.android.tools.r8.ir.code.Cmp asCmp() -> x
-com.android.tools.r8.ir.code.Cmp$1 -> com.android.tools.r8.internal.jb:
+com.android.tools.r8.ir.code.Cmp$1 -> com.android.tools.r8.internal.lb:
     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.kb:
+com.android.tools.r8.ir.code.Cmp$Bias -> com.android.tools.r8.internal.mb:
     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
@@ -38796,7 +38972,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.Uc:
+com.android.tools.r8.ir.code.ConstClass -> com.android.tools.r8.internal.Wc:
     com.android.tools.r8.graph.DexType clazz -> j
     int $r8$clinit -> m
     boolean ignoreCompatRules -> k
@@ -38846,7 +39022,7 @@
     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() -> y
-com.android.tools.r8.ir.code.ConstClass$Builder -> com.android.tools.r8.internal.Tc:
+com.android.tools.r8.ir.code.ConstClass$Builder -> com.android.tools.r8.internal.Vc:
     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
@@ -38855,7 +39031,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.Vc:
+com.android.tools.r8.ir.code.ConstInstruction -> com.android.tools.r8.internal.Xc:
     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() -> R0
@@ -38865,7 +39041,7 @@
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
     boolean isConstInstruction() -> s1
     com.android.tools.r8.ir.code.ConstInstruction asConstInstruction() -> z
-com.android.tools.r8.ir.code.ConstMethodHandle -> com.android.tools.r8.internal.Xc:
+com.android.tools.r8.ir.code.ConstMethodHandle -> com.android.tools.r8.internal.Zc:
     com.android.tools.r8.graph.DexMethodHandle methodHandle -> j
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():21:21 -> <clinit>
@@ -38898,7 +39074,7 @@
     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.ConstMethodType -> com.android.tools.r8.internal.Yc:
+com.android.tools.r8.ir.code.ConstMethodType -> com.android.tools.r8.internal.ad:
     com.android.tools.r8.graph.DexProto methodType -> j
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():21:21 -> <clinit>
@@ -38930,7 +39106,7 @@
     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.ad:
+com.android.tools.r8.ir.code.ConstNumber -> com.android.tools.r8.internal.cd:
     long value -> j
     int $r8$clinit -> l
     boolean $assertionsDisabled -> k
@@ -39001,10 +39177,10 @@
     1:1:boolean isZero():111:111 -> w2
     1:1:boolean negativeIs16Bit():292:292 -> x2
     1:1:boolean negativeIs8Bit():284:284 -> y2
-com.android.tools.r8.ir.code.ConstNumber$1 -> com.android.tools.r8.internal.Zc:
+com.android.tools.r8.ir.code.ConstNumber$1 -> com.android.tools.r8.internal.bd:
     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.cd:
+com.android.tools.r8.ir.code.ConstString -> com.android.tools.r8.internal.ed:
     int $r8$clinit -> l
     boolean $assertionsDisabled -> k
     com.android.tools.r8.graph.DexString value -> j
@@ -39022,7 +39198,7 @@
     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():471:471 -> a
+    9:9:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> 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
@@ -39045,7 +39221,7 @@
     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.kd:
+com.android.tools.r8.ir.code.ConstantValueUtils -> com.android.tools.r8.internal.md:
     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
@@ -39067,7 +39243,7 @@
     37:37:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> a
     37:37:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):55 -> a
     38:38:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):56:56 -> a
-com.android.tools.r8.ir.code.DebugLocalRead -> com.android.tools.r8.internal.Ld:
+com.android.tools.r8.ir.code.DebugLocalRead -> com.android.tools.r8.internal.Nd:
     1:1:void <init>():20:20 -> <init>
     boolean hasInvariantOutType() -> W0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
@@ -39084,11 +39260,11 @@
     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.Md:
+com.android.tools.r8.ir.code.DebugLocalUninitialized -> com.android.tools.r8.internal.Od:
     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() -> g1
-com.android.tools.r8.ir.code.DebugLocalWrite -> com.android.tools.r8.internal.Nd:
+com.android.tools.r8.ir.code.DebugLocalWrite -> com.android.tools.r8.internal.Pd:
     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>
@@ -39102,7 +39278,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() -> g1
-com.android.tools.r8.ir.code.DebugLocalsChange -> com.android.tools.r8.internal.Od:
+com.android.tools.r8.ir.code.DebugLocalsChange -> com.android.tools.r8.internal.Qd:
     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
@@ -39135,7 +39311,7 @@
     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.Pd:
+com.android.tools.r8.ir.code.DebugPosition -> com.android.tools.r8.internal.Rd:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:void <init>():20:20 -> <init>
@@ -39162,7 +39338,7 @@
     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.Qd:
+com.android.tools.r8.ir.code.DefaultAliasedValueConfiguration -> com.android.tools.r8.internal.Sd:
     com.android.tools.r8.ir.code.DefaultAliasedValueConfiguration INSTANCE -> a
     boolean $assertionsDisabled -> b
     1:3:void <clinit>():7:9 -> <clinit>
@@ -39175,13 +39351,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.Zd:
+com.android.tools.r8.ir.code.DefaultInstructionVisitor -> com.android.tools.r8.internal.be:
     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.Bf:
+com.android.tools.r8.ir.code.DexItemBasedConstString -> com.android.tools.r8.internal.Af:
     int $r8$clinit -> m
     com.android.tools.r8.graph.DexReference item -> j
     boolean $assertionsDisabled -> l
@@ -41399,7 +41575,7 @@
     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.eA:
+com.android.tools.r8.ir.code.LinearFlowInstructionListIterator -> com.android.tools.r8.internal.jA:
     java.util.Set seenBlocks -> e
     boolean $assertionsDisabled -> f
     com.android.tools.r8.ir.code.IRCode code -> b
@@ -41451,7 +41627,7 @@
     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):272:272 -> set
     2:2:void set(java.lang.Object):22 -> set
-com.android.tools.r8.ir.code.Load -> com.android.tools.r8.internal.AA:
+com.android.tools.r8.ir.code.Load -> com.android.tools.r8.internal.FA:
     1:1:void <init>(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.Value):23:23 -> <init>
     boolean hasInvariantOutType() -> W0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
@@ -41471,7 +41647,7 @@
     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.OA:
+com.android.tools.r8.ir.code.LogicalBinop -> com.android.tools.r8.internal.TA:
     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>
@@ -41516,10 +41692,10 @@
     1:5:boolean needsValueInRegister(com.android.tools.r8.ir.code.Value):44:48 -> d
     com.android.tools.r8.ir.code.LogicalBinop asLogicalBinop() -> i0
     com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode() -> r2
-com.android.tools.r8.ir.code.LogicalBinop$1 -> com.android.tools.r8.internal.NA:
+com.android.tools.r8.ir.code.LogicalBinop$1 -> com.android.tools.r8.internal.SA:
     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.jC:
+com.android.tools.r8.ir.code.MemberType -> com.android.tools.r8.internal.oC:
     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
@@ -41551,7 +41727,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.MD:
+com.android.tools.r8.ir.code.Monitor -> com.android.tools.r8.internal.RD:
     boolean $assertionsDisabled -> j
     com.android.tools.r8.ir.code.Monitor$Type type -> i
     1:1:void <clinit>():21:21 -> <clinit>
@@ -41588,10 +41764,10 @@
     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.KD:
+com.android.tools.r8.ir.code.Monitor$1 -> com.android.tools.r8.internal.PD:
     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.LD:
+com.android.tools.r8.ir.code.Monitor$Type -> com.android.tools.r8.internal.QD:
     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
@@ -41599,7 +41775,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.OD:
+com.android.tools.r8.ir.code.Move -> com.android.tools.r8.internal.TD:
     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>
@@ -41628,7 +41804,7 @@
     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.QD:
+com.android.tools.r8.ir.code.MoveException -> com.android.tools.r8.internal.VD:
     com.android.tools.r8.graph.DexType exceptionType -> i
     boolean $assertionsDisabled -> k
     com.android.tools.r8.utils.InternalOptions options -> j
@@ -41641,7 +41817,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():471:471 -> a
+    7:7:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> 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
@@ -41660,7 +41836,7 @@
     int opcode() -> j2
     com.android.tools.r8.ir.code.MoveException asMoveException() -> l0
     1:1:com.android.tools.r8.graph.DexType getExceptionType():126:126 -> m2
-com.android.tools.r8.ir.code.Mul -> com.android.tools.r8.internal.SD:
+com.android.tools.r8.ir.code.Mul -> com.android.tools.r8.internal.XD:
     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
@@ -41685,7 +41861,7 @@
     com.android.tools.r8.ir.code.Mul asMul() -> m0
     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.uE:
+com.android.tools.r8.ir.code.Neg -> com.android.tools.r8.internal.zE:
     com.android.tools.r8.ir.code.NumericType type -> i
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():21:21 -> <clinit>
@@ -41715,10 +41891,10 @@
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):49:49 -> b
     int opcode() -> j2
     com.android.tools.r8.ir.code.Neg asNeg() -> n0
-com.android.tools.r8.ir.code.Neg$1 -> com.android.tools.r8.internal.tE:
+com.android.tools.r8.ir.code.Neg$1 -> com.android.tools.r8.internal.yE:
     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.EE:
+com.android.tools.r8.ir.code.NewArrayEmpty -> com.android.tools.r8.internal.JE:
     com.android.tools.r8.graph.DexType type -> i
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():26:26 -> <clinit>
@@ -41757,7 +41933,7 @@
     1:1:com.android.tools.r8.ir.code.Value size():55:55 -> m2
     com.android.tools.r8.ir.code.NewArrayEmpty asNewArrayEmpty() -> o0
     1:1:java.lang.String toString():47:47 -> toString
-com.android.tools.r8.ir.code.NewArrayFilledData -> com.android.tools.r8.internal.FE:
+com.android.tools.r8.ir.code.NewArrayFilledData -> com.android.tools.r8.internal.KE:
     long size -> j
     short[] data -> k
     int element_width -> i
@@ -41798,7 +41974,7 @@
     int opcode() -> j2
     1:1:com.android.tools.r8.ir.code.Value src():50:50 -> m2
     com.android.tools.r8.ir.code.NewArrayFilledData asNewArrayFilledData() -> p0
-com.android.tools.r8.ir.code.NewInstance -> com.android.tools.r8.internal.GE:
+com.android.tools.r8.ir.code.NewInstance -> com.android.tools.r8.internal.LE:
     com.android.tools.r8.graph.DexType clazz -> i
     boolean allowSpilling -> j
     boolean $assertionsDisabled -> k
@@ -41835,7 +42011,7 @@
     1:1:void markNoSpilling():203:203 -> p2
     com.android.tools.r8.ir.code.NewInstance asNewInstance() -> q0
     1:1:java.lang.String toString():71:71 -> toString
-com.android.tools.r8.ir.code.NewUnboxedEnumInstance -> com.android.tools.r8.internal.HE:
+com.android.tools.r8.ir.code.NewUnboxedEnumInstance -> com.android.tools.r8.internal.ME:
     com.android.tools.r8.graph.DexType clazz -> i
     int ordinal -> j
     boolean $assertionsDisabled -> k
@@ -41863,9 +42039,9 @@
     1:1:int getOrdinal():55:55 -> m2
     com.android.tools.r8.ir.code.NewUnboxedEnumInstance asNewUnboxedEnumInstance() -> r0
     1:1:java.lang.String toString():80:80 -> toString
-com.android.tools.r8.ir.code.NextUntilIterator -> com.android.tools.r8.internal.IE:
+com.android.tools.r8.ir.code.NextUntilIterator -> com.android.tools.r8.internal.NE:
     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.EF:
+com.android.tools.r8.ir.code.Not -> com.android.tools.r8.internal.JF:
     com.android.tools.r8.ir.code.NumericType type -> i
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():19:19 -> <clinit>
@@ -41894,10 +42070,10 @@
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):83:83 -> b
     int opcode() -> j2
     com.android.tools.r8.ir.code.Not asNot() -> s0
-com.android.tools.r8.ir.code.Not$1 -> com.android.tools.r8.internal.DF:
+com.android.tools.r8.ir.code.Not$1 -> com.android.tools.r8.internal.IF:
     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.NF:
+com.android.tools.r8.ir.code.NumberConversion -> com.android.tools.r8.internal.SF:
     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>
@@ -41957,15 +42133,15 @@
     1:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):138:142 -> b
     int opcode() -> j2
     com.android.tools.r8.ir.code.NumberConversion asNumberConversion() -> t0
-com.android.tools.r8.ir.code.NumberConversion$1 -> com.android.tools.r8.internal.MF:
+com.android.tools.r8.ir.code.NumberConversion$1 -> com.android.tools.r8.internal.RF:
     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.SF:
+com.android.tools.r8.ir.code.NumberGenerator -> com.android.tools.r8.internal.XF:
     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.YF:
+com.android.tools.r8.ir.code.NumericType -> com.android.tools.r8.internal.dG:
     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
@@ -41992,10 +42168,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.XF:
+com.android.tools.r8.ir.code.NumericType$1 -> com.android.tools.r8.internal.cG:
     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.MI:
+com.android.tools.r8.ir.code.Or -> com.android.tools.r8.internal.RI:
     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
@@ -42015,7 +42191,7 @@
     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() -> u0
-com.android.tools.r8.ir.code.Phi -> com.android.tools.r8.internal.BJ:
+com.android.tools.r8.ir.code.Phi -> com.android.tools.r8.internal.KJ:
     com.android.tools.r8.ir.code.Phi$RegisterReadType readType -> t
     java.util.List definitionUsers -> v
     java.util.List operands -> s
@@ -42109,18 +42285,18 @@
     6:6:void removeDeadPhi():324:324 -> n0
     1:1:boolean removeTrivialPhi():240:240 -> o0
     1:1:void setIsStackPhi(boolean):376:376 -> p0
-com.android.tools.r8.ir.code.Phi$RegisterReadType -> com.android.tools.r8.internal.BJ$a:
+com.android.tools.r8.ir.code.Phi$RegisterReadType -> com.android.tools.r8.internal.KJ$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.CJ:
+com.android.tools.r8.ir.code.Phi$StackMapPhi -> com.android.tools.r8.internal.LJ:
     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 -> d
-com.android.tools.r8.ir.code.Pop -> com.android.tools.r8.internal.NJ:
+com.android.tools.r8.ir.code.Pop -> com.android.tools.r8.internal.WJ:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():17:17 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.Value):20:21 -> <init>
@@ -42143,7 +42319,7 @@
     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.TJ:
+com.android.tools.r8.ir.code.Position -> com.android.tools.r8.internal.cK:
     boolean removeInnerFramesIfThrowingNpe -> e
     boolean $assertionsDisabled -> f
     int line -> b
@@ -42152,7 +42328,7 @@
     1:1:void <clinit>():17:17 -> <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):17:17 -> <init>
     2:6:void <init>(int,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position,boolean):37:41 -> <init>
-    com.android.tools.r8.utils.structural.StructuralItem self() -> K
+    com.android.tools.r8.utils.structural.StructuralItem self() -> L
     com.android.tools.r8.ir.code.Position$PositionBuilder builderWithCopy() -> a
     1:1:void access$400(com.android.tools.r8.utils.structural.StructuralSpecification):17:17 -> a
     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):121:127 -> a
@@ -42178,24 +42354,24 @@
     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():169 -> hashCode
     com.android.tools.r8.utils.Int2StructuralItemArrayMap getOutlinePositions() -> i
-    1:1:boolean hasCallerPosition():69:69 -> j
+    1:1:boolean hasCallerPosition():69:69 -> k
     boolean hasFile() -> l
     1:1:boolean isNone():132:132 -> m
     boolean isOutline() -> o
     1:1:boolean isRemoveInnerFramesIfThrowingNpe():53:53 -> p
     1:1:boolean isSome():140:140 -> q
     1:1:com.android.tools.r8.ir.code.Position none():85:85 -> r
+    1:1:com.android.tools.r8.ir.code.Position syntheticNone():116:116 -> s
     1:19:java.lang.String com.android.tools.r8.ir.code.Position.toString(boolean):173:191 -> toString
     1:19:java.lang.String toString():196 -> toString
-    1:1:com.android.tools.r8.ir.code.Position syntheticNone():116:116 -> u
-com.android.tools.r8.ir.code.Position$1 -> com.android.tools.r8.internal.OJ:
-com.android.tools.r8.ir.code.Position$OutlineCallerPosition -> com.android.tools.r8.internal.QJ:
+com.android.tools.r8.ir.code.Position$1 -> com.android.tools.r8.internal.XJ:
+com.android.tools.r8.ir.code.Position$OutlineCallerPosition -> com.android.tools.r8.internal.ZJ:
     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):443:443 -> <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):464:467 -> <init>
-    com.android.tools.r8.utils.structural.StructuralItem self() -> K
+    com.android.tools.r8.utils.structural.StructuralItem self() -> L
     1:7:com.android.tools.r8.ir.code.Position$PositionBuilder builderWithCopy():483:489 -> a
     int getCompareToId() -> c
     1:1:void lambda$specify$0(com.android.tools.r8.utils.structural.StructuralSpecification):450:450 -> c
@@ -42206,7 +42382,7 @@
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():510:510 -> n
     1:1:boolean isOutline():495:495 -> o
     1:1:com.android.tools.r8.ir.code.Position$OutlineCallerPosition$OutlineCallerPositionBuilder builder():514:514 -> v
-com.android.tools.r8.ir.code.Position$OutlineCallerPosition$OutlineCallerPositionBuilder -> com.android.tools.r8.internal.PJ:
+com.android.tools.r8.ir.code.Position$OutlineCallerPosition$OutlineCallerPositionBuilder -> com.android.tools.r8.internal.YJ:
     boolean isOutline -> i
     boolean $assertionsDisabled -> j
     com.android.tools.r8.utils.Int2StructuralItemArrayMap$Builder outlinePositionsBuilder -> g
@@ -42222,23 +42398,23 @@
     com.android.tools.r8.ir.code.Position$PositionBuilder self() -> c
     1:8:com.android.tools.r8.ir.code.Position$OutlineCallerPosition build():553:560 -> e
     1:1:boolean hasOutlinePositions():548:548 -> f
-com.android.tools.r8.ir.code.Position$OutlinePosition -> com.android.tools.r8.internal.SJ:
+com.android.tools.r8.ir.code.Position$OutlinePosition -> com.android.tools.r8.internal.bK:
     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):392:392 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position,boolean):399:399 -> <init>
-    com.android.tools.r8.utils.structural.StructuralItem self() -> K
+    com.android.tools.r8.utils.structural.StructuralItem self() -> L
     1:1:com.android.tools.r8.ir.code.Position$PositionBuilder builderWithCopy():414:414 -> a
     int getCompareToId() -> c
     1:1:void lambda$getStructuralMapping$0(com.android.tools.r8.utils.structural.StructuralSpecification):419:419 -> c
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():419:419 -> n
     1:1:com.android.tools.r8.ir.code.Position$OutlinePosition$OutlinePositionBuilder builder():423:423 -> v
-com.android.tools.r8.ir.code.Position$OutlinePosition$OutlinePositionBuilder -> com.android.tools.r8.internal.RJ:
+com.android.tools.r8.ir.code.Position$OutlinePosition$OutlinePositionBuilder -> com.android.tools.r8.internal.aK:
     1:1:void <init>(com.android.tools.r8.ir.code.Position$1):426:426 -> <init>
     2:2:void <init>():429:429 -> <init>
     1:1:com.android.tools.r8.ir.code.Position$OutlinePosition com.android.tools.r8.ir.code.Position$OutlinePosition$OutlinePositionBuilder.build():438:438 -> a
     1:1:com.android.tools.r8.ir.code.Position build():426 -> a
     com.android.tools.r8.ir.code.Position$PositionBuilder self() -> c
     1:1:com.android.tools.r8.ir.code.Position$OutlinePosition build():438:438 -> e
-com.android.tools.r8.ir.code.Position$PositionBuilder -> com.android.tools.r8.internal.TJ$a:
+com.android.tools.r8.ir.code.Position$PositionBuilder -> com.android.tools.r8.internal.cK$a:
     boolean noCheckOfPosition -> e
     boolean noCheckOfMethod -> f
     com.android.tools.r8.graph.DexMethod method -> b
@@ -42253,14 +42429,14 @@
     1:2:com.android.tools.r8.ir.code.Position$PositionBuilder disableMethodCheck():244:245 -> b
     com.android.tools.r8.ir.code.Position$PositionBuilder self() -> c
     1:2:com.android.tools.r8.ir.code.Position$PositionBuilder setRemoveInnerFramesIfThrowingNpe(boolean):234:235 -> d
-com.android.tools.r8.ir.code.Position$SourcePosition -> com.android.tools.r8.internal.TJ$b:
+com.android.tools.r8.ir.code.Position$SourcePosition -> com.android.tools.r8.internal.cK$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>():251:255 -> <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):251:251 -> <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):270:272 -> <init>
-    com.android.tools.r8.utils.structural.StructuralItem self() -> K
+    com.android.tools.r8.utils.structural.StructuralItem self() -> L
     1:5:com.android.tools.r8.ir.code.Position$PositionBuilder builderWithCopy():292:296 -> a
     int getCompareToId() -> c
     1:1:void lambda$specify$0(com.android.tools.r8.utils.structural.StructuralSpecification):261:261 -> c
@@ -42270,7 +42446,7 @@
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():301:301 -> n
     1:1:com.android.tools.r8.ir.code.Position$SourcePosition access$000():251:251 -> v
     1:1:com.android.tools.r8.ir.code.Position$SourcePosition$SourcePositionBuilder builder():305:305 -> w
-com.android.tools.r8.ir.code.Position$SourcePosition$SourcePositionBuilder -> com.android.tools.r8.internal.TJ$b$a:
+com.android.tools.r8.ir.code.Position$SourcePosition$SourcePositionBuilder -> com.android.tools.r8.internal.cK$b$a:
     com.android.tools.r8.graph.DexString file -> g
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():308:308 -> <clinit>
@@ -42279,19 +42455,19 @@
     2:2:com.android.tools.r8.ir.code.Position$SourcePosition$SourcePositionBuilder setFile(com.android.tools.r8.graph.DexString):319:319 -> a
     com.android.tools.r8.ir.code.Position$PositionBuilder self() -> c
     1:3:com.android.tools.r8.ir.code.Position$SourcePosition build():325:327 -> e
-com.android.tools.r8.ir.code.Position$SyntheticPosition -> com.android.tools.r8.internal.TJ$c:
+com.android.tools.r8.ir.code.Position$SyntheticPosition -> com.android.tools.r8.internal.cK$c:
     com.android.tools.r8.ir.code.Position NO_POSITION_SYNTHETIC -> g
     1:1:void <clinit>():338:338 -> <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):333:333 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position,boolean):346:346 -> <init>
-    com.android.tools.r8.utils.structural.StructuralItem self() -> K
+    com.android.tools.r8.utils.structural.StructuralItem self() -> L
     1:1:com.android.tools.r8.ir.code.Position$PositionBuilder builderWithCopy():361:361 -> a
     int getCompareToId() -> c
     1:1:void lambda$getStructuralMapping$0(com.android.tools.r8.utils.structural.StructuralSpecification):366:366 -> c
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():366:366 -> n
     1:1:com.android.tools.r8.ir.code.Position access$100():333:333 -> v
     1:1:com.android.tools.r8.ir.code.Position$SyntheticPosition$SyntheticPositionBuilder builder():370:370 -> w
-com.android.tools.r8.ir.code.Position$SyntheticPosition$SyntheticPositionBuilder -> com.android.tools.r8.internal.TJ$c$a:
+com.android.tools.r8.ir.code.Position$SyntheticPosition$SyntheticPositionBuilder -> com.android.tools.r8.internal.cK$c$a:
     boolean $assertionsDisabled -> g
     1:1:void <clinit>():373:373 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Position$1):373:373 -> <init>
@@ -42299,9 +42475,9 @@
     1:1:com.android.tools.r8.ir.code.Position build():373:373 -> a
     com.android.tools.r8.ir.code.Position$PositionBuilder self() -> c
     1:3:com.android.tools.r8.ir.code.Position$SyntheticPosition build():385:387 -> e
-com.android.tools.r8.ir.code.PreviousUntilIterator -> com.android.tools.r8.internal.zK:
+com.android.tools.r8.ir.code.PreviousUntilIterator -> com.android.tools.r8.internal.IK:
     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.cO:
+com.android.tools.r8.ir.code.RecordFieldValues -> com.android.tools.r8.internal.lO:
     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() -> W0
@@ -42331,7 +42507,7 @@
     int opcode() -> j2
     1:1:com.android.tools.r8.graph.DexField[] getFields():33:33 -> m2
     com.android.tools.r8.ir.code.RecordFieldValues asRecordFieldValues() -> v0
-com.android.tools.r8.ir.code.Rem -> com.android.tools.r8.internal.kQ:
+com.android.tools.r8.ir.code.Rem -> com.android.tools.r8.internal.tQ:
     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
@@ -42361,7 +42537,7 @@
     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() -> w0
-com.android.tools.r8.ir.code.Return -> com.android.tools.r8.internal.HR:
+com.android.tools.r8.ir.code.Return -> com.android.tools.r8.internal.RR:
     boolean $assertionsDisabled -> j
     int $r8$clinit -> k
     1:1:void <clinit>():21:21 -> <clinit>
@@ -42387,20 +42563,20 @@
     1:1:boolean isReturnVoid():46:46 -> o2
     1:2:com.android.tools.r8.ir.code.Value returnValue():59:60 -> p2
     com.android.tools.r8.ir.code.Return asReturn() -> x0
-com.android.tools.r8.ir.code.Return$Builder -> com.android.tools.r8.internal.GR:
+com.android.tools.r8.ir.code.Return$Builder -> com.android.tools.r8.internal.QR:
     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.cS:
+com.android.tools.r8.ir.code.SafeCheckCast -> com.android.tools.r8.internal.lS:
     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.bS:
+com.android.tools.r8.ir.code.SafeCheckCast$Builder -> com.android.tools.r8.internal.kS:
     1:1:void <init>():38:38 -> <init>
     1:1:com.android.tools.r8.ir.code.CheckCast build():42:42 -> b
-com.android.tools.r8.ir.code.Shl -> com.android.tools.r8.internal.DS:
+com.android.tools.r8.ir.code.Shl -> com.android.tools.r8.internal.MS:
     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
@@ -42420,7 +42596,7 @@
     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() -> y0
-com.android.tools.r8.ir.code.Shr -> com.android.tools.r8.internal.FS:
+com.android.tools.r8.ir.code.Shr -> com.android.tools.r8.internal.OS:
     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
@@ -42440,9 +42616,9 @@
     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() -> z0
-com.android.tools.r8.ir.code.SingleConstant -> com.android.tools.r8.internal.VS:
+com.android.tools.r8.ir.code.SingleConstant -> com.android.tools.r8.internal.eT:
     int decodedValue() -> a
-com.android.tools.r8.ir.code.StackValue -> com.android.tools.r8.internal.aU:
+com.android.tools.r8.ir.code.StackValue -> com.android.tools.r8.internal.jU:
     int height -> r
     com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo typeInfo -> s
     boolean $assertionsDisabled -> t
@@ -42460,7 +42636,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.bU:
+com.android.tools.r8.ir.code.StackValues -> com.android.tools.r8.internal.kU:
     com.android.tools.r8.ir.code.StackValue[] stackValues -> r
     boolean $assertionsDisabled -> s
     1:1:void <clinit>():14:14 -> <clinit>
@@ -42471,7 +42647,7 @@
     1:1:com.android.tools.r8.ir.code.StackValue[] getStackValues():25:25 -> j0
     1:10:java.lang.String toString():40:49 -> toString
     1:1:com.android.tools.r8.ir.analysis.type.TypeElement getType():59:59 -> w
-com.android.tools.r8.ir.code.StaticGet -> com.android.tools.r8.internal.rU:
+com.android.tools.r8.ir.code.StaticGet -> com.android.tools.r8.internal.AU:
     int $r8$clinit -> l
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():35:35 -> <clinit>
@@ -42526,13 +42702,13 @@
     1:1:com.android.tools.r8.ir.code.Value dest():67:67 -> n2
     1:1:java.lang.String toString():182:182 -> toString
     boolean isFieldGet() -> z1
-com.android.tools.r8.ir.code.StaticGet$Builder -> com.android.tools.r8.internal.qU:
+com.android.tools.r8.ir.code.StaticGet$Builder -> com.android.tools.r8.internal.zU:
     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.tU:
+com.android.tools.r8.ir.code.StaticPut -> com.android.tools.r8.internal.CU:
     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>
@@ -42578,7 +42754,7 @@
     int opcode() -> j2
     1:2:com.android.tools.r8.ir.code.Value value():56:57 -> l
     1:1:java.lang.String toString():189:189 -> toString
-com.android.tools.r8.ir.code.Store -> com.android.tools.r8.internal.vU:
+com.android.tools.r8.ir.code.Store -> com.android.tools.r8.internal.EU:
     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>
@@ -42602,7 +42778,7 @@
     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.VU:
+com.android.tools.r8.ir.code.StringSwitch -> com.android.tools.r8.internal.eV:
     boolean $assertionsDisabled -> n
     com.android.tools.r8.graph.DexString[] keys -> m
     1:1:void <clinit>():17:17 -> <clinit>
@@ -42627,7 +42803,7 @@
     5:5:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.code.StringSwitch.getKey(int):80:80 -> toString
     5:5:java.lang.String toString():89 -> toString
     6:11:java.lang.String toString():89:94 -> toString
-com.android.tools.r8.ir.code.Sub -> com.android.tools.r8.internal.uV:
+com.android.tools.r8.ir.code.Sub -> com.android.tools.r8.internal.DV:
     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>
@@ -42662,7 +42838,7 @@
     boolean isCommutative() -> n2
     1:8:int maxInOutValueRegisterSize():131: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.FV:
+com.android.tools.r8.ir.code.Swap -> com.android.tools.r8.internal.OV:
     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>
@@ -42682,7 +42858,7 @@
     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.GV:
+com.android.tools.r8.ir.code.Switch -> com.android.tools.r8.internal.PV:
     int fallthroughBlockIndex -> k
     boolean $assertionsDisabled -> l
     int[] targetBlockIndices -> j
@@ -42708,7 +42884,7 @@
     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
-com.android.tools.r8.ir.code.Throw -> com.android.tools.r8.internal.kW:
+com.android.tools.r8.ir.code.Throw -> com.android.tools.r8.internal.tW:
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value):20:20 -> <init>
@@ -42730,17 +42906,17 @@
     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.pX:
+com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier -> com.android.tools.r8.internal.yX:
     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.oX:
+com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier$1 -> com.android.tools.r8.internal.xX:
     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.KX:
+com.android.tools.r8.ir.code.UninitializedThisLocalRead -> com.android.tools.r8.internal.TX:
     1:1:void <init>(com.android.tools.r8.ir.code.Value):29:29 -> <init>
     boolean hasInvariantOutType() -> W0
     void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper) -> a
@@ -42754,7 +42930,7 @@
     int maxInValueRegister() -> h2
     int maxOutValueRegister() -> i2
     int opcode() -> j2
-com.android.tools.r8.ir.code.Unop -> com.android.tools.r8.internal.ZX:
+com.android.tools.r8.ir.code.Unop -> com.android.tools.r8.internal.iY:
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):17:17 -> <init>
     boolean hasInvariantOutType() -> W0
     1:2:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):56:57 -> a
@@ -42766,7 +42942,7 @@
     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.Ushr -> com.android.tools.r8.internal.iY:
+com.android.tools.r8.ir.code.Ushr -> com.android.tools.r8.internal.rY:
     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() -> H0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
@@ -42786,7 +42962,7 @@
     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.sY:
+com.android.tools.r8.ir.code.Value -> com.android.tools.r8.internal.BY:
     com.android.tools.r8.ir.regalloc.LiveIntervals liveIntervals -> j
     com.android.tools.r8.ir.analysis.type.TypeElement type -> o
     int needsRegister -> k
@@ -42818,7 +42994,7 @@
     1:1:boolean isConstClass():828:828 -> J
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isConstClass():0:0 -> J
     2:2:boolean isConstClass():828 -> J
-    1:1:boolean isConstNumber():799:799 -> L
+    1:1:boolean isConstNumber():799:799 -> K
     1:1:boolean isConstString():812:812 -> M
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isConstString():0:0 -> M
     2:2:boolean isConstString():812 -> M
@@ -43028,14 +43204,14 @@
     1:11:com.android.tools.r8.utils.LongInterval getValueRange():960:970 -> x
     1:1:boolean hasAliasedValue():204:204 -> y
     1:1:boolean hasAnyUsers():406:406 -> z
-com.android.tools.r8.ir.code.Value$DebugData -> com.android.tools.r8.internal.qY:
+com.android.tools.r8.ir.code.Value$DebugData -> com.android.tools.r8.internal.zY:
     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.tY:
+com.android.tools.r8.ir.code.ValueFactory -> com.android.tools.r8.internal.CY:
     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.AY:
+com.android.tools.r8.ir.code.ValueType -> com.android.tools.r8.internal.JY:
     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
@@ -43045,7 +43221,7 @@
     1:5:void <clinit>():17:21 -> <clinit>
     6:6:void <clinit>():16:16 -> <clinit>
     1:1:void <init>(java.lang.String,int):16:16 -> <init>
-    com.android.tools.r8.utils.structural.StructuralItem self() -> K
+    com.android.tools.r8.utils.structural.StructuralItem self() -> L
     1:1:int compareTo(com.android.tools.r8.utils.structural.StructuralItem):16:16 -> a
     2:2:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):24:24 -> a
     3:3:boolean isObject():38:38 -> a
@@ -43087,14 +43263,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.zY:
+com.android.tools.r8.ir.code.ValueType$1 -> com.android.tools.r8.internal.IY:
     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.CY:
+com.android.tools.r8.ir.code.ValueTypeConstraint -> com.android.tools.r8.internal.LY:
     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
@@ -43143,7 +43319,7 @@
     79:79:com.android.tools.r8.ir.code.ValueTypeConstraint fromTypeLattice(com.android.tools.r8.ir.analysis.type.TypeElement):137:137 -> a
     1:1:int requiredRegisters():42:42 -> b
     1:1:com.android.tools.r8.ir.code.ValueTypeConstraint[] values():13:13 -> c
-com.android.tools.r8.ir.code.ValueTypeConstraint$1 -> com.android.tools.r8.internal.BY:
+com.android.tools.r8.ir.code.ValueTypeConstraint$1 -> com.android.tools.r8.internal.KY:
     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
@@ -43152,9 +43328,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.DZ:
+com.android.tools.r8.ir.code.WideConstant -> com.android.tools.r8.internal.MZ:
     long decodedValue() -> a
-com.android.tools.r8.ir.code.Xor -> com.android.tools.r8.internal.P00:
+com.android.tools.r8.ir.code.Xor -> com.android.tools.r8.internal.Y00:
     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() -> I0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
@@ -43174,7 +43350,7 @@
     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.V2:
+com.android.tools.r8.ir.conversion.ArrayFilledDataPayloadResolver -> com.android.tools.r8.internal.Y2:
     java.util.Map unresolvedPayload -> a
     java.util.Map payloadToData -> b
     boolean $assertionsDisabled -> c
@@ -43186,8 +43362,8 @@
     19:19:void clear():63:63 -> a
     1:1:int getElementWidth(int):51:51 -> b
     1:1:long getSize(int):55:55 -> c
-com.android.tools.r8.ir.conversion.ArrayFilledDataPayloadResolver$1 -> com.android.tools.r8.internal.T2:
-com.android.tools.r8.ir.conversion.ArrayFilledDataPayloadResolver$PayloadData -> com.android.tools.r8.internal.U2:
+com.android.tools.r8.ir.conversion.ArrayFilledDataPayloadResolver$1 -> com.android.tools.r8.internal.W2:
+com.android.tools.r8.ir.conversion.ArrayFilledDataPayloadResolver$PayloadData -> com.android.tools.r8.internal.X2:
     long size -> b
     short[] data -> c
     int element_width -> a
@@ -43479,7 +43655,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     17:19:void processFieldRead(com.android.tools.r8.graph.DexField):274:276 -> i
     1:5:void processFieldWrite(com.android.tools.r8.graph.DexField):282:286 -> j
-com.android.tools.r8.ir.conversion.CallSiteInformation -> com.android.tools.r8.internal.a6:
+com.android.tools.r8.ir.conversion.CallSiteInformation -> com.android.tools.r8.internal.d6:
     1:1:void <init>():17:17 -> <init>
     boolean hasDoubleCallSite(com.android.tools.r8.graph.ProgramMethod) -> a
     boolean hasSingleCallSite(com.android.tools.r8.graph.ProgramMethod) -> b
@@ -43502,7 +43678,7 @@
     1:1:com.android.tools.r8.ir.conversion.CallSiteInformation$EmptyCallSiteInformation access$000():35:35 -> a
     boolean hasSingleCallSite(com.android.tools.r8.graph.ProgramMethod) -> b
     void unsetCallSiteInformation(com.android.tools.r8.graph.ProgramMethod) -> c
-com.android.tools.r8.ir.conversion.CfBuilder -> com.android.tools.r8.internal.p6:
+com.android.tools.r8.ir.conversion.CfBuilder -> com.android.tools.r8.internal.s6:
     com.android.tools.r8.ir.code.Position currentPosition -> h
     java.util.Map newInstanceLabels -> q
     java.util.List thisInitializers -> p
@@ -43703,8 +43879,8 @@
     21:26:void updateLocals(com.android.tools.r8.cf.code.CfLabel):558:563 -> b
     27:27:com.android.tools.r8.cf.code.CfLabel lambda$getLabel$0(com.android.tools.r8.ir.code.BasicBlock):674:674 -> b
     28:28:int getLocalRegister(com.android.tools.r8.ir.code.Value):678:678 -> b
-com.android.tools.r8.ir.conversion.CfBuilder$1 -> com.android.tools.r8.internal.n6:
-com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker -> com.android.tools.r8.internal.o6:
+com.android.tools.r8.ir.conversion.CfBuilder$1 -> com.android.tools.r8.internal.q6:
+com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker -> com.android.tools.r8.internal.r6:
     int height -> b
     boolean $assertionsDisabled -> c
     int maxHeight -> a
@@ -43712,7 +43888,7 @@
     1:3:void <init>():106:108 -> <init>
     4:4:void <init>(com.android.tools.r8.ir.conversion.CfBuilder$1):106:106 -> <init>
     1:3:void push(com.android.tools.r8.ir.code.Value):115:117 -> a
-com.android.tools.r8.ir.conversion.CfSourceCode -> com.android.tools.r8.internal.j8:
+com.android.tools.r8.ir.conversion.CfSourceCode -> com.android.tools.r8.internal.l8:
     int currentInstructionIndex -> o
     com.android.tools.r8.graph.CfCode code -> h
     com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo currentBlockInfo -> a
@@ -43743,7 +43919,7 @@
     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():471:471 -> a
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> 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
@@ -43967,16 +44143,16 @@
     393:394:int[] getTargets(int):363:364 -> i
     399:399:boolean localsChanged():776:776 -> i
     1:10:void setLocalVariableLists():763:772 -> j
-com.android.tools.r8.ir.conversion.CfSourceCode$1 -> com.android.tools.r8.internal.g8:
+com.android.tools.r8.ir.conversion.CfSourceCode$1 -> com.android.tools.r8.internal.i8:
     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.h8:
+com.android.tools.r8.ir.conversion.CfSourceCode$LocalVariableList -> com.android.tools.r8.internal.j8:
     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.i8:
+com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList -> com.android.tools.r8.internal.k8:
     java.util.List guards -> c
     boolean $assertionsDisabled -> e
     int endOffset -> b
@@ -43985,13 +44161,13 @@
     1:1:void <clinit>():70:70 -> <clinit>
     1:5:void <init>(int,int,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):77:81 -> <init>
     1:2:boolean isEmpty():89:90 -> a
-com.android.tools.r8.ir.conversion.CfSourceUtils -> com.android.tools.r8.internal.k8:
+com.android.tools.r8.ir.conversion.CfSourceUtils -> com.android.tools.r8.internal.m8:
     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.x8:
+com.android.tools.r8.ir.conversion.CfState -> com.android.tools.r8.internal.z8:
     com.android.tools.r8.ir.conversion.CfState$Snapshot current -> a
     com.android.tools.r8.ir.code.Position position -> b
     boolean $assertionsDisabled -> c
@@ -44028,8 +44204,8 @@
     1:1:com.android.tools.r8.ir.conversion.CfState$Slot peek(int):205:205 -> d
     1:2:com.android.tools.r8.ir.conversion.CfState$Slot pop():187:188 -> e
     1:1:java.lang.String toString():236:236 -> toString
-com.android.tools.r8.ir.conversion.CfState$1 -> com.android.tools.r8.internal.n8:
-com.android.tools.r8.ir.conversion.CfState$BaseSnapshot -> com.android.tools.r8.internal.o8:
+com.android.tools.r8.ir.conversion.CfState$1 -> com.android.tools.r8.internal.p8:
+com.android.tools.r8.ir.conversion.CfState$BaseSnapshot -> com.android.tools.r8.internal.q8:
     com.android.tools.r8.ir.conversion.CfState$SlotType[] locals -> c
     com.android.tools.r8.ir.conversion.CfState$SlotType[] stack -> d
     boolean $assertionsDisabled -> e
@@ -44057,7 +44233,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.p8:
+com.android.tools.r8.ir.conversion.CfState$Pop -> com.android.tools.r8.internal.r8:
     int stackHeight -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():476:476 -> <clinit>
@@ -44066,7 +44242,7 @@
     1:1:com.android.tools.r8.ir.conversion.CfState$Slot peek():499:499 -> c
     1:1:int stackHeight():488:488 -> d
     1:1:java.lang.String toString():504:504 -> toString
-com.android.tools.r8.ir.conversion.CfState$Push -> com.android.tools.r8.internal.q8:
+com.android.tools.r8.ir.conversion.CfState$Push -> com.android.tools.r8.internal.s8:
     com.android.tools.r8.ir.conversion.CfState$Slot slot -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():437:437 -> <clinit>
@@ -44093,7 +44269,7 @@
     2:2:int com.android.tools.r8.ir.conversion.CfState$Slot.access$500(com.android.tools.r8.ir.conversion.CfState$Slot):239 -> d
     2:2:int stackHeight():449 -> d
     1:1:java.lang.String toString():472:472 -> toString
-com.android.tools.r8.ir.conversion.CfState$Slot -> com.android.tools.r8.internal.r8:
+com.android.tools.r8.ir.conversion.CfState$Slot -> com.android.tools.r8.internal.t8:
     com.android.tools.r8.ir.conversion.CfState$SlotType slotType -> d
     com.android.tools.r8.ir.code.ValueType type -> b
     boolean $assertionsDisabled -> e
@@ -44116,12 +44292,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.u8:
+com.android.tools.r8.ir.conversion.CfState$SlotType -> com.android.tools.r8.internal.w8:
     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.s8:
+com.android.tools.r8.ir.conversion.CfState$SlotType$Imprecise -> com.android.tools.r8.internal.u8:
     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
@@ -44132,7 +44308,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.t8:
+com.android.tools.r8.ir.conversion.CfState$SlotType$Precise -> com.android.tools.r8.internal.v8:
     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
@@ -44143,7 +44319,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.v8:
+com.android.tools.r8.ir.conversion.CfState$Snapshot -> com.android.tools.r8.internal.x8:
     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>
@@ -44157,7 +44333,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.w8:
+com.android.tools.r8.ir.conversion.CfState$Write -> com.android.tools.r8.internal.y8:
     com.android.tools.r8.ir.conversion.CfState$Slot slot -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():508:508 -> <clinit>
@@ -44193,13 +44369,13 @@
     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.w9:
+com.android.tools.r8.ir.conversion.ClassConverterResult -> com.android.tools.r8.internal.y9:
     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.u9:
-com.android.tools.r8.ir.conversion.ClassConverterResult$Builder -> com.android.tools.r8.internal.v9:
+com.android.tools.r8.ir.conversion.ClassConverterResult$1 -> com.android.tools.r8.internal.w9:
+com.android.tools.r8.ir.conversion.ClassConverterResult$Builder -> com.android.tools.r8.internal.x9:
     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
@@ -44223,14 +44399,14 @@
     13:18:void processMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):148:148 -> a
     boolean isProcessedConcurrently(com.android.tools.r8.graph.ProgramMethod) -> b
     1:2:void scheduleMethodForProcessing(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer):78:79 -> b
-    3:3:boolean com.android.tools.r8.synthesis.SyntheticItems.isNonLegacySynthetic(com.android.tools.r8.graph.DexProgramClass):225:225 -> b
+    3:3:boolean com.android.tools.r8.synthesis.SyntheticItems.isNonLegacySynthetic(com.android.tools.r8.graph.DexProgramClass):226:226 -> b
     3:3:void scheduleMethodForProcessing(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer):79 -> b
     4:4:void scheduleMethodForProcessing(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer):83:83 -> b
     5:5:java.util.concurrent.Future com.android.tools.r8.utils.ThreadUtils.processAsynchronously(java.util.concurrent.Callable,java.util.concurrent.ExecutorService):34:34 -> b
     5:5:void scheduleMethodForProcessing(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer):84 -> b
     6:6:void scheduleMethodForProcessing(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer):83:83 -> b
     1:2:void scheduleDesugaredMethodForProcessing(com.android.tools.r8.graph.ProgramMethod):99:100 -> c
-    3:3:boolean com.android.tools.r8.synthesis.SyntheticItems.isNonLegacySynthetic(com.android.tools.r8.graph.DexProgramClass):225:225 -> c
+    3:3:boolean com.android.tools.r8.synthesis.SyntheticItems.isNonLegacySynthetic(com.android.tools.r8.graph.DexProgramClass):226:226 -> c
     3:3:void scheduleDesugaredMethodForProcessing(com.android.tools.r8.graph.ProgramMethod):100 -> c
     4:7:void scheduleDesugaredMethodForProcessing(com.android.tools.r8.graph.ProgramMethod):104:107 -> c
     8:8:java.util.concurrent.Future com.android.tools.r8.utils.ThreadUtils.processAsynchronously(java.util.concurrent.Callable,java.util.concurrent.ExecutorService):34:34 -> c
@@ -44242,7 +44418,7 @@
     1:1:void newWave():55:55 -> d
     1:6:com.android.tools.r8.utils.Timing lambda$scheduleDesugaredMethodForProcessing$1(com.android.tools.r8.graph.ProgramMethod):110:110 -> e
     7:8:boolean verifyNoPendingMethodProcessing():156:157 -> e
-com.android.tools.r8.ir.conversion.DexBuilder -> com.android.tools.r8.internal.qf:
+com.android.tools.r8.ir.conversion.DexBuilder -> com.android.tools.r8.internal.pf:
     boolean hasBackwardsBranch -> n
     int inRegisterCount -> l
     int outRegisterCount -> m
@@ -44378,10 +44554,10 @@
     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.ff:
+com.android.tools.r8.ir.conversion.DexBuilder$1 -> com.android.tools.r8.internal.ef:
     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.gf:
+com.android.tools.r8.ir.conversion.DexBuilder$FallThroughInfo -> com.android.tools.r8.internal.ff:
     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
@@ -44389,11 +44565,11 @@
     int getSize() -> d
     int maxSize() -> e
     int minSize() -> f
-com.android.tools.r8.ir.conversion.DexBuilder$FillArrayDataInfo -> com.android.tools.r8.internal.hf:
+com.android.tools.r8.ir.conversion.DexBuilder$FillArrayDataInfo -> com.android.tools.r8.internal.gf:
     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.if:
+com.android.tools.r8.ir.conversion.DexBuilder$FixedSizeInfo -> com.android.tools.r8.internal.hf:
     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
@@ -44402,7 +44578,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.jf:
+com.android.tools.r8.ir.conversion.DexBuilder$GotoInfo -> com.android.tools.r8.internal.if:
     boolean $assertionsDisabled -> f
     int size -> e
     1:1:void <clinit>():1095:1095 -> <clinit>
@@ -44427,7 +44603,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.kf:
+com.android.tools.r8.ir.conversion.DexBuilder$IfInfo -> com.android.tools.r8.internal.jf:
     boolean $assertionsDisabled -> f
     int size -> e
     1:1:void <clinit>():1226:1226 -> <clinit>
@@ -44545,7 +44721,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.lf:
+com.android.tools.r8.ir.conversion.DexBuilder$Info -> com.android.tools.r8.internal.kf:
     com.android.tools.r8.ir.code.Instruction ir -> a
     int offset -> b
     int maxOffset -> c
@@ -44565,7 +44741,7 @@
     int getSize() -> d
     int maxSize() -> e
     int minSize() -> f
-com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo -> com.android.tools.r8.internal.mf:
+com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo -> com.android.tools.r8.internal.lf:
     boolean $assertionsDisabled -> f
     int size -> e
     1:1:void <clinit>():1375:1375 -> <clinit>
@@ -44636,7 +44812,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.nf:
+com.android.tools.r8.ir.conversion.DexBuilder$MultiFixedSizeInfo -> com.android.tools.r8.internal.mf:
     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>
@@ -44646,18 +44822,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.of:
+com.android.tools.r8.ir.conversion.DexBuilder$SwitchPayloadInfo -> com.android.tools.r8.internal.nf:
     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.pf:
+com.android.tools.r8.ir.conversion.DexBuilder$TryItem -> com.android.tools.r8.internal.of:
     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.eg:
+com.android.tools.r8.ir.conversion.DexSourceCode -> com.android.tools.r8.internal.dg:
     boolean $assertionsDisabled -> n
     com.android.tools.r8.ir.code.Position currentPosition -> j
     com.android.tools.r8.graph.DexMethod originalMethod -> m
@@ -45016,12 +45192,12 @@
     535:535:boolean com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo.isConcreteCallSiteOptimizationInfo():0:0 -> a
     535:535:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):758 -> a
     536:541:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):758:763 -> a
-    542:542:boolean com.android.tools.r8.graph.AppView.hasLiveness():657:657 -> a
+    542:542:boolean com.android.tools.r8.graph.AppView.hasLiveness():659:659 -> a
     542:542:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):763 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     543:547:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):764:764 -> a
     554:554:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):771:771 -> a
-    555:555:boolean com.android.tools.r8.utils.InternalOptions.isStringSwitchConversionEnabled():1896:1896 -> a
+    555:555:boolean com.android.tools.r8.utils.InternalOptions.isStringSwitchConversionEnabled():1902:1902 -> a
     555:555:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):771 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     556:556:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):772:772 -> a
@@ -45358,7 +45534,7 @@
     84:94:void addTrivialIf(int,int):1454:1464 -> b
     95:98:void addInstancePut(int,int,com.android.tools.r8.graph.DexField):1552:1555 -> b
     99:99:void addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1718:1718 -> b
-    100:100:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():471:471 -> b
+    100:100:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> b
     100:100:void addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1718 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     101:107:void addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1718:1724 -> b
@@ -45745,306 +45921,306 @@
     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>():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):185:185 -> <init>
-    2:151:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):167:316 -> <init>
-    152:152:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing):321:321 -> <init>
+    1:1:void <clinit>():125:125 -> <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:150:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):166:314 -> <init>
+    151:151:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing):319:319 -> <init>
     boolean lambda$materializeInstructionBeforeLongOperationsWorkaround$27(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":208,"2":209,"3":210}}
-    208:208:java.lang.String lambda$new$0(java.lang.String):204:204 -> a
-    209:209:java.lang.String lambda$new$0(java.lang.String):204:204 -> a
-    210:210:java.lang.String lambda$new$0(java.lang.String):204:204 -> a
-    205:205:java.lang.String lambda$new$0(java.lang.String):204:204 -> a
-    206:206:java.lang.String com.android.tools.r8.utils.DescriptorUtils.getPackageBinaryNameFromJavaType(java.lang.String):380:380 -> a
-    206:206:java.lang.String lambda$new$0(java.lang.String):204 -> a
-    207:207:java.lang.String lambda$new$0(java.lang.String):204:204 -> a
-    211:212:void com.android.tools.r8.ir.desugar.lambda.LambdaDeserializationMethodRemover.run(com.android.tools.r8.graph.AppView):17:18 -> a
-    211:212:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):367 -> a
-    213:237:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):368:392 -> a
-    238:238:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():436:436 -> a
-    238:238:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):392 -> 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):365 -> a
+    212:236:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):366:390 -> a
+    237:237:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():438:438 -> a
+    237:237:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):390 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    239:239:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):393:393 -> a
-    240:241:void processCovariantReturnTypeAnnotations(com.android.tools.r8.graph.DexApplication$Builder):360:361 -> a
-    240:241:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):395 -> a
-    242:248:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):397:403 -> a
-    249:249:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):400:400 -> a
-    250:254:void synthesizeBridgesForNestBasedAccessesOnClasspath(com.android.tools.r8.ir.conversion.D8MethodProcessor,java.util.concurrent.ExecutorService):335:339 -> a
-    255:255:void lambda$synthesizeBridgesForNestBasedAccessesOnClasspath$1(com.android.tools.r8.ir.conversion.D8MethodProcessor,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.desugar.nest.D8NestBasedAccessDesugaring):337:337 -> a
-    256:260:com.android.tools.r8.graph.DexApplication commitPendingSyntheticItemsD8(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):408:412 -> a
-    261:265:com.android.tools.r8.graph.DexApplication commitPendingSyntheticItemsD8(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):409:413 -> a
-    266:270:void commitPendingSyntheticItemsR8(com.android.tools.r8.graph.AppView):419:423 -> a
-    271:271:void commitPendingSyntheticItemsR8(com.android.tools.r8.graph.AppView):420:420 -> a
-    272:274:void classSynthesisDesugaring(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):431:431 -> a
-    276:276:void classSynthesisDesugaring(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):433:433 -> a
-    277:277:void convertClasses(com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor,java.util.concurrent.ExecutorService):460:460 -> a
-    278:281: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
-    278:281:void convertClasses(com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor,java.util.concurrent.ExecutorService):461 -> a
-    282:292:void convertClasses(com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor,java.util.concurrent.ExecutorService):462:472 -> a
-    293:301:void com.android.tools.r8.ir.desugar.lambda.D8LambdaDesugaring.rewriteEnclosingLambdaMethodAttributes(com.android.tools.r8.graph.AppView,java.util.Map):17:25 -> a
-    293:301:void convertClasses(com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor,java.util.concurrent.ExecutorService):471 -> a
-    302:302:void convertClasses(com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor,java.util.concurrent.ExecutorService):474:474 -> a
-    303:305:void prepareDesugaringForD8(java.util.concurrent.ExecutorService):480:482 -> a
-    306:314:void prepareDesugaringForD8(java.util.concurrent.ExecutorService):481:489 -> a
-    315:315:void lambda$prepareDesugaringForD8$5(com.android.tools.r8.ir.desugar.ProgramAdditions,com.android.tools.r8.graph.DexProgramClass):484:484 -> a
-    316:316:void lambda$prepareDesugaringForD8$4(com.android.tools.r8.ir.desugar.ProgramAdditions,com.android.tools.r8.graph.ProgramMethod):486:486 -> a
-    317:350: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):497:530 -> a
-    351: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):529:529 -> a
-    352:355:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):539:542 -> a
-    356: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):541:547 -> a
-    363:367:void checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):582:586 -> 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):550 -> a
-    368:368:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):444:444 -> a
-    368:368:void checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):586 -> 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):550 -> a
-    369:389:void checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):587:607 -> a
-    369:389: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
-    390:390:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    390:390:void checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):607 -> a
-    390:390: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
-    391:391:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    391:391:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    391:391:void checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):607 -> a
-    391:391: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
-    392:392:void checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):607:607 -> a
-    392:392: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
-    393:393: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
-    394:394:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():471:471 -> a
-    394:394: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
+    238:238:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):391:391 -> a
+    239:240:void processCovariantReturnTypeAnnotations(com.android.tools.r8.graph.DexApplication$Builder):358:359 -> a
+    239:240:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):393 -> a
+    241:247:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):395:401 -> a
+    248:248:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):398:398 -> a
+    249:253:void synthesizeBridgesForNestBasedAccessesOnClasspath(com.android.tools.r8.ir.conversion.D8MethodProcessor,java.util.concurrent.ExecutorService):333:337 -> a
+    254:254:void lambda$synthesizeBridgesForNestBasedAccessesOnClasspath$1(com.android.tools.r8.ir.conversion.D8MethodProcessor,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.desugar.nest.D8NestBasedAccessDesugaring):335:335 -> a
+    255:259:com.android.tools.r8.graph.DexApplication commitPendingSyntheticItemsD8(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):406:410 -> a
+    260:264:com.android.tools.r8.graph.DexApplication commitPendingSyntheticItemsD8(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):407:411 -> a
+    265:269:void commitPendingSyntheticItemsR8(com.android.tools.r8.graph.AppView):417:421 -> a
+    270:270:void commitPendingSyntheticItemsR8(com.android.tools.r8.graph.AppView):418:418 -> a
+    271:273:void classSynthesisDesugaring(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):429:429 -> a
+    275:275:void classSynthesisDesugaring(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):431:431 -> a
+    276:276:void convertClasses(com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor,java.util.concurrent.ExecutorService):458:458 -> 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):459 -> a
+    281:291:void convertClasses(com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor,java.util.concurrent.ExecutorService):460:470 -> 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):469 -> a
+    301:301:void convertClasses(com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor,java.util.concurrent.ExecutorService):472:472 -> a
+    302:304:void prepareDesugaringForD8(java.util.concurrent.ExecutorService):478:480 -> a
+    305:313:void prepareDesugaringForD8(java.util.concurrent.ExecutorService):479:487 -> a
+    314:314:void lambda$prepareDesugaringForD8$5(com.android.tools.r8.ir.desugar.ProgramAdditions,com.android.tools.r8.graph.DexProgramClass):482:482 -> a
+    315:315:void lambda$prepareDesugaringForD8$4(com.android.tools.r8.ir.desugar.ProgramAdditions,com.android.tools.r8.graph.ProgramMethod):484:484 -> a
+    316:349: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):495:528 -> a
+    350:350: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):527:527 -> a
+    351:354: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:540 -> a
+    355:361:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):539:545 -> a
+    362:366:void checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):580:584 -> a
+    362:366: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):548 -> a
+    367:367:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):444:444 -> a
+    367:367:void checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):584 -> a
+    367: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):548 -> a
+    368:388:void checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):585:605 -> a
+    368:388: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):548 -> a
+    389:389:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    389:389:void checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):605 -> a
+    389:389: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):548 -> a
+    390:390:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    390:390:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    390:390:void checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):605 -> a
+    390:390: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):548 -> a
+    391:391:void checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):605:605 -> a
+    391:391: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):548 -> a
+    392:392: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):549:549 -> a
+    393:393:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> a
+    393:393: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):549 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    395: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:561 -> a
-    406: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):554:563 -> a
-    416:416:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():471:471 -> a
-    416:416: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):563 -> a
+    394: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):549:559 -> a
+    405:414:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):552:561 -> a
+    415:415:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> a
+    415:415:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):561 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    417:417:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):564:564 -> a
-    418:418:void lambda$optimize$8(java.util.concurrent.ExecutorService,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagator):652:652 -> a
-    419:419: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):677:677 -> a
-    420:420:void lambda$optimize$11(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagator):711:711 -> a
-    421:421:void lambda$optimize$12(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,com.android.tools.r8.ir.optimize.Inliner):719:719 -> a
-    422:422:void lambda$optimize$13(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer):734:734 -> a
-    423:423:com.android.tools.r8.utils.Timing lambda$optimize$14(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):749:749 -> a
-    424:424:void waveStart(com.android.tools.r8.utils.collections.ProgramMethodSet):826:826 -> a
-    425:431:void addWaveDoneAction(com.android.tools.r8.utils.Action):854:860 -> a
-    432:432:void addWaveDoneAction(com.android.tools.r8.utils.Action):858:858 -> a
-    433:433:void addWaveDoneAction(com.android.tools.r8.utils.Action):855:855 -> a
-    434:435:void computeReachabilitySensitivity(com.android.tools.r8.graph.DexApplication):869:870 -> a
-    436:436:void lambda$computeReachabilitySensitivity$15(com.android.tools.r8.graph.DexEncodedMethod):874:874 -> a
-    437:440:void forEachSynthesizedServiceLoaderMethod(com.android.tools.r8.graph.ProgramMethod):887:890 -> a
-    441:441:void clearDexMethodCompilationState():894:894 -> a
-    442:442:void clearDexMethodCompilationState(com.android.tools.r8.graph.DexProgramClass):898:898 -> a
-    443:452:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):911:920 -> a
-    453:458:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):919:924 -> a
-    459:459:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):923:923 -> a
-    460:461:void optimizeSynthesizedMethods(java.util.List,java.util.concurrent.ExecutorService):932:933 -> a
-    462:462:void lambda$optimizeSynthesizedMethod$17(com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):943:943 -> a
-    463:465:void processMethodsConcurrently(com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.concurrent.ExecutorService):950:952 -> a
-    466:466:java.lang.String logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):961:961 -> a
-    467:467:com.android.tools.r8.utils.Timing lambda$rewriteDesugaredCode$20(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):1017:1017 -> a
-    468:473:boolean desugar(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1076:1081 -> a
-    468:473:com.android.tools.r8.utils.Timing 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):1027 -> a
-    468:473:com.android.tools.r8.utils.Timing lambda$rewriteNonDesugaredCode$19(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
-    474:479:com.android.tools.r8.utils.Timing rewriteNonDesugaredCodeInternal(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1028:1033 -> a
-    474:479:com.android.tools.r8.utils.Timing lambda$rewriteNonDesugaredCode$19(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
-    480:486:com.android.tools.r8.utils.Timing rewriteNonDesugaredCodeInternal(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1029:1035 -> a
-    480:486:com.android.tools.r8.utils.Timing lambda$rewriteNonDesugaredCode$19(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
-    487:497:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1093:1103 -> a
-    498:503:void printC1VisualizerHeader(com.android.tools.r8.graph.DexEncodedMethod):1895:1900 -> a
-    498:503:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1106 -> a
-    504:529:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.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:1132 -> a
-    530:530:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.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
+    416:416: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):562:562 -> a
+    417:417:void lambda$optimize$8(java.util.concurrent.ExecutorService,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagator):650:650 -> a
+    418:418: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):675:675 -> a
+    419:419:void lambda$optimize$11(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagator):709:709 -> a
+    420:420:void lambda$optimize$12(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,com.android.tools.r8.ir.optimize.Inliner):717:717 -> a
+    421:421:void lambda$optimize$13(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer):732:732 -> a
+    422:422:com.android.tools.r8.utils.Timing lambda$optimize$14(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):747:747 -> a
+    423:423:void waveStart(com.android.tools.r8.utils.collections.ProgramMethodSet):824:824 -> a
+    424:430:void addWaveDoneAction(com.android.tools.r8.utils.Action):852:858 -> a
+    431:431:void addWaveDoneAction(com.android.tools.r8.utils.Action):856:856 -> a
+    432:432:void addWaveDoneAction(com.android.tools.r8.utils.Action):853:853 -> a
+    433:434:void computeReachabilitySensitivity(com.android.tools.r8.graph.DexApplication):867:868 -> a
+    435:435:void lambda$computeReachabilitySensitivity$15(com.android.tools.r8.graph.DexEncodedMethod):872:872 -> a
+    436:439:void forEachSynthesizedServiceLoaderMethod(com.android.tools.r8.graph.ProgramMethod):885:888 -> a
+    440:440:void clearDexMethodCompilationState():892:892 -> a
+    441:441:void clearDexMethodCompilationState(com.android.tools.r8.graph.DexProgramClass):896:896 -> a
+    442:451:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):909:918 -> a
+    452:457:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):917:922 -> a
+    458:458:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):921:921 -> a
+    459:460:void optimizeSynthesizedMethods(java.util.List,java.util.concurrent.ExecutorService):930:931 -> a
+    461:461:void lambda$optimizeSynthesizedMethod$17(com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):941:941 -> a
+    462:464:void processMethodsConcurrently(com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.concurrent.ExecutorService):948:950 -> a
+    465:465:java.lang.String logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):959:959 -> a
+    466:466:com.android.tools.r8.utils.Timing lambda$rewriteDesugaredCode$20(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1015:1015 -> a
+    467:472:boolean desugar(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1074:1079 -> a
+    467:472:com.android.tools.r8.utils.Timing 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):1025 -> a
+    467:472:com.android.tools.r8.utils.Timing lambda$rewriteNonDesugaredCode$19(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):998 -> a
+    473:478:com.android.tools.r8.utils.Timing rewriteNonDesugaredCodeInternal(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1026:1031 -> a
+    473:478:com.android.tools.r8.utils.Timing lambda$rewriteNonDesugaredCode$19(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):998 -> a
+    479:485:com.android.tools.r8.utils.Timing 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):1027:1033 -> a
+    479:485:com.android.tools.r8.utils.Timing lambda$rewriteNonDesugaredCode$19(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):998 -> a
+    486:496:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1091:1101 -> a
+    497:502:void printC1VisualizerHeader(com.android.tools.r8.graph.DexEncodedMethod):1893:1898 -> a
+    497:502:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1104 -> a
+    503:528:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.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:1130 -> a
+    529:529:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.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":4357,"2":4358,"3":4359}}
+    4357:4357:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1130:1130 -> a
+    4358:4358:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1130:1130 -> a
+    4359:4359:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1130:1130 -> a
+    1661:1666:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1132:1137 -> a
+    1667:1667:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.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:1135 -> a
+    1668:1668:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.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":4364,"2":4365,"3":4366}}
-    4364:4364:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1132:1132 -> a
-    4365:4365:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1132:1132 -> a
-    4366:4366:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1132:1132 -> a
-    1664:1669:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1134:1139 -> a
-    1670:1670:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1137:1137 -> a
-    1671:1671:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.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":4371,"2":4372,"3":4373}}
-    4371:4371:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1137:1137 -> a
-    4372:4372:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1137:1137 -> a
-    4373:4373:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1137:1137 -> a
-    2811:2816:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1140:1145 -> a
-    2817:2817:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.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":4381,"2":4382,"3":4383}}
-    4381:4381:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1145:1145 -> a
-    4382:4382:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1145:1145 -> a
-    4383:4383:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1145:1145 -> a
-    3965:3977:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1148:1160 -> a
-    3978:3982:boolean shouldPassThrough(com.android.tools.r8.graph.ProgramMethod):1511:1515 -> a
-    3978:3982:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1162 -> a
-    3983:3983:boolean com.android.tools.r8.graph.Code.isThrowNullCode():0:0 -> a
-    3983:3983:boolean shouldPassThrough(com.android.tools.r8.graph.ProgramMethod):1515 -> a
-    3983:3983:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1162 -> a
-    3984:3985:boolean shouldPassThrough(com.android.tools.r8.graph.ProgramMethod):1515:1516 -> a
-    3984:3985:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1162 -> a
-    3986:3986:boolean com.android.tools.r8.graph.Code.isDefaultInstanceInitializerCode():0:0 -> a
-    3986:3986:boolean shouldPassThrough(com.android.tools.r8.graph.ProgramMethod):1516 -> a
-    3986:3986:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1162 -> a
-    3987:3996:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.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:1173 -> a
-    3997:4022:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1166:1191 -> a
-    4023:4023:void com.android.tools.r8.naming.IdentifierNameStringMarker.decoupleIdentifierNameStringsInMethod(com.android.tools.r8.ir.code.IRCode):94:94 -> a
-    4023:4023:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.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
+    4364:4364:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.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:1135 -> a
+    4365:4365:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.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:1135 -> a
+    4366:4366:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.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:1135 -> a
+    2806:2811:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1138:1143 -> a
+    2812:2812:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.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":4374,"2":4375,"3":4376}}
+    4374:4374:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1143:1143 -> a
+    4375:4375:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1143:1143 -> a
+    4376:4376:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1143:1143 -> a
+    3958:3970:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1146:1158 -> a
+    3971:3975:boolean shouldPassThrough(com.android.tools.r8.graph.ProgramMethod):1509:1513 -> a
+    3971:3975:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1160 -> a
+    3976:3976:boolean com.android.tools.r8.graph.Code.isThrowNullCode():0:0 -> a
+    3976:3976:boolean shouldPassThrough(com.android.tools.r8.graph.ProgramMethod):1513 -> a
+    3976:3976:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1160 -> a
+    3977:3978:boolean shouldPassThrough(com.android.tools.r8.graph.ProgramMethod):1513:1514 -> a
+    3977:3978:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1160 -> a
+    3979:3979:boolean com.android.tools.r8.graph.Code.isDefaultInstanceInitializerCode():0:0 -> a
+    3979:3979:boolean shouldPassThrough(com.android.tools.r8.graph.ProgramMethod):1514 -> a
+    3979:3979:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1160 -> a
+    3980: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):1162:1171 -> a
+    3990:4015:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.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:1189 -> a
+    4016:4016:void com.android.tools.r8.naming.IdentifierNameStringMarker.decoupleIdentifierNameStringsInMethod(com.android.tools.r8.ir.code.IRCode):94:94 -> a
+    4016:4016:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1189 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4024:4061:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.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:1229 -> a
-    4062:4062: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):877:877 -> a
-    4062:4062:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1229 -> a
+    4017:4054:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1190:1227 -> a
+    4055:4055: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):877:877 -> a
+    4055:4055:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1227 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4063:4063: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):871:871 -> a
-    4063:4063:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1229 -> a
+    4056:4056: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):871:871 -> a
+    4056:4056:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1227 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4064:4169:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1230:1335 -> a
-    4170:4171:boolean com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.shouldRun(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):88:89 -> a
-    4170:4171:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1335 -> a
-    4172:4177:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1336:1341 -> a
-    4178:4180:void invertConditionalsForTesting(com.android.tools.r8.ir.code.IRCode):983:985 -> a
-    4178:4180:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1342 -> a
-    4181:4195:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.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:1360 -> a
-    4196:4227:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1359:1390 -> a
-    4228:4275:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1379:1426 -> a
-    4276:4276:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():471:471 -> a
-    4276:4276:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1426 -> a
+    4057:4162:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1228:1333 -> a
+    4163:4164:boolean com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.shouldRun(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):88:89 -> a
+    4163:4164:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.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 -> a
+    4165:4170:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1334:1339 -> a
+    4171:4173:void invertConditionalsForTesting(com.android.tools.r8.ir.code.IRCode):981:983 -> a
+    4171:4173:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1340 -> a
+    4174:4188:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1344:1358 -> a
+    4189:4220:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.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:1388 -> a
+    4221:4268:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1377:1424 -> a
+    4269:4269:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> a
+    4269:4269:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1424 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4277:4299:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1427:1449 -> a
-    4300:4305:boolean com.android.tools.r8.utils.InternalOptions.methodMatchesLogArgumentsFilter(com.android.tools.r8.graph.DexEncodedMethod):1184:1189 -> a
-    4300:4305:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1449 -> a
+    4270:4292:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1425:1447 -> a
+    4293:4298:boolean com.android.tools.r8.utils.InternalOptions.methodMatchesLogArgumentsFilter(com.android.tools.r8.graph.DexEncodedMethod):1183:1188 -> a
+    4293:4298:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.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)"]}
-    4306: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):1449:1506 -> a
-    4384:4384:void lambda$optimize$21(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):1218:1218 -> a
-    4385:4385:void lambda$optimize$22(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):1222:1222 -> a
-    4386:4388:com.android.tools.r8.ir.optimize.InliningOracle lambda$optimize$23(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):1392:1392 -> a
-    4389:4430: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):1530:1571 -> a
-    4431:4431:boolean com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.enableRemoveProtoEnumSwitchMap():1567:1567 -> a
-    4431:4431: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):1571 -> a
+    4299:4356:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.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:1504 -> a
+    4377:4377:void lambda$optimize$21(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):1216:1216 -> a
+    4378:4378:void lambda$optimize$22(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):1220:1220 -> a
+    4379:4381:com.android.tools.r8.ir.optimize.InliningOracle lambda$optimize$23(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):1390:1390 -> a
+    4382:4423: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):1528:1569 -> a
+    4424:4424:boolean com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.enableRemoveProtoEnumSwitchMap():1566:1566 -> a
+    4424:4424: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):1569 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4432:4437: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):1572:1577 -> a
-    4438:4438:void lambda$collectOptimizationInfo$24(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):1531:1531 -> a
-    4439:4447:void removeDeadCodeAndFinalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1589:1597 -> a
-    4448:4448:void removeDeadCodeAndFinalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1593:1593 -> a
-    4449: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):1607:1608 -> a
-    4451:4451:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():471:471 -> a
-    4451:4451: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):1608 -> a
+    4425:4430: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):1570:1575 -> a
+    4431:4431:void lambda$collectOptimizationInfo$24(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):1529:1529 -> a
+    4432:4440:void removeDeadCodeAndFinalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1587:1595 -> a
+    4441:4441:void removeDeadCodeAndFinalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1591:1591 -> a
+    4442: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):1605:1606 -> a
+    4444:4444:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> a
+    4444:4444: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):1606 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4452:4457:void finalizeToCf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodConversionOptions):1618:1623 -> a
-    4452:4457: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):1609 -> a
-    4458:4458: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):1611:1611 -> a
-    4459:4473:void 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:1646 -> a
-    4459:4473: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):1612 -> a
-    4474:4480:void 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):1645:1651 -> a
-    4474:4480: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):1612 -> a
-    4481:4481:void markProcessed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1656:1656 -> a
-    4482:4490:boolean shouldComputeInliningConstraint(com.android.tools.r8.graph.ProgramMethod):1665:1673 -> a
-    4482:4490:void markProcessed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1658 -> a
-    4491:4491:boolean com.android.tools.r8.shaking.KeepMethodInfo.isInliningAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):58:58 -> a
-    4491:4491:boolean shouldComputeInliningConstraint(com.android.tools.r8.graph.ProgramMethod):1673 -> a
-    4491:4491:void markProcessed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1658 -> a
-    4492:4494:void markProcessed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1659:1661 -> a
-    4495:4503: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):1698:1706 -> a
-    4504:4516:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3917:3929 -> a
-    4504:4516: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):1706 -> a
-    4517:4517:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1598:1598 -> a
-    4517:4517:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3930 -> a
-    4517:4517: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):1706 -> a
-    4518:4519:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3930:3931 -> a
-    4518:4519: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):1706 -> a
-    4520:4535: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):1708:1723 -> a
-    4536:4536: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):1722:1722 -> a
-    4537:4551:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1780:1794 -> a
-    4552:4552:boolean com.android.tools.r8.ir.code.Instruction.isMul():0:0 -> a
-    4552:4552:boolean isLongMul(com.android.tools.r8.ir.code.Instruction):1840 -> a
-    4552:4552:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1795 -> a
-    4553:4554:boolean isLongMul(com.android.tools.r8.ir.code.Instruction):1841:1842 -> a
-    4553:4554:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1795 -> a
-    4555:4555:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1798:1798 -> a
-    4556:4556:boolean isLongAddOrSub(com.android.tools.r8.ir.code.Instruction):1847:1847 -> a
-    4556:4556:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1799 -> a
-    4557:4557:boolean com.android.tools.r8.ir.code.Instruction.isSub():0:0 -> a
-    4557:4557:boolean isLongAddOrSub(com.android.tools.r8.ir.code.Instruction):1847 -> a
-    4557:4557:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1799 -> a
-    4558:4558:boolean isLongAddOrSub(com.android.tools.r8.ir.code.Instruction):1848:1848 -> a
-    4558:4558:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1799 -> a
-    4559:4560:boolean isFallthoughTarget(com.android.tools.r8.ir.code.BasicBlock):1852:1853 -> a
-    4559:4560:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1802 -> a
-    4561:4562:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1805:1806 -> a
-    4563:4567:boolean isAliasOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):1826:1830 -> a
-    4563:4567:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1807 -> a
-    4568:4573:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1808:1813 -> a
-    4574:4585:void ensureThrowingInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction):1862:1873 -> a
-    4574:4585:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1814 -> a
-    4586:4587:com.android.tools.r8.graph.DexMethod lambda$materializeInstructionBeforeLongOperationsWorkaround$26(com.android.tools.r8.graph.DexItemFactory):1788:1789 -> a
-    4588:4588:com.android.tools.r8.graph.DexMethod lambda$materializeInstructionBeforeLongOperationsWorkaround$26(com.android.tools.r8.graph.DexItemFactory):1787:1787 -> a
-    4589:4589:boolean isNotPseudoInstruction(com.android.tools.r8.ir.code.Instruction):1835:1835 -> a
-    4590:4590:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1911:1911 -> a
-    4591:4591:void com.android.tools.r8.utils.CfgPrinter.resetUnusedValue():24:24 -> a
-    4591:4591:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1912 -> a
+    4445:4450:void finalizeToCf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodConversionOptions):1616:1621 -> a
+    4445: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):1607 -> a
+    4451:4451: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):1609:1609 -> a
+    4452:4466:void 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):1630:1644 -> a
+    4452:4466: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):1610 -> a
+    4467:4473:void 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):1643:1649 -> a
+    4467:4473: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):1610 -> a
+    4474:4474:void markProcessed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1654:1654 -> a
+    4475:4483:boolean shouldComputeInliningConstraint(com.android.tools.r8.graph.ProgramMethod):1663:1671 -> a
+    4475:4483:void markProcessed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1656 -> a
+    4484:4484:boolean com.android.tools.r8.shaking.KeepMethodInfo.isInliningAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):58:58 -> a
+    4484:4484:boolean shouldComputeInliningConstraint(com.android.tools.r8.graph.ProgramMethod):1671 -> a
+    4484:4484:void markProcessed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1656 -> a
+    4485:4487:void markProcessed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1657:1659 -> a
+    4488:4496: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):1696:1704 -> a
+    4497:4509:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3917:3929 -> a
+    4497:4509: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):1704 -> a
+    4510:4510:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1598:1598 -> a
+    4510:4510:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3930 -> a
+    4510:4510: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):1704 -> a
+    4511:4512:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3930:3931 -> a
+    4511:4512: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):1704 -> a
+    4513:4528: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):1706:1721 -> a
+    4529:4529: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):1720:1720 -> a
+    4530:4544:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1778:1792 -> a
+    4545:4545:boolean com.android.tools.r8.ir.code.Instruction.isMul():0:0 -> a
+    4545:4545:boolean isLongMul(com.android.tools.r8.ir.code.Instruction):1838 -> a
+    4545:4545:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1793 -> a
+    4546:4547:boolean isLongMul(com.android.tools.r8.ir.code.Instruction):1839:1840 -> a
+    4546:4547:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1793 -> a
+    4548:4548:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1796:1796 -> a
+    4549:4549:boolean isLongAddOrSub(com.android.tools.r8.ir.code.Instruction):1845:1845 -> a
+    4549:4549:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1797 -> a
+    4550:4550:boolean com.android.tools.r8.ir.code.Instruction.isSub():0:0 -> a
+    4550:4550:boolean isLongAddOrSub(com.android.tools.r8.ir.code.Instruction):1845 -> a
+    4550:4550:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1797 -> a
+    4551:4551:boolean isLongAddOrSub(com.android.tools.r8.ir.code.Instruction):1846:1846 -> a
+    4551:4551:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1797 -> a
+    4552:4553:boolean isFallthoughTarget(com.android.tools.r8.ir.code.BasicBlock):1850:1851 -> a
+    4552:4553:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1800 -> a
+    4554:4555:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1803:1804 -> a
+    4556:4560:boolean isAliasOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):1824:1828 -> a
+    4556:4560:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1805 -> a
+    4561:4566:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1806:1811 -> a
+    4567:4578:void ensureThrowingInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction):1860:1871 -> a
+    4567:4578:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1812 -> a
+    4579:4580:com.android.tools.r8.graph.DexMethod lambda$materializeInstructionBeforeLongOperationsWorkaround$26(com.android.tools.r8.graph.DexItemFactory):1786:1787 -> a
+    4581:4581:com.android.tools.r8.graph.DexMethod lambda$materializeInstructionBeforeLongOperationsWorkaround$26(com.android.tools.r8.graph.DexItemFactory):1785:1785 -> a
+    4582:4582:boolean isNotPseudoInstruction(com.android.tools.r8.ir.code.Instruction):1833:1833 -> a
+    4583:4583:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1909:1909 -> a
+    4584:4584:void com.android.tools.r8.utils.CfgPrinter.resetUnusedValue():24:24 -> a
+    4584:4584:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1910 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4592:4609:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1913:1930 -> a
-    4610:4610:void lambda$onMethodCodePruned$29(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagator):1963:1963 -> a
+    4585:4602:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1911:1928 -> a
+    4603:4603:void lambda$onMethodCodePruned$29(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagator):1961:1961 -> a
     boolean lambda$postProcessingDesugaringForD8$2(com.android.tools.r8.graph.ProgramMethod) -> b
-    1:1:void clearNestAttributes():348:348 -> b
-    2:9:void postProcessingDesugaringForD8(com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor,java.util.concurrent.ExecutorService):441:448 -> b
-    10:13:void postProcessingDesugaringForD8(com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor,java.util.concurrent.ExecutorService):447:450 -> b
-    14:17:void postProcessingDesugaringForD8(com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor,java.util.concurrent.ExecutorService):449:452 -> b
-    18:18:boolean lambda$prepareDesugaringForD8$3(com.android.tools.r8.graph.DexEncodedMethod):485:485 -> b
-    19:24:void workaroundAbstractMethodOnNonAbstractClassVerificationBug(java.util.concurrent.ExecutorService):614:619 -> b
-    25:25:void workaroundAbstractMethodOnNonAbstractClassVerificationBug(java.util.concurrent.ExecutorService):618:618 -> b
-    26:26:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):633:633 -> b
+    1:1:void clearNestAttributes():346:346 -> b
+    2:9:void postProcessingDesugaringForD8(com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor,java.util.concurrent.ExecutorService):439:446 -> b
+    10:13:void postProcessingDesugaringForD8(com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor,java.util.concurrent.ExecutorService):445:448 -> b
+    14:17:void postProcessingDesugaringForD8(com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor,java.util.concurrent.ExecutorService):447:450 -> b
+    18:18:boolean lambda$prepareDesugaringForD8$3(com.android.tools.r8.graph.DexEncodedMethod):483:483 -> b
+    19:24:void workaroundAbstractMethodOnNonAbstractClassVerificationBug(java.util.concurrent.ExecutorService):612:617 -> b
+    25:25:void workaroundAbstractMethodOnNonAbstractClassVerificationBug(java.util.concurrent.ExecutorService):616:616 -> b
+    26:26:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):631:631 -> 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):633 -> b
-    28:165:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):633:770 -> b
-    166:166:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():471:471 -> b
-    166:166:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):770 -> b
+    27:27:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):631 -> b
+    28:165:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):631:768 -> b
+    166:166:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> b
+    166:166:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):768 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    167:167:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):771:771 -> b
-    168:169:void staticizeClasses(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):354:355 -> b
-    168:169:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):773 -> b
-    170:186:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):774:790 -> b
-    187:220:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):789:822 -> b
-    221:221:void lambda$optimize$9(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer):657:657 -> b
-    222:226:void waveDone(com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.concurrent.ExecutorService):831:835 -> b
-    227:227:boolean com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.enableRemoveProtoEnumSwitchMap():1567:1567 -> b
-    227:227:void waveDone(com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.concurrent.ExecutorService):835 -> b
+    167:167:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):769:769 -> b
+    168:169:void staticizeClasses(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):352:353 -> b
+    168:169:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):771 -> b
+    170:186:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):772:788 -> b
+    187:220:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):787:820 -> b
+    221:221:void lambda$optimize$9(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer):655:655 -> b
+    222:226:void waveDone(com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.concurrent.ExecutorService):829:833 -> b
+    227:227:boolean com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.enableRemoveProtoEnumSwitchMap():1566:1566 -> b
+    227:227:void waveDone(com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.concurrent.ExecutorService):833 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    228:235:void waveDone(com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.concurrent.ExecutorService):836:843 -> b
+    228:235:void waveDone(com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.concurrent.ExecutorService):834:841 -> b
     236:236:com.android.tools.r8.graph.PrunedItems$Builder com.android.tools.r8.graph.PrunedItems.builder():36:36 -> b
-    236:236:void waveDone(com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.concurrent.ExecutorService):844 -> b
-    237:240:void waveDone(com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.concurrent.ExecutorService):844:847 -> b
-    241:247:void waveDone(com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.concurrent.ExecutorService):843:849 -> b
-    248:250:void lambda$computeReachabilitySensitivity$16(com.android.tools.r8.graph.DexProgramClass):872:874 -> b
-    251:251:void processSynthesizedServiceLoaderMethods(java.util.List,java.util.concurrent.ExecutorService):882:882 -> b
-    252:252:void lambda$processMethodsConcurrently$18(com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):954:954 -> b
-    253:262: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):970:979 -> b
-    263:264:com.android.tools.r8.utils.Timing rewriteNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):997:998 -> b
-    265:265: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):996:996 -> b
-    266:286:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1729:1749 -> b
-    287:299:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1879:1891 -> b
-    287:299:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1760 -> b
-    300:304:boolean lambda$workaroundForwardingInitializerBug$25(com.android.tools.r8.ir.code.Instruction):1751:1755 -> b
-    305:306:void printPhase(java.lang.String):1905:1906 -> b
-    307:307:void lambda$onMethodPruned$28(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagator):1943:1943 -> b
-    1:1:com.android.tools.r8.ir.optimize.Inliner getInliner():329:329 -> c
-    2:3:void lambda$workaroundAbstractMethodOnNonAbstractClassVerificationBug$7(com.android.tools.r8.graph.DexProgramClass):621:622 -> c
-    4:4:void lambda$workaroundAbstractMethodOnNonAbstractClassVerificationBug$6(com.android.tools.r8.graph.ProgramMethod):623:623 -> 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):1014:1015 -> 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):1013:1013 -> c
-    8:14:void updateHighestSortingStrings(com.android.tools.r8.graph.DexEncodedMethod):1680:1686 -> c
-    1:1:boolean isInWave():864:864 -> 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):1043:1052 -> d
-    12:19: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):1048:1055 -> d
-    20:20:boolean needsIRConversion(com.android.tools.r8.graph.ProgramMethod):569:569 -> d
-    20:20: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):1058 -> d
+    236:236:void waveDone(com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.concurrent.ExecutorService):842 -> b
+    237:240:void waveDone(com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.concurrent.ExecutorService):842:845 -> b
+    241:247:void waveDone(com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.concurrent.ExecutorService):841:847 -> b
+    248:250:void lambda$computeReachabilitySensitivity$16(com.android.tools.r8.graph.DexProgramClass):870:872 -> b
+    251:251:void processSynthesizedServiceLoaderMethods(java.util.List,java.util.concurrent.ExecutorService):880:880 -> b
+    252:252:void lambda$processMethodsConcurrently$18(com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):952:952 -> b
+    253:262: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):968:977 -> b
+    263:264: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):995:996 -> b
+    265:265: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):994:994 -> b
+    266:286:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1727:1747 -> b
+    287:299:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1877:1889 -> b
+    287:299:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1758 -> b
+    300:304:boolean lambda$workaroundForwardingInitializerBug$25(com.android.tools.r8.ir.code.Instruction):1749:1753 -> b
+    305:306:void printPhase(java.lang.String):1903:1904 -> b
+    307:307:void lambda$onMethodPruned$28(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagator):1941:1941 -> b
+    1:1:com.android.tools.r8.ir.optimize.Inliner getInliner():327:327 -> c
+    2:3:void lambda$workaroundAbstractMethodOnNonAbstractClassVerificationBug$7(com.android.tools.r8.graph.DexProgramClass):619:620 -> c
+    4:4:void lambda$workaroundAbstractMethodOnNonAbstractClassVerificationBug$6(com.android.tools.r8.graph.ProgramMethod):621:621 -> 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):1012:1013 -> 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):1011:1011 -> c
+    8:14:void updateHighestSortingStrings(com.android.tools.r8.graph.DexEncodedMethod):1678:1684 -> c
+    1:1:boolean isInWave():862:862 -> 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):1041:1050 -> d
+    12:19: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):1046:1053 -> d
+    20:20:boolean needsIRConversion(com.android.tools.r8.graph.ProgramMethod):567:567 -> d
+    20:20: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):1056 -> d
     21:21:boolean com.android.tools.r8.graph.Code.isThrowNullCode():0:0 -> d
-    21:21:boolean needsIRConversion(com.android.tools.r8.graph.ProgramMethod):569 -> d
-    21: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):1058 -> d
-    22:28:boolean needsIRConversion(com.android.tools.r8.graph.ProgramMethod):572:578 -> d
-    22:28: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):1058 -> d
-    29:39: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):1058:1068 -> d
-    40:41:com.android.tools.r8.utils.Timing rewriteDesugaredCodeInternal(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1059:1060 -> d
-    42:52:void onMethodCodePruned(com.android.tools.r8.graph.ProgramMethod):1960:1970 -> d
-    1:1:void reportNestDesugarDependencies():343:343 -> e
-    2:13:void onMethodPruned(com.android.tools.r8.graph.ProgramMethod):1941:1952 -> e
-    1:5:void optimizeSynthesizedMethod(com.android.tools.r8.graph.ProgramMethod):937:941 -> f
+    21:21:boolean needsIRConversion(com.android.tools.r8.graph.ProgramMethod):567 -> d
+    21: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):1056 -> d
+    22:28:boolean needsIRConversion(com.android.tools.r8.graph.ProgramMethod):570:576 -> d
+    22:28: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):1056 -> d
+    29:39: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):1056:1066 -> d
+    40: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):1057:1058 -> d
+    42:52:void onMethodCodePruned(com.android.tools.r8.graph.ProgramMethod):1958:1968 -> d
+    1:1:void reportNestDesugarDependencies():341:341 -> e
+    2:13:void onMethodPruned(com.android.tools.r8.graph.ProgramMethod):1939:1950 -> e
+    1:5:void optimizeSynthesizedMethod(com.android.tools.r8.graph.ProgramMethod):935:939 -> f
 com.android.tools.r8.ir.conversion.LensCodeRewriter -> com.android.tools.r8.ir.conversion.u:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.optimize.enums.EnumUnboxer enumUnboxer -> b
@@ -46237,7 +46413,7 @@
     952:952:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction):945 -> a
     953:955:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction):945:947 -> a
     956:956:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction):943:943 -> a
-com.android.tools.r8.ir.conversion.LensCodeRewriterUtils -> com.android.tools.r8.internal.Bz:
+com.android.tools.r8.ir.conversion.LensCodeRewriterUtils -> com.android.tools.r8.internal.Gz:
     java.util.Map protoFixupCache -> c
     java.util.Map rewrittenCallSiteCache -> d
     boolean $assertionsDisabled -> e
@@ -46395,16 +46571,16 @@
     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
     1:1:boolean registerField(com.android.tools.r8.graph.DexField):126:126 -> i
-com.android.tools.r8.ir.conversion.MethodConversionOptions -> com.android.tools.r8.internal.GC:
+com.android.tools.r8.ir.conversion.MethodConversionOptions -> com.android.tools.r8.internal.LC:
     1:1:void <init>():7:7 -> <init>
     boolean isPeepholeOptimizationsEnabled() -> a
-com.android.tools.r8.ir.conversion.MethodConversionOptions$DefaultMethodConversionOptions -> com.android.tools.r8.internal.EC:
+com.android.tools.r8.ir.conversion.MethodConversionOptions$DefaultMethodConversionOptions -> com.android.tools.r8.internal.JC:
     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.FC:
+com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions -> com.android.tools.r8.internal.KC:
     com.android.tools.r8.ir.conversion.MethodProcessor methodProcessor -> a
     boolean enablePeepholeOptimizations -> b
     boolean $assertionsDisabled -> c
@@ -46413,7 +46589,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.QC:
+com.android.tools.r8.ir.conversion.MethodOptimizationFeedback -> com.android.tools.r8.internal.VC:
     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
@@ -46458,7 +46634,7 @@
     void methodNeverReturnsNormally(com.android.tools.r8.graph.ProgramMethod) -> t
     void unsetAbstractReturnValue(com.android.tools.r8.graph.ProgramMethod) -> u
     void unsetDynamicReturnType(com.android.tools.r8.graph.ProgramMethod) -> v
-com.android.tools.r8.ir.conversion.MethodProcessor -> com.android.tools.r8.internal.aD:
+com.android.tools.r8.ir.conversion.MethodProcessor -> com.android.tools.r8.internal.fD:
     1:1:void <init>():9:9 -> <init>
     com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext createMethodProcessingContext(com.android.tools.r8.graph.ProgramMethod) -> a
     com.android.tools.r8.ir.conversion.CallSiteInformation getCallSiteInformation() -> a
@@ -46506,7 +46682,7 @@
     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.vI:
+com.android.tools.r8.ir.conversion.OneTimeMethodProcessor$MethodAction -> com.android.tools.r8.internal.AI:
     void accept(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext) -> a
 com.android.tools.r8.ir.conversion.PartialCallGraphBuilder -> com.android.tools.r8.ir.conversion.B:
     com.android.tools.r8.utils.collections.ProgramMethodSet seeds -> f
@@ -46570,13 +46746,13 @@
     22:44: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):122:144 -> a
     boolean isPrimaryMethodProcessor() -> b
     1:2:boolean shouldApplyCodeRewritings(com.android.tools.r8.graph.ProgramMethod):78:79 -> d
-com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$MethodAction -> com.android.tools.r8.internal.AK:
+com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$MethodAction -> com.android.tools.r8.internal.JK:
     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.ir.conversion.F:
     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.ir.conversion.G:
     void notifyWaveStart(com.android.tools.r8.utils.collections.ProgramMethodSet) -> a
-com.android.tools.r8.ir.conversion.SourceCode -> com.android.tools.r8.internal.uT:
+com.android.tools.r8.ir.conversion.SourceCode -> com.android.tools.r8.internal.DT:
     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
@@ -46600,11 +46776,11 @@
     int instructionOffset(int) -> e
     boolean verifyRegister(int) -> f
     int instructionIndex(int) -> g
-com.android.tools.r8.ir.conversion.StringSwitchConverter -> com.android.tools.r8.internal.eV:
+com.android.tools.r8.ir.conversion.StringSwitchConverter -> com.android.tools.r8.internal.nV:
     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.WU:
-com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping -> com.android.tools.r8.internal.YU:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$1 -> com.android.tools.r8.internal.fV:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping -> com.android.tools.r8.internal.hV:
     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
@@ -46615,7 +46791,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.XU:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping$Builder -> com.android.tools.r8.internal.gV:
     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
@@ -46635,14 +46811,14 @@
     63:77:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping extendWithSwitch(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.code.BasicBlock):766:780 -> a
     78:78:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping$Builder.setFallthroughBlock(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.BasicBlock):682:682 -> a
     78:78:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping extendWithSwitch(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.code.BasicBlock):769 -> a
-com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo -> com.android.tools.r8.internal.aV:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo -> com.android.tools.r8.internal.jV:
     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.ZU:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo$Builder -> com.android.tools.r8.internal.iV:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> a
     1:1:void <clinit>():198:198 -> <clinit>
@@ -46662,7 +46838,7 @@
     37:37: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)"]}
     38:47: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.cV:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping -> com.android.tools.r8.internal.lV:
     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
@@ -46673,7 +46849,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.bV:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping$Builder -> com.android.tools.r8.internal.kV:
     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
@@ -46728,7 +46904,7 @@
     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.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.dV:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils -> com.android.tools.r8.internal.mV:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():797:797 -> <clinit>
     1:2:com.android.tools.r8.ir.code.BasicBlock getTrueTarget(com.android.tools.r8.ir.code.If):800:801 -> a
@@ -46832,7 +47008,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.LV:
+com.android.tools.r8.ir.conversion.SwitchPayloadResolver -> com.android.tools.r8.internal.UV:
     java.util.Map unresolvedPayload -> a
     java.util.Map payloadToData -> b
     boolean $assertionsDisabled -> c
@@ -46843,13 +47019,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.KV:
+com.android.tools.r8.ir.conversion.SwitchPayloadResolver$PayloadData -> com.android.tools.r8.internal.TV:
     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.gW:
+com.android.tools.r8.ir.conversion.SyntheticStraightLineSourceCode -> com.android.tools.r8.internal.pW:
     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>
@@ -46875,7 +47051,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.sX:
+com.android.tools.r8.ir.conversion.TypeConstraintResolver -> com.android.tools.r8.internal.BX:
     java.util.Map unificationParents -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.conversion.IRBuilder builder -> b
@@ -46976,7 +47152,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     191:193:boolean verifyNoConstrainedUses(com.android.tools.r8.ir.code.Value,java.util.Set):233:235 -> a
     194:196:com.android.tools.r8.ir.code.Value canonical(com.android.tools.r8.ir.code.Value):273:275 -> a
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter -> com.android.tools.r8.internal.W3:
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter -> com.android.tools.r8.internal.Z3:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.desugar.BackportedMethodRewriter$RewritableMethods rewritableMethods -> b
     boolean $assertionsDisabled -> c
@@ -46993,19 +47169,19 @@
     84:84:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getMethodProviderOrNull(com.android.tools.r8.graph.DexMethod):126 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     85:93:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getMethodProviderOrNull(com.android.tools.r8.graph.DexMethod):127:135 -> a
-    94:94:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():436:436 -> a
+    94:94:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():438:438 -> a
     94:94:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getMethodProviderOrNull(com.android.tools.r8.graph.DexMethod):135 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     95:109:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getMethodProviderOrNull(com.android.tools.r8.graph.DexMethod):135:149 -> a
     1:1:boolean hasBackports():65:65 -> b
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$FullMethodInvokeRewriter -> com.android.tools.r8.internal.O3:
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$FullMethodInvokeRewriter -> com.android.tools.r8.internal.R3:
     1:1:void <init>():1521:1521 -> <init>
     1:1:com.android.tools.r8.cf.code.CfInstruction rewriteSingle(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory):1525:1525 -> a
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$InvokeRewriter -> com.android.tools.r8.internal.P3:
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$InvokeRewriter -> com.android.tools.r8.internal.S3:
     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):1419:1420 -> <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):1430:1430 -> a
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodGenerator -> com.android.tools.r8.internal.Q3:
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodGenerator -> com.android.tools.r8.internal.T3:
     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):1440:1440 -> <init>
     2:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory,java.lang.String):1444:1445 -> <init>
@@ -47017,14 +47193,14 @@
     14:14:com.android.tools.r8.graph.Code com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodGenerator.generateTemplateMethod(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1482:1482 -> a
     14:14:com.android.tools.r8.graph.Code lambda$getSyntheticMethod$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):1474 -> a
     15:15:com.android.tools.r8.graph.DexProto getProto(com.android.tools.r8.graph.DexItemFactory):1478:1478 -> a
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter -> com.android.tools.r8.internal.R3:
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter -> com.android.tools.r8.internal.U3:
     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):1517:1517 -> a
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider -> com.android.tools.r8.internal.S3:
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider -> com.android.tools.r8.internal.V3:
     com.android.tools.r8.graph.DexMethod method -> a
     1:2:void <init>(com.android.tools.r8.graph.DexMethod):1402:1403 -> <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.T3:
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$RewritableMethods -> com.android.tools.r8.internal.W3:
     java.util.Map rewritable -> b
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> c
@@ -47063,16 +47239,16 @@
     1:61:void initializeJava9OptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1224:1284 -> j
     1:8:void initializeObjectsMethodProviders(com.android.tools.r8.graph.DexItemFactory):1357:1364 -> k
     1:7:void initializeStreamMethodProviders(com.android.tools.r8.graph.DexItemFactory):1345:1351 -> l
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$StatifyingMethodGenerator -> com.android.tools.r8.internal.U3:
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$StatifyingMethodGenerator -> com.android.tools.r8.internal.X3:
     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):1495:1496 -> <init>
     1:1:com.android.tools.r8.graph.DexProto getProto(com.android.tools.r8.graph.DexItemFactory):1501:1501 -> a
     2:2:com.android.tools.r8.graph.DexProto com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodGenerator.getProto(com.android.tools.r8.graph.DexItemFactory):1478:1478 -> a
     2:2:com.android.tools.r8.graph.DexProto getProto(com.android.tools.r8.graph.DexItemFactory):1501 -> a
     3:3:com.android.tools.r8.graph.DexProto getProto(com.android.tools.r8.graph.DexItemFactory):1501:1501 -> a
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory -> com.android.tools.r8.internal.V3:
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory -> com.android.tools.r8.internal.Y3:
     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.J5:
+com.android.tools.r8.ir.desugar.BufferCovariantReturnTypeRewriter -> com.android.tools.r8.internal.M5:
     com.android.tools.r8.graph.DexItemFactory factory -> a
     1:3:void <init>(com.android.tools.r8.graph.AppView):28:30 -> <init>
     1:15:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):43:57 -> a
@@ -47082,48 +47258,49 @@
     18:32:com.android.tools.r8.graph.DexMethod matchingBufferCovariantMethod(com.android.tools.r8.graph.DexMethod):61:75 -> a
     33:35:boolean isInvokeCandidate(com.android.tools.r8.cf.code.CfInstruction):83:85 -> a
     36:40:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):90:94 -> a
-com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaring -> com.android.tools.r8.internal.r6:
+com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaring -> com.android.tools.r8.internal.u6:
     void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer) -> a
-com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringCollection -> com.android.tools.r8.internal.u6:
+com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringCollection -> com.android.tools.r8.internal.x6:
     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.RetargetingInfo):22:23 -> a
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():436:436 -> a
-    3:3:com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringCollection create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo):23 -> 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():438:438 -> 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.CfClassSynthesizerDesugaringCollection create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo):25 -> a
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():436:436 -> 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():438:438 -> 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:com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringCollection create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo):25 -> 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.CfClassSynthesizerDesugaringCollection create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.desugaredlibrary.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.RetargetingInfo):27:43 -> a
-com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringCollection$EmptyCfClassSynthesizerCollection -> com.android.tools.r8.internal.s6:
+    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.v6:
     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.t6:
+com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringCollection$NonEmptyCfClassSynthesizerCollection -> com.android.tools.r8.internal.w6:
     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.v6:
+com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer -> com.android.tools.r8.internal.y6:
     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
     2:2:java.util.Set getSynthesizedClasses():49:49 -> a
     1:1:void acceptDesugaredLibraryRetargeterDispatchProgramClass(com.android.tools.r8.graph.DexProgramClass):40:40 -> b
-    1:1:void acceptProgramEmulatedInterface(com.android.tools.r8.graph.DexProgramClass):25:25 -> c
-    1:1:void acceptWrapperProgramClass(com.android.tools.r8.graph.DexProgramClass):30:30 -> d
-com.android.tools.r8.ir.desugar.CfInstructionDesugaring -> com.android.tools.r8.internal.i7:
+    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.k7:
     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.j7:
+com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection -> com.android.tools.r8.internal.l7:
     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
@@ -47135,27 +47312,27 @@
     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():471:471 -> a
+    7:7:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> 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.RetargetingInfo getRetargetingInfo() -> b
-com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer -> com.android.tools.r8.internal.n7:
+    com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo getRetargetingInfo() -> b
+com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer -> com.android.tools.r8.internal.p7:
     1:1:void <init>():46:46 -> <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
     void com.android.tools.r8.ir.desugar.lambda.LambdaDesugaringEventConsumer.acceptLambdaClass(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.ProgramMethod) -> a
     1:1:com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer createForD8(com.android.tools.r8.ir.conversion.D8MethodProcessor):61:61 -> a
     void com.android.tools.r8.ir.desugar.twr.TwrCloseResourceDesugaringEventConsumer.acceptTwrCloseResourceMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod) -> b
-    void com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceSynthesizerEventConsumer$ClasspathEmulatedInterfaceSynthesizerEventConsumer.acceptClasspathEmulatedInterface(com.android.tools.r8.graph.DexClasspathClass) -> c
-    void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryAPIConverterEventConsumer.acceptAPIConversion(com.android.tools.r8.graph.ProgramMethod) -> e
+    void com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceSynthesizerEventConsumer$ClasspathEmulatedInterfaceSynthesizerEventConsumer.acceptClasspathEmulatedInterface(com.android.tools.r8.graph.DexClasspathClass) -> d
+    void com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryAPIConverterEventConsumer.acceptAPIConversion(com.android.tools.r8.graph.ProgramMethod) -> e
     void com.android.tools.r8.ir.desugar.backports.BackportedMethodDesugaringEventConsumer.acceptBackportedMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod) -> f
     void com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer.acceptInvokeStaticInterfaceOutliningMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod) -> g
     void com.android.tools.r8.ir.desugar.records.RecordDesugaringEventConsumer$RecordInstructionDesugaringEventConsumer.acceptRecordMethod(com.android.tools.r8.graph.ProgramMethod) -> h
     void com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicDesugaringEventConsumer.acceptThrowMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod) -> i
-com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$1 -> com.android.tools.r8.internal.k7:
-com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer -> com.android.tools.r8.internal.l7:
+com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$1 -> com.android.tools.r8.internal.m7:
+com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer -> com.android.tools.r8.internal.n7:
     java.util.Map pendingInvokeSpecialBridges -> b
     java.util.List synthesizedConstantDynamicClasses -> d
     java.util.List synthesizedLambdaClasses -> c
@@ -47193,15 +47370,16 @@
     void acceptWrapperClasspathClass(com.android.tools.r8.graph.DexClasspathClass) -> b
     1:1:void acceptNestFieldGetBridge(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):149:149 -> b
     2:2:void acceptTwrCloseResourceMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):164:164 -> b
-    void acceptClasspathEmulatedInterface(com.android.tools.r8.graph.DexClasspathClass) -> c
+    void acceptEnumConversionClasspathClass(com.android.tools.r8.graph.DexClasspathClass) -> c
     1:1:void acceptNestMethodBridge(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):159:159 -> c
+    void acceptClasspathEmulatedInterface(com.android.tools.r8.graph.DexClasspathClass) -> d
     1:1:void acceptNestFieldPutBridge(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):154:154 -> d
     1:1:void acceptAPIConversion(com.android.tools.r8.graph.ProgramMethod):190:190 -> e
     1:1:void acceptBackportedMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):111:111 -> f
     1:1:void acceptInvokeStaticInterfaceOutliningMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):175:175 -> g
     1:1:void acceptRecordMethod(com.android.tools.r8.graph.ProgramMethod):116:116 -> h
     1:1:void acceptThrowMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):169:169 -> i
-com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$R8CfInstructionDesugaringEventConsumer -> com.android.tools.r8.internal.m7:
+com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$R8CfInstructionDesugaringEventConsumer -> com.android.tools.r8.internal.o7:
     java.util.function.BiConsumer onCompanionMethodCallback -> i
     com.android.tools.r8.graph.AppView appView -> a
     java.util.function.BiConsumer twrCloseResourceMethodConsumer -> d
@@ -47232,56 +47410,57 @@
     3:3:void acceptTwrCloseResourceMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):405:405 -> b
     4:5:void finalizeInvokeSpecialDesugaring():414:415 -> b
     6:8:void lambda$finalizeInvokeSpecialDesugaring$0(com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialBridgeInfo):417:419 -> b
-    1:1:void acceptClasspathEmulatedInterface(com.android.tools.r8.graph.DexClasspathClass):308:308 -> c
+    1:1:void acceptEnumConversionClasspathClass(com.android.tools.r8.graph.DexClasspathClass):345:345 -> c
     2:2:void acceptNestMethodBridge(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):398:398 -> c
     3:16:void finalizeLambdaDesugaring():423:436 -> c
-    1:1:void acceptNestFieldPutBridge(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):393:393 -> d
+    1:1:void acceptClasspathEmulatedInterface(com.android.tools.r8.graph.DexClasspathClass):308:308 -> d
+    2:2:void acceptNestFieldPutBridge(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):393:393 -> d
     void acceptAPIConversion(com.android.tools.r8.graph.ProgramMethod) -> e
     void acceptBackportedMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod) -> f
     1:1:void acceptInvokeStaticInterfaceOutliningMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):335:335 -> g
     void acceptRecordMethod(com.android.tools.r8.graph.ProgramMethod) -> h
     void acceptThrowMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod) -> i
-com.android.tools.r8.ir.desugar.CfPostProcessingDesugaring -> com.android.tools.r8.internal.O7:
+com.android.tools.r8.ir.desugar.CfPostProcessingDesugaring -> com.android.tools.r8.internal.Q7:
     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.R7:
+com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection -> com.android.tools.r8.internal.T7:
     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.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.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.RetargetingInfo):28 -> a
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():436:436 -> 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.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.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.RetargetingInfo):62:80 -> a
-    6:24: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.RetargetingInfo):28 -> 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():438:438 -> 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
+    6:24: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
     25:25:com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection.empty():35:35 -> a
-    25:25:com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection$NonEmptyCfPostProcessingDesugaringCollection.create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade,com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo):81 -> a
-    25:25: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.RetargetingInfo):28 -> a
-    26:26: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.RetargetingInfo):83:83 -> a
-    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.RetargetingInfo):28 -> a
+    25:25:com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection$NonEmptyCfPostProcessingDesugaringCollection.create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo):81 -> a
+    25:25: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
+    26:26: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):83:83 -> a
+    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.RetargetingInfo):31 -> a
-com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection$EmptyCfPostProcessingDesugaringCollection -> com.android.tools.r8.internal.P7:
+    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.R7:
     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.Q7:
+com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection$NonEmptyCfPostProcessingDesugaringCollection -> com.android.tools.r8.internal.S7:
     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.V7:
+com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer -> com.android.tools.r8.internal.X7:
     1:1:void <init>():26:26 -> <init>
-    void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryAPICallbackSynthesizorEventConsumer.acceptAPIConversionCallback(com.android.tools.r8.graph.ProgramMethod) -> a
+    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
-    void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer.acceptInterfaceInjection(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClass) -> a
+    void com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer.acceptInterfaceInjection(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClass) -> a
     void com.android.tools.r8.ir.desugar.itf.InterfaceProcessingDesugaringEventConsumer.warnMissingInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper) -> a
     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.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer.acceptForwardingMethod(com.android.tools.r8.graph.ProgramMethod) -> b
-com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer$1 -> com.android.tools.r8.internal.S7:
-com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer$D8CfPostProcessingDesugaringEventConsumer -> com.android.tools.r8.internal.T7:
+    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.U7:
+com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer$D8CfPostProcessingDesugaringEventConsumer -> com.android.tools.r8.internal.V7:
     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
@@ -47298,8 +47477,9 @@
     6:6:void acceptAPIConversionCallback(com.android.tools.r8.graph.ProgramMethod):104:104 -> a
     void acceptWrapperClasspathClass(com.android.tools.r8.graph.DexClasspathClass) -> b
     1:1:void acceptForwardingMethod(com.android.tools.r8.graph.ProgramMethod):91:91 -> b
+    void acceptEnumConversionClasspathClass(com.android.tools.r8.graph.DexClasspathClass) -> c
     1:3:void addMethodToReprocess(com.android.tools.r8.graph.ProgramMethod):62:64 -> c
-com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer$R8PostProcessingDesugaringEventConsumer -> com.android.tools.r8.internal.U7:
+com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer$R8PostProcessingDesugaringEventConsumer -> com.android.tools.r8.internal.W7:
     com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection desugaring -> b
     java.util.function.BiConsumer missingClassConsumer -> c
     com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions additions -> a
@@ -47313,7 +47493,8 @@
     6:7:void acceptAPIConversionCallback(com.android.tools.r8.graph.ProgramMethod):169:170 -> a
     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
-com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer -> com.android.tools.r8.internal.td:
+    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.vd:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.ir.conversion.IRConverter converter -> a
     boolean $assertionsDisabled -> c
@@ -47387,7 +47568,7 @@
     188:188:boolean com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer.isCovariantReturnTypeAnnotation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):268:268 -> a
     188:188:boolean isCovariantReturnTypeAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):264 -> a
     1:1: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.xe:
+com.android.tools.r8.ir.desugar.DesugarDescription -> com.android.tools.r8.internal.ze:
     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>
@@ -47398,22 +47579,22 @@
     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.qe:
-com.android.tools.r8.ir.desugar.DesugarDescription$Builder -> com.android.tools.r8.internal.re:
+com.android.tools.r8.ir.desugar.DesugarDescription$1 -> com.android.tools.r8.internal.se:
+com.android.tools.r8.ir.desugar.DesugarDescription$Builder -> com.android.tools.r8.internal.te:
     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.se:
+com.android.tools.r8.ir.desugar.DesugarDescription$DesugarCallback -> com.android.tools.r8.internal.ue:
     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.te:
+com.android.tools.r8.ir.desugar.DesugarDescription$InitialBuilder -> com.android.tools.r8.internal.ve:
     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.ve:
+com.android.tools.r8.ir.desugar.DesugarDescription$NonEmptyBuilder -> com.android.tools.r8.internal.xe:
     java.util.List scanEffects -> a
     com.android.tools.r8.ir.desugar.DesugarDescription$DesugarCallback desugarRewrite -> b
     boolean $assertionsDisabled -> c
@@ -47422,13 +47603,13 @@
     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.ue:
+com.android.tools.r8.ir.desugar.DesugarDescription$NonEmptyBuilder$1 -> com.android.tools.r8.internal.we:
     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.we:
+com.android.tools.r8.ir.desugar.DesugarDescription$ScanCallback -> com.android.tools.r8.internal.ye:
     void scan() -> a
 com.android.tools.r8.ir.desugar.EmptyCfInstructionDesugaringCollection -> com.android.tools.r8.internal.Mg:
     com.android.tools.r8.ir.desugar.EmptyCfInstructionDesugaringCollection INSTANCE -> a
@@ -47443,7 +47624,7 @@
     void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer) -> a
     void withD8NestBasedAccessDesugaring(com.android.tools.r8.utils.ThrowingConsumer) -> a
     void withDesugaredLibraryAPIConverter(java.util.function.Consumer) -> a
-    com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo getRetargetingInfo() -> b
+    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.Wj:
     int getFreshLocal(int) -> a
@@ -47539,7 +47720,7 @@
     220:225:com.android.tools.r8.graph.DexField getCaptureField(int):140:145 -> a
     226:226:com.android.tools.r8.graph.DexField getCaptureField(int):142:142 -> a
     227:228:boolean canAccessModifyLambdaImplMethod():326:327 -> a
-    229:229:boolean com.android.tools.r8.utils.InternalOptions.canAccessModifyLambdaImplementationMethods(com.android.tools.r8.graph.AppView):1784:1784 -> a
+    229:229:boolean com.android.tools.r8.utils.InternalOptions.canAccessModifyLambdaImplementationMethods(com.android.tools.r8.graph.AppView):1783:1783 -> a
     229:229:boolean canAccessModifyLambdaImplMethod():327 -> a
     230:232:boolean canAccessModifyLambdaImplMethod():328:330 -> a
     233:233:boolean com.android.tools.r8.ir.desugar.LambdaDescriptor.delegatesToLambdaImplMethod(com.android.tools.r8.graph.DexItemFactory):183:183 -> a
@@ -47617,7 +47798,7 @@
     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():436:436 -> a
+    86:86:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():438:438 -> 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
@@ -47630,15 +47811,15 @@
     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():471:471 -> a
+    34:34:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> 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():436:436 -> a
+    39:39:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():438:438 -> 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():471:471 -> a
+    41:41:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> 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
@@ -47651,15 +47832,15 @@
     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():471:471 -> a
+    39:39:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> 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():436:436 -> a
+    44:44:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():438:438 -> 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():471:471 -> a
+    46:46:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> 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
@@ -47888,21 +48069,21 @@
 com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode$1 -> com.android.tools.r8.internal.pz:
     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.IA:
+com.android.tools.r8.ir.desugar.LocalStackAllocator -> com.android.tools.r8.internal.NA:
     void allocateLocalStack(int) -> a
-com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection -> com.android.tools.r8.internal.qF:
+com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection -> com.android.tools.r8.internal.vF:
     java.util.List desugarings -> b
     com.android.tools.r8.graph.AppView appView -> a
+    com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter desugaredLibraryAPIConverter -> f
     com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring nestBasedAccessDesugaring -> c
-    com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter desugaredLibraryAPIConverter -> f
-    com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeter desugaredLibraryRetargeter -> d
     com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter interfaceMethodRewriter -> e
+    com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeter desugaredLibraryRetargeter -> d
     boolean $assertionsDisabled -> g
     1:1:void <clinit>():48:48 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute):61:61 -> <init>
     2:87:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute):51:136 -> <init>
     1:2:com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection createForCfToCfNonDesugar(com.android.tools.r8.graph.AppView):141:142 -> a
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():471:471 -> a
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> a
     3:3:com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection createForCfToCfNonDesugar(com.android.tools.r8.graph.AppView):142 -> 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):142:143 -> a
@@ -47947,19 +48128,20 @@
     18:18:void ensureCfCode(com.android.tools.r8.graph.ProgramMethod):170:170 -> b
     19:19:void ensureCfCode(com.android.tools.r8.graph.ProgramMethod):166:166 -> b
     20:20:boolean lambda$noDesugaringBecauseOfImpreciseDesugaring$4(com.android.tools.r8.ir.desugar.CfInstructionDesugaring):247:247 -> b
-    21:22:com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo getRetargetingInfo():371:372 -> b
+    21:22:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo getRetargetingInfo():371:372 -> b
     1:18:boolean noDesugaringBecauseOfImpreciseDesugaring(com.android.tools.r8.graph.ProgramMethod):240:257 -> c
     19:19:boolean lambda$noDesugaringBecauseOfImpreciseDesugaring$5(com.android.tools.r8.ir.desugar.CfInstructionDesugaring):253:253 -> c
-com.android.tools.r8.ir.desugar.PrefixRewritingMapper -> com.android.tools.r8.internal.jK:
+com.android.tools.r8.ir.desugar.PrefixRewritingMapper -> com.android.tools.r8.internal.sK:
     1:1:void <init>():23:23 -> <init>
     void forAllRewrittenTypes(java.util.function.Consumer) -> a
-    boolean isRewriting() -> a
     void rewriteType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType) -> a
     boolean shouldRewriteTypeName(java.lang.String) -> a
-    1:1:boolean hasRewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):34:34 -> a
-    2:6:boolean hasRewrittenTypeInSignature(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.AppView):38:42 -> a
+    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
+    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.hK:
+com.android.tools.r8.ir.desugar.PrefixRewritingMapper$DesugarPrefixRewritingMapper -> com.android.tools.r8.internal.qK:
     java.util.Map rewritten -> b
     java.util.Map initialPrefixes -> c
     com.android.tools.r8.graph.DexItemFactory factory -> d
@@ -47968,62 +48150,62 @@
     java.util.Set notRewritten -> a
     1:1:void <clinit>():55:55 -> <clinit>
     1:1:void <init>(java.util.Map,com.android.tools.r8.graph.DexItemFactory,boolean):65:65 -> <init>
-    2:21:void <init>(java.util.Map,com.android.tools.r8.graph.DexItemFactory,boolean):57:76 -> <init>
-    boolean isRewriting() -> a
-    1:1:void forAllRewrittenTypes(java.util.function.Consumer):85:85 -> a
-    2:25:void validatePrefixes(java.util.Map):89:112 -> a
+    2:22:void <init>(java.util.Map,com.android.tools.r8.graph.DexItemFactory,boolean):57:77 -> <init>
+    1:1:void forAllRewrittenTypes(java.util.function.Consumer):86:86 -> a
+    2:25:void validatePrefixes(java.util.Map):90:113 -> a
     26:26:void validatePrefixes(java.util.Map):0:0 -> a
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":29,"2":30,"3":31}}
-    29:29:void validatePrefixes(java.util.Map):112:112 -> a
-    30:30:void validatePrefixes(java.util.Map):112:112 -> a
-    31:31:void validatePrefixes(java.util.Map):112:112 -> a
+    29:29:void validatePrefixes(java.util.Map):113:113 -> a
+    30:30:void validatePrefixes(java.util.Map):113:113 -> a
+    31:31:void validatePrefixes(java.util.Map):113:113 -> a
     27:27:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    27:27:void validatePrefixes(java.util.Map):112 -> a
-    28:28:void validatePrefixes(java.util.Map):112:112 -> a
-    32:42:void rewriteType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):152:162 -> a
-    43:44:boolean shouldRewriteTypeName(java.lang.String):198:199 -> a
-    1:1:com.android.tools.r8.graph.DexString toDescriptorPrefix(java.lang.String):80:80 -> b
+    27:27:void validatePrefixes(java.util.Map):113 -> a
+    28:28:void validatePrefixes(java.util.Map):113:113 -> a
+    32:42:void rewriteType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):153:163 -> a
+    43:44:boolean shouldRewriteTypeName(java.lang.String):199:200 -> a
+    boolean isRewriting() -> b
+    1:1:com.android.tools.r8.graph.DexString toDescriptorPrefix(java.lang.String):81:81 -> b
     2:2:com.android.tools.r8.graph.DexString toDescriptorPrefix(java.lang.String):0:0 -> b
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":83,"2":84,"3":85}}
-    83:83:com.android.tools.r8.graph.DexString toDescriptorPrefix(java.lang.String):80:80 -> b
-    84:84:com.android.tools.r8.graph.DexString toDescriptorPrefix(java.lang.String):80:80 -> b
-    85:85:com.android.tools.r8.graph.DexString toDescriptorPrefix(java.lang.String):80:80 -> b
-    82:82:com.android.tools.r8.graph.DexString toDescriptorPrefix(java.lang.String):80:80 -> b
-    86:91:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):121:126 -> b
-    92:92:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.PrefixRewritingMapper$DesugarPrefixRewritingMapper.computePrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):166:166 -> b
-    92:92:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):128 -> b
-    93:93:int com.android.tools.r8.graph.DexString.getArrayDim():529:529 -> b
-    93:93:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexString.withoutArray(com.android.tools.r8.graph.DexItemFactory):518 -> b
-    93:93:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.PrefixRewritingMapper$DesugarPrefixRewritingMapper.computePrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):166 -> b
-    93:93:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):128 -> b
-    94:96:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexString.withoutArray(com.android.tools.r8.graph.DexItemFactory):522:524 -> b
-    94:96:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.PrefixRewritingMapper$DesugarPrefixRewritingMapper.computePrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):166 -> b
-    94:96:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):128 -> b
-    97:97:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.PrefixRewritingMapper$DesugarPrefixRewritingMapper.computePrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):167:167 -> b
-    97:97:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):128 -> b
-    98:98:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.PrefixRewritingMapper$DesugarPrefixRewritingMapper.lookup(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,java.util.Map):178:178 -> b
-    98:98:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.PrefixRewritingMapper$DesugarPrefixRewritingMapper.computePrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):167 -> b
-    98:98:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):128 -> b
-    99:99:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):444:444 -> b
-    99:99: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 -> b
-    99:99:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.PrefixRewritingMapper$DesugarPrefixRewritingMapper.computePrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):167 -> b
-    99:99:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):128 -> b
-    100:103: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:183 -> b
-    100:103:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.PrefixRewritingMapper$DesugarPrefixRewritingMapper.computePrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):167 -> b
-    100:103:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):128 -> b
-    104:114:void com.android.tools.r8.ir.desugar.PrefixRewritingMapper$DesugarPrefixRewritingMapper.failIfRewritingProgramType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):133:143 -> b
-    104:114:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.PrefixRewritingMapper$DesugarPrefixRewritingMapper.computePrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):169 -> b
-    104:114:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):128 -> b
-    115:115:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.PrefixRewritingMapper$DesugarPrefixRewritingMapper.computePrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):172:172 -> b
-    115:115:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):128 -> b
-com.android.tools.r8.ir.desugar.PrefixRewritingMapper$EmptyPrefixRewritingMapper -> com.android.tools.r8.internal.iK:
-    1:1:void <init>():207:207 -> <init>
+      # {"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 -> b
+    85:85:com.android.tools.r8.graph.DexString toDescriptorPrefix(java.lang.String):81:81 -> b
+    86:86:com.android.tools.r8.graph.DexString toDescriptorPrefix(java.lang.String):81:81 -> b
+    83:83:com.android.tools.r8.graph.DexString toDescriptorPrefix(java.lang.String):81:81 -> b
+    87:92:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):122:127 -> b
+    93:93:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.PrefixRewritingMapper$DesugarPrefixRewritingMapper.computePrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):167:167 -> b
+    93:93:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):129 -> b
+    94:94:int com.android.tools.r8.graph.DexString.getArrayDim():529:529 -> b
+    94:94:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexString.withoutArray(com.android.tools.r8.graph.DexItemFactory):518 -> b
+    94:94:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.PrefixRewritingMapper$DesugarPrefixRewritingMapper.computePrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):167 -> b
+    94:94:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):129 -> b
+    95:97:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexString.withoutArray(com.android.tools.r8.graph.DexItemFactory):522:524 -> b
+    95:97:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.PrefixRewritingMapper$DesugarPrefixRewritingMapper.computePrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):167 -> b
+    95:97:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):129 -> b
+    98:98: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:168 -> b
+    98:98:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):129 -> b
+    99:99: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
+    99:99: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
+    99:99:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):129 -> b
+    100:100:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):444:444 -> b
+    100:100: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
+    100:100: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
+    100:100:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):129 -> b
+    101:104: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
+    101:104: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
+    101:104:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):129 -> b
+    105:115: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
+    105:115: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
+    105:115:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):129 -> b
+    116:116: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
+    116:116: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.rK:
+    1:1:void <init>():208:208 -> <init>
     void forAllRewrittenTypes(java.util.function.Consumer) -> a
-    boolean isRewriting() -> a
     void rewriteType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType) -> a
     boolean shouldRewriteTypeName(java.lang.String) -> a
+    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.FK:
+com.android.tools.r8.ir.desugar.ProgramAdditions -> com.android.tools.r8.internal.OK:
     java.util.Map additions -> b
     java.util.Set added -> a
     boolean $assertionsDisabled -> c
@@ -48064,7 +48246,7 @@
     60:64:void lambda$ensureOutlineMethod$1(com.android.tools.r8.graph.DexProto,com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.synthesis.SyntheticMethodBuilder):139:143 -> a
     65:74:void lambda$ensureOutlineMethod$1(com.android.tools.r8.graph.DexProto,com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.synthesis.SyntheticMethodBuilder):137:146 -> a
     75:84:com.android.tools.r8.graph.Code lambda$ensureOutlineMethod$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):148:157 -> a
-com.android.tools.r8.ir.desugar.backports.BackportedMethods -> com.android.tools.r8.internal.X3:
+com.android.tools.r8.ir.desugar.backports.BackportedMethods -> com.android.tools.r8.internal.a4:
     1:20:com.android.tools.r8.graph.CfCode IntegerMethods_parseIntSubsequenceWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2122:2141 -> A
     21:34:com.android.tools.r8.graph.CfCode IntegerMethods_parseIntSubsequenceWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2135:2148 -> A
     35:49:com.android.tools.r8.graph.CfCode IntegerMethods_parseIntSubsequenceWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2145:2159 -> A
@@ -49236,19 +49418,19 @@
     29:29:com.android.tools.r8.graph.CfCode ObjectsMethods_nonNull(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6648 -> z0
     30:32:com.android.tools.r8.graph.CfCode ObjectsMethods_nonNull(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6648:6650 -> z0
     33:56:com.android.tools.r8.graph.CfCode ObjectsMethods_nonNull(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6631:6654 -> z0
-com.android.tools.r8.ir.desugar.backports.BooleanMethodRewrites -> com.android.tools.r8.internal.j5:
+com.android.tools.r8.ir.desugar.backports.BooleanMethodRewrites -> com.android.tools.r8.internal.m5:
     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.Mb:
+com.android.tools.r8.ir.desugar.backports.CollectionMethodGenerators -> com.android.tools.r8.internal.Ob:
     1:1:com.android.tools.r8.graph.CfCode generateListOf(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int):31:31 -> a
     2:21:com.android.tools.r8.graph.CfCode generateFixedMethods(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int,com.android.tools.r8.graph.DexType):40:59 -> a
     22:22:com.android.tools.r8.graph.CfCode generateFixedMethods(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int,com.android.tools.r8.graph.DexType):56:56 -> a
     23:39:com.android.tools.r8.graph.CfCode generateFixedMethods(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int,com.android.tools.r8.graph.DexType):53:69 -> a
     1:1:com.android.tools.r8.graph.CfCode generateSetOf(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int):35:35 -> b
-com.android.tools.r8.ir.desugar.backports.CollectionMethodRewrites -> com.android.tools.r8.internal.Nb:
+com.android.tools.r8.ir.desugar.backports.CollectionMethodRewrites -> com.android.tools.r8.internal.Pb:
     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
@@ -49258,26 +49440,26 @@
     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.lB:
+com.android.tools.r8.ir.desugar.backports.LongMethodRewrites -> com.android.tools.r8.internal.qB:
     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.WF:
+com.android.tools.r8.ir.desugar.backports.NumericMethodRewrites -> com.android.tools.r8.internal.bG:
     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.VF:
+com.android.tools.r8.ir.desugar.backports.NumericMethodRewrites$1 -> com.android.tools.r8.internal.aG:
     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.sI:
+com.android.tools.r8.ir.desugar.backports.ObjectsMethodRewrites -> com.android.tools.r8.internal.xI:
     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.rI:
+com.android.tools.r8.ir.desugar.backports.ObjectsMethodRewrites$1 -> com.android.tools.r8.internal.wI:
     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.JI:
+com.android.tools.r8.ir.desugar.backports.OptionalMethodRewrites -> com.android.tools.r8.internal.OI:
     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
@@ -49289,10 +49471,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.yT:
+com.android.tools.r8.ir.desugar.backports.SparseArrayMethodRewrites -> com.android.tools.r8.internal.HT:
     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.gd:
+com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass -> com.android.tools.r8.internal.id:
     com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicReference reference -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass$Behaviour behaviour -> f
@@ -49386,7 +49568,7 @@
     152:152:void synthesizeConstantDynamicClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):186 -> a
     153:154:com.android.tools.r8.graph.DexProgramClass getConstantDynamicProgramClass():311:312 -> a
     155:157:void setClass(com.android.tools.r8.graph.DexProgramClass):316:318 -> a
-com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicInstructionDesugaring -> com.android.tools.r8.internal.hd:
+com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicInstructionDesugaring -> com.android.tools.r8.internal.jd:
     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>
@@ -49406,7 +49588,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.id:
+com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicReference -> com.android.tools.r8.internal.kd:
     java.lang.Object[] bootstrapMethodArguments -> d
     com.android.tools.r8.graph.DexString name -> a
     boolean $assertionsDisabled -> e
@@ -49420,91 +49602,91 @@
     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.DesugaredLibraryAPICallbackSynthesizer -> com.android.tools.r8.internal.ye:
+com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPICallbackSynthesizer -> com.android.tools.r8.internal.Ae:
     com.android.tools.r8.graph.DexItemFactory factory -> b
-    com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer wrapperSynthesizor -> c
+    com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer wrapperSynthesizor -> c
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set trackedCallBackAPIs -> d
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():33:33 -> <clinit>
     1:8:void <init>(com.android.tools.r8.graph.AppView):41:48 -> <init>
     1:7:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):58:64 -> a
-    8:32:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPICallbackSynthesizer.shouldRegisterCallback(com.android.tools.r8.graph.ProgramMethod):102:126 -> a
+    8:32:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPICallbackSynthesizer.shouldRegisterCallback(com.android.tools.r8.graph.ProgramMethod):102:126 -> a
     8:32:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):65 -> a
-    33:33:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():436:436 -> a
-    33:33:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPICallbackSynthesizer.shouldRegisterCallback(com.android.tools.r8.graph.ProgramMethod):126 -> a
+    33:33:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():438:438 -> a
+    33:33:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPICallbackSynthesizer.shouldRegisterCallback(com.android.tools.r8.graph.ProgramMethod):126 -> a
     33:33:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):65 -> a
-    34:35:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPICallbackSynthesizer.shouldRegisterCallback(com.android.tools.r8.graph.ProgramMethod):130:131 -> a
+    34:35:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPICallbackSynthesizer.shouldRegisterCallback(com.android.tools.r8.graph.ProgramMethod):130:131 -> a
     34:35:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):65 -> a
-    36:36:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():436:436 -> a
-    36:36:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPICallbackSynthesizer.shouldRegisterCallback(com.android.tools.r8.graph.ProgramMethod):131 -> a
+    36:36:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():438:438 -> a
+    36:36:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPICallbackSynthesizer.shouldRegisterCallback(com.android.tools.r8.graph.ProgramMethod):131 -> a
     36:36:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):65 -> a
-    37:37:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPICallbackSynthesizer.shouldRegisterCallback(com.android.tools.r8.graph.ProgramMethod):134:134 -> a
+    37:37:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPICallbackSynthesizer.shouldRegisterCallback(com.android.tools.r8.graph.ProgramMethod):134:134 -> a
     37:37:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):65 -> a
     38:44:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):66:72 -> a
-    45:62:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPICallbackSynthesizer.generateCallbackMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryAPICallbackSynthesizorEventConsumer):195:212 -> a
+    45:62: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
     45:62:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):70 -> a
     63:71:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):74:82 -> a
-    72:72:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPICallbackSynthesizer.generateTrackingWarnings():217:217 -> a
+    72:72:void com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPICallbackSynthesizer.generateTrackingWarnings():217:217 -> a
     72:72:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):83 -> a
     73:74:boolean noPendingWrappersOrConversions():88:89 -> a
     75:91:boolean overridesNonFinalLibraryMethod(com.android.tools.r8.graph.ProgramMethod):139:155 -> a
     92:92:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
     92:92:boolean overridesNonFinalLibraryMethod(com.android.tools.r8.graph.ProgramMethod):157 -> a
     93:93:boolean overridesNonFinalLibraryMethod(com.android.tools.r8.graph.ProgramMethod):157:157 -> a
-    94:94:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():436:436 -> a
+    94:94:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():438:438 -> a
     94:94:boolean overridesNonFinalLibraryMethod(com.android.tools.r8.graph.ProgramMethod):157 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    95:101:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPICallbackSynthesizer.shouldGenerateCallbacksForEmulateInterfaceAPIs(com.android.tools.r8.graph.DexClass):181:187 -> a
+    95:101:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPICallbackSynthesizer.shouldGenerateCallbacksForEmulateInterfaceAPIs(com.android.tools.r8.graph.DexClass):181:187 -> a
     95:101:boolean overridesNonFinalLibraryMethod(com.android.tools.r8.graph.ProgramMethod):160 -> a
     102:108:boolean overridesNonFinalLibraryMethod(com.android.tools.r8.graph.ProgramMethod):163:169 -> a
-com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter -> com.android.tools.r8.internal.Ke:
+com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter -> com.android.tools.r8.internal.Me:
     com.android.tools.r8.graph.DexItemFactory factory -> b
-    com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer wrapperSynthesizor -> e
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set precedingDesugarings -> c
     java.util.Set emulatedMethods -> d
     java.util.Set trackedAPIs -> f
     boolean $assertionsDisabled -> g
+    com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer wrapperSynthesizor -> e
     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.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):325:327 -> 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 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:16:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter.shouldOutlineAPIConversion(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):344:352 -> a
-    8:16:java.util.Collection com.android.tools.r8.ir.desugar.desugaredlibrary.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):329 -> a
+    8: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):345:353 -> a
+    8: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
     8: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:18:java.util.Collection com.android.tools.r8.ir.desugar.desugaredlibrary.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:332 -> a
+    17:18: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
     17:18: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
-    19:35:java.util.Collection com.android.tools.r8.ir.desugar.desugaredlibrary.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):362:378 -> a
-    19:35:java.util.Collection com.android.tools.r8.ir.desugar.desugaredlibrary.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):335 -> a
+    19:35: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:379 -> a
+    19:35: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
     19:35:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):105 -> a
-    36:48:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter.addInlineParameterConversionInstructions(com.android.tools.r8.graph.DexMethod[],java.util.ArrayList):490:502 -> a
-    36:48:java.util.Collection com.android.tools.r8.ir.desugar.desugaredlibrary.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):386 -> a
-    36:48:java.util.Collection com.android.tools.r8.ir.desugar.desugaredlibrary.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):335 -> a
+    36:48:void com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.addInlineParameterConversionInstructions(com.android.tools.r8.graph.DexMethod[],java.util.ArrayList):491:503 -> a
+    36:48: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
+    36:48: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
     36:48: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
-    49:54:java.util.Collection com.android.tools.r8.ir.desugar.desugaredlibrary.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):389:394 -> a
-    49:54:java.util.Collection com.android.tools.r8.ir.desugar.desugaredlibrary.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):335 -> a
+    49:54: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
+    49:54: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
     49: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):105 -> a
     55:61:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):117:123 -> a
-    62:71:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter.shouldRewriteInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):149:158 -> a
+    62:71:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.shouldRewriteInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):149:158 -> a
     62:71:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):123 -> a
     72:72:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    72:72:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter.shouldRewriteInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):159 -> a
+    72:72:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.shouldRewriteInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):159 -> a
     72:72:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):123 -> a
-    73:73:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter.isEmulatedInterfaceOverride(com.android.tools.r8.graph.DexClassAndMethod):174:174 -> a
-    73:73:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter.shouldRewriteInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):162 -> a
+    73:73:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.isEmulatedInterfaceOverride(com.android.tools.r8.graph.DexClassAndMethod):174:174 -> a
+    73:73:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.shouldRewriteInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):162 -> a
     73:73:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):123 -> a
     74:74:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexClassAndMember.getName():53:53 -> a
-    74:74:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter.isEmulatedInterfaceOverride(com.android.tools.r8.graph.DexClassAndMethod):174 -> a
-    74:74:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter.shouldRewriteInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):162 -> a
+    74:74:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.isEmulatedInterfaceOverride(com.android.tools.r8.graph.DexClassAndMethod):174 -> a
+    74:74:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.shouldRewriteInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):162 -> a
     74:74:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):123 -> a
-    75:87:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter.isEmulatedInterfaceOverride(com.android.tools.r8.graph.DexClassAndMethod):174:186 -> a
-    75:87:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter.shouldRewriteInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):162 -> a
+    75:87:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.isEmulatedInterfaceOverride(com.android.tools.r8.graph.DexClassAndMethod):174:186 -> a
+    75:87:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.shouldRewriteInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):162 -> a
     75:87:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):123 -> a
-    88:91:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter.shouldRewriteInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):165:168 -> a
+    88:91:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.shouldRewriteInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):165:168 -> a
     88:91:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):123 -> a
-    92:93:boolean isAPIConversionSyntheticType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer,com.android.tools.r8.graph.AppView):128:129 -> a
+    92:93:boolean 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
     94:97:com.android.tools.r8.graph.DexClassAndMethod getMethodForDesugaring(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):137:140 -> a
     98:98: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
     98:98:com.android.tools.r8.graph.DexClassAndMethod getMethodForDesugaring(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):140 -> a
@@ -49512,214 +49694,45 @@
     100:102:com.android.tools.r8.graph.DexClassAndMethod getMethodForDesugaring(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):142:144 -> a
     103:103:boolean lambda$isAlreadyDesugared$0(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaring):191:191 -> a
     104:118:com.android.tools.r8.graph.DexMethod methodWithVivifiedTypeInSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):196:210 -> a
-    119:129:void generateTrackDesugaredAPIWarnings(java.util.Set,java.lang.String,com.android.tools.r8.graph.AppView):218:228 -> a
-    130:130:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):234:234 -> a
+    119:129:void generateTrackDesugaredAPIWarnings(java.util.Set,java.lang.String,com.android.tools.r8.graph.AppView):219:229 -> a
+    130:130:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):235:235 -> a
     131:131: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":371,"2":372,"3":373}}
-    371:371:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):234:234 -> a
-    372:372:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):234:234 -> a
-    373:373:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):234:234 -> a
-    367:367:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):236:236 -> a
-    368:370:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):235:237 -> a
-    374:387: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):267:280 -> a
-    388:393: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):278:283 -> a
-    394:403:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.desugaredlibrary.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):246:255 -> a
-    394:403: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 -> a
-    404:404: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):282:282 -> a
-    405:412:com.android.tools.r8.graph.DexMethod[] computeParameterConversions(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer,com.android.tools.r8.graph.ProgramMethod):305:312 -> a
-    413:418: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):409:414 -> a
-    419:426: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):413:420 -> a
-    427:443: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):418:434 -> a
-    444: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):433:444 -> a
-    456:456:void com.android.tools.r8.cf.code.CfCheckCast.<init>(com.android.tools.r8.graph.DexType):36:36 -> a
-    456: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):444 -> a
-    457: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):444:448 -> 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):448 -> 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):448:452 -> a
-    468:472: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):424:428 -> a
-    473:473: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):430:430 -> a
-    474:501:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter.computeParameterConversionCfCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[]):457:484 -> a
-    474: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):430 -> a
-    502:515: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):511:524 -> a
-    516:536: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):522:542 -> a
-    537:541: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):528:532 -> a
-    542:548: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):534:540 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":372,"2":373,"3":374}}
+    372:372:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):235:235 -> a
+    373:373:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):235:235 -> a
+    374:374:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):235:235 -> a
+    368:368:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):237:237 -> a
+    369:371:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):236:238 -> a
+    375:388: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
+    389:394: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
+    395:404: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
+    395:404: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
+    405:405: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
+    406:413:com.android.tools.r8.graph.DexMethod[] 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
+    414:419: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
+    420:427: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
+    428:444: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
+    445: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):434:445 -> a
+    457:457:void com.android.tools.r8.cf.code.CfCheckCast.<init>(com.android.tools.r8.graph.DexType):36:36 -> a
+    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):445 -> a
+    458: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):445:449 -> 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):449 -> 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):449:453 -> a
+    469:473: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
+    474:474: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
+    475:502: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:485 -> a
+    475:502: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
+    503:516: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:525 -> a
+    517:537: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
+    538:542: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
+    543:549: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
     1:1:boolean isAlreadyDesugared(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):190:190 -> b
     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 -> b
     2:2:boolean isAlreadyDesugared(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):190 -> b
-    3:3:void generateTrackingWarnings():213:213 -> b
-    4:7:com.android.tools.r8.graph.DexMethod computeReturnConversion(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer,com.android.tools.r8.graph.ProgramMethod):292:295 -> b
-com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfiguration -> com.android.tools.r8.internal.Me:
-    com.android.tools.r8.utils.AndroidApiLevel requiredCompilationAPILevel -> a
-    java.util.Map retargetCoreLibMember -> i
-    java.util.Set wrapperConversions -> o
-    boolean supportAllCallbacksFromLibrary -> f
-    java.util.Map backportCoreLibraryMember -> j
-    com.android.tools.r8.ir.desugar.PrefixRewritingMapper prefixRewritingMapper -> p
-    java.util.Map customConversions -> k
-    java.lang.String synthesizedLibraryClassesPackagePrefix -> c
-    java.util.List extraKeepRules -> n
-    boolean libraryCompilation -> b
-    java.lang.String jsonSource -> e
-    java.util.Map rewritePrefix -> g
-    java.util.List dontRewriteInvocation -> l
-    java.util.Set dontRetargetLibMember -> m
-    java.lang.String identifier -> d
-    java.util.Map emulateLibraryInterface -> h
-    1:1:void <init>(com.android.tools.r8.utils.AndroidApiLevel,boolean,java.lang.String,java.lang.String,java.lang.String,boolean,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.List,java.util.Set,java.util.List,com.android.tools.r8.ir.desugar.PrefixRewritingMapper,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfiguration$1):38:38 -> <init>
-    2:18:void <init>(com.android.tools.r8.utils.AndroidApiLevel,boolean,java.lang.String,java.lang.String,java.lang.String,boolean,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.List,java.util.Set,java.util.List,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):137:153 -> <init>
-    1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfiguration$Builder builder(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,com.android.tools.r8.origin.Origin):66:66 -> a
-    2:17:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfiguration withOnlyRewritePrefixForTesting(java.util.Map,com.android.tools.r8.utils.InternalOptions):71:86 -> a
-    18:33:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfiguration empty():91:106 -> a
-    34:34:com.android.tools.r8.ir.desugar.PrefixRewritingMapper com.android.tools.r8.ir.desugar.PrefixRewritingMapper.empty():26:26 -> a
-    34:34:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfiguration empty():107 -> a
-    35:35:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfiguration empty():107:107 -> a
-    36:36:java.lang.String com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfiguration.getSynthesizedLibraryClassesPackagePrefix():169:169 -> a
-    36:36:java.lang.String convertJavaNameToDesugaredLibrary(com.android.tools.r8.graph.DexType):177 -> a
-    37:39:java.lang.String convertJavaNameToDesugaredLibrary(com.android.tools.r8.graph.DexType):177:179 -> a
-    40:40:java.lang.String convertJavaNameToDesugaredLibrary(com.android.tools.r8.graph.DexType):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":221,"2":222,"3":223}}
-    221:221:java.lang.String convertJavaNameToDesugaredLibrary(com.android.tools.r8.graph.DexType):180:180 -> a
-    222:222:java.lang.String convertJavaNameToDesugaredLibrary(com.android.tools.r8.graph.DexType):180:180 -> a
-    223:223:java.lang.String convertJavaNameToDesugaredLibrary(com.android.tools.r8.graph.DexType):180:180 -> a
-    220:220:java.lang.String convertJavaNameToDesugaredLibrary(com.android.tools.r8.graph.DexType):180:180 -> a
-    224:224:boolean isSupported(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):200:200 -> a
-    225:225:com.android.tools.r8.graph.DexMethod retargetMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.AppView):218:218 -> a
-    226:233:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfiguration.retargetMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):205:212 -> a
-    226:233:com.android.tools.r8.graph.DexMethod retargetMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.AppView):218 -> a
-    234:234:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfiguration.retargetMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):209:209 -> a
-    234:234:com.android.tools.r8.graph.DexMethod retargetMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.AppView):218 -> a
-    1:1:java.util.Map getBackportCoreLibraryMember():226:226 -> b
-    1:1:java.util.Map getCustomConversions():230:230 -> c
-    1:1:java.util.Set getDontRetargetLibMember():242:242 -> d
-    1:1:java.util.List getDontRewriteInvocation():238:238 -> e
-    1:1:java.util.Map getEmulateLibraryInterface():196:196 -> f
-    1:1:java.util.List getExtraKeepRules():246:246 -> g
-    1:1:java.lang.String getIdentifier():184:184 -> h
-    1:1:java.lang.String getJsonSource():250:250 -> i
-    1:1:com.android.tools.r8.ir.desugar.PrefixRewritingMapper getPrefixRewritingMapper():157:157 -> j
-    1:1:com.android.tools.r8.utils.AndroidApiLevel getRequiredCompilationApiLevel():161:161 -> k
-    1:1:java.util.Map getRetargetCoreLibMember():222:222 -> l
-    1:1:java.util.Map getRewritePrefix():188:188 -> m
-    1:1:java.lang.String getSynthesizedLibraryClassesPackagePrefix():169:169 -> n
-    1:1:java.util.Set getWrapperConversions():234:234 -> o
-    1:1:java.util.Map com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfiguration.getEmulateLibraryInterface():196:196 -> p
-    1:1:boolean hasEmulatedLibraryInterfaces():192 -> p
-    2:2:boolean hasEmulatedLibraryInterfaces():192:192 -> p
-    boolean isEmptyConfiguration() -> q
-    1:1:boolean isLibraryCompilation():165:165 -> r
-com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfiguration$1 -> com.android.tools.r8.internal.Le:
-    1:1:void <init>(com.android.tools.r8.utils.AndroidApiLevel,boolean,java.lang.String,java.lang.String,java.lang.String,boolean,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.List,java.util.Set,java.util.List,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):107:107 -> <init>
-    boolean isSupported(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView) -> a
-com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfiguration$Builder -> com.android.tools.r8.internal.Me$a:
-    java.lang.String identifier -> g
-    java.lang.String synthesizedLibraryClassesPackagePrefix -> f
-    java.util.List extraKeepRules -> q
-    java.lang.String jsonSource -> h
-    java.util.List dontRewriteInvocation -> o
-    java.util.Map customConversions -> m
-    boolean supportAllCallbacksFromLibrary -> r
-    com.android.tools.r8.utils.Reporter reporter -> b
-    boolean $assertionsDisabled -> s
-    com.android.tools.r8.graph.DexItemFactory factory -> a
-    com.android.tools.r8.utils.AndroidApiLevel requiredCompilationAPILevel -> d
-    com.android.tools.r8.origin.Origin origin -> c
-    boolean libraryCompilation -> e
-    java.util.Map rewritePrefix -> i
-    java.util.Map emulateLibraryInterface -> j
-    java.util.Set dontRetargetLibMember -> p
-    java.util.Map retargetCoreLibMember -> k
-    java.util.Map backportCoreLibraryMember -> l
-    java.util.Set wrapperConversions -> n
-    1:1:void <clinit>():257:257 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,com.android.tools.r8.origin.Origin,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfiguration$1):257:257 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,com.android.tools.r8.origin.Origin):279:279 -> <init>
-    3:23:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,com.android.tools.r8.origin.Origin):262:282 -> <init>
-    1:12:void put(java.util.Map,java.lang.Object,java.lang.Object,java.lang.String):286:297 -> a
-    13:13:void put(java.util.Map,java.lang.Object,java.lang.Object,java.lang.String):287:287 -> a
-    14:14:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfiguration$Builder setRequiredCompilationAPILevel(com.android.tools.r8.utils.AndroidApiLevel):316:316 -> a
-    15:15:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfiguration$Builder setExtraKeepRules(java.util.List):331:331 -> a
-    16:18:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfiguration$Builder putBackportCoreLibraryMember(java.lang.String,java.lang.String):390:392 -> a
-    19:19:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfiguration$Builder addDontRetargetLibMember(java.lang.String):410:410 -> a
-    20:20:void setSupportAllCallbacksFromLibrary(boolean):428:428 -> a
-    21:38:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfiguration build():432:449 -> a
-    39:39:com.android.tools.r8.ir.desugar.PrefixRewritingMapper com.android.tools.r8.ir.desugar.PrefixRewritingMapper.empty():26:26 -> a
-    39:39:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfiguration build():450 -> a
-    40:40:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfiguration build():451:451 -> a
-    1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfiguration$Builder setLibraryCompilation():326:326 -> b
-    2:4:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfiguration$Builder putCustomConversion(java.lang.String,java.lang.String):357:359 -> b
-    5:9:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfiguration$Builder addDontRewriteInvocation(java.lang.String):401:405 -> b
-    10:10:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfiguration$Builder addDontRewriteInvocation(java.lang.String):402:402 -> b
-    1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfiguration$Builder setProgramCompilation():321:321 -> c
-    2:4:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfiguration$Builder putEmulateLibraryInterface(java.lang.String,java.lang.String):346:348 -> c
-    5:6:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfiguration$Builder addWrapperConversion(java.lang.String):368:369 -> c
-    1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfiguration$Builder setDesugaredLibraryIdentifier(java.lang.String):306:306 -> d
-    2:9:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfiguration$Builder putRetargetCoreLibMember(java.lang.String,java.lang.String):374:381 -> d
-    10:12:void validate():455:457 -> d
-    13:13:void validate():0:0 -> d
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":478,"2":479,"3":480}}
-    478:478:void validate():457:457 -> d
-    479:479:void validate():457:457 -> d
-    480:480:void validate():457:457 -> d
-    475:475:void validate():462:462 -> d
-    476:476:void validate():461:461 -> d
-    477:477:void validate():457:457 -> d
-    1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfiguration$Builder setJsonSource(java.lang.String):311:311 -> e
-    2:2:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfiguration$Builder putRewritePrefix(java.lang.String,java.lang.String):336:336 -> e
-    1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfiguration$Builder setSynthesizedLibraryClassesPackagePrefix(java.lang.String):301:301 -> f
-    2:4:int sharpIndex(java.lang.String,java.lang.String):415:417 -> f
-    5:5:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> f
-    5:5:int sharpIndex(java.lang.String,java.lang.String):417 -> f
-    6:6:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> f
-    6:6:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> f
-    6:6:int sharpIndex(java.lang.String,java.lang.String):417 -> f
-    7:7:int sharpIndex(java.lang.String,java.lang.String):417:417 -> f
-    1:1:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):424:424 -> g
-com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfigurationParser -> com.android.tools.r8.internal.Ne:
-    com.android.tools.r8.utils.SemanticVersion MIN_SUPPORTED_VERSION -> g
-    com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfiguration$Builder configurationBuilder -> e
-    com.android.tools.r8.origin.Origin origin -> f
-    int minAPILevel -> d
-    boolean $assertionsDisabled -> h
-    com.android.tools.r8.utils.Reporter reporter -> b
-    boolean libraryCompilation -> c
-    com.android.tools.r8.graph.DexItemFactory dexItemFactory -> a
-    1:4:void <clinit>():24:27 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,boolean,int):65:65 -> <init>
-    2:13:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,boolean,int):58:69 -> <init>
-    void lambda$parse$0(com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfiguration$Builder) -> a
-    1:7:com.android.tools.r8.com.google.gson.JsonElement required(com.android.tools.r8.com.google.gson.JsonObject,java.lang.String):73:79 -> a
-    8:8:com.android.tools.r8.com.google.gson.JsonElement required(com.android.tools.r8.com.google.gson.JsonObject,java.lang.String):74:74 -> a
-    9:9:com.android.tools.r8.com.google.gson.JsonElement required(com.android.tools.r8.com.google.gson.JsonObject,java.lang.String):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":84,"2":85,"3":86,"4":87,"5":88,"6":89}}
-    84:84:com.android.tools.r8.com.google.gson.JsonElement required(com.android.tools.r8.com.google.gson.JsonObject,java.lang.String):74:74 -> a
-    85:85:com.android.tools.r8.com.google.gson.JsonElement required(com.android.tools.r8.com.google.gson.JsonObject,java.lang.String):74:74 -> a
-    86:86:com.android.tools.r8.com.google.gson.JsonElement required(com.android.tools.r8.com.google.gson.JsonObject,java.lang.String):74:74 -> a
-    87:87:com.android.tools.r8.com.google.gson.JsonElement required(com.android.tools.r8.com.google.gson.JsonObject,java.lang.String):74:74 -> a
-    88:88:com.android.tools.r8.com.google.gson.JsonElement required(com.android.tools.r8.com.google.gson.JsonObject,java.lang.String):74:74 -> a
-    89:89:com.android.tools.r8.com.google.gson.JsonElement required(com.android.tools.r8.com.google.gson.JsonObject,java.lang.String):74:74 -> a
-    83:83:com.android.tools.r8.com.google.gson.JsonElement required(com.android.tools.r8.com.google.gson.JsonObject,java.lang.String):74:74 -> a
-    90:90:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfiguration parse(com.android.tools.r8.StringResource):83:83 -> a
-    91:139:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfiguration parse(com.android.tools.r8.StringResource,java.util.function.Consumer):89:137 -> a
-    140:146:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfiguration parse(com.android.tools.r8.StringResource,java.util.function.Consumer):136:142 -> a
-    147:154:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfiguration parse(com.android.tools.r8.StringResource,java.util.function.Consumer):141:148 -> a
-    155:174:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfiguration parse(com.android.tools.r8.StringResource,java.util.function.Consumer):147:166 -> a
-    175:175:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfiguration parse(com.android.tools.r8.StringResource,java.util.function.Consumer):122:122 -> a
-    176:176:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfiguration parse(com.android.tools.r8.StringResource,java.util.function.Consumer):112:112 -> a
-    177:177:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfiguration parse(com.android.tools.r8.StringResource,java.util.function.Consumer):104:104 -> a
-    178:181:void parseFlagsList(com.android.tools.r8.com.google.gson.JsonArray):171:174 -> a
-    182:186:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfigurationParser.parseFlags(com.android.tools.r8.com.google.gson.JsonObject):181:185 -> a
-    182:186:void parseFlagsList(com.android.tools.r8.com.google.gson.JsonArray):175 -> a
-    187:195:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfigurationParser.parseFlags(com.android.tools.r8.com.google.gson.JsonObject):184:192 -> a
-    187:195:void parseFlagsList(com.android.tools.r8.com.google.gson.JsonArray):175 -> a
-    196:204:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfigurationParser.parseFlags(com.android.tools.r8.com.google.gson.JsonObject):191:199 -> a
-    196:204:void parseFlagsList(com.android.tools.r8.com.google.gson.JsonArray):175 -> a
-    205:219:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfigurationParser.parseFlags(com.android.tools.r8.com.google.gson.JsonObject):198:212 -> a
-    205:219:void parseFlagsList(com.android.tools.r8.com.google.gson.JsonArray):175 -> a
-    220:238:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfigurationParser.parseFlags(com.android.tools.r8.com.google.gson.JsonObject):211:229 -> a
-    220:238:void parseFlagsList(com.android.tools.r8.com.google.gson.JsonArray):175 -> a
-com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryEnumConversionSynthesizer -> com.android.tools.r8.internal.Oe:
+    3:3:void generateTrackingWarnings():214:214 -> b
+    4:7:com.android.tools.r8.graph.DexMethod 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 -> b
+com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryEnumConversionSynthesizer -> com.android.tools.r8.internal.Ne:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> c
@@ -49735,18 +49748,18 @@
     63:65:com.android.tools.r8.graph.Code lambda$buildEnumMethodsWithCode$4(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):98:100 -> a
     66:78:void buildEnumMethodsWithoutCode(com.android.tools.r8.synthesis.SyntheticClasspathClassBuilder,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):115:127 -> a
     79:79:void lambda$buildEnumMethodsWithoutCode$11(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticMethodBuilder):123:123 -> a
-    80:83:com.android.tools.r8.graph.DexMethod ensureEnumConversionMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):137:140 -> a
-    84:86:com.android.tools.r8.graph.DexMethod ensureEnumConversionMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):139:141 -> a
+    80:83:com.android.tools.r8.graph.DexMethod ensureEnumConversionMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):137:140 -> a
+    84:86:com.android.tools.r8.graph.DexMethod ensureEnumConversionMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):139:141 -> a
     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():436:436 -> a
+    102:102:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():438:438 -> 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.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):180:192 -> a
-    124:124:com.android.tools.r8.graph.DexClass ensureEnumConversionClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):190:190 -> 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
+    124:124:com.android.tools.r8.graph.DexClass ensureEnumConversionClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):190:190 -> a
     125:125:void lambda$ensureEnumConversionClass$17(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticClasspathClassBuilder):194:194 -> a
     com.android.tools.r8.graph.Code lambda$buildEnumMethodsWithoutCode$12(com.android.tools.r8.graph.DexMethod) -> b
     1:1:void lambda$buildEnumMethodsWithCode$3(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.Iterable,com.android.tools.r8.synthesis.SyntheticMethodBuilder):79:79 -> b
@@ -49758,12 +49771,396 @@
     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.DesugaredLibraryRetargeter -> com.android.tools.r8.internal.Se:
+com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer -> com.android.tools.r8.internal.Ye:
+    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>
+    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
+    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():438:438 -> 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:39: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:148 -> a
+    40:40:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.canGenerateWrapper(com.android.tools.r8.graph.DexType):219:219 -> a
+    40:40: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
+    41:48: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
+    49:53:com.android.tools.r8.graph.DexMethod getCustomConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):181:185 -> a
+    54:54:com.android.tools.r8.graph.DexMethod getCustomConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):184:184 -> a
+    55:61:com.android.tools.r8.graph.DexClass getValidClassToWrap(com.android.tools.r8.graph.DexType):223:229 -> a
+    62:62:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    62:62:com.android.tools.r8.graph.DexClass getValidClassToWrap(com.android.tools.r8.graph.DexType):229 -> a
+    63:63:com.android.tools.r8.graph.DexClass getValidClassToWrap(com.android.tools.r8.graph.DexType):229:229 -> a
+    64:64:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():438:438 -> a
+    64:64: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)"]}
+    65:66:com.android.tools.r8.graph.DexClass getValidClassToWrap(com.android.tools.r8.graph.DexType):229:230 -> a
+    67:73: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:265 -> a
+    74:74: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
+    74:74: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
+    75: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):267:285 -> a
+    94:94:java.util.Collection lambda$ensureWrappers$0(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):274:274 -> a
+    95:95:com.android.tools.r8.graph.DexProgramClass getExistingProgramWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind):302:302 -> a
+    96:98: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
+    99:101: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
+    102:102: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
+    102:102: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
+    103:103: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
+    103:103: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
+    104:107: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
+    108:108: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
+    109:109:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():438:438 -> a
+    109:109: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)"]}
+    110:114: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
+    115:115: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
+    116:119: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
+    120:120: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
+    121:127: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
+    128:130: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
+    131:132: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
+    131:132: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
+    133:133: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":148,"2":149,"3":150}}
+    148:148: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
+    148:148: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
+    149:149: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
+    149:149: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
+    150:150: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
+    150:150: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
+    134:146: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
+    134:146: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
+    147:147: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
+    151:155:void buildConversionMethod(com.android.tools.r8.synthesis.SyntheticMethodBuilder,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.CfCode):414:418 -> a
+    156:161:void buildConversionMethod(com.android.tools.r8.synthesis.SyntheticMethodBuilder,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.CfCode):417:422 -> a
+    162:167: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
+    168:168: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
+    168:168: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
+    168:168: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
+    169:175: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:661 -> a
+    169:175: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
+    176:179: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
+    180:184:void buildWrapperConstructor(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.synthesis.SyntheticMethodBuilder):446:450 -> a
+    185:190:void buildWrapperConstructor(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.synthesis.SyntheticMethodBuilder):449:454 -> a
+    191:192:com.android.tools.r8.graph.Code lambda$buildWrapperConstructor$9(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexMethod):456:457 -> a
+    193:193:java.lang.String lambda$reportFinalMethodsInWrapper$10(com.android.tools.r8.graph.DexMethod):568:568 -> a
+    194:194:java.lang.String[] lambda$reportFinalMethodsInWrapper$11(int):568:568 -> a
+    195:197:void reportFinalMethodsInWrapper(java.util.Set):568:570 -> a
+    198:198:void reportFinalMethodsInWrapper(java.util.Set):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":777,"2":778,"3":779}}
+    777:777:void reportFinalMethodsInWrapper(java.util.Set):570:570 -> a
+    778:778:void reportFinalMethodsInWrapper(java.util.Set):570:570 -> a
+    779:779:void reportFinalMethodsInWrapper(java.util.Set):570:570 -> a
+    773:775:void reportFinalMethodsInWrapper(java.util.Set):575:577 -> a
+    776:776:void reportFinalMethodsInWrapper(java.util.Set):572:572 -> a
+    780:796: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
+    797:799: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
+    800:800:java.util.List allImplementedMethods(com.android.tools.r8.graph.DexClass):604:604 -> a
+    801:825:java.util.List com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.internalAllImplementedMethods(com.android.tools.r8.graph.DexClass):609:633 -> a
+    801:825:java.util.List lambda$allImplementedMethods$12(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):605 -> a
+    826:826:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():438:438 -> a
+    826:826:java.util.List com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.internalAllImplementedMethods(com.android.tools.r8.graph.DexClass):633 -> a
+    826:826:java.util.List lambda$allImplementedMethods$12(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):605 -> a
+    827:835:java.util.List com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.internalAllImplementedMethods(com.android.tools.r8.graph.DexClass):633:641 -> a
+    827:835:java.util.List lambda$allImplementedMethods$12(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):605 -> a
+    836:847:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):670:681 -> a
+    848:851: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
+    848:851:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):682 -> a
+    852:852:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():438:438 -> a
+    852:852: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
+    852:852:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):682 -> a
+    853:855: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
+    853:855:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):682 -> a
+    856:856: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
+    856:856: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
+    856:856:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):682 -> a
+    857:859: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
+    857:859:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):682 -> a
+    860:860: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
+    860:860: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
+    860:860:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):682 -> a
+    861:869: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
+    861:869:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):682 -> a
+    870:870:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):686:686 -> a
+    871:874:void com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.ensureProgramWrappersVirtualMethods(com.android.tools.r8.graph.DexClass):717:720 -> a
+    871:874:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):687 -> a
+    875:881:void com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.ensureProgramWrappersVirtualMethods(com.android.tools.r8.graph.DexClass):719:725 -> a
+    875:881:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):687 -> a
+    882:882:void com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.ensureProgramWrappersVirtualMethods(com.android.tools.r8.graph.DexClass):724:724 -> a
+    882:882:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):687 -> a
+    883:883:void com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.ensureProgramWrappersVirtualMethods(com.android.tools.r8.graph.DexClass):723:723 -> a
+    883:883: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:16: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:174 -> b
+    17:17:java.util.Collection lambda$ensureWrappers$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):282:282 -> b
+    18:18:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions getExistingProgramWrapperConversions(com.android.tools.r8.graph.DexClass):291:291 -> b
+    19:19:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():438:438 -> b
+    19:19:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions getExistingProgramWrapperConversions(com.android.tools.r8.graph.DexClass):291 -> b
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    20:27:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions getExistingProgramWrapperConversions(com.android.tools.r8.graph.DexClass):291:298 -> b
+    28:28:void lambda$buildWrapper$8(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.synthesis.SyntheticMethodBuilder):440:440 -> b
+    1:2:com.android.tools.r8.graph.DexEncodedField getWrapperUniqueEncodedField(com.android.tools.r8.graph.DexClass):313:314 -> c
+    3:18:java.util.Collection synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):513:528 -> c
+    19:19:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():438:438 -> c
+    19:19: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)"]}
+    20:24:java.util.Collection synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):528:532 -> c
+    25:45:java.util.Collection synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):531:551 -> c
+    46:51:java.util.Collection com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.finalizeWrapperMethods(java.util.List,java.util.Set):558:563 -> c
+    46:51:java.util.Collection synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):553 -> c
+    1:1:com.android.tools.r8.graph.DexField getWrapperUniqueField(com.android.tools.r8.graph.DexClass):318:318 -> d
+    2:22:java.util.Collection synthesizeVirtualMethodsForVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):462:482 -> d
+    23:36:java.util.Collection synthesizeVirtualMethodsForVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):478:491 -> d
+    37:55:java.util.Collection synthesizeVirtualMethodsForVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):488:506 -> d
+    56:61:java.util.Collection com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.finalizeWrapperMethods(java.util.List,java.util.Set):558:563 -> d
+    56:61:java.util.Collection synthesizeVirtualMethodsForVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):508 -> d
+    1:1:boolean isInvalidWrapper(com.android.tools.r8.graph.DexClass):391:391 -> e
+    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 -> e
+    2:2:boolean isInvalidWrapper(com.android.tools.r8.graph.DexClass):391 -> e
+com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions -> com.android.tools.r8.internal.Xe:
+    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.Ze:
+    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.legacyspecification.LegacyDesugaredLibrarySpecification -> com.android.tools.r8.internal.Cz:
+    com.android.tools.r8.ir.desugar.PrefixRewritingMapper prefixRewritingMapper -> d
+    com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags rewritingFlags -> c
+    boolean libraryCompilation -> a
+    com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags topLevelFlags -> b
+    1:9: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):60:68 -> <init>
+    1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification withOnlyRewritePrefixForTesting(java.util.Map,com.android.tools.r8.utils.InternalOptions):33:33 -> a
+    2:8:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags.empty():46:52 -> a
+    2:8:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification withOnlyRewritePrefixForTesting(java.util.Map,com.android.tools.r8.utils.InternalOptions):34 -> a
+    9:9:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification withOnlyRewritePrefixForTesting(java.util.Map,com.android.tools.r8.utils.InternalOptions):35:35 -> a
+    10:10:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification empty():41:41 -> a
+    11:17:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags.empty():46:52 -> a
+    11:17:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification empty():42 -> a
+    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():88:88 -> a
+    28:28:java.lang.String convertJavaNameToDesugaredLibrary(com.android.tools.r8.graph.DexType):96 -> a
+    29:31:java.lang.String convertJavaNameToDesugaredLibrary(com.android.tools.r8.graph.DexType):96:98 -> a
+    32:32:java.lang.String convertJavaNameToDesugaredLibrary(com.android.tools.r8.graph.DexType):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":132,"2":133,"3":134}}
+    132:132:java.lang.String convertJavaNameToDesugaredLibrary(com.android.tools.r8.graph.DexType):99:99 -> a
+    133:133:java.lang.String convertJavaNameToDesugaredLibrary(com.android.tools.r8.graph.DexType):99:99 -> a
+    134:134:java.lang.String convertJavaNameToDesugaredLibrary(com.android.tools.r8.graph.DexType):99:99 -> a
+    131:131:java.lang.String convertJavaNameToDesugaredLibrary(com.android.tools.r8.graph.DexType):99:99 -> a
+    135:135:boolean isSupported(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):119:119 -> a
+    136:136:com.android.tools.r8.graph.DexMethod retargetMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.AppView):139:139 -> a
+    137:146: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):124:133 -> a
+    137:146:com.android.tools.r8.graph.DexMethod retargetMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.AppView):139 -> a
+    147:147: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):130:130 -> a
+    147:147:com.android.tools.r8.graph.DexMethod retargetMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.AppView):139 -> a
+    1:1:java.util.Map getBackportCoreLibraryMember():147:147 -> b
+    1:1:java.util.Map getCustomConversions():151:151 -> c
+    1:1:java.util.Set getDontRetargetLibMember():163:163 -> d
+    1:1:java.util.List getDontRewriteInvocation():159:159 -> e
+    1:1:java.util.Map getEmulateLibraryInterface():115:115 -> f
+    1:1:java.util.List getExtraKeepRules():167:167 -> g
+    1:1:java.lang.String getIdentifier():103:103 -> h
+    1:1:java.lang.String getJsonSource():171:171 -> i
+    1:1:com.android.tools.r8.ir.desugar.PrefixRewritingMapper getPrefixRewritingMapper():76:76 -> j
+    1:1:com.android.tools.r8.utils.AndroidApiLevel getRequiredCompilationApiLevel():80:80 -> k
+    1:1:java.util.Map getRetargetCoreLibMember():143:143 -> l
+    1:1:java.util.Map getRewritePrefix():107:107 -> m
+    1:1:java.lang.String getSynthesizedLibraryClassesPackagePrefix():88:88 -> n
+    1:1:java.util.Set getWrapperConversions():155:155 -> o
+    1:1:java.util.Map com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification.getEmulateLibraryInterface():115:115 -> p
+    1:1:boolean hasEmulatedLibraryInterfaces():111 -> p
+    2:2:boolean hasEmulatedLibraryInterfaces():111:111 -> p
+    boolean isEmptyConfiguration() -> q
+    1:1:boolean isLibraryCompilation():84:84 -> r
+    1:1:boolean supportAllCallbacksFromLibrary():72:72 -> s
+com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification$1 -> com.android.tools.r8.internal.Bz:
+    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.Dz:
+    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
+    int minAPILevel -> d
+    boolean $assertionsDisabled -> h
+    com.android.tools.r8.utils.Reporter reporter -> b
+    boolean libraryCompilation -> c
+    com.android.tools.r8.graph.DexItemFactory dexItemFactory -> a
+    1:4:void <clinit>():24:27 -> <clinit>
+    1:5:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,boolean,int):65:69 -> <init>
+    void lambda$parse$0(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags$Builder) -> a
+    1:7:com.android.tools.r8.com.google.gson.JsonElement required(com.android.tools.r8.com.google.gson.JsonObject,java.lang.String):90:96 -> a
+    8:8:com.android.tools.r8.com.google.gson.JsonElement required(com.android.tools.r8.com.google.gson.JsonObject,java.lang.String):91:91 -> a
+    9:9:com.android.tools.r8.com.google.gson.JsonElement required(com.android.tools.r8.com.google.gson.JsonObject,java.lang.String):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":101,"2":102,"3":103,"4":104,"5":105,"6":106}}
+    101:101:com.android.tools.r8.com.google.gson.JsonElement required(com.android.tools.r8.com.google.gson.JsonObject,java.lang.String):91:91 -> a
+    102:102:com.android.tools.r8.com.google.gson.JsonElement required(com.android.tools.r8.com.google.gson.JsonObject,java.lang.String):91:91 -> a
+    103:103:com.android.tools.r8.com.google.gson.JsonElement required(com.android.tools.r8.com.google.gson.JsonObject,java.lang.String):91:91 -> a
+    104:104:com.android.tools.r8.com.google.gson.JsonElement required(com.android.tools.r8.com.google.gson.JsonObject,java.lang.String):91:91 -> a
+    105:105:com.android.tools.r8.com.google.gson.JsonElement required(com.android.tools.r8.com.google.gson.JsonObject,java.lang.String):91:91 -> a
+    106:106:com.android.tools.r8.com.google.gson.JsonElement required(com.android.tools.r8.com.google.gson.JsonObject,java.lang.String):91:91 -> a
+    100:100:com.android.tools.r8.com.google.gson.JsonElement required(com.android.tools.r8.com.google.gson.JsonObject,java.lang.String):91:91 -> a
+    107:107:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification parse(com.android.tools.r8.StringResource):100:100 -> a
+    108:109:void com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecificationParser.setOrigin(com.android.tools.r8.StringResource):132:133 -> a
+    108:109:java.lang.String com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecificationParser.parseJson(com.android.tools.r8.StringResource):119 -> a
+    108:109:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification parse(com.android.tools.r8.StringResource,java.util.function.Consumer):105 -> a
+    110:112:java.lang.String com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecificationParser.parseJson(com.android.tools.r8.StringResource):122:124 -> a
+    110:112:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification parse(com.android.tools.r8.StringResource,java.util.function.Consumer):105 -> a
+    113:113:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags$Builder com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags.builder():66:66 -> a
+    113:113:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecificationParser.parseTopLevelFlags(java.lang.String,java.util.function.Consumer):151 -> a
+    113:113:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification parse(com.android.tools.r8.StringResource,java.util.function.Consumer):107 -> a
+    114:144:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecificationParser.parseTopLevelFlags(java.lang.String,java.util.function.Consumer):153:183 -> a
+    114:144:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification parse(com.android.tools.r8.StringResource,java.util.function.Consumer):107 -> a
+    145:151:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecificationParser.parseTopLevelFlags(java.lang.String,java.util.function.Consumer):182:188 -> a
+    145:151:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification parse(com.android.tools.r8.StringResource,java.util.function.Consumer):107 -> a
+    152:171:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecificationParser.parseTopLevelFlags(java.lang.String,java.util.function.Consumer):187:206 -> a
+    152:171:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification parse(com.android.tools.r8.StringResource,java.util.function.Consumer):107 -> a
+    172:179:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecificationParser.parseRewritingFlags():137:144 -> a
+    172:179:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification parse(com.android.tools.r8.StringResource,java.util.function.Consumer):109 -> a
+    180:183:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecificationParser.parseRewritingFlags():143:146 -> a
+    180:183:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification parse(com.android.tools.r8.StringResource,java.util.function.Consumer):109 -> a
+    184:187:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification parse(com.android.tools.r8.StringResource,java.util.function.Consumer):111:114 -> a
+    188:188:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecificationParser.parseTopLevelFlags(java.lang.String,java.util.function.Consumer):168:168 -> a
+    188:188:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification parse(com.android.tools.r8.StringResource,java.util.function.Consumer):107 -> a
+    189:189:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecificationParser.parseTopLevelFlags(java.lang.String,java.util.function.Consumer):158:158 -> a
+    189:189:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification parse(com.android.tools.r8.StringResource,java.util.function.Consumer):107 -> a
+    190:190:java.lang.String com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecificationParser.parseJson(com.android.tools.r8.StringResource):126:126 -> a
+    190:190:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification parse(com.android.tools.r8.StringResource,java.util.function.Consumer):105 -> a
+    191:194:void parseFlagsList(com.android.tools.r8.com.google.gson.JsonArray,com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags$Builder):210:213 -> a
+    195:239:void com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecificationParser.parseFlags(com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags$Builder):220:264 -> a
+    195:239:void parseFlagsList(com.android.tools.r8.com.google.gson.JsonArray,com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags$Builder):214 -> a
+com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags -> com.android.tools.r8.internal.Ez:
+    java.util.Map rewritePrefix -> a
+    java.util.Set dontRetargetLibMember -> g
+    java.util.Map emulateLibraryInterface -> b
+    java.util.Set wrapperConversions -> h
+    java.util.Map retargetCoreLibMember -> c
+    java.util.Map backportCoreLibraryMember -> d
+    java.util.List dontRewriteInvocation -> f
+    java.util.Map customConversions -> e
+    1:9:void <init>(java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.List,java.util.Set,java.util.Set):49:57 -> <init>
+    1:3:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags withOnlyRewritePrefixForTesting(java.util.Map,com.android.tools.r8.utils.InternalOptions):74:76 -> a
+    4:4:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags$Builder builder(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,com.android.tools.r8.origin.Origin):80:80 -> a
+    5:17:void com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags$Builder.<init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,com.android.tools.r8.origin.Origin):146:146 -> a
+    5:17:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags$Builder builder(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,com.android.tools.r8.origin.Origin):80 -> a
+    18:18:java.util.Map getBackportCoreLibraryMember():111:111 -> a
+    1:1:java.util.Map getCustomConversions():115:115 -> b
+    1:1:java.util.Set getDontRetargetLibMember():123:123 -> c
+    1:1:java.util.List getDontRewriteInvocation():119:119 -> d
+    1:1:java.util.Map getEmulateLibraryInterface():103:103 -> e
+    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.Ez$a:
+    java.util.Map rewritePrefix -> d
+    java.util.Set dontRetargetLibMember -> j
+    com.android.tools.r8.origin.Origin origin -> c
+    boolean $assertionsDisabled -> l
+    java.util.List dontRewriteInvocation -> i
+    java.util.Map emulateLibraryInterface -> e
+    java.util.Set wrapperConversions -> k
+    java.util.Map retargetCoreLibMember -> f
+    com.android.tools.r8.utils.Reporter reporter -> b
+    java.util.Map backportCoreLibraryMember -> g
+    com.android.tools.r8.graph.DexItemFactory factory -> a
+    java.util.Map customConversions -> h
+    1:1:void <clinit>():130:130 -> <clinit>
+    1:12:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,com.android.tools.r8.origin.Origin,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.List,java.util.Set,java.util.Set):171:182 -> <init>
+    1:12:void put(java.util.Map,java.lang.Object,java.lang.Object,java.lang.String):187:198 -> a
+    13:13:void put(java.util.Map,java.lang.Object,java.lang.Object,java.lang.String):188:188 -> a
+    14:16:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags$Builder putBackportCoreLibraryMember(java.lang.String,java.lang.String):256:258 -> a
+    17:17:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags$Builder addDontRetargetLibMember(java.lang.String):276:276 -> a
+    18:27:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags build():294:303 -> a
+    1:3:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags$Builder putCustomConversion(java.lang.String,java.lang.String):223:225 -> b
+    4:8:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags$Builder addDontRewriteInvocation(java.lang.String):267:271 -> b
+    9:9:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags$Builder addDontRewriteInvocation(java.lang.String):268:268 -> b
+    10:12:void validate():307:309 -> b
+    13:13:void validate():0:0 -> b
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":330,"2":331,"3":332}}
+    330:330:void validate():309:309 -> b
+    331:331:void validate():309:309 -> b
+    332:332:void validate():309:309 -> b
+    327:327:void validate():314:314 -> b
+    328:328:void validate():313:313 -> b
+    329:329:void validate():309:309 -> b
+    1:3:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags$Builder putEmulateLibraryInterface(java.lang.String,java.lang.String):212:214 -> c
+    4:5:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags$Builder addWrapperConversion(java.lang.String):234:235 -> c
+    1:8:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags$Builder putRetargetCoreLibMember(java.lang.String,java.lang.String):240:247 -> d
+    9:9: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
+    1:3:int sharpIndex(java.lang.String,java.lang.String):281:283 -> f
+    4:4:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> f
+    4:4:int sharpIndex(java.lang.String,java.lang.String):283 -> f
+    5:5:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> f
+    5:5:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> f
+    5:5:int sharpIndex(java.lang.String,java.lang.String):283 -> f
+    6:6:int sharpIndex(java.lang.String,java.lang.String):283:283 -> f
+com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags -> com.android.tools.r8.internal.Fz:
+    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
+    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):36:42 -> <init>
+    1:1:java.util.List getExtraKeepRules():90:90 -> a
+    1:1:java.lang.String getIdentifier():78:78 -> b
+    1:1:java.lang.String getJsonSource():82:82 -> c
+    1:1:com.android.tools.r8.utils.AndroidApiLevel getRequiredCompilationAPILevel():70:70 -> d
+    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.Fz$a:
+    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
+    java.lang.String jsonSource -> d
+    1:1:void <init>():103:103 -> <init>
+    2:6:void <init>():96:100 -> <init>
+    1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags$Builder setRequiredCompilationAPILevel(com.android.tools.r8.utils.AndroidApiLevel):106:106 -> a
+    2:2:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags$Builder setDesugaredLibraryIdentifier(java.lang.String):116:116 -> a
+    3:3:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags$Builder setSupportAllCallbacksFromLibrary(boolean):126:126 -> a
+    4:4:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags$Builder setExtraKeepRules(java.util.List):131:131 -> a
+    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.retargeter.DesugaredLibraryRetargeter -> com.android.tools.r8.internal.Re:
+    com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo retargetingInfo -> c
     com.android.tools.r8.utils.collections.DexClassAndMethodSet emulatedDispatchMethods -> f
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Map retargetLibraryMember -> d
-    com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo retargetingInfo -> c
-    com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSyntheticHelper syntheticHelper -> b
+    com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSyntheticHelper syntheticHelper -> b
     boolean $assertionsDisabled -> g
     java.util.Map nonFinalHolderRewrites -> e
     1:1:void <clinit>():37:37 -> <clinit>
@@ -49772,60 +50169,60 @@
     2:10:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):75:83 -> a
     11:11:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):82:82 -> a
     12:12:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):88:88 -> a
-    13:26:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeter$InvokeRetargetingResult computeRetargetLibraryMember(com.android.tools.r8.graph.DexMethod):179:192 -> a
-    27:31:com.android.tools.r8.graph.DexMethod lambda$computeRetargetLibraryMember$0(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):185:189 -> a
-    32:33:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeter.computeRetargetMethod(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexType):209:210 -> a
-    32:33:com.android.tools.r8.graph.DexMethod lambda$computeRetargetLibraryMember$0(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):188 -> a
+    13:26:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeter$InvokeRetargetingResult computeRetargetLibraryMember(com.android.tools.r8.graph.DexMethod):179:192 -> a
+    27:31:com.android.tools.r8.graph.DexMethod lambda$computeRetargetLibraryMember$0(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):185:189 -> a
+    32:33:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeter.computeRetargetMethod(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexType):209:210 -> a
+    32:33:com.android.tools.r8.graph.DexMethod lambda$computeRetargetLibraryMember$0(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):188 -> a
     34:34:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.prependHolderToProto(com.android.tools.r8.graph.DexMethod):2582:2582 -> a
-    34:34:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeter.computeRetargetMethod(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexType):210 -> a
-    34:34:com.android.tools.r8.graph.DexMethod lambda$computeRetargetLibraryMember$0(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):188 -> a
-    35:35:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeter.computeRetargetMethod(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexType):211:211 -> a
-    35:35:com.android.tools.r8.graph.DexMethod lambda$computeRetargetLibraryMember$0(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):188 -> a
-    1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo getRetargetingInfo():62:62 -> b
-    2:8:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeter$InvokeRetargetingResult computeNewInvokeTarget(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):128:134 -> b
+    34:34:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeter.computeRetargetMethod(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexType):210 -> a
+    34:34:com.android.tools.r8.graph.DexMethod lambda$computeRetargetLibraryMember$0(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):188 -> a
+    35:35:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeter.computeRetargetMethod(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexType):211:211 -> a
+    35:35:com.android.tools.r8.graph.DexMethod lambda$computeRetargetLibraryMember$0(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):188 -> a
+    1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo getRetargetingInfo():62:62 -> 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):128:134 -> 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.DesugaredLibraryRetargeter$InvokeRetargetingResult computeNewInvokeTarget(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):135 -> 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):135 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    10:16:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeter$InvokeRetargetingResult computeNewInvokeTarget(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):135:141 -> b
-    17:30:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeter$InvokeRetargetingResult com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeter.computeRetargetedMethod(com.android.tools.r8.graph.DexMethod,boolean):160:173 -> b
-    17:30:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeter$InvokeRetargetingResult computeNewInvokeTarget(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):141 -> b
-    31:37:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeter$InvokeRetargetingResult computeNewInvokeTarget(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):142:148 -> b
+    10:16:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeter$InvokeRetargetingResult computeNewInvokeTarget(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):135:141 -> b
+    17:30:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeter$InvokeRetargetingResult com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeter.computeRetargetedMethod(com.android.tools.r8.graph.DexMethod,boolean):160:173 -> b
+    17:30:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeter$InvokeRetargetingResult computeNewInvokeTarget(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):141 -> b
+    31: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):142:148 -> b
     38:38: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
-    38:38:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeter$InvokeRetargetingResult computeNewInvokeTarget(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):148 -> b
-    39:41:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeter$InvokeRetargetingResult computeNewInvokeTarget(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):150:152 -> b
-    42:42:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeter$InvokeRetargetingResult computeNewInvokeTarget(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):151:151 -> b
-    43:43:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeter$InvokeRetargetingResult computeNewInvokeTarget(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):129:129 -> 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):148 -> b
+    39: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):150:152 -> b
+    42:42:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeter$InvokeRetargetingResult computeNewInvokeTarget(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):151:151 -> b
+    43: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):129:129 -> b
     44:49:boolean matchesNonFinalHolderRewrite(com.android.tools.r8.graph.DexMethod):196:201 -> b
-com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeter$InvokeRetargetingResult -> com.android.tools.r8.internal.Re:
-    com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeter$InvokeRetargetingResult NO_REWRITING -> c
+com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeter$InvokeRetargetingResult -> com.android.tools.r8.internal.Qe:
     boolean hasNewInvokeTarget -> a
+    com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeter$InvokeRetargetingResult NO_REWRITING -> c
     java.util.function.Function newInvokeTargetSupplier -> b
     boolean $assertionsDisabled -> d
     1:3:void <clinit>():91:93 -> <clinit>
-    1:1:void <init>(boolean,java.util.function.Function,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeter$1):91:91 -> <init>
+    1:1:void <init>(boolean,java.util.function.Function,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeter$1):91:91 -> <init>
     2:4:void <init>(boolean,java.util.function.Function):110:112 -> <init>
-    com.android.tools.r8.graph.DexMethod lambda$createInvokeRetargetingResult$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer) -> a
-    1:3:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeter$InvokeRetargetingResult createInvokeRetargetingResult(com.android.tools.r8.graph.DexMethod):102:104 -> a
+    com.android.tools.r8.graph.DexMethod lambda$createInvokeRetargetingResult$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer) -> a
+    1:3:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeter$InvokeRetargetingResult createInvokeRetargetingResult(com.android.tools.r8.graph.DexMethod):102:104 -> a
     4:4:boolean hasNewInvokeTarget():116:116 -> a
-    5:5:com.android.tools.r8.graph.DexMethod getNewInvokeTarget(com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):121:121 -> a
-    6:6:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeter$InvokeRetargetingResult.hasNewInvokeTarget():116:116 -> a
-    6:6:com.android.tools.r8.graph.DexMethod getNewInvokeTarget(com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):121 -> a
-    7:8:com.android.tools.r8.graph.DexMethod getNewInvokeTarget(com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):121:122 -> a
-    com.android.tools.r8.graph.DexMethod lambda$static$0(com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer) -> b
-com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterL8Synthesizer -> com.android.tools.r8.internal.Te:
-    com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSyntheticHelper syntheticHelper -> a
+    5:5:com.android.tools.r8.graph.DexMethod getNewInvokeTarget(com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):121:121 -> a
+    6:6:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeter$InvokeRetargetingResult.hasNewInvokeTarget():116:116 -> a
+    6:6:com.android.tools.r8.graph.DexMethod getNewInvokeTarget(com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):121 -> a
+    7:8:com.android.tools.r8.graph.DexMethod getNewInvokeTarget(com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):121:122 -> 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.Se:
+    com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSyntheticHelper syntheticHelper -> a
     com.android.tools.r8.utils.collections.DexClassAndMethodSet emulatedDispatchMethods -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():12:12 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo):29:32 -> <init>
-    1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterL8Synthesizer create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo):20:20 -> a
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():436:436 -> a
-    2:2:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterL8Synthesizer create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo):20 -> a
+    1:4:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo):29:32 -> <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):20:20 -> a
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():438:438 -> 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):20 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:8:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterL8Synthesizer create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo):20:25 -> a
-    9:9:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterL8Synthesizer create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo):22:22 -> a
+    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):20:25 -> 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):22:22 -> a
     10:12:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):37:39 -> a
-com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterLibraryTypeSynthesizer -> com.android.tools.r8.internal.Ue:
+com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterLibraryTypeSynthesizer -> com.android.tools.r8.internal.Te:
     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
@@ -49847,109 +50244,109 @@
     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
     1:4:void checkForAssumedLibraryTypes(com.android.tools.r8.graph.AppView):43:46 -> b
-    5:5:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterLibraryTypeSynthesizer.warnMissingRetargetCoreLibraryMember(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):156:156 -> 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
     6:6:void checkForAssumedLibraryTypes(com.android.tools.r8.graph.AppView):0:0 -> b
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":10,"2":11,"3":12}}
-    10:10:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterLibraryTypeSynthesizer.warnMissingRetargetCoreLibraryMember(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):156:156 -> b
+    10:10: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
     10:10:void checkForAssumedLibraryTypes(com.android.tools.r8.graph.AppView):48 -> b
-    11:11:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterLibraryTypeSynthesizer.warnMissingRetargetCoreLibraryMember(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):156:156 -> b
+    11:11: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
     11:11:void checkForAssumedLibraryTypes(com.android.tools.r8.graph.AppView):48 -> b
-    12:12:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterLibraryTypeSynthesizer.warnMissingRetargetCoreLibraryMember(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):156:156 -> b
+    12:12: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
     12:12:void checkForAssumedLibraryTypes(com.android.tools.r8.graph.AppView):48 -> b
-    7:9:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterLibraryTypeSynthesizer.warnMissingRetargetCoreLibraryMember(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):159:161 -> 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.DesugaredLibraryRetargeterPostProcessor -> com.android.tools.r8.internal.Ve:
+com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterPostProcessor -> com.android.tools.r8.internal.Ue:
     com.android.tools.r8.utils.collections.DexClassAndMethodSet emulatedDispatchMethods -> c
     com.android.tools.r8.graph.AppView appView -> a
-    com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSyntheticHelper syntheticHelper -> b
+    com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSyntheticHelper syntheticHelper -> b
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():33:33 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo):40:43 -> <init>
+    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():436:436 -> a
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():438:438 -> 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.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer):59:59 -> a
-    6:6:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():436:436 -> a
-    6:6:void ensureInterfacesAndForwardingMethodsSynthesized(java.util.Collection,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer):59 -> 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():438:438 -> 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.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer):59:59 -> a
+    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.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer):60 -> a
-    9:18:void ensureInterfacesAndForwardingMethodsSynthesized(java.util.Collection,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer):61:70 -> a
+    8:8:void ensureInterfacesAndForwardingMethodsSynthesized(java.util.Collection,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer):60 -> a
+    9:18:void ensureInterfacesAndForwardingMethodsSynthesized(java.util.Collection,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer):61:70 -> a
     19:19:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    19:19:void ensureInterfacesAndForwardingMethodsSynthesized(java.util.Collection,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer):74 -> a
-    20:22:void ensureInterfacesAndForwardingMethodsSynthesized(java.util.Collection,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer):74:76 -> a
-    23:23:void lambda$ensureInterfacesAndForwardingMethodsSynthesized$0(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,java.util.List):78:78 -> a
-    24:28:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterPostProcessor.inherit(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.collections.DexClassAndMethodSet):89:93 -> a
-    24:28:void lambda$ensureInterfacesAndForwardingMethodsSynthesized$0(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,java.util.List):78 -> a
+    19:19:void ensureInterfacesAndForwardingMethodsSynthesized(java.util.Collection,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer):74 -> a
+    20:22:void ensureInterfacesAndForwardingMethodsSynthesized(java.util.Collection,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer):74:76 -> a
+    23:23:void lambda$ensureInterfacesAndForwardingMethodsSynthesized$0(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):78:78 -> a
+    24:28:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterPostProcessor.inherit(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.collections.DexClassAndMethodSet):89:93 -> a
+    24:28:void lambda$ensureInterfacesAndForwardingMethodsSynthesized$0(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):78 -> a
     29:29:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> a
-    29:29:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterPostProcessor.inherit(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.collections.DexClassAndMethodSet):94 -> a
-    29:29:void lambda$ensureInterfacesAndForwardingMethodsSynthesized$0(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,java.util.List):78 -> a
-    30:34:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterPostProcessor.inherit(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.collections.DexClassAndMethodSet):97:101 -> a
-    30:34:void lambda$ensureInterfacesAndForwardingMethodsSynthesized$0(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,java.util.List):78 -> a
-    35:38:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterPostProcessor.reportInvalidLibrarySupertype(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.utils.collections.DexClassAndMethodSet):158:161 -> a
-    35:38:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterPostProcessor.inherit(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.collections.DexClassAndMethodSet):95 -> a
-    35:38:void lambda$ensureInterfacesAndForwardingMethodsSynthesized$0(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,java.util.List):78 -> a
+    29:29:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterPostProcessor.inherit(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.collections.DexClassAndMethodSet):94 -> a
+    29:29:void lambda$ensureInterfacesAndForwardingMethodsSynthesized$0(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):78 -> a
+    30:34:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterPostProcessor.inherit(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.collections.DexClassAndMethodSet):97:101 -> a
+    30:34:void lambda$ensureInterfacesAndForwardingMethodsSynthesized$0(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):78 -> a
+    35:38:void com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterPostProcessor.reportInvalidLibrarySupertype(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.utils.collections.DexClassAndMethodSet):158:161 -> a
+    35:38:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterPostProcessor.inherit(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.collections.DexClassAndMethodSet):95 -> a
+    35:38:void lambda$ensureInterfacesAndForwardingMethodsSynthesized$0(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):78 -> a
     39:39:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> a
-    39:39:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterPostProcessor.reportInvalidLibrarySupertype(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.utils.collections.DexClassAndMethodSet):162 -> a
-    39:39:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterPostProcessor.inherit(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.collections.DexClassAndMethodSet):95 -> a
-    39:39:void lambda$ensureInterfacesAndForwardingMethodsSynthesized$0(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,java.util.List):78 -> a
-    40:46:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterPostProcessor.reportInvalidLibrarySupertype(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.utils.collections.DexClassAndMethodSet):163:169 -> a
-    40:46:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterPostProcessor.inherit(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.collections.DexClassAndMethodSet):95 -> a
-    40:46:void lambda$ensureInterfacesAndForwardingMethodsSynthesized$0(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,java.util.List):78 -> a
+    39:39:void com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterPostProcessor.reportInvalidLibrarySupertype(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.utils.collections.DexClassAndMethodSet):162 -> a
+    39:39:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterPostProcessor.inherit(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.collections.DexClassAndMethodSet):95 -> a
+    39:39:void lambda$ensureInterfacesAndForwardingMethodsSynthesized$0(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):78 -> a
+    40:46:void com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterPostProcessor.reportInvalidLibrarySupertype(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.utils.collections.DexClassAndMethodSet):163:169 -> a
+    40:46:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterPostProcessor.inherit(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.collections.DexClassAndMethodSet):95 -> a
+    40:46:void lambda$ensureInterfacesAndForwardingMethodsSynthesized$0(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):78 -> a
     47:47:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():761:761 -> a
-    47:47:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterPostProcessor.reportInvalidLibrarySupertype(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.utils.collections.DexClassAndMethodSet):171 -> a
-    47:47:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterPostProcessor.inherit(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.collections.DexClassAndMethodSet):95 -> a
-    47:47:void lambda$ensureInterfacesAndForwardingMethodsSynthesized$0(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,java.util.List):78 -> a
-    48:48:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterPostProcessor.reportInvalidLibrarySupertype(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.utils.collections.DexClassAndMethodSet):171:171 -> a
-    48:48:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterPostProcessor.inherit(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.collections.DexClassAndMethodSet):95 -> a
-    48:48:void lambda$ensureInterfacesAndForwardingMethodsSynthesized$0(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,java.util.List):78 -> a
-    49:49:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterPostProcessor.reportInvalidLibrarySupertype(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.utils.collections.DexClassAndMethodSet):170:170 -> a
-    49:49:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterPostProcessor.inherit(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.collections.DexClassAndMethodSet):95 -> a
-    49:49:void lambda$ensureInterfacesAndForwardingMethodsSynthesized$0(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,java.util.List):78 -> a
-    50:50:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterPostProcessor.reportInvalidLibrarySupertype(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.utils.collections.DexClassAndMethodSet):166:166 -> a
-    50:50:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterPostProcessor.inherit(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.collections.DexClassAndMethodSet):95 -> a
-    50:50:void lambda$ensureInterfacesAndForwardingMethodsSynthesized$0(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,java.util.List):78 -> a
-    51:69:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterPostProcessor.ensureInterfacesAndForwardingMethodsSynthesized(com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer,com.android.tools.r8.graph.DexProgramClass,java.util.List):114:132 -> a
-    51:69:void lambda$ensureInterfacesAndForwardingMethodsSynthesized$0(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,java.util.List):79 -> a
-    70:73:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterPostProcessor.ensureInterfacesAndForwardingMethodsSynthesized(com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer,com.android.tools.r8.graph.DexProgramClass,java.util.List):131:134 -> a
-    70:73:void lambda$ensureInterfacesAndForwardingMethodsSynthesized$0(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,java.util.List):79 -> a
-    74:79:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterPostProcessor.createForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass):146:151 -> a
-    74:79:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterPostProcessor.ensureInterfacesAndForwardingMethodsSynthesized(com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer,com.android.tools.r8.graph.DexProgramClass,java.util.List):135 -> a
-    74:79:void lambda$ensureInterfacesAndForwardingMethodsSynthesized$0(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,java.util.List):79 -> a
-    80:82:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterPostProcessor.createForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass):150:152 -> a
-    80:82:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterPostProcessor.ensureInterfacesAndForwardingMethodsSynthesized(com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer,com.android.tools.r8.graph.DexProgramClass,java.util.List):135 -> a
-    80:82:void lambda$ensureInterfacesAndForwardingMethodsSynthesized$0(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,java.util.List):79 -> a
-    83:84:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterPostProcessor.ensureInterfacesAndForwardingMethodsSynthesized(com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer,com.android.tools.r8.graph.DexProgramClass,java.util.List):136:137 -> a
-    83:84:void lambda$ensureInterfacesAndForwardingMethodsSynthesized$0(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,java.util.List):79 -> a
-com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer -> com.android.tools.r8.internal.We:
+    47:47:void com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterPostProcessor.reportInvalidLibrarySupertype(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.utils.collections.DexClassAndMethodSet):171 -> a
+    47:47:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterPostProcessor.inherit(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.collections.DexClassAndMethodSet):95 -> a
+    47:47:void lambda$ensureInterfacesAndForwardingMethodsSynthesized$0(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):78 -> a
+    48:48:void com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterPostProcessor.reportInvalidLibrarySupertype(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.utils.collections.DexClassAndMethodSet):171:171 -> a
+    48:48:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterPostProcessor.inherit(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.collections.DexClassAndMethodSet):95 -> a
+    48:48:void lambda$ensureInterfacesAndForwardingMethodsSynthesized$0(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):78 -> a
+    49:49:void com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterPostProcessor.reportInvalidLibrarySupertype(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.utils.collections.DexClassAndMethodSet):170:170 -> a
+    49:49:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterPostProcessor.inherit(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.collections.DexClassAndMethodSet):95 -> a
+    49:49:void lambda$ensureInterfacesAndForwardingMethodsSynthesized$0(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):78 -> a
+    50:50:void com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterPostProcessor.reportInvalidLibrarySupertype(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.utils.collections.DexClassAndMethodSet):166:166 -> a
+    50:50:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterPostProcessor.inherit(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.collections.DexClassAndMethodSet):95 -> a
+    50:50:void lambda$ensureInterfacesAndForwardingMethodsSynthesized$0(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):78 -> a
+    51:69: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):114:132 -> a
+    51:69:void lambda$ensureInterfacesAndForwardingMethodsSynthesized$0(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,java.util.List):79 -> a
+    70:73: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):131:134 -> a
+    70:73:void lambda$ensureInterfacesAndForwardingMethodsSynthesized$0(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,java.util.List):79 -> a
+    74:79:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterPostProcessor.createForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass):146:151 -> a
+    74:79: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):135 -> a
+    74:79:void lambda$ensureInterfacesAndForwardingMethodsSynthesized$0(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,java.util.List):79 -> a
+    80:82:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterPostProcessor.createForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass):150:152 -> a
+    80:82: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):135 -> a
+    80:82:void lambda$ensureInterfacesAndForwardingMethodsSynthesized$0(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,java.util.List):79 -> a
+    83:84: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):136:137 -> a
+    83:84:void lambda$ensureInterfacesAndForwardingMethodsSynthesized$0(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,java.util.List):79 -> a
+com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer -> com.android.tools.r8.internal.Ve:
     void acceptDesugaredLibraryRetargeterDispatchClasspathClass(com.android.tools.r8.graph.DexClasspathClass) -> a
-com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSyntheticHelper -> com.android.tools.r8.internal.Xe:
+com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSyntheticHelper -> com.android.tools.r8.internal.We:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():22:22 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.AppView):26:27 -> <init>
-    1:2:com.android.tools.r8.graph.DexClass ensureEmulatedHolderDispatchMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):33:34 -> a
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():436:436 -> a
-    3:3:com.android.tools.r8.graph.DexClass ensureEmulatedHolderDispatchMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):34 -> a
+    1:2:com.android.tools.r8.graph.DexClass ensureEmulatedHolderDispatchMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):33:34 -> a
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():438:438 -> a
+    3:3:com.android.tools.r8.graph.DexClass ensureEmulatedHolderDispatchMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):34 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4:7:com.android.tools.r8.graph.DexClass ensureEmulatedHolderDispatchMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):35:38 -> a
-    8:20:com.android.tools.r8.graph.DexClass ensureEmulatedHolderDispatchMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):37:49 -> a
+    4:7:com.android.tools.r8.graph.DexClass ensureEmulatedHolderDispatchMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):35:38 -> a
+    8:20:com.android.tools.r8.graph.DexClass ensureEmulatedHolderDispatchMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):37:49 -> a
     21:21:void lambda$ensureEmulatedHolderDispatchMethod$0(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.synthesis.SyntheticClasspathClassBuilder):54:54 -> a
-    22:23:void lambda$ensureEmulatedHolderDispatchMethod$1(com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer,com.android.tools.r8.graph.DexClasspathClass):56:57 -> a
+    22:23:void lambda$ensureEmulatedHolderDispatchMethod$1(com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer,com.android.tools.r8.graph.DexClasspathClass):56:57 -> a
     24:24:void lambda$ensureProgramEmulatedHolderDispatchMethod$2(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):77:77 -> a
     25:25:void lambda$ensureEmulatedInterfaceDispatchMethod$4(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.synthesis.SyntheticClasspathClassBuilder):103:103 -> a
-    26:26:com.android.tools.r8.graph.DexClass ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer):113:113 -> a
-    27:27:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():436:436 -> a
-    27:27:com.android.tools.r8.graph.DexClass ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer):113 -> a
+    26:26:com.android.tools.r8.graph.DexClass ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer):113:113 -> a
+    27:27:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():438:438 -> a
+    27:27:com.android.tools.r8.graph.DexClass ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer):113 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    28:34:com.android.tools.r8.graph.DexClass ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer):113:119 -> a
-    35:35:com.android.tools.r8.graph.DexClass ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer):117:117 -> a
+    28:34:com.android.tools.r8.graph.DexClass ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer):113:119 -> a
+    35:35:com.android.tools.r8.graph.DexClass ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer):117:117 -> a
     36:36:void lambda$ensureEmulatedInterfaceDispatchMethod$6(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):121:121 -> a
-    37:38:void lambda$ensureEmulatedInterfaceDispatchMethod$7(com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer,com.android.tools.r8.graph.DexProgramClass):123:124 -> a
+    37:38:void lambda$ensureEmulatedInterfaceDispatchMethod$7(com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer,com.android.tools.r8.graph.DexProgramClass):123:124 -> a
     39:40:void buildInterfaceDispatchMethod(com.android.tools.r8.synthesis.SyntheticClassBuilder,com.android.tools.r8.graph.DexClassAndMethod):131:132 -> a
     41:41:void lambda$buildInterfaceDispatchMethod$8(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.synthesis.SyntheticMethodBuilder):135:135 -> a
     42:42:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexClassAndMember.getName():53:53 -> a
@@ -49962,280 +50359,100 @@
     55:55:void lambda$buildHolderDispatchMethod$10(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.synthesis.SyntheticMethodBuilder):159 -> a
     56:61:void lambda$buildHolderDispatchMethod$10(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.synthesis.SyntheticMethodBuilder):159:164 -> a
     62:62:com.android.tools.r8.graph.Code lambda$buildHolderDispatchMethod$9(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):166:166 -> a
-    63:63:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():436:436 -> a
+    63:63:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():438:438 -> a
     63:63:com.android.tools.r8.graph.Code lambda$buildHolderDispatchMethod$9(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):166 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     64:64:com.android.tools.r8.graph.Code lambda$buildHolderDispatchMethod$9(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):174:174 -> a
     65:71:com.android.tools.r8.graph.Code lambda$buildHolderDispatchMethod$9(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):168:174 -> a
     72:76:void rewriteType(com.android.tools.r8.graph.DexType):180:184 -> a
-    1:2:void ensureProgramEmulatedHolderDispatchMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer):64:65 -> b
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():436:436 -> b
-    3:3:void ensureProgramEmulatedHolderDispatchMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer):65 -> b
+    1:2:void ensureProgramEmulatedHolderDispatchMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer):64:65 -> b
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():438:438 -> b
+    3:3:void ensureProgramEmulatedHolderDispatchMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer):65 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4:13:void ensureProgramEmulatedHolderDispatchMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer):65:74 -> b
-    14:14:void ensureProgramEmulatedHolderDispatchMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer):72:72 -> b
-    15:16:void lambda$ensureProgramEmulatedHolderDispatchMethod$3(com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer,com.android.tools.r8.graph.DexProgramClass):79:80 -> b
-    17:18:com.android.tools.r8.graph.DexClass ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):87:88 -> b
-    19:19:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():436:436 -> b
-    19:19:com.android.tools.r8.graph.DexClass ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):88 -> b
+    4:13:void ensureProgramEmulatedHolderDispatchMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer):65:74 -> b
+    14:14:void ensureProgramEmulatedHolderDispatchMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer):72:72 -> b
+    15:16:void lambda$ensureProgramEmulatedHolderDispatchMethod$3(com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer,com.android.tools.r8.graph.DexProgramClass):79:80 -> b
+    17:18:com.android.tools.r8.graph.DexClass ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):87:88 -> b
+    19:19:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():438:438 -> b
+    19:19:com.android.tools.r8.graph.DexClass ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):88 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    20:23:com.android.tools.r8.graph.DexClass ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):89:92 -> b
-    24:32:com.android.tools.r8.graph.DexClass ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):91:99 -> b
-    33:34:void lambda$ensureEmulatedInterfaceDispatchMethod$5(com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer,com.android.tools.r8.graph.DexClasspathClass):105:106 -> b
-com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer -> com.android.tools.r8.internal.Ze:
-    com.android.tools.r8.graph.DexItemFactory factory -> b
-    com.android.tools.r8.graph.AppView appView -> a
-    java.util.concurrent.ConcurrentHashMap allImplementedMethodsCache -> c
-    boolean $assertionsDisabled -> e
-    com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryEnumConversionSynthesizer enumConverter -> d
-    1:1:void <clinit>():97:97 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):105:105 -> <init>
-    2:9:void <init>(com.android.tools.r8.graph.AppView):101:108 -> <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):121:124 -> a
-    5:5:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.canConvert(com.android.tools.r8.graph.DexType):190:190 -> a
-    5:5:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):127 -> a
-    6:6:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.canGenerateWrapper(com.android.tools.r8.graph.DexType):218:218 -> a
-    6:6:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.canConvert(com.android.tools.r8.graph.DexType):191 -> a
-    6:6:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):127 -> a
-    7:11:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.reportInvalidInvoke(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):195:199 -> a
-    7:11:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):130 -> 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.DesugaredLibraryWrapperSynthesizer.reportInvalidInvoke(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):199:199 -> a
-    28:28:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):130 -> a
-    29:29:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.reportInvalidInvoke(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):199:199 -> a
-    29:29:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):130 -> a
-    30:30:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.reportInvalidInvoke(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):199:199 -> a
-    30:30:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):130 -> a
-    13:24:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.reportInvalidInvoke(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):199:210 -> a
-    13:24:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):130 -> a
-    25:25:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():436:436 -> a
-    25:25:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.reportInvalidInvoke(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):210 -> a
-    25:25:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):130 -> a
-    26:26:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.reportInvalidInvoke(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):213:213 -> a
-    26:26:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):130 -> a
-    27:27:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.reportInvalidInvoke(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):211:211 -> a
-    27:27:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):130 -> a
-    31:39: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.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):139:147 -> a
-    40:40:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.canGenerateWrapper(com.android.tools.r8.graph.DexType):218:218 -> a
-    40:40: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.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):147 -> a
-    41:48: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.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):147:154 -> a
-    49:53:com.android.tools.r8.graph.DexMethod getCustomConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):180:184 -> a
-    54:54:com.android.tools.r8.graph.DexMethod getCustomConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):183:183 -> a
-    55:61:com.android.tools.r8.graph.DexClass getValidClassToWrap(com.android.tools.r8.graph.DexType):222:228 -> a
-    62:62:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    62:62:com.android.tools.r8.graph.DexClass getValidClassToWrap(com.android.tools.r8.graph.DexType):228 -> a
-    63:63:com.android.tools.r8.graph.DexClass getValidClassToWrap(com.android.tools.r8.graph.DexType):228:228 -> a
-    64:64:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():436:436 -> a
-    64:64:com.android.tools.r8.graph.DexClass getValidClassToWrap(com.android.tools.r8.graph.DexType):228 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    65:66:com.android.tools.r8.graph.DexClass getValidClassToWrap(com.android.tools.r8.graph.DexType):228:229 -> a
-    67:73:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer$WrapperConversions ensureWrappers(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):258:264 -> a
-    74:74:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.vivifiedTypeFor(com.android.tools.r8.graph.DexType):234:234 -> a
-    74:74:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer$WrapperConversions ensureWrappers(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):265 -> a
-    75:93:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer$WrapperConversions ensureWrappers(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):266:284 -> a
-    94:94:java.util.Collection lambda$ensureWrappers$0(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):273:273 -> a
-    95:95:com.android.tools.r8.graph.DexProgramClass getExistingProgramWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind):301:301 -> a
-    96:98: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):305:307 -> a
-    99:101: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
-    102:102:com.android.tools.r8.graph.DexField com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.getWrapperUniqueField(com.android.tools.r8.graph.DexClass):317:317 -> a
-    102:102: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):369 -> a
-    103:103:com.android.tools.r8.graph.DexField com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.getWrapperUniqueField(com.android.tools.r8.graph.DexClass):317:317 -> a
-    103:103: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
-    104:107: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:374 -> a
-    108:108: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.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer):326:326 -> a
-    109:109:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():436:436 -> a
-    109:109: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.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer):326 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    110:114: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.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer):326:330 -> a
-    115:115: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):334:334 -> a
-    116:119: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.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer,java.util.function.Function):347:350 -> a
-    120:120: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:357 -> a
-    121:127: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):356:362 -> a
-    128:130:void lambda$ensureClasspathWrapper$3(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticMethodBuilder):360:360 -> a
-    131:132:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.computeProgramConversionMethodCode(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexClass):395:396 -> a
-    131:132: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):385 -> a
-    133:133: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":148,"2":149,"3":150}}
-    148:148:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.computeProgramConversionMethodCode(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexClass):396:396 -> a
-    148:148: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):385 -> a
-    149:149:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.computeProgramConversionMethodCode(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexClass):396:396 -> a
-    149:149: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):385 -> a
-    150:150:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.computeProgramConversionMethodCode(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexClass):396:396 -> a
-    150:150: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):385 -> a
-    134:146:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.computeProgramConversionMethodCode(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexClass):396:408 -> a
-    134:146: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):385 -> a
-    147:147: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:382 -> a
-    151:155:void buildConversionMethod(com.android.tools.r8.synthesis.SyntheticMethodBuilder,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.CfCode):413:417 -> a
-    156:161:void buildConversionMethod(com.android.tools.r8.synthesis.SyntheticMethodBuilder,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.CfCode):416:421 -> a
-    162:167: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):429:434 -> a
-    168:168:com.android.tools.r8.graph.DexField com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.wrappedValueField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):647:647 -> a
-    168:168:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.synthesizeWrappedValueEncodedField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):651 -> a
-    168:168: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):434 -> a
-    169:175:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.synthesizeWrappedValueEncodedField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):654:660 -> a
-    169:175: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):434 -> a
-    176:179: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):436:439 -> a
-    180:184:void buildWrapperConstructor(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.synthesis.SyntheticMethodBuilder):445:449 -> a
-    185:190:void buildWrapperConstructor(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.synthesis.SyntheticMethodBuilder):448:453 -> a
-    191:192:com.android.tools.r8.graph.Code lambda$buildWrapperConstructor$9(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexMethod):455:456 -> a
-    193:193:java.lang.String lambda$reportFinalMethodsInWrapper$10(com.android.tools.r8.graph.DexMethod):567:567 -> a
-    194:194:java.lang.String[] lambda$reportFinalMethodsInWrapper$11(int):567:567 -> a
-    195:197:void reportFinalMethodsInWrapper(java.util.Set):567:569 -> a
-    198:198:void reportFinalMethodsInWrapper(java.util.Set):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":776,"2":777,"3":778}}
-    776:776:void reportFinalMethodsInWrapper(java.util.Set):569:569 -> a
-    777:777:void reportFinalMethodsInWrapper(java.util.Set):569:569 -> a
-    778:778:void reportFinalMethodsInWrapper(java.util.Set):569:569 -> a
-    772:774:void reportFinalMethodsInWrapper(java.util.Set):574:576 -> a
-    775:775:void reportFinalMethodsInWrapper(java.util.Set):571:571 -> a
-    779:795: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):582:598 -> a
-    796:798: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):597:599 -> a
-    799:799:java.util.List allImplementedMethods(com.android.tools.r8.graph.DexClass):603:603 -> a
-    800:824:java.util.List com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.internalAllImplementedMethods(com.android.tools.r8.graph.DexClass):608:632 -> a
-    800:824:java.util.List lambda$allImplementedMethods$12(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):604 -> a
-    825:825:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():436:436 -> a
-    825:825:java.util.List com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.internalAllImplementedMethods(com.android.tools.r8.graph.DexClass):632 -> a
-    825:825:java.util.List lambda$allImplementedMethods$12(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):604 -> a
-    826:834:java.util.List com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.internalAllImplementedMethods(com.android.tools.r8.graph.DexClass):632:640 -> a
-    826:834:java.util.List lambda$allImplementedMethods$12(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):604 -> a
-    835:846:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):669:680 -> a
-    847:850:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.ensureProgramWrappersWithoutVirtualMethods(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer):694:697 -> a
-    847:850:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):681 -> a
-    851:851:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():436:436 -> a
-    851:851:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.ensureProgramWrappersWithoutVirtualMethods(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer):697 -> a
-    851:851:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):681 -> a
-    852:854:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.ensureProgramWrappersWithoutVirtualMethods(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer):697:699 -> a
-    852:854:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):681 -> a
-    855:855:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.vivifiedTypeFor(com.android.tools.r8.graph.DexType):234:234 -> a
-    855:855:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.ensureProgramWrappersWithoutVirtualMethods(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer):701 -> a
-    855:855:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):681 -> a
-    856:858:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.ensureProgramWrappersWithoutVirtualMethods(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer):700:702 -> a
-    856:858:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):681 -> a
-    859:859:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.vivifiedTypeFor(com.android.tools.r8.graph.DexType):234:234 -> a
-    859:859:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.ensureProgramWrappersWithoutVirtualMethods(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer):706 -> a
-    859:859:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):681 -> a
-    860:868:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.ensureProgramWrappersWithoutVirtualMethods(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer):703:711 -> a
-    860:868:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):681 -> a
-    869:869:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):685:685 -> a
-    870:873:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.ensureProgramWrappersVirtualMethods(com.android.tools.r8.graph.DexClass):716:719 -> a
-    870:873:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):686 -> a
-    874:880:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.ensureProgramWrappersVirtualMethods(com.android.tools.r8.graph.DexClass):718:724 -> a
-    874:880:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):686 -> a
-    881:881:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.ensureProgramWrappersVirtualMethods(com.android.tools.r8.graph.DexClass):723:723 -> a
-    881:881:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):686 -> a
-    882:882:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.ensureProgramWrappersVirtualMethods(com.android.tools.r8.graph.DexClass):722:722 -> a
-    882:882:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):686 -> a
-    1:2:boolean isSyntheticWrapper(com.android.tools.r8.graph.DexType):112:113 -> b
-    3:16: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):160:173 -> b
-    17:17:java.util.Collection lambda$ensureWrappers$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):281:281 -> b
-    18:18:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer$WrapperConversions getExistingProgramWrapperConversions(com.android.tools.r8.graph.DexClass):290:290 -> b
-    19:19:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():436:436 -> b
-    19:19:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer$WrapperConversions getExistingProgramWrapperConversions(com.android.tools.r8.graph.DexClass):290 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    20:27:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer$WrapperConversions getExistingProgramWrapperConversions(com.android.tools.r8.graph.DexClass):290:297 -> b
-    28:28:void lambda$buildWrapper$8(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.synthesis.SyntheticMethodBuilder):439:439 -> b
-    1:2:com.android.tools.r8.graph.DexEncodedField getWrapperUniqueEncodedField(com.android.tools.r8.graph.DexClass):312:313 -> c
-    3:18:java.util.Collection synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):512:527 -> c
-    19:19:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():436:436 -> c
-    19:19:java.util.Collection synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):527 -> c
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    20:24:java.util.Collection synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):527:531 -> c
-    25:45:java.util.Collection synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):530:550 -> c
-    46:51:java.util.Collection com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.finalizeWrapperMethods(java.util.List,java.util.Set):557:562 -> c
-    46:51:java.util.Collection synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):552 -> c
-    1:1:com.android.tools.r8.graph.DexField getWrapperUniqueField(com.android.tools.r8.graph.DexClass):317:317 -> d
-    2:22:java.util.Collection synthesizeVirtualMethodsForVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):461:481 -> d
-    23:36:java.util.Collection synthesizeVirtualMethodsForVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):477:490 -> d
-    37:55:java.util.Collection synthesizeVirtualMethodsForVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):487:505 -> d
-    56:61:java.util.Collection com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.finalizeWrapperMethods(java.util.List,java.util.Set):557:562 -> d
-    56:61:java.util.Collection synthesizeVirtualMethodsForVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):507 -> d
-    1:1:boolean isInvalidWrapper(com.android.tools.r8.graph.DexClass):390:390 -> e
-    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 -> e
-    2:2:boolean isInvalidWrapper(com.android.tools.r8.graph.DexClass):390 -> e
-com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer$WrapperConversions -> com.android.tools.r8.internal.Ye:
-    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):242:244 -> <init>
-    1:1:com.android.tools.r8.graph.DexMethod getConversion():248:248 -> a
-    1:1:com.android.tools.r8.graph.DexMethod getVivifiedConversion():252:252 -> b
-com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer -> com.android.tools.r8.internal.af:
-    void acceptWrapperClasspathClass(com.android.tools.r8.graph.DexClasspathClass) -> b
-com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo -> com.android.tools.r8.internal.NQ:
+    20:23:com.android.tools.r8.graph.DexClass ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):89:92 -> b
+    24:32:com.android.tools.r8.graph.DexClass ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):91:99 -> b
+    33:34:void lambda$ensureEmulatedInterfaceDispatchMethod$5(com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer,com.android.tools.r8.graph.DexClasspathClass):105:106 -> b
+com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo -> com.android.tools.r8.internal.WQ:
     java.util.Map retargetLibraryMember -> a
     java.util.Map nonFinalHolderRewrites -> b
     com.android.tools.r8.utils.collections.DexClassAndMethodSet emulatedDispatchMethods -> c
-    1:4:void <init>(java.util.Map,java.util.Map,com.android.tools.r8.utils.collections.DexClassAndMethodSet):35:38 -> <init>
-    1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo get(com.android.tools.r8.graph.AppView):42:42 -> a
-    2:2:com.android.tools.r8.utils.collections.DexClassAndMethodSet getEmulatedDispatchMethods():54:54 -> a
-    1:1:java.util.Map getNonFinalHolderRewrites():50:50 -> b
-    1:1:java.util.Map getRetargetLibraryMember():46:46 -> c
-com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo$RetargetingInfoBuilder -> com.android.tools.r8.internal.MQ:
+    1:4:void <init>(java.util.Map,java.util.Map,com.android.tools.r8.utils.collections.DexClassAndMethodSet):36:39 -> <init>
+    1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo get(com.android.tools.r8.graph.AppView):43:43 -> a
+    2:2:com.android.tools.r8.utils.collections.DexClassAndMethodSet getEmulatedDispatchMethods():55:55 -> a
+    1:1:java.util.Map getNonFinalHolderRewrites():51:51 -> b
+    1:1:java.util.Map getRetargetLibraryMember():47:47 -> c
+com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder -> com.android.tools.r8.internal.VQ:
     com.android.tools.r8.utils.collections.DexClassAndMethodSet emulatedDispatchMethods -> d
     java.util.Map retargetLibraryMember -> b
     java.util.Map nonFinalHolderRewrites -> c
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> e
-    1:1:void <clinit>():57:57 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):64:64 -> <init>
-    2:7:void <init>(com.android.tools.r8.graph.AppView):60:65 -> <init>
-    1:17:com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo$RetargetingInfoBuilder.computeRetargetingInfo():69:85 -> a
-    1:17:com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo access$000(com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo$RetargetingInfoBuilder):57 -> a
+    1:1:void <clinit>():58:58 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):65:65 -> <init>
+    2:7:void <init>(com.android.tools.r8.graph.AppView):61:66 -> <init>
+    1:17:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder.computeRetargetingInfo():70:86 -> a
+    1:17:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo access$000(com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder):58 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     18:18:boolean com.android.tools.r8.graph.DexClass.isFinal():656:656 -> a
-    18:18:com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo$RetargetingInfoBuilder.computeRetargetingInfo():86 -> a
-    18:18:com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo access$000(com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo$RetargetingInfoBuilder):57 -> a
+    18:18:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder.computeRetargetingInfo():87 -> a
+    18:18:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo access$000(com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder):58 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    19:19:com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo$RetargetingInfoBuilder.computeRetargetingInfo():87:87 -> a
-    19:19:com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo access$000(com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo$RetargetingInfoBuilder):57 -> a
+    19:19:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder.computeRetargetingInfo():88:88 -> a
+    19:19:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo access$000(com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder):58 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     20:20:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexClassAndMember.getName():53:53 -> a
-    20:20:com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo$RetargetingInfoBuilder.computeRetargetingInfo():87 -> a
-    20:20:com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo access$000(com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo$RetargetingInfoBuilder):57 -> a
+    20:20:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder.computeRetargetingInfo():88 -> a
+    20:20:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo access$000(com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder):58 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    21:22:com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo$RetargetingInfoBuilder.computeRetargetingInfo():87:88 -> a
-    21:22:com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo access$000(com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo$RetargetingInfoBuilder):57 -> a
+    21:22:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder.computeRetargetingInfo():88:89 -> a
+    21:22:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo access$000(com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder):58 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     23:23:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexClassAndMember.getName():53:53 -> a
-    23:23:com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo$RetargetingInfoBuilder.computeRetargetingInfo():88 -> a
-    23:23:com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo access$000(com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo$RetargetingInfoBuilder):57 -> a
+    23:23:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder.computeRetargetingInfo():89 -> a
+    23:23:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo access$000(com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder):58 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    24:41:com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo$RetargetingInfoBuilder.computeRetargetingInfo():88:105 -> a
-    24:41:com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo access$000(com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo$RetargetingInfoBuilder):57 -> a
+    24:41:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder.computeRetargetingInfo():89:106 -> a
+    24:41:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo access$000(com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder):58 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    42:42:com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo$RetargetingInfoBuilder.computeRetargetingInfo():104:104 -> a
-    42:42:com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo access$000(com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo$RetargetingInfoBuilder):57 -> a
+    42:42:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder.computeRetargetingInfo():105:105 -> a
+    42:42:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo access$000(com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder):58 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    43:62:com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo$RetargetingInfoBuilder.computeRetargetingInfo():102:121 -> a
-    43:62:com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo access$000(com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo$RetargetingInfoBuilder):57 -> a
+    43:62:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder.computeRetargetingInfo():103:122 -> a
+    43:62:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo access$000(com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder):58 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    63:67:com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo$RetargetingInfoBuilder.computeRetargetingInfo():120:124 -> a
-    63:67:com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo access$000(com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo$RetargetingInfoBuilder):57 -> a
+    63:67:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder.computeRetargetingInfo():121:125 -> a
+    63:67:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo access$000(com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder):58 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    68:77:com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo$RetargetingInfoBuilder.computeRetargetingInfo():123:132 -> a
-    68:77:com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo access$000(com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo$RetargetingInfoBuilder):57 -> a
+    68:77:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder.computeRetargetingInfo():124:133 -> a
+    68:77:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo access$000(com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder):58 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    78:85:com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo$RetargetingInfoBuilder.computeRetargetingInfo():130:137 -> a
-    78:85:com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo access$000(com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo$RetargetingInfoBuilder):57 -> a
+    78:85:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder.computeRetargetingInfo():131:138 -> a
+    78:85:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo access$000(com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder):58 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    86:92:com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo$RetargetingInfoBuilder.computeRetargetingInfo():136:142 -> a
-    86:92:com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo access$000(com.android.tools.r8.ir.desugar.desugaredlibrary.RetargetingInfo$RetargetingInfoBuilder):57 -> a
+    86:92:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder.computeRetargetingInfo():137:143 -> a
+    86:92:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo access$000(com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo$RetargetingInfoBuilder):58 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    93:94:com.android.tools.r8.graph.DexMethod computeRetargetMethod(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexType):147:148 -> a
+    93:94:com.android.tools.r8.graph.DexMethod computeRetargetMethod(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexType):148:149 -> a
     95:95:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.prependHolderToProto(com.android.tools.r8.graph.DexMethod):2582:2582 -> a
-    95:95:com.android.tools.r8.graph.DexMethod computeRetargetMethod(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexType):148 -> a
-    96:96:com.android.tools.r8.graph.DexMethod computeRetargetMethod(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexType):149:149 -> a
-    97:114:boolean isEmulatedInterfaceDispatch(com.android.tools.r8.graph.DexClassAndMethod):154:171 -> a
-    115:117:void lambda$isEmulatedInterfaceDispatch$0(com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexType):173:175 -> a
-    118:121:java.util.List findMethodsWithName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):183:186 -> a
+    95:95:com.android.tools.r8.graph.DexMethod computeRetargetMethod(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexType):149 -> a
+    96:96:com.android.tools.r8.graph.DexMethod computeRetargetMethod(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexType):150:150 -> a
+    97:114:boolean isEmulatedInterfaceDispatch(com.android.tools.r8.graph.DexClassAndMethod):155:172 -> a
+    115:117:void lambda$isEmulatedInterfaceDispatch$0(com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexType):174:176 -> a
+    118:121:java.util.List findMethodsWithName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):184:187 -> a
     122:122: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":311,"2":312,"3":313}}
-    311:311:java.util.List findMethodsWithName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):186:186 -> a
-    312:312:java.util.List findMethodsWithName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):186:186 -> a
-    313:313:java.util.List findMethodsWithName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):186:186 -> a
-    310:310:java.util.List findMethodsWithName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):188:188 -> a
-    314:314:boolean lambda$findMethodsWithName$1(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod):185:185 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":312,"2":313,"3":314}}
+    312:312:java.util.List findMethodsWithName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):187:187 -> a
+    313:313:java.util.List findMethodsWithName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):187:187 -> a
+    314:314:java.util.List findMethodsWithName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):187:187 -> a
+    311:311:java.util.List findMethodsWithName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):189:189 -> a
+    315:315:boolean lambda$findMethodsWithName$1(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod):186:186 -> a
 com.android.tools.r8.ir.desugar.icce.AlwaysThrowingInstructionDesugaring -> com.android.tools.r8.internal.C1:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> b
@@ -50332,7 +50549,7 @@
     56:56:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaring.ensureInvokeSpecialBridge(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaringEventConsumer):130:130 -> a
     56:56:java.util.List com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaring.desugarInvokeInstruction(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):102 -> a
     56:56:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):80 -> a
-com.android.tools.r8.ir.desugar.itf.ClassProcessor -> com.android.tools.r8.internal.ta:
+com.android.tools.r8.ir.desugar.itf.ClassProcessor -> com.android.tools.r8.internal.va:
     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
@@ -50579,8 +50796,8 @@
     44:46:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.computeInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):441:443 -> b
     44:46:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitInterfaceInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):975 -> b
     44:46: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.la:
-com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo -> com.android.tools.r8.internal.ma:
+com.android.tools.r8.ir.desugar.itf.ClassProcessor$1 -> com.android.tools.r8.internal.na:
+com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo -> com.android.tools.r8.internal.oa:
     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
@@ -50589,7 +50806,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.na:
+com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo -> com.android.tools.r8.internal.pa:
     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
@@ -50610,21 +50827,21 @@
     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.oa:
+com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces -> com.android.tools.r8.internal.qa:
     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.pa:
+com.android.tools.r8.ir.desugar.itf.ClassProcessor$LibraryReportingContext -> com.android.tools.r8.internal.ra:
     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.qa:
+com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures -> com.android.tools.r8.internal.sa:
     com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures EMPTY -> b
     java.util.Set signatures -> a
     1:1:void <clinit>():71:71 -> <clinit>
@@ -50635,7 +50852,7 @@
     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.ra:
+com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext -> com.android.tools.r8.internal.ta:
     com.android.tools.r8.graph.DexClass directSubClass -> a
     com.android.tools.r8.graph.DexProgramClass closestProgramSubClass -> b
     java.util.function.BiConsumer reportMissingTypeCallback -> c
@@ -50643,7 +50860,7 @@
     1:5:com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext forClass(com.android.tools.r8.graph.DexClass):308:312 -> a
     6:6:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):317:317 -> a
     7:7: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.sa:
+com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo -> com.android.tools.r8.internal.ua:
     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
@@ -50660,7 +50877,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     15:15:boolean isEmpty():195:195 -> a
     16:20: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.ee:
+com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper -> com.android.tools.r8.internal.ge:
     java.util.Set candidates -> a
     java.util.Set hidden -> b
     1:5:void <init>():17:21 -> <init>
@@ -50668,8 +50885,8 @@
     3:8:void hideMatches(com.android.tools.r8.graph.DexMethod):65:70 -> a
     9:9:void addDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):76:76 -> a
     10:13:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection wrapInCollection():81:84 -> a
-com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$1 -> com.android.tools.r8.internal.ce:
-com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection -> com.android.tools.r8.internal.de:
+com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$1 -> com.android.tools.r8.internal.ee:
+com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection -> com.android.tools.r8.internal.fe:
     java.util.List hidden -> b
     java.util.List live -> a
     com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection EMPTY -> c
@@ -50686,7 +50903,7 @@
     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():436:436 -> a
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():438:438 -> 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
@@ -50728,7 +50945,7 @@
     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():436:436 -> a
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():438:438 -> 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
@@ -50748,7 +50965,7 @@
     39:39:boolean com.android.tools.r8.graph.Definition.isProgramMethod():0:0 -> 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):203 -> 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:204 -> a
-    41:41:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():436:436 -> a
+    41:41:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():438:438 -> a
     41:41: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)"]}
     42:48: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
@@ -51307,7 +51524,7 @@
     1:1:boolean hasNonClinitDirectMethods():369:369 -> f
     1:1:void setHasBridgesToRemove():381:381 -> g
     1:1:void setHasNonClinitDirectMethods():373:373 -> h
-com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer -> com.android.tools.r8.internal.MK:
+com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer -> com.android.tools.r8.internal.VK:
     com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper helper -> b
     java.util.Map emulatedInterfacesHierarchy -> c
     com.android.tools.r8.graph.AppView appView -> a
@@ -51363,7 +51580,7 @@
     111:118: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:155 -> a
     111:118: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
     119:119:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):230:230 -> a
-    120:120:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():436:436 -> a
+    120:120:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():438:438 -> a
     120:120:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):230 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     121:132:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):230:241 -> a
@@ -51451,7 +51668,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.xd:
+com.android.tools.r8.ir.desugar.nest.D8NestBasedAccessDesugaring -> com.android.tools.r8.internal.zd:
     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
@@ -51482,53 +51699,53 @@
     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):933:933 -> b
+    11:11:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):932:932 -> 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):935 -> b
+    12:12:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):934 -> 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):935:935 -> b
+    13:13:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):934:934 -> 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):939:939 -> b
-    14:14:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):935 -> b
+    14:14:java.lang.String com.android.tools.r8.utils.InternalOptions.messageErrorMissingNestHost(com.android.tools.r8.graph.DexClass):938:938 -> b
+    14:14:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):934 -> 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):940:940 -> b
-    20:20:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):935 -> b
+    20:20:java.lang.String com.android.tools.r8.utils.InternalOptions.messageErrorMissingNestHost(com.android.tools.r8.graph.DexClass):939:939 -> b
+    20:20:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):934 -> 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):940:940 -> b
-    21:21:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):935 -> b
+    21:21:java.lang.String com.android.tools.r8.utils.InternalOptions.messageErrorMissingNestHost(com.android.tools.r8.graph.DexClass):939:939 -> b
+    21:21:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):934 -> 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):940:940 -> b
-    22:22:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):935 -> b
+    22:22:java.lang.String com.android.tools.r8.utils.InternalOptions.messageErrorMissingNestHost(com.android.tools.r8.graph.DexClass):939:939 -> b
+    22:22:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):934 -> 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):940:941 -> b
-    16:17:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):935 -> b
+    16:17:java.lang.String com.android.tools.r8.utils.InternalOptions.messageErrorMissingNestHost(com.android.tools.r8.graph.DexClass):939:940 -> b
+    16:17:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):934 -> 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):935:935 -> b
+    18:18:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):934:934 -> 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):933:933 -> b
+    19:19:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):932:932 -> 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
     1:1:void reportDesugarDependencies():40:40 -> c
-com.android.tools.r8.ir.desugar.nest.D8NestBasedAccessDesugaring$1 -> com.android.tools.r8.internal.vd:
+com.android.tools.r8.ir.desugar.nest.D8NestBasedAccessDesugaring$1 -> com.android.tools.r8.internal.xd:
     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.wd:
+com.android.tools.r8.ir.desugar.nest.D8NestBasedAccessDesugaring$NestBasedAccessDesugaringUseRegistry -> com.android.tools.r8.internal.yd:
     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>
@@ -51553,7 +51770,7 @@
     6:6:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89:89 -> 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.vE:
+com.android.tools.r8.ir.desugar.nest.Nest -> com.android.tools.r8.internal.AE:
     com.android.tools.r8.graph.DexClass hostClass -> a
     java.util.List members -> b
     java.util.List missingMembers -> c
@@ -51567,7 +51784,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.xE:
+com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring -> com.android.tools.r8.internal.CE:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     java.util.Map syntheticNestConstructorTypes -> c
     com.android.tools.r8.graph.AppView appView -> a
@@ -51601,8 +51818,8 @@
     void lambda$getMethodBridgeReference$5(com.android.tools.r8.synthesis.SyntheticClasspathClassBuilder) -> a
     void lambda$getMethodBridgeReference$6(com.android.tools.r8.graph.DexClasspathClass) -> a
     52:52:com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring create(com.android.tools.r8.graph.AppView):78:78 -> a
-    53:53:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1838:1838 -> a
-    53:53:boolean com.android.tools.r8.utils.InternalOptions.shouldDesugarNests():513 -> a
+    53:53:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1837:1837 -> a
+    53:53:boolean com.android.tools.r8.utils.InternalOptions.shouldDesugarNests():515 -> a
     53:53: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)"]}
     54:56:com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring create(com.android.tools.r8.graph.AppView):79:81 -> a
@@ -51707,7 +51924,7 @@
     299:299:com.android.tools.r8.graph.DexType lambda$getMethodBridgeReference$7(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexType):453 -> a
     300:305:com.android.tools.r8.graph.DexType lambda$getMethodBridgeReference$7(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexType):453:458 -> a
     306:312: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.wE:
+com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring$BridgeAndTarget -> com.android.tools.r8.internal.BE:
     com.android.tools.r8.graph.DexClassAndMember target -> b
     com.android.tools.r8.graph.DexMethod bridge -> a
     boolean $assertionsDisabled -> c
@@ -51716,11 +51933,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.yE:
+com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer -> com.android.tools.r8.internal.DE:
     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.RN:
+com.android.tools.r8.ir.desugar.records.RecordCfMethods -> com.android.tools.r8.internal.aO:
     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
@@ -51758,11 +51975,11 @@
     280:294:com.android.tools.r8.graph.CfCode RecordMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):298:312 -> b
     295:295:com.android.tools.r8.graph.CfCode RecordMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):309:309 -> b
     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
-com.android.tools.r8.ir.desugar.records.RecordCfToCfRewriter -> com.android.tools.r8.internal.SN:
+com.android.tools.r8.ir.desugar.records.RecordCfToCfRewriter -> com.android.tools.r8.internal.bO:
     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():471:471 -> a
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> 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
@@ -51778,7 +51995,7 @@
     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.WN:
+com.android.tools.r8.ir.desugar.records.RecordDesugaring -> com.android.tools.r8.internal.fO:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.DexProto recordToStringHelperProto -> c
@@ -51899,9 +52116,9 @@
     5:7:com.android.tools.r8.graph.DexMethod getFieldsAsObjectsMethod(com.android.tools.r8.graph.DexType):269:269 -> b
     8:20: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):332:344 -> b
     21:34: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.XN:
+com.android.tools.r8.ir.desugar.records.RecordDesugaringEventConsumer -> com.android.tools.r8.internal.gO:
     void acceptRecordClass(com.android.tools.r8.graph.DexProgramClass) -> a
-com.android.tools.r8.ir.desugar.records.RecordFieldValuesRewriter -> com.android.tools.r8.internal.dO:
+com.android.tools.r8.ir.desugar.records.RecordFieldValuesRewriter -> com.android.tools.r8.internal.mO:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> c
     com.android.tools.r8.ir.conversion.IRConverter irConverter -> b
@@ -51954,7 +52171,7 @@
     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.gO:
+com.android.tools.r8.ir.desugar.records.RecordRewriterHelper -> com.android.tools.r8.internal.pO:
     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
@@ -51970,8 +52187,8 @@
     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.eO:
-com.android.tools.r8.ir.desugar.records.RecordRewriterHelper$RecordInvokeDynamic -> com.android.tools.r8.internal.fO:
+com.android.tools.r8.ir.desugar.records.RecordRewriterHelper$1 -> com.android.tools.r8.internal.nO:
+com.android.tools.r8.ir.desugar.records.RecordRewriterHelper$RecordInvokeDynamic -> com.android.tools.r8.internal.oO:
     com.android.tools.r8.graph.DexString methodName -> a
     com.android.tools.r8.graph.DexString fieldNames -> c
     com.android.tools.r8.graph.DexField[] fields -> d
@@ -51991,7 +52208,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.NU:
+com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring -> com.android.tools.r8.internal.WU:
     com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods stringBuilderMethods -> b
     java.util.Map paramTypeToAppendMethod -> c
     com.android.tools.r8.graph.DexItemFactory factory -> a
@@ -52086,12 +52303,12 @@
     598:598:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
     598:598:com.android.tools.r8.errors.CompilationError error(com.android.tools.r8.graph.ProgramMethod,java.lang.String):422 -> a
     1:1:com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods access$100(com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring):49:49 -> b
-com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$ArgumentChunk -> com.android.tools.r8.internal.JU:
+com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$ArgumentChunk -> com.android.tools.r8.internal.SU:
     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.KU:
+com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$Chunk -> com.android.tools.r8.internal.TU:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.graph.DexMethod method -> a
     1:1:void <clinit>():337:337 -> <clinit>
@@ -52104,7 +52321,7 @@
     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.LU:
+com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$ConcatBuilder -> com.android.tools.r8.internal.UU:
     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
@@ -52130,12 +52347,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.MU:
+com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$ConstantChunk -> com.android.tools.r8.internal.VU:
     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.iX:
+com.android.tools.r8.ir.desugar.twr.TwrInstructionDesugaring -> com.android.tools.r8.internal.rX:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.DexProto twrCloseResourceProto -> c
@@ -52200,7 +52417,7 @@
     65:66:boolean isTwrCloseResourceInvoke(com.android.tools.r8.cf.code.CfInstruction):162:163 -> a
     67:67:boolean com.android.tools.r8.ir.desugar.twr.TwrInstructionDesugaring.isTwrCloseResourceMethod(com.android.tools.r8.graph.DexMethod):167:167 -> a
     67:67:boolean isTwrCloseResourceInvoke(com.android.tools.r8.cf.code.CfInstruction):163 -> a
-com.android.tools.r8.ir.optimize.AssertionsRewriter -> com.android.tools.r8.internal.o3:
+com.android.tools.r8.ir.optimize.AssertionsRewriter -> com.android.tools.r8.internal.r3:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.AssertionsConfiguration$AssertionTransformation defaultTransformation -> c
@@ -52306,10 +52523,10 @@
     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.m3:
+com.android.tools.r8.ir.optimize.AssertionsRewriter$1 -> com.android.tools.r8.internal.p3:
     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.n3:
+com.android.tools.r8.ir.optimize.AssertionsRewriter$ConfigurationEntryWithDexString -> com.android.tools.r8.internal.q3:
     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>
@@ -52331,7 +52548,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.G3:
+com.android.tools.r8.ir.optimize.AssumeInserter -> com.android.tools.r8.internal.J3:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():62:62 -> <clinit>
@@ -52500,11 +52717,11 @@
     104:104:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.isEverything():0:0 -> b
     104:104:boolean lambda$materializeAssumeInstructions$8(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):530 -> b
     1:1:java.util.List lambda$materializeSelectedAssumeInstructions$13(com.android.tools.r8.ir.code.Instruction):618:618 -> c
-com.android.tools.r8.ir.optimize.AssumeInserter$1 -> com.android.tools.r8.internal.v3:
-com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance -> com.android.tools.r8.internal.x3:
+com.android.tools.r8.ir.optimize.AssumeInserter$1 -> com.android.tools.r8.internal.y3:
+com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance -> com.android.tools.r8.internal.A3:
     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.w3:
+com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance$Builder -> com.android.tools.r8.internal.z3:
     java.util.Map dominatedPhiUsers -> c
     com.android.tools.r8.ir.code.Value assumedValue -> a
     java.util.Set dominatedUsers -> b
@@ -52522,7 +52739,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.y3:
+com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo -> com.android.tools.r8.internal.B3:
     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
@@ -52532,7 +52749,7 @@
     1:1:boolean hasDynamicTypeInfo():700:700 -> a
     1:1:boolean isNonNull():725:725 -> b
     1:1:void setNotNull():729:729 -> c
-com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues -> com.android.tools.r8.internal.A3:
+com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues -> com.android.tools.r8.internal.D3:
     java.util.Map assumedValues -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():746:746 -> <clinit>
@@ -52557,7 +52774,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.z3:
+com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder -> com.android.tools.r8.internal.C3:
     java.util.Map assumedValues -> a
     java.util.Set nonNullValuesKnownToDominateAllUsers -> b
     1:7:void <init>():850:856 -> <init>
@@ -52587,34 +52804,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.B3:
+com.android.tools.r8.ir.optimize.AssumeInserter$EverythingAssumedDominance -> com.android.tools.r8.internal.E3:
     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.C3:
+com.android.tools.r8.ir.optimize.AssumeInserter$EverythingElseAssumedDominance -> com.android.tools.r8.internal.F3:
     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.D3:
+com.android.tools.r8.ir.optimize.AssumeInserter$NothingAssumedDominance -> com.android.tools.r8.internal.G3:
     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.E3:
+com.android.tools.r8.ir.optimize.AssumeInserter$SomethingAssumedDominance -> com.android.tools.r8.internal.H3:
     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.F3:
+com.android.tools.r8.ir.optimize.AssumeInserter$UnknownAssumedDominance -> com.android.tools.r8.internal.I3:
     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.H3:
+com.android.tools.r8.ir.optimize.AssumeRemover -> com.android.tools.r8.internal.K3:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set affectedValues -> c
     java.util.Set assumeInstructionsToRemove -> d
@@ -52642,7 +52859,7 @@
     41:41: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.o4:
+com.android.tools.r8.ir.optimize.BasicBlockInstructionsEquivalence -> com.android.tools.r8.internal.r4:
     com.android.tools.r8.ir.regalloc.RegisterAllocator allocator -> a
     int[] hashes -> b
     boolean $assertionsDisabled -> c
@@ -52661,7 +52878,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.J9:
+com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization -> com.android.tools.r8.internal.L9:
     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
@@ -52740,7 +52957,7 @@
     742:742:boolean com.android.tools.r8.ir.code.Instruction.isConstClass():0:0 -> a
     742:742:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Instruction):544 -> a
     743:744:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Instruction):544:545 -> a
-com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult -> com.android.tools.r8.internal.H9:
+com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult -> com.android.tools.r8.internal.J9:
     java.util.Map fieldsWithStaticValues -> a
     com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult EMPTY -> b
     boolean $assertionsDisabled -> c
@@ -52750,13 +52967,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.I9:
+com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$WaveDoneAction -> com.android.tools.r8.internal.K9:
     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.tb:
+com.android.tools.r8.ir.optimize.CodeRewriter -> com.android.tools.r8.internal.vb:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.utils.InternalOptions options -> c
@@ -53212,7 +53429,7 @@
     25:25:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3460 -> i
     26:43:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3461:3478 -> i
     1:1:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1337:1337 -> j
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():471:471 -> j
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> j
     2:2:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1337 -> 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):1337:1341 -> j
@@ -53239,7 +53456,7 @@
     1:1:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):957:957 -> 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):961:961 -> k
     2:2:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):957 -> k
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isSwitchRewritingEnabled():1892:1892 -> k
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isSwitchRewritingEnabled():1898:1898 -> 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):961 -> k
     3:3:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):957 -> k
     4:4:boolean com.android.tools.r8.ir.optimize.CodeRewriter.rewriteSwitch(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.controlflow.SwitchCaseAnalyzer):964:964 -> k
@@ -53306,7 +53523,7 @@
     75:76:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1982 -> n
     77:86:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1996:2005 -> n
     1:1:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2233:2233 -> o
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():471:471 -> o
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> o
     2:2:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2233 -> 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):2236:2244 -> o
@@ -53413,10 +53630,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):3872 -> u
     9:41:void workaroundNumberConversionRegisterAllocationBug(com.android.tools.r8.ir.code.IRCode):3873:3905 -> u
-com.android.tools.r8.ir.optimize.CodeRewriter$1 -> com.android.tools.r8.internal.mb:
+com.android.tools.r8.ir.optimize.CodeRewriter$1 -> com.android.tools.r8.internal.ob:
     int[] $SwitchMap$com$android$tools$r8$ir$code$If$Type -> a
     1:1:void <clinit>():2679:2679 -> <clinit>
-com.android.tools.r8.ir.optimize.CodeRewriter$CSEExpressionEquivalence -> com.android.tools.r8.internal.nb:
+com.android.tools.r8.ir.optimize.CodeRewriter$CSEExpressionEquivalence -> com.android.tools.r8.internal.pb:
     com.android.tools.r8.utils.InternalOptions options -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():2400:2400 -> <clinit>
@@ -53435,7 +53652,7 @@
     25:39:int doHash(java.lang.Object):2400 -> a
     40:45:boolean identicalValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):2464:2469 -> a
     46:50:int getHashCode(com.android.tools.r8.ir.code.Value):2475:2479 -> a
-com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult -> com.android.tools.r8.internal.ob:
+com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult -> com.android.tools.r8.internal.qb:
     boolean anyAffectedValues -> a
     boolean anySimplifications -> b
     boolean $assertionsDisabled -> c
@@ -53444,7 +53661,7 @@
     2:5:void <init>(boolean,boolean):2562:2565 -> <init>
     1:1:boolean anyAffectedValues():2569:2569 -> a
     1:1:boolean anySimplifications():2573:2573 -> b
-com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder -> com.android.tools.r8.internal.pb:
+com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder -> com.android.tools.r8.internal.rb:
     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
@@ -53465,11 +53682,11 @@
     17:20:com.android.tools.r8.ir.code.BasicBlock build():675 -> a
     21:23:com.android.tools.r8.ir.code.BasicBlock build():677:679 -> a
     1:1:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setTarget(com.android.tools.r8.ir.code.BasicBlock):654:654 -> b
-com.android.tools.r8.ir.optimize.CodeRewriter$InstructionBuilder -> com.android.tools.r8.internal.qb:
+com.android.tools.r8.ir.optimize.CodeRewriter$InstructionBuilder -> com.android.tools.r8.internal.sb:
     com.android.tools.r8.ir.code.Position position -> b
     int blockNumber -> a
     1:2:void <init>(com.android.tools.r8.ir.code.Position):554:555 -> <init>
-com.android.tools.r8.ir.optimize.CodeRewriter$Interval -> com.android.tools.r8.internal.rb:
+com.android.tools.r8.ir.optimize.CodeRewriter$Interval -> com.android.tools.r8.internal.tb:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList keys -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():760:760 -> <clinit>
@@ -53503,7 +53720,7 @@
     13:13:boolean com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):564:564 -> b
     13:13:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):782 -> 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.sb:
+com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder -> com.android.tools.r8.internal.ub:
     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
@@ -53518,7 +53735,7 @@
     30:31:com.android.tools.r8.ir.code.BasicBlock build(com.android.tools.r8.ir.code.IRMetadata):619:620 -> a
     32:32:java.lang.Integer lambda$build$0(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,com.android.tools.r8.ir.code.BasicBlock):609:609 -> 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):615:615 -> b
-com.android.tools.r8.ir.optimize.ConstantCanonicalizer -> com.android.tools.r8.internal.ed:
+com.android.tools.r8.ir.optimize.ConstantCanonicalizer -> com.android.tools.r8.internal.gd:
     com.android.tools.r8.ir.optimize.CodeRewriter codeRewriter -> a
     int numberOfEffectivelyFinalFieldCanonicalization -> f
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap histogramOfCanonicalizationCandidatesPerMethod -> g
@@ -53578,7 +53795,7 @@
     206:206:boolean lambda$canonicalize$2(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):199:199 -> a
     207:207:int lambda$canonicalize$4(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):209:209 -> a
     1:1:boolean lambda$canonicalize$3(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):208:208 -> b
-com.android.tools.r8.ir.optimize.ConstantCanonicalizer$1 -> com.android.tools.r8.internal.dd:
+com.android.tools.r8.ir.optimize.ConstantCanonicalizer$1 -> com.android.tools.r8.internal.fd:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():95:95 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.optimize.ConstantCanonicalizer):95:95 -> <init>
@@ -53594,7 +53811,7 @@
     29:29:int hashCode(java.lang.Object):95 -> a
     30:30:int com.android.tools.r8.ir.optimize.ConstantCanonicalizer$1.hashCode(com.android.tools.r8.ir.code.Instruction):102:102 -> a
     30:30:int hashCode(java.lang.Object):95 -> a
-com.android.tools.r8.ir.optimize.DeadCodeRemover -> com.android.tools.r8.internal.Hd:
+com.android.tools.r8.ir.optimize.DeadCodeRemover -> com.android.tools.r8.internal.Jd:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.optimize.CodeRewriter codeRewriter -> b
     boolean $assertionsDisabled -> c
@@ -53626,7 +53843,7 @@
     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.Gd:
+com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult -> com.android.tools.r8.internal.Id:
     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>
@@ -53637,16 +53854,16 @@
     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.Dd:
+com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult$1 -> com.android.tools.r8.internal.Fd:
     1:1:void <init>():240:240 -> <init>
-com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult$2 -> com.android.tools.r8.internal.Ed:
+com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult$2 -> com.android.tools.r8.internal.Gd:
     1:1:void <init>():248:248 -> <init>
-com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult$3 -> com.android.tools.r8.internal.Fd:
+com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult$3 -> com.android.tools.r8.internal.Hd:
     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.Wd:
+com.android.tools.r8.ir.optimize.DefaultInliningOracle -> com.android.tools.r8.internal.Yd:
     com.android.tools.r8.ir.conversion.MethodProcessor methodProcessor -> e
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.optimize.Inliner inliner -> b
@@ -53672,19 +53889,19 @@
     24:39:boolean com.android.tools.r8.ir.optimize.Inliner.neverInline(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):127:142 -> a
     24:39:com.android.tools.r8.ir.optimize.Inliner$InlineResult computeInlining(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.WhyAreYouNotInliningReporter):265 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    40:40:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():504:504 -> a
+    40:40:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():506:506 -> a
     40:40:boolean com.android.tools.r8.ir.optimize.Inliner.neverInline(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):142 -> a
     40:40:com.android.tools.r8.ir.optimize.Inliner$InlineResult computeInlining(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.WhyAreYouNotInliningReporter):265 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     41:42:boolean com.android.tools.r8.ir.optimize.Inliner.neverInline(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):142:143 -> a
     41:42:com.android.tools.r8.ir.optimize.Inliner$InlineResult computeInlining(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.WhyAreYouNotInliningReporter):265 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    43:43:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):264:264 -> a
+    43:43:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):265:265 -> a
     43:43:boolean com.android.tools.r8.ir.optimize.Inliner.neverInline(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):143 -> a
     43:43:com.android.tools.r8.ir.optimize.Inliner$InlineResult computeInlining(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.WhyAreYouNotInliningReporter):265 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    44:44:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexType):260:260 -> a
-    44:44:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):264 -> a
+    44:44:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexType):261:261 -> a
+    44:44:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):265 -> a
     44:44:boolean com.android.tools.r8.ir.optimize.Inliner.neverInline(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):143 -> a
     44:44:com.android.tools.r8.ir.optimize.Inliner$InlineResult computeInlining(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.WhyAreYouNotInliningReporter):265 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(3)"]}
@@ -53711,7 +53928,7 @@
     354:354:boolean com.android.tools.r8.ir.optimize.DefaultInliningOracle.isSingleTargetInvalid(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):100:100 -> a
     354:354:com.android.tools.r8.ir.optimize.Inliner$InlineResult computeInlining(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.WhyAreYouNotInliningReporter):261 -> a
     361:369: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):130:138 -> a
-    370:370:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():471:471 -> a
+    370:370:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> a
     370:370: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):138 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     371:398: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):140:167 -> a
@@ -53726,7 +53943,7 @@
     401:401:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInBase(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticItems):179:179 -> a
     401:401: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
     402:407:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):168:173 -> a
-    408:408:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():504:504 -> a
+    408:408:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():506:506 -> a
     408:408:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):173 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     409:421:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):173:185 -> a
@@ -53786,7 +54003,7 @@
     668:684:boolean willExceedBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):579 -> a
     685:717:boolean willExceedMonitorEnterValuesBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):607:639 -> a
     718:718:void markInlined(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason):698:698 -> a
-com.android.tools.r8.ir.optimize.Devirtualizer -> com.android.tools.r8.internal.cf:
+com.android.tools.r8.ir.optimize.Devirtualizer -> com.android.tools.r8.internal.bf:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.utils.InternalOptions options -> b
     boolean $assertionsDisabled -> c
@@ -54121,7 +54338,7 @@
     31:31:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():446:446 -> a
     31:31:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):606 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    32:32:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():471:471 -> a
+    32:32:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> 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):606 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     33:35: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):607:609 -> a
@@ -54268,7 +54485,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.XB:
+com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool -> com.android.tools.r8.internal.cC:
     com.android.tools.r8.graph.DexClass clazz -> a
     com.android.tools.r8.com.google.common.base.Equivalence equivalence -> b
     java.util.Set interfaces -> d
@@ -54304,7 +54521,7 @@
     1:2:void linkSubtype(com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):181:182 -> b
     3:4:void seen(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):195:196 -> b
     1:2:void linkSupertype(com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):176:177 -> c
-com.android.tools.r8.ir.optimize.MemberValuePropagation -> com.android.tools.r8.internal.kC:
+com.android.tools.r8.ir.optimize.MemberValuePropagation -> com.android.tools.r8.internal.pC:
     com.android.tools.r8.ir.optimize.info.OptimizationFeedback feedback -> d
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set warnedFields -> c
@@ -54429,7 +54646,7 @@
     399:400:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):541:542 -> a
     401:413: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
     401:413: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.ZC:
+com.android.tools.r8.ir.optimize.MethodPoolCollection -> com.android.tools.r8.internal.eD:
     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
@@ -54519,7 +54736,7 @@
     27:27:void com.android.tools.r8.ir.optimize.MemberPoolCollection.lambda$getAllSubTypesExclusive$4(java.util.Deque,com.android.tools.r8.graph.DexType):155:155 -> d
     28:28:void com.android.tools.r8.ir.optimize.MemberPoolCollection.addNonNull(java.util.Collection,java.lang.Object):273:273 -> d
     28:28:void com.android.tools.r8.ir.optimize.MemberPoolCollection.lambda$getAllSubTypesExclusive$4(java.util.Deque,com.android.tools.r8.graph.DexType):155 -> d
-com.android.tools.r8.ir.optimize.MoveEliminator -> com.android.tools.r8.internal.PD:
+com.android.tools.r8.ir.optimize.MoveEliminator -> com.android.tools.r8.internal.UD:
     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>
@@ -54527,12 +54744,12 @@
     1:12:boolean shouldBeEliminated(com.android.tools.r8.ir.code.Instruction):22:33 -> a
     13:51:boolean shouldBeEliminated(com.android.tools.r8.ir.code.Instruction):32:70 -> a
     52:56:boolean lambda$shouldBeEliminated$0(com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.code.Move):55:59 -> a
-com.android.tools.r8.ir.optimize.NestReducer -> com.android.tools.r8.internal.BE:
+com.android.tools.r8.ir.optimize.NestReducer -> com.android.tools.r8.internal.GE:
     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():1838:1838 -> a
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.shouldDesugarNests():513 -> a
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1837:1837 -> a
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.shouldDesugarNests():515 -> 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
@@ -54557,7 +54774,7 @@
     3:3:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):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.CE:
+com.android.tools.r8.ir.optimize.NestUtils -> com.android.tools.r8.internal.HE:
     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
@@ -54581,7 +54798,7 @@
     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 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.iJ:
+com.android.tools.r8.ir.optimize.OutlinerImpl -> com.android.tools.r8.internal.rJ:
     java.util.Map outlineSites -> b
     java.util.Map generatedOutlines -> c
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> e
@@ -54618,7 +54835,7 @@
     122:122: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):1514:1514 -> a
     123:123:void lambda$buildOutlineMethods$8(com.android.tools.r8.ir.optimize.OutlinerImpl$Outline,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.synthesis.SyntheticMethodBuilder):1525:1525 -> a
     124:133:void lambda$buildOutlineMethods$8(com.android.tools.r8.ir.optimize.OutlinerImpl$Outline,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.synthesis.SyntheticMethodBuilder):1524:1533 -> a
-    134:134:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():471:471 -> a
+    134:134:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> a
     134:134: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 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     135:135:void lambda$buildOutlineMethods$8(com.android.tools.r8.ir.optimize.OutlinerImpl$Outline,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.synthesis.SyntheticMethodBuilder):1535:1535 -> a
@@ -54653,7 +54870,7 @@
     29:50:java.util.List buildOutlineMethods():1518:1539 -> 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.WI:
+com.android.tools.r8.ir.optimize.OutlinerImpl$BinOpOutlineInstruction -> com.android.tools.r8.internal.fJ:
     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
@@ -54708,7 +54925,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.XI:
+com.android.tools.r8.ir.optimize.OutlinerImpl$InvokeOutlineInstruction -> com.android.tools.r8.internal.gJ:
     com.android.tools.r8.ir.code.Invoke$Type invokeType -> d
     com.android.tools.r8.graph.DexProto proto -> f
     boolean hasOutValue -> e
@@ -54756,7 +54973,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.YI:
+com.android.tools.r8.ir.optimize.OutlinerImpl$NewInstanceOutlineInstruction -> com.android.tools.r8.internal.hJ:
     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
@@ -54785,7 +55002,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.ZI:
+com.android.tools.r8.ir.optimize.OutlinerImpl$Outline -> com.android.tools.r8.internal.iJ:
     java.util.List argumentTypes -> b
     java.util.List templateInstructions -> d
     java.util.List argumentMap -> c
@@ -54830,7 +55047,7 @@
     1:18:boolean equals(java.lang.Object):638:655 -> equals
     1:6:int hashCode():663:668 -> hashCode
     1:37:java.lang.String toString():724:760 -> toString
-com.android.tools.r8.ir.optimize.OutlinerImpl$OutlineCode -> com.android.tools.r8.internal.aJ:
+com.android.tools.r8.ir.optimize.OutlinerImpl$OutlineCode -> com.android.tools.r8.internal.jJ:
     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):1764:1765 -> <init>
@@ -54838,12 +55055,12 @@
     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):1791:1792 -> a
     3:3:void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry):1802:1802 -> a
     4:4:void registerCodeReferencesForDesugaring(com.android.tools.r8.graph.ClasspathMethod,com.android.tools.r8.graph.UseRegistry):1807:1807 -> a
-    1:1:int computeHashCode():1812:1812 -> e0
+    1:1:int computeHashCode():1812:1812 -> f0
     1:1:boolean computeEquals(java.lang.Object):1817:1817 -> g
-    int estimatedDexCodeSizeUpperBoundInBytes() -> i0
-    int estimatedSizeForInlining() -> j0
+    int estimatedDexCodeSizeUpperBoundInBytes() -> j0
+    int estimatedSizeForInlining() -> k0
     1:1:java.lang.String toString():1797:1797 -> toString
-com.android.tools.r8.ir.optimize.OutlinerImpl$OutlineInstruction -> com.android.tools.r8.internal.cJ:
+com.android.tools.r8.ir.optimize.OutlinerImpl$OutlineInstruction -> com.android.tools.r8.internal.lJ:
     com.android.tools.r8.ir.optimize.OutlinerImpl$OutlineInstruction$OutlineInstructionType type -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():140:140 -> <clinit>
@@ -54856,18 +55073,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.bJ:
+com.android.tools.r8.ir.optimize.OutlinerImpl$OutlineInstruction$OutlineInstructionType$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.kJ:
 # {"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.dJ:
+com.android.tools.r8.ir.optimize.OutlinerImpl$OutlineMethodIdentifier -> com.android.tools.r8.internal.mJ:
     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):1186:1187 -> <init>
     1:1:void handle(int,int,com.android.tools.r8.ir.optimize.OutlinerImpl$Outline):1192:1192 -> a
-com.android.tools.r8.ir.optimize.OutlinerImpl$OutlineRewriter -> com.android.tools.r8.internal.eJ:
+com.android.tools.r8.ir.optimize.OutlinerImpl$OutlineRewriter -> com.android.tools.r8.internal.nJ:
     com.android.tools.r8.ir.optimize.OutlinerImpl this$0 -> t
     boolean $assertionsDisabled -> u
     com.android.tools.r8.ir.code.IRCode code -> p
@@ -54886,17 +55103,17 @@
     69:69:void handle(int,int,com.android.tools.r8.ir.optimize.OutlinerImpl$Outline):1293 -> a
     70:72:void handle(int,int,com.android.tools.r8.ir.optimize.OutlinerImpl$Outline):1294:1296 -> a
     73:75:boolean removeMethodFromOutlineList(com.android.tools.r8.ir.optimize.OutlinerImpl$Outline):1302:1304 -> a
-    76:80:java.util.Optional com.android.tools.r8.utils.ListUtils.removeFirstMatch(java.util.List,java.util.function.Predicate):225:229 -> a
+    76:80:java.util.Optional com.android.tools.r8.utils.ListUtils.removeFirstMatch(java.util.List,java.util.function.Predicate):233:237 -> a
     76:80:boolean removeMethodFromOutlineList(com.android.tools.r8.ir.optimize.OutlinerImpl$Outline):1303 -> a
     81:81:boolean removeMethodFromOutlineList(com.android.tools.r8.ir.optimize.OutlinerImpl$Outline):1306:1306 -> a
     82:86:boolean removeMethodFromOutlineList(com.android.tools.r8.ir.optimize.OutlinerImpl$Outline):1303:1307 -> a
     87:87:boolean lambda$removeMethodFromOutlineList$0(com.android.tools.r8.graph.ProgramMethod):1305:1305 -> a
-com.android.tools.r8.ir.optimize.OutlinerImpl$OutlineSiteIdentifier -> com.android.tools.r8.internal.fJ:
+com.android.tools.r8.ir.optimize.OutlinerImpl$OutlineSiteIdentifier -> com.android.tools.r8.internal.oJ:
     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):1199:1200 -> <init>
     1:3:void handle(int,int,com.android.tools.r8.ir.optimize.OutlinerImpl$Outline):1205:1207 -> a
     4:4:java.util.List lambda$handle$0(com.android.tools.r8.ir.optimize.OutlinerImpl$Outline):1206:1206 -> a
-com.android.tools.r8.ir.optimize.OutlinerImpl$OutlineSourceCode -> com.android.tools.r8.internal.gJ:
+com.android.tools.r8.ir.optimize.OutlinerImpl$OutlineSourceCode -> com.android.tools.r8.internal.pJ:
     com.android.tools.r8.ir.optimize.OutlinerImpl$Outline outline -> a
     com.android.tools.r8.ir.optimize.OutlinerImpl this$0 -> e
     boolean $assertionsDisabled -> f
@@ -54931,7 +55148,7 @@
     1:1:com.android.tools.r8.ir.code.Position getCurrentPosition():1740:1740 -> e
     boolean verifyRegister(int) -> f
     int instructionIndex(int) -> g
-com.android.tools.r8.ir.optimize.OutlinerImpl$OutlineSpotter -> com.android.tools.r8.internal.hJ:
+com.android.tools.r8.ir.optimize.OutlinerImpl$OutlineSpotter -> com.android.tools.r8.internal.qJ:
     com.android.tools.r8.graph.DexType returnType -> j
     int returnValueUniqueUsersLeft -> l
     com.android.tools.r8.ir.optimize.OutlinerImpl this$0 -> n
@@ -55038,12 +55255,12 @@
     254:258:void adjustReturnValueUsersLeft(int):1116:1120 -> a
     259:288:void candidate(int,int):1127:1156 -> a
     1:7:boolean supportedArgumentType(com.android.tools.r8.ir.code.Value):972:978 -> b
-    8:8:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():471:471 -> b
+    8:8:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> b
     8:8:boolean supportedArgumentType(com.android.tools.r8.ir.code.Value):978 -> 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):981:987 -> b
     16:26:void reset(int):1161:1171 -> b
-com.android.tools.r8.ir.optimize.PeepholeOptimizer -> com.android.tools.r8.internal.AJ:
+com.android.tools.r8.ir.optimize.PeepholeOptimizer -> com.android.tools.r8.internal.JJ:
     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
@@ -55122,7 +55339,7 @@
     1:19:boolean mayShareIdenticalBlockPrefix(com.android.tools.r8.ir.code.BasicBlock):207:225 -> b
     20:20:boolean mayShareIdenticalBlockPrefix(com.android.tools.r8.ir.code.BasicBlock):224:224 -> b
     21:21:java.util.List lambda$shareIdenticalBlockSuffix$2(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):271:271 -> b
-com.android.tools.r8.ir.optimize.PhiOptimizations -> com.android.tools.r8.internal.DJ:
+com.android.tools.r8.ir.optimize.PhiOptimizations -> com.android.tools.r8.internal.MJ:
     1:1:void <init>():21:21 -> <init>
     1:1:boolean optimize(com.android.tools.r8.ir.code.IRCode):24:24 -> a
     1:6:boolean tryMovePhisToStack(com.android.tools.r8.ir.code.IRCode):112:117 -> b
@@ -55171,7 +55388,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.oO:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination -> com.android.tools.r8.internal.xO:
     com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$BlockState activeState -> h
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> j
@@ -55280,7 +55497,7 @@
     54:54:void run():218:218 -> c
     55: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):475:499 -> c
     55:79:void run():218 -> c
-    80:80:boolean com.android.tools.r8.graph.AppView.hasLiveness():657:657 -> c
+    80:80:boolean com.android.tools.r8.graph.AppView.hasLiveness():659:659 -> 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):499 -> c
     80:80:void run():218 -> 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):501:503 -> c
@@ -55345,8 +55562,8 @@
     450:450:void run():293 -> c
     451:452:void run():293:294 -> c
     1:1:com.android.tools.r8.ir.code.IRCode access$300(com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination):56:56 -> d
-com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$1 -> com.android.tools.r8.internal.hO:
-com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$BlockState -> com.android.tools.r8.internal.iO:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$1 -> com.android.tools.r8.internal.qO:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$BlockState -> com.android.tools.r8.internal.rO:
     java.util.LinkedHashMap finalInstanceFieldValues -> a
     java.util.LinkedHashMap nonFinalInstanceFieldValues -> d
     boolean $assertionsDisabled -> i
@@ -55426,7 +55643,7 @@
     3:3:int com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$BlockState.size(java.util.Set):1067:1067 -> f
     3:3:int size():1059 -> f
     4:8:int size():1059:1063 -> f
-com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$BlockStates -> com.android.tools.r8.internal.jO:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$BlockStates -> com.android.tools.r8.internal.sO:
     java.util.LinkedHashMap activeStateAtExit -> a
     int capacity -> b
     boolean $assertionsDisabled -> c
@@ -55450,7 +55667,7 @@
     73:73:void recordActiveStateOnBlockExit(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$BlockState):689 -> a
     74:76:void recordActiveStateOnBlockExit(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$BlockState):690:692 -> a
     77:81:void removeState(com.android.tools.r8.ir.code.BasicBlock):696:700 -> a
-com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$ExistingValue -> com.android.tools.r8.internal.kO:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$ExistingValue -> com.android.tools.r8.internal.tO:
     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):97:97 -> <init>
@@ -55462,7 +55679,7 @@
     118:118:java.lang.String toString():115:115 -> toString
     119:119:java.lang.String toString():115:115 -> toString
     116:116:java.lang.String toString():115:115 -> toString
-com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$FieldAndObject -> com.android.tools.r8.internal.lO:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$FieldAndObject -> com.android.tools.r8.internal.uO:
     com.android.tools.r8.graph.DexField field -> a
     com.android.tools.r8.ir.code.Value object -> b
     boolean $assertionsDisabled -> c
@@ -55472,9 +55689,9 @@
     1:1:com.android.tools.r8.graph.DexField access$800(com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$FieldAndObject):136:136 -> a
     1:5:boolean equals(java.lang.Object):153:157 -> equals
     1:1:int hashCode():148:148 -> hashCode
-com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$FieldValue -> com.android.tools.r8.internal.mO:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$FieldValue -> com.android.tools.r8.internal.vO:
     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.nO:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$MaterializableValue -> com.android.tools.r8.internal.wO:
     com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination this$0 -> b
     com.android.tools.r8.ir.analysis.value.SingleValue value -> a
     boolean $assertionsDisabled -> c
@@ -55483,7 +55700,7 @@
     2:4:void <init>(com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination,com.android.tools.r8.ir.analysis.value.SingleValue):123:125 -> <init>
     1:3:void eliminateRedundantRead(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):130:132 -> a
     4:4:void eliminateRedundantRead(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):131:131 -> a
-com.android.tools.r8.ir.optimize.ReflectionOptimizer -> com.android.tools.r8.internal.TP:
+com.android.tools.r8.ir.optimize.ReflectionOptimizer -> com.android.tools.r8.internal.cQ:
     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
@@ -55532,13 +55749,13 @@
     183: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):111 -> a
     184:205: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
     206:220: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
-    221:221:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():471:471 -> a
+    221:221:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> a
     221: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):145 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     222:224: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
     225: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):147:147 -> a
     226:228: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.mS:
+com.android.tools.r8.ir.optimize.ServiceLoaderRewriter -> com.android.tools.r8.internal.vS:
     java.util.List serviceLoadMethods -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.androidapi.AndroidApiLevelCompute apiLevelCompute -> c
@@ -55554,7 +55771,7 @@
     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():471:471 -> a
+    111:111:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> 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
@@ -55583,7 +55800,7 @@
     239:239: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
     240:268:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.ServiceLoaderSourceCode.generate(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.DexItemFactory):90:118 -> a
     240:268: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.lS:
+com.android.tools.r8.ir.optimize.ServiceLoaderRewriter$Rewriter -> com.android.tools.r8.internal.uS:
     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
@@ -55600,7 +55817,7 @@
     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.IV:
+com.android.tools.r8.ir.optimize.SwitchCaseEliminator -> com.android.tools.r8.internal.RV:
     com.android.tools.r8.ir.code.BasicBlock alwaysHitTarget -> f
     boolean $assertionsDisabled -> j
     com.android.tools.r8.ir.code.InstructionListIterator iterator -> c
@@ -55686,7 +55903,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.JV:
+com.android.tools.r8.ir.optimize.SwitchMapCollector -> com.android.tools.r8.internal.SV:
     com.android.tools.r8.graph.DexString switchMapPrefix -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.DexString kotlinSwitchMapPrefix -> c
@@ -55715,7 +55932,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.pY:
+com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations -> com.android.tools.r8.internal.yY:
     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
@@ -55761,10 +55978,10 @@
     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.mY:
-com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations$MethodSynthesizerConsumer -> com.android.tools.r8.internal.nY:
+com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations$1 -> com.android.tools.r8.internal.vY:
+com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations$MethodSynthesizerConsumer -> com.android.tools.r8.internal.wY:
     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.oY:
+com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations$UtilityMethodForCodeOptimizations -> com.android.tools.r8.internal.xY:
     com.android.tools.r8.graph.ProgramMethod method -> a
     boolean optimized -> b
     boolean $assertionsDisabled -> c
@@ -55774,7 +55991,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.S9:
+com.android.tools.r8.ir.optimize.classinliner.ClassInliner -> com.android.tools.r8.internal.U9:
     java.util.concurrent.ConcurrentHashMap knownClasses -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():40:40 -> <clinit>
@@ -55796,19 +56013,19 @@
     137:154:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus com.android.tools.r8.ir.optimize.classinliner.ClassInliner.computeClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):285:302 -> a
     137:154:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus com.android.tools.r8.ir.optimize.classinliner.ClassInliner.isClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):270 -> a
     137:154: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
-    155:155:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():504:504 -> a
+    155:155:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():506:506 -> a
     155:155:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus com.android.tools.r8.ir.optimize.classinliner.ClassInliner.computeClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):305 -> a
     155:155:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus com.android.tools.r8.ir.optimize.classinliner.ClassInliner.isClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):270 -> a
     155:155: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
     156:157:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus com.android.tools.r8.ir.optimize.classinliner.ClassInliner.computeClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):305:306 -> a
     156:157:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus com.android.tools.r8.ir.optimize.classinliner.ClassInliner.isClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):270 -> a
     156:157:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus lambda$processMethodCode$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):160 -> a
-    158:158:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):264:264 -> a
+    158:158:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):265:265 -> a
     158:158:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus com.android.tools.r8.ir.optimize.classinliner.ClassInliner.computeClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):306 -> a
     158:158:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus com.android.tools.r8.ir.optimize.classinliner.ClassInliner.isClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):270 -> a
     158:158: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
-    159:159:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexType):260:260 -> a
-    159:159:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):264 -> a
+    159:159:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexType):261:261 -> a
+    159:159:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):265 -> a
     159:159:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus com.android.tools.r8.ir.optimize.classinliner.ClassInliner.computeClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):306 -> a
     159:159:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus com.android.tools.r8.ir.optimize.classinliner.ClassInliner.isClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):270 -> a
     159:159:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus lambda$processMethodCode$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):160 -> a
@@ -55820,12 +56037,12 @@
     164:164: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
     165:166: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
     165:166: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.R9:
+com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus -> com.android.tools.r8.internal.T9:
     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.T9:
+com.android.tools.r8.ir.optimize.classinliner.ClassInlinerCostAnalysis -> com.android.tools.r8.internal.V9:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.optimize.inliner.InliningIRProvider inliningIRProvider -> b
     boolean $assertionsDisabled -> e
@@ -55837,7 +56054,7 @@
     1:29:boolean willExceedInstructionBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List):52:80 -> a
     30:59: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
     30:59:boolean willExceedInstructionBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List):81 -> a
-    60:60:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():471:471 -> a
+    60:60:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> a
     60:60: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
     60:60:boolean willExceedInstructionBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List):81 -> a
     61:61:boolean com.android.tools.r8.ir.code.Instruction.isInstanceGet():0:0 -> a
@@ -55850,12 +56067,12 @@
     65:72:boolean willExceedInstructionBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List):81 -> a
     73:74: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
     73:74:boolean willExceedInstructionBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List):81 -> a
-    75:75:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():471:471 -> a
+    75:75:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> a
     75:75: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
     75:75:boolean willExceedInstructionBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List):81 -> a
     76:86:boolean willExceedInstructionBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List):82:92 -> a
     87:89:boolean exceedsInstructionBudgetAfterIncrement(int):98:100 -> a
-com.android.tools.r8.ir.optimize.classinliner.ClassInlinerReceiverSet -> com.android.tools.r8.internal.W9:
+com.android.tools.r8.ir.optimize.classinliner.ClassInlinerReceiverSet -> com.android.tools.r8.internal.Y9:
     java.util.Map deferredAliasValidityChecks -> c
     java.util.Set receiverAliases -> a
     java.util.Set illegalReceiverAliases -> b
@@ -56190,7 +56407,7 @@
     1527:1528:void removeInstruction(com.android.tools.r8.ir.code.Instruction):1247:1248 -> a
     1:1:com.android.tools.r8.graph.DexProgramClass getEligibleClass():130:130 -> b
     2:2:java.lang.RuntimeException reportUnknownFieldReadFromSingleton(com.android.tools.r8.ir.code.InstanceGet):819:819 -> b
-    3:3:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():500:500 -> b
+    3:3:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():502:502 -> b
     3:3: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)"]}
     4:4:java.lang.RuntimeException reportUnknownFieldReadFromSingleton(com.android.tools.r8.ir.code.InstanceGet):0:0 -> b
@@ -56239,7 +56456,7 @@
 com.android.tools.r8.ir.optimize.classinliner.analysis.AnalysisContext -> com.android.tools.r8.internal.F1:
     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.w5:
+com.android.tools.r8.ir.optimize.classinliner.analysis.BottomParameterUsage -> com.android.tools.r8.internal.z5:
     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>
@@ -56261,7 +56478,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.x5:
+com.android.tools.r8.ir.optimize.classinliner.analysis.BottomParameterUsagePerContext -> com.android.tools.r8.internal.A5:
     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>
@@ -56270,7 +56487,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.y5:
+com.android.tools.r8.ir.optimize.classinliner.analysis.BottomParameterUsages -> com.android.tools.r8.internal.B5:
     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>
@@ -56284,7 +56501,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.V9:
+com.android.tools.r8.ir.optimize.classinliner.analysis.ClassInlinerMethodConstraintAnalysis -> com.android.tools.r8.internal.X9:
     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
@@ -56298,7 +56515,7 @@
     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.Rd:
+com.android.tools.r8.ir.optimize.classinliner.analysis.DefaultAnalysisContext -> com.android.tools.r8.internal.Td:
     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>
@@ -56362,7 +56579,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.uF:
+com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsage -> com.android.tools.r8.internal.zF:
     boolean isParameterUsedAsLock -> e
     boolean $assertionsDisabled -> f
     java.util.Set fieldsReadFromParameter -> a
@@ -56386,7 +56603,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.vF:
+com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsagePerContext -> com.android.tools.r8.internal.AF:
     java.util.Map backing -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():14:14 -> <clinit>
@@ -56467,7 +56684,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.wF:
+com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages -> com.android.tools.r8.internal.BF:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap backing -> a
     com.android.tools.r8.ir.code.AssumeAndCheckCastAliasedValueConfiguration aliasedValueConfiguration -> b
     boolean $assertionsDisabled -> c
@@ -56552,7 +56769,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.tJ:
+com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage -> com.android.tools.r8.internal.CJ:
     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
@@ -56567,13 +56784,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.uJ:
+com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext -> com.android.tools.r8.internal.DJ:
     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.vJ:
+com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages -> com.android.tools.r8.internal.EJ:
     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
@@ -56598,7 +56815,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.UW:
+com.android.tools.r8.ir.optimize.classinliner.analysis.TransferFunction -> com.android.tools.r8.internal.dX:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     java.util.Set instructionsOfInterest -> g
     com.android.tools.r8.graph.AppView appView -> a
@@ -56761,7 +56978,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.TX:
+com.android.tools.r8.ir.optimize.classinliner.analysis.UnknownParameterUsage -> com.android.tools.r8.internal.cY:
     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>
@@ -56773,7 +56990,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.UX:
+com.android.tools.r8.ir.optimize.classinliner.analysis.UnknownParameterUsagePerContext -> com.android.tools.r8.internal.dY:
     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>
@@ -56782,7 +56999,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.VX:
+com.android.tools.r8.ir.optimize.classinliner.analysis.UnknownParameterUsages -> com.android.tools.r8.internal.eY:
     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>
@@ -56811,14 +57028,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.U9:
+com.android.tools.r8.ir.optimize.classinliner.constraint.ClassInlinerMethodConstraint -> com.android.tools.r8.internal.W9:
     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.Sc:
+com.android.tools.r8.ir.optimize.classinliner.constraint.ConditionalClassInlinerMethodConstraint -> com.android.tools.r8.internal.Uc:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages usages -> a
     1:1:void <clinit>():28:28 -> <clinit>
@@ -56836,7 +57053,7 @@
     33:35:boolean isEligibleForNewInstanceClassInlining(com.android.tools.r8.graph.ProgramMethod,int):74:76 -> a
     36:67:boolean isEligibleForStaticGetClassInlining(com.android.tools.r8.graph.AppView,int,com.android.tools.r8.ir.analysis.value.objectstate.ObjectState,com.android.tools.r8.graph.ProgramMethod):85:116 -> a
     1:2:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage getParameterUsage(int):68:69 -> b
-com.android.tools.r8.ir.optimize.controlflow.SwitchCaseAnalyzer -> com.android.tools.r8.internal.HV:
+com.android.tools.r8.ir.optimize.controlflow.SwitchCaseAnalyzer -> com.android.tools.r8.internal.QV:
     com.android.tools.r8.ir.optimize.controlflow.SwitchCaseAnalyzer INSTANCE -> a
     boolean $assertionsDisabled -> b
     1:3:void <clinit>():15:17 -> <clinit>
@@ -57928,7 +58145,7 @@
     54:56:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):205 -> a
     57:58: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
     57:58:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):205 -> a
-    59:59:boolean com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.enableRemoveProtoEnumSwitchMap():1567:1567 -> a
+    59:59:boolean com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.enableRemoveProtoEnumSwitchMap():1566:1566 -> a
     59:59: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)"]}
     59:59:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):205 -> a
@@ -58022,7 +58239,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.HA:
+com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass -> com.android.tools.r8.internal.MA:
     com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData data -> c
     com.android.tools.r8.graph.DexProgramClass localUtilityClass -> b
     boolean $assertionsDisabled -> d
@@ -58064,8 +58281,8 @@
     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.FA:
-com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass$Builder -> com.android.tools.r8.internal.GA:
+com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass$1 -> com.android.tools.r8.internal.KA:
+com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass$Builder -> com.android.tools.r8.internal.LA:
     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
@@ -58077,7 +58294,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.CS:
+com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass -> com.android.tools.r8.internal.LS:
     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):57:59 -> <init>
@@ -58103,8 +58320,8 @@
     7:7:com.android.tools.r8.graph.Code lambda$ensureOrdinalMethod$4(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):126:126 -> e
     1:5:com.android.tools.r8.graph.ProgramMethod ensureOrdinalMethod(com.android.tools.r8.graph.AppView):121:125 -> f
     6:6:com.android.tools.r8.graph.ProgramMethod ensureOrdinalMethod(com.android.tools.r8.graph.AppView):122:122 -> f
-com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$1 -> com.android.tools.r8.internal.AS:
-com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder -> com.android.tools.r8.internal.BS:
+com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$1 -> com.android.tools.r8.internal.JS:
+com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder -> com.android.tools.r8.internal.KS:
     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
@@ -58126,37 +58343,32 @@
     8:8:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):211 -> 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):232:237 -> a
     9:14:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):211 -> 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):245:246 -> a
-    15:16:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):215 -> a
-    17:17:com.android.tools.r8.graph.MethodAccessFlags com.android.tools.r8.graph.MethodAccessFlags.createForClassInitializer():79:79 -> 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):247 -> a
-    17:17:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):215 -> 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):247:247 -> a
-    18:18:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):215 -> a
-    19:42: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):257:280 -> a
-    19: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):248 -> a
-    19:42:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):215 -> a
-    43:47: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):248:252 -> a
-    43:47:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):215 -> a
-    48:52: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):286:290 -> a
-    48:52:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):216 -> a
-    53:53: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):288:288 -> a
-    53:53:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):216 -> a
-    54:60: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:293 -> a
-    54:60:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):216 -> a
-    61:71: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):309:319 -> a
-    61:71: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):294 -> a
-    61:71:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):216 -> a
-    72:89: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):313:330 -> a
-    72:89: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):294 -> a
-    72:89:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):216 -> a
-    90:95: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):294:299 -> a
-    90:95:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):216 -> a
-    96:96:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):214:214 -> a
-    97:102:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):213:218 -> a
-    103:106:com.android.tools.r8.graph.DexProgramClass findDeterministicContextType(java.util.Set):335:338 -> a
+    15: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:247 -> a
+    15:17:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):215 -> a
+    18:41: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):257:280 -> a
+    18:41: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):248 -> a
+    18:41:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):215 -> a
+    42:46: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):248:252 -> a
+    42:46:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):215 -> a
+    47:51: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):286:290 -> a
+    47:51:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):216 -> a
+    52:52: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):288:288 -> a
+    52:52:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):216 -> a
+    53:59: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:293 -> a
+    53:59:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):216 -> a
+    60:70: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):309:319 -> a
+    60:70: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):294 -> a
+    60:70:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):216 -> a
+    71:88: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):313:330 -> a
+    71:88: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):294 -> a
+    71:88:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):216 -> a
+    89:94: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):294:299 -> a
+    89:94:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):216 -> a
+    95:95:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):214:214 -> a
+    96:101:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):213:218 -> a
+    102:105:com.android.tools.r8.graph.DexProgramClass findDeterministicContextType(java.util.Set):335:338 -> a
     1:19:com.android.tools.r8.graph.DexProgramClass createClass():202:220 -> b
-com.android.tools.r8.ir.optimize.enums.classification.CheckNotNullEnumUnboxerMethodClassification -> com.android.tools.r8.internal.n9:
+com.android.tools.r8.ir.optimize.enums.classification.CheckNotNullEnumUnboxerMethodClassification -> com.android.tools.r8.internal.p9:
     int argumentIndex -> a
     1:2:void <init>(int):16:17 -> <init>
     com.android.tools.r8.ir.optimize.enums.classification.CheckNotNullEnumUnboxerMethodClassification asCheckNotNullClassification() -> a
@@ -58193,13 +58405,13 @@
     73:73: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
     74:74:com.android.tools.r8.ir.optimize.enums.classification.UnknownEnumUnboxerMethodClassification com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification.unknown():12:12 -> a
     74:74: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.MX:
+com.android.tools.r8.ir.optimize.enums.classification.UnknownEnumUnboxerMethodClassification -> com.android.tools.r8.internal.VX:
     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.o9:
+com.android.tools.r8.ir.optimize.enums.code.CheckNotZeroCode -> com.android.tools.r8.internal.q9:
     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
@@ -58234,16 +58446,16 @@
     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:int computeHashCode():95:95 -> e0
+    1:1:int computeHashCode():95:95 -> f0
     1:1:boolean computeEquals(java.lang.Object):90:90 -> g
-    1:1:int estimatedDexCodeSizeUpperBoundInBytes():100:100 -> i0
+    1:1:int estimatedDexCodeSizeUpperBoundInBytes():100:100 -> j0
     1:1:java.lang.String toString():0:0 -> toString
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":122,"2":123,"3":124}}
     122:122:java.lang.String toString():120:120 -> toString
     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.ON:
+com.android.tools.r8.ir.optimize.enums.eligibility.Reason -> com.android.tools.r8.internal.XN:
     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
@@ -58269,7 +58481,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.LN:
+com.android.tools.r8.ir.optimize.enums.eligibility.Reason$IllegalInvokeWithImpreciseParameterTypeReason -> com.android.tools.r8.internal.UN:
     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
@@ -58278,11 +58490,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.MN:
+com.android.tools.r8.ir.optimize.enums.eligibility.Reason$StringReason -> com.android.tools.r8.internal.VN:
     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.NN:
+com.android.tools.r8.ir.optimize.enums.eligibility.Reason$UnsupportedLibraryInvokeReason -> com.android.tools.r8.internal.WN:
     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
@@ -58291,13 +58503,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.b6:
+com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo -> com.android.tools.r8.internal.e6:
     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
     com.android.tools.r8.ir.analysis.type.DynamicType getDynamicType(int) -> b
     1:1:com.android.tools.r8.ir.optimize.info.TopCallSiteOptimizationInfo top():14:14 -> b
-com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo -> com.android.tools.r8.internal.Ac:
+com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo -> com.android.tools.r8.internal.Cc:
     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
@@ -58342,7 +58554,7 @@
     1:5:boolean equals(java.lang.Object):188:192 -> equals
     1:1:int hashCode():197:197 -> hashCode
     1:2:java.lang.String toString():202:203 -> toString
-com.android.tools.r8.ir.optimize.info.DefaultFieldOptimizationInfo -> com.android.tools.r8.internal.Ud:
+com.android.tools.r8.ir.optimize.info.DefaultFieldOptimizationInfo -> com.android.tools.r8.internal.Wd:
     com.android.tools.r8.ir.optimize.info.DefaultFieldOptimizationInfo INSTANCE -> a
     1:1:void <clinit>():13:13 -> <clinit>
     1:1:void <init>():15:15 -> <init>
@@ -58355,7 +58567,7 @@
     boolean isDead() -> i
     boolean valueHasBeenPropagated() -> j
     1:1:com.android.tools.r8.ir.optimize.info.DefaultFieldOptimizationInfo getInstance():18:18 -> k
-com.android.tools.r8.ir.optimize.info.DefaultMethodOptimizationInfo -> com.android.tools.r8.internal.be:
+com.android.tools.r8.ir.optimize.info.DefaultMethodOptimizationInfo -> com.android.tools.r8.internal.de:
     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
@@ -58403,18 +58615,18 @@
     int getReadBits() -> h
     boolean isDead() -> i
     boolean valueHasBeenPropagated() -> j
-com.android.tools.r8.ir.optimize.info.LibraryOptimizationInfoInitializerFeedback -> com.android.tools.r8.internal.Qz:
+com.android.tools.r8.ir.optimize.info.LibraryOptimizationInfoInitializerFeedback -> com.android.tools.r8.internal.Vz:
     com.android.tools.r8.ir.optimize.info.LibraryOptimizationInfoInitializerFeedback INSTANCE -> b
     1:1:void <clinit>():12:12 -> <clinit>
     1:1:void <init>():15:15 -> <init>
     1:1:void recordLibraryFieldHasAbstractValue(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.value.AbstractValue):23:23 -> a
     1:1:com.android.tools.r8.ir.optimize.info.LibraryOptimizationInfoInitializerFeedback getInstance():18:18 -> b
-com.android.tools.r8.ir.optimize.info.MemberOptimizationInfo -> com.android.tools.r8.internal.WB:
+com.android.tools.r8.ir.optimize.info.MemberOptimizationInfo -> com.android.tools.r8.internal.bC:
     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.RC:
+com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo -> com.android.tools.r8.internal.WC:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():21:21 -> <clinit>
     1:1:void <init>():21:21 -> <init>
@@ -58447,7 +58659,7 @@
     boolean isInitializerEnablingJavaVmAssertions() -> x
     boolean isReachabilitySensitive() -> y
     boolean mayHaveSideEffects() -> z
-com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector -> com.android.tools.r8.internal.TC:
+com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector -> com.android.tools.r8.internal.YC:
     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
@@ -58786,14 +58998,14 @@
     1255:1300: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
     1301:1301:boolean lambda$isNonNullOnNormalExit$4(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):1143:1143 -> 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.SC:
+com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect -> com.android.tools.r8.internal.XC:
     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.mE:
+com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo -> com.android.tools.r8.internal.rE:
     boolean $assertionsDisabled -> e
     com.android.tools.r8.ir.analysis.type.DynamicType dynamicType -> d
     int flags -> b
@@ -58824,7 +59036,7 @@
     1:1:void markAsPropagated():113:113 -> l
     1:1:void markCannotBeKept():86:86 -> 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.nE:
+com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo -> com.android.tools.r8.internal.sE:
     com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification enumUnboxerMethodClassification -> g
     java.util.BitSet nonNullParamOnNormalExits -> m
     java.util.BitSet nonNullParamOrThrow -> l
@@ -59006,18 +59218,18 @@
     1:1:boolean isInitializerEnablingJavaVmAssertions():467:467 -> x
     1:1:boolean isReachabilitySensitive():383:383 -> y
     1:1:boolean mayHaveSideEffects():487:487 -> z
-com.android.tools.r8.ir.optimize.info.OptimizationFeedback -> com.android.tools.r8.internal.AI:
+com.android.tools.r8.ir.optimize.info.OptimizationFeedback -> com.android.tools.r8.internal.FI:
     1:1:void <init>():20:20 -> <init>
     void modifyAppInfoWithLiveness(java.util.function.Consumer) -> a
     1:1:void fixupOptimizationInfos(java.lang.Iterable,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback$OptimizationInfoFixer):62:62 -> a
     2:2: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.zI:
+com.android.tools.r8.ir.optimize.info.OptimizationFeedback$OptimizationInfoFixer -> com.android.tools.r8.internal.EI:
     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.BI:
+com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed -> com.android.tools.r8.internal.GI:
     java.util.Map fieldOptimizationInfos -> b
     java.util.Map methodOptimizationInfos -> c
     java.util.Map processed -> d
@@ -59188,7 +59400,7 @@
     void unsetDynamicReturnType(com.android.tools.r8.graph.ProgramMethod) -> v
 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.DI:
+com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple -> com.android.tools.r8.internal.II:
     com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple INSTANCE -> a
     1:1:void <clinit>():27:27 -> <clinit>
     1:1:void <init>():29:29 -> <init>
@@ -59456,12 +59668,12 @@
     5:5:void unsetInlinedIntoSingleCallSite(com.android.tools.r8.graph.ProgramMethod):270 -> w
     6:6:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):341:341 -> w
     6:6:void unsetInlinedIntoSingleCallSite(com.android.tools.r8.graph.ProgramMethod):270 -> w
-com.android.tools.r8.ir.optimize.info.TopCallSiteOptimizationInfo -> com.android.tools.r8.internal.IW:
+com.android.tools.r8.ir.optimize.info.TopCallSiteOptimizationInfo -> com.android.tools.r8.internal.RW:
     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.F5:
+com.android.tools.r8.ir.optimize.info.bridge.BridgeAnalyzer -> com.android.tools.r8.internal.I5:
     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
@@ -59485,7 +59697,7 @@
     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.bZ:
+com.android.tools.r8.ir.optimize.info.bridge.VirtualBridgeInfo -> com.android.tools.r8.internal.kZ:
     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>
@@ -59573,7 +59785,7 @@
     1:6:boolean equals(java.lang.Object):87:92 -> equals
     1:1:int hashCode():79:79 -> hashCode
     1:1:java.lang.String toString():97:97 -> toString
-com.android.tools.r8.ir.optimize.info.field.NonTrivialInstanceFieldInitializationInfoCollection -> com.android.tools.r8.internal.xF:
+com.android.tools.r8.ir.optimize.info.field.NonTrivialInstanceFieldInitializationInfoCollection -> com.android.tools.r8.internal.CF:
     java.util.TreeMap infos -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():23:23 -> <clinit>
@@ -59595,7 +59807,7 @@
     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.PX:
+com.android.tools.r8.ir.optimize.info.field.UnknownInstanceFieldInitializationInfo -> com.android.tools.r8.internal.YX:
     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>
@@ -59603,7 +59815,7 @@
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens) -> a
     1:1:com.android.tools.r8.ir.optimize.info.field.UnknownInstanceFieldInitializationInfo getInstance():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.rd:
+com.android.tools.r8.ir.optimize.info.initializer.ContextInsensitiveInstanceInitializerInfoCollection -> com.android.tools.r8.internal.td:
     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
@@ -59613,7 +59825,7 @@
     1:1:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo get(com.android.tools.r8.ir.code.InvokeDirect):14 -> b
     1:1:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo com.android.tools.r8.ir.optimize.info.initializer.ContextInsensitiveInstanceInitializerInfoCollection.getContextInsensitive():25:25 -> c
     1:1:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo getContextInsensitive():14 -> c
-com.android.tools.r8.ir.optimize.info.initializer.DefaultInstanceInitializerInfo -> com.android.tools.r8.internal.Yd:
+com.android.tools.r8.ir.optimize.info.initializer.DefaultInstanceInitializerInfo -> com.android.tools.r8.internal.ae:
     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>
@@ -59658,7 +59870,7 @@
     5:5:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection empty():23:23 -> a
     com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo get(com.android.tools.r8.ir.code.InvokeDirect) -> b
     com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo getContextInsensitive() -> c
-com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo -> com.android.tools.r8.internal.AF:
+com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo -> com.android.tools.r8.internal.FF:
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection fieldInitializationInfos -> b
     boolean $assertionsDisabled -> e
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet -> c
@@ -59687,8 +59899,8 @@
     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.yF:
-com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder -> com.android.tools.r8.internal.zF:
+com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$1 -> com.android.tools.r8.internal.DF:
+com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder -> com.android.tools.r8.internal.EF:
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection instanceFieldInitializationInfos -> a
     boolean $assertionsDisabled -> e
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet -> c
@@ -59745,7 +59957,7 @@
     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.Xd:
+com.android.tools.r8.ir.optimize.inliner.DefaultInliningReasonStrategy -> com.android.tools.r8.internal.Zd:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.conversion.CallSiteInformation callSiteInformation -> b
     com.android.tools.r8.utils.InternalOptions$InlinerOptions options -> c
@@ -59755,12 +59967,12 @@
     1:16:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):37:52 -> a
     17:23:boolean com.android.tools.r8.ir.optimize.inliner.DefaultInliningReasonStrategy.isSingleCallerInliningTarget(com.android.tools.r8.graph.ProgramMethod):65:71 -> a
     17:23:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):54 -> a
-    24:24:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():504:504 -> a
+    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):71 -> 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.conversion.MethodProcessor):54 -> a
     25:25:boolean com.android.tools.r8.ir.optimize.inliner.DefaultInliningReasonStrategy.isSingleCallerInliningTarget(com.android.tools.r8.graph.ProgramMethod):71:71 -> 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.conversion.MethodProcessor):54 -> a
-    26:26:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():504:504 -> 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):72 -> 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.conversion.MethodProcessor):54 -> a
     27:27:boolean com.android.tools.r8.ir.optimize.inliner.DefaultInliningReasonStrategy.isSingleCallerInliningTarget(com.android.tools.r8.graph.ProgramMethod):72:72 -> a
@@ -59802,7 +60014,7 @@
     1:1:boolean verifyIRCacheIsEmpty():67:67 -> b
 com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy -> com.android.tools.r8.internal.co:
     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.conversion.MethodProcessor) -> a
-com.android.tools.r8.ir.optimize.inliner.NopWhyAreYouNotInliningReporter -> com.android.tools.r8.internal.CF:
+com.android.tools.r8.ir.optimize.inliner.NopWhyAreYouNotInliningReporter -> com.android.tools.r8.internal.HF:
     com.android.tools.r8.ir.optimize.inliner.NopWhyAreYouNotInliningReporter INSTANCE -> a
     1:1:void <clinit>():15:15 -> <clinit>
     1:1:void <init>():18:18 -> <init>
@@ -59839,7 +60051,7 @@
     void reportUnknownTarget() -> v
     boolean unsetReasonHasBeenReportedFlag() -> w
     1:1:com.android.tools.r8.ir.optimize.inliner.NopWhyAreYouNotInliningReporter getInstance():21:21 -> x
-com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter -> com.android.tools.r8.internal.BZ:
+com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter -> com.android.tools.r8.internal.KZ:
     1:1:void <init>():18:18 -> <init>
     void reportCallerNotSameClass() -> a
     void reportIncorrectArity(int,int) -> a
@@ -59875,7 +60087,7 @@
     void reportRecursiveMethod() -> u
     void reportUnknownTarget() -> v
     boolean unsetReasonHasBeenReportedFlag() -> w
-com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporterImpl -> com.android.tools.r8.internal.CZ:
+com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporterImpl -> com.android.tools.r8.internal.LZ:
     boolean $assertionsDisabled -> e
     com.android.tools.r8.graph.ProgramMethod context -> b
     com.android.tools.r8.graph.ProgramMethod callee -> a
@@ -59935,7 +60147,7 @@
     1:1:void reportRecursiveMethod():209:209 -> u
     1:1:void reportUnknownTarget():214:214 -> v
     1:2:boolean unsetReasonHasBeenReportedFlag():270:271 -> w
-com.android.tools.r8.ir.optimize.library.BooleanMethodOptimizer -> com.android.tools.r8.internal.i5:
+com.android.tools.r8.ir.optimize.library.BooleanMethodOptimizer -> com.android.tools.r8.internal.l5:
     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>
@@ -59964,7 +60176,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.L5:
+com.android.tools.r8.ir.optimize.library.ByteMethodOptimizer -> com.android.tools.r8.internal.O5:
     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
@@ -59983,7 +60195,7 @@
     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():657:657 -> 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
@@ -60002,7 +60214,7 @@
     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.Fz:
+com.android.tools.r8.ir.optimize.library.LibraryFieldSynthesis -> com.android.tools.r8.internal.Kz:
     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
@@ -60010,7 +60222,7 @@
     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:19:void lambda$synthesizeEnumFields$0(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexField):38:44 -> a
     20:20: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.Hz:
+com.android.tools.r8.ir.optimize.library.LibraryMemberOptimizer -> com.android.tools.r8.internal.Mz:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Map libraryMethodModelCollections -> d
     java.util.Set modeledLibraryTypes -> c
@@ -60047,11 +60259,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.Jz:
+com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection -> com.android.tools.r8.internal.Oz:
     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.Iz:
-com.android.tools.r8.ir.optimize.library.LibraryMethodSideEffectModelCollection -> com.android.tools.r8.internal.Nz:
+com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State -> com.android.tools.r8.internal.Nz:
+com.android.tools.r8.ir.optimize.library.LibraryMethodSideEffectModelCollection -> com.android.tools.r8.internal.Sz:
     java.util.Map finalMethodsWithoutSideEffects -> a
     java.util.Set nonFinalMethodsWithoutSideEffects -> c
     java.util.Set unconditionalFinalMethodsWithoutSideEffects -> b
@@ -60076,7 +60288,7 @@
     2:2:boolean lambda$buildFinalMethodsWithoutSideEffects$3(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,java.util.List):56:56 -> b
     3:29:java.util.Set buildUnconditionalFinalMethodsWithoutSideEffects(com.android.tools.r8.graph.DexItemFactory):71:97 -> b
     1:1:boolean lambda$buildFinalMethodsWithoutSideEffects$2(com.android.tools.r8.graph.DexMethod,java.util.List):52:52 -> c
-com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer -> com.android.tools.r8.internal.Pz:
+com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer -> com.android.tools.r8.internal.Uz:
     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
@@ -60157,7 +60369,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.MA:
+com.android.tools.r8.ir.optimize.library.LogMethodOptimizer -> com.android.tools.r8.internal.RA:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.DexMethod wtfMethod -> i
     com.android.tools.r8.graph.DexMethod eMethod -> h
@@ -60179,14 +60391,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.aI:
+com.android.tools.r8.ir.optimize.library.ObjectMethodOptimizer -> com.android.tools.r8.internal.fI:
     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.qI:
+com.android.tools.r8.ir.optimize.library.ObjectsMethodOptimizer -> com.android.tools.r8.internal.vI:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.utils.InternalOptions options -> d
@@ -60244,7 +60456,7 @@
     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:69: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
     60: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):79 -> a
-    70:70:boolean com.android.tools.r8.graph.AppView.hasClassHierarchy():640:640 -> a
+    70:70:boolean com.android.tools.r8.graph.AppView.hasClassHierarchy():642:642 -> a
     70: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):195 -> a
     70: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: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):196:196 -> a
@@ -60283,14 +60495,14 @@
     132: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):122:122 -> a
     132: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
     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.iU:
+com.android.tools.r8.ir.optimize.library.StatelessLibraryMethodModelCollection -> com.android.tools.r8.internal.rU:
     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.IU:
+com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer -> com.android.tools.r8.internal.RU:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.utils.InternalOptions options -> c
@@ -60381,7 +60593,7 @@
     85:85: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.HU:
+com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State -> com.android.tools.r8.internal.QU:
     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
@@ -60406,7 +60618,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.OU:
+com.android.tools.r8.ir.optimize.library.StringMethodOptimizer -> com.android.tools.r8.internal.XU:
     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>
@@ -60440,7 +60652,7 @@
     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.t3:
+com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo -> com.android.tools.r8.internal.w3:
     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>
@@ -60451,10 +60663,10 @@
     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.u3:
+com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfoLookup -> com.android.tools.r8.internal.x3:
     1:8:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo lookupAssumeInfo(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexClassAndMethod):22:29 -> a
     9:23:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo lookupAssumeInfo(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClassAndMember):35:49 -> a
-com.android.tools.r8.ir.optimize.outliner.OutlineCollection -> com.android.tools.r8.internal.SI:
+com.android.tools.r8.ir.optimize.outliner.OutlineCollection -> com.android.tools.r8.internal.bJ:
     java.util.Map canonicalization -> a
     java.util.Map outlines -> c
     com.android.tools.r8.graph.GraphLens appliedGraphLens -> b
@@ -60475,14 +60687,14 @@
     15:34:void rewriteWithLens(com.android.tools.r8.graph.GraphLens):55:74 -> a
     35:41:void lambda$rewriteWithLens$0(com.android.tools.r8.graph.GraphLens,java.util.Map,com.android.tools.r8.graph.DexMethod,java.util.List):62:68 -> a
     42:43:java.util.List rewriteOutlinesWithLens(java.util.List,com.android.tools.r8.graph.GraphLens):79:80 -> a
-    44:44:java.util.List com.android.tools.r8.utils.ListUtils.mapOrElse(java.util.List,java.util.function.Function):168:168 -> a
+    44:44:java.util.List com.android.tools.r8.utils.ListUtils.mapOrElse(java.util.List,java.util.function.Function):176:176 -> a
     44:44:java.util.List rewriteOutlinesWithLens(java.util.List,com.android.tools.r8.graph.GraphLens):80 -> a
     45:45:com.android.tools.r8.ir.optimize.OutlinerImpl$Outline lambda$rewriteOutlinesWithLens$1(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.optimize.OutlinerImpl$Outline):80:80 -> a
     46:47:java.util.Map computeMethodsPerOutline(com.android.tools.r8.graph.AppView):96:97 -> a
     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.VI:
+com.android.tools.r8.ir.optimize.outliner.Outliner -> com.android.tools.r8.internal.eJ:
     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
@@ -60494,7 +60706,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.UI:
+com.android.tools.r8.ir.optimize.outliner.Outliner$1 -> com.android.tools.r8.internal.dJ:
     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
@@ -60502,7 +60714,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.q4:
+com.android.tools.r8.ir.optimize.peepholes.BasicBlockMuncher -> com.android.tools.r8.internal.t4:
     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
@@ -60518,7 +60730,7 @@
     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():10:10 -> 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.r4:
+com.android.tools.r8.ir.optimize.peepholes.BasicBlockPeephole -> com.android.tools.r8.internal.u4:
     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.Fg:
@@ -60545,7 +60757,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.BA:
+com.android.tools.r8.ir.optimize.peepholes.LoadLoadDupPeephole -> com.android.tools.r8.internal.GA:
     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
@@ -60556,10 +60768,10 @@
     1:24:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):41:64 -> a
     25:25:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> a
     25:25:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):64 -> a
-com.android.tools.r8.ir.optimize.peepholes.Match -> com.android.tools.r8.internal.UB:
+com.android.tools.r8.ir.optimize.peepholes.Match -> com.android.tools.r8.internal.ZB:
     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.RD:
+com.android.tools.r8.ir.optimize.peepholes.MoveLoadUpPeephole -> com.android.tools.r8.internal.WD:
     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
@@ -60592,12 +60804,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.xJ:
+com.android.tools.r8.ir.optimize.peepholes.PeepholeExpression -> com.android.tools.r8.internal.GJ:
     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.yJ:
+com.android.tools.r8.ir.optimize.peepholes.PeepholeHelper -> com.android.tools.r8.internal.HJ:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:java.util.function.Predicate withoutLocalInfo(java.util.function.Predicate):17:17 -> a
@@ -60608,7 +60820,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.zJ:
+com.android.tools.r8.ir.optimize.peepholes.PeepholeLayout -> com.android.tools.r8.internal.IJ:
     com.android.tools.r8.ir.optimize.peepholes.PeepholeExpression[] expressions -> b
     java.util.List instructions -> a
     boolean backwards -> c
@@ -60617,7 +60829,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.JJ:
+com.android.tools.r8.ir.optimize.peepholes.Point -> com.android.tools.r8.internal.SJ:
     java.util.function.Predicate predicate -> a
     int index -> b
     boolean $assertionsDisabled -> c
@@ -60629,7 +60841,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.lQ:
+com.android.tools.r8.ir.optimize.peepholes.RemoveDebugPositionPeephole -> com.android.tools.r8.internal.uQ:
     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
@@ -60639,14 +60851,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.wU:
+com.android.tools.r8.ir.optimize.peepholes.StoreLoadPeephole -> com.android.tools.r8.internal.FU:
     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.xU:
+com.android.tools.r8.ir.optimize.peepholes.StoreLoadToDupStorePeephole -> com.android.tools.r8.internal.GU:
     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
@@ -60665,7 +60877,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.yU:
+com.android.tools.r8.ir.optimize.peepholes.StoreSequenceLoadPeephole -> com.android.tools.r8.internal.HU:
     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
@@ -60691,7 +60903,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.GZ:
+com.android.tools.r8.ir.optimize.peepholes.Wildcard -> com.android.tools.r8.internal.PZ:
     java.util.function.Predicate predicate -> a
     int index -> b
     boolean $assertionsDisabled -> c
@@ -60703,7 +60915,7 @@
     3:3:java.util.List get(com.android.tools.r8.ir.optimize.peepholes.Match):42:42 -> a
     1:1:java.util.function.Predicate getPredicate():22:22 -> b
     int getMax() -> c
-com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer -> com.android.tools.r8.internal.Ga:
+com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer -> com.android.tools.r8.internal.Ia:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.GraphLens graphLensForOptimizationPass -> d
     java.util.concurrent.ConcurrentHashMap candidates -> g
@@ -60812,7 +61024,7 @@
     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.Ea:
+com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CallSiteReferencesInvalidator -> com.android.tools.r8.internal.Ga:
     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
@@ -60837,7 +61049,7 @@
     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.Fa:
+com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo -> com.android.tools.r8.internal.Ha:
     java.util.concurrent.atomic.AtomicInteger instancesCreated -> e
     com.android.tools.r8.graph.DexEncodedField singletonField -> b
     java.util.concurrent.atomic.AtomicInteger fieldWrites -> d
@@ -60855,12 +61067,12 @@
     2:2:com.android.tools.r8.graph.DexProgramClass hostClass():94 -> a
     3:4:com.android.tools.r8.graph.DexProgramClass hostClass():94:95 -> a
     1:1:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo invalidate():100:100 -> b
-com.android.tools.r8.ir.optimize.staticizer.ClassStaticizerGraphLens -> com.android.tools.r8.internal.Ha:
+com.android.tools.r8.ir.optimize.staticizer.ClassStaticizerGraphLens -> com.android.tools.r8.internal.Ja:
     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.uU:
+com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor -> com.android.tools.r8.internal.DU:
     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
@@ -61298,7 +61510,7 @@
     126:128:void removeTrivialBuilders():808:810 -> b
     1:1:java.util.Map getBuilderState(com.android.tools.r8.ir.code.Value):321:321 -> c
     1:1:java.util.Map lambda$createBuilderState$0(com.android.tools.r8.ir.code.Value):316:316 -> d
-com.android.tools.r8.ir.optimize.string.StringOptimizer -> com.android.tools.r8.internal.QU:
+com.android.tools.r8.ir.optimize.string.StringOptimizer -> com.android.tools.r8.internal.ZU:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> i
@@ -61422,13 +61634,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.PU:
+com.android.tools.r8.ir.optimize.string.StringOptimizer$StringOptimizerEscapeAnalysisConfiguration -> com.android.tools.r8.internal.YU:
     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.H8:
+com.android.tools.r8.ir.optimize.templates.CfUtilityMethodsForCodeOptimizations -> com.android.tools.r8.internal.J8:
     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
@@ -61442,7 +61654,7 @@
     32:32:com.android.tools.r8.graph.CfCode CfUtilityMethodsForCodeOptimizationsTemplates_toStringIfNotNull(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):177 -> b
     33:34:com.android.tools.r8.graph.CfCode CfUtilityMethodsForCodeOptimizationsTemplates_toStringIfNotNull(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):177:178 -> b
     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
-com.android.tools.r8.ir.optimize.typechecks.CheckCastAndInstanceOfMethodSpecialization -> com.android.tools.r8.internal.f9:
+com.android.tools.r8.ir.optimize.typechecks.CheckCastAndInstanceOfMethodSpecialization -> com.android.tools.r8.internal.h9:
     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
@@ -61676,7 +61888,7 @@
     3531:3539: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
     3540:3540: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
     3541:3576: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
-    3577:3577:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():471:471 -> a
+    3577:3577:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> a
     3577:3577:boolean unconstrainedForCf(int,com.android.tools.r8.utils.InternalOptions):2727 -> a
     3577:3577: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
     3578:3584: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
@@ -61698,11 +61910,11 @@
     3605:3605:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2615 -> a
     3606:3633:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2616:2643 -> a
     3634:3640:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2640:2646 -> a
-    3641:3641:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():471:471 -> a
+    3641:3641:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> a
     3641:3641: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)"]}
     3642:3649:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2646:2653 -> a
-    3650:3650:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():471:471 -> a
+    3650:3650:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> a
     3650:3650:boolean unconstrainedForCf(int,com.android.tools.r8.utils.InternalOptions):2727 -> a
     3650:3650:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2653 -> a
     3651:3688:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2653:2690 -> a
@@ -62212,7 +62424,7 @@
     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.xA:
+com.android.tools.r8.ir.regalloc.LiveIntervalsUse -> com.android.tools.r8.internal.CA:
     int position -> b
     int limit -> c
     1:3:void <init>(int,int):12:14 -> <init>
@@ -62224,7 +62436,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.zA:
+com.android.tools.r8.ir.regalloc.LiveRange -> com.android.tools.r8.internal.EA:
     com.android.tools.r8.ir.regalloc.LiveRange INFINITE -> d
     int start -> b
     int end -> c
@@ -62244,7 +62456,7 @@
     61:61:java.lang.String toString():28:28 -> toString
     62:62:java.lang.String toString():28:28 -> toString
     63:63:java.lang.String toString():28:28 -> toString
-com.android.tools.r8.ir.regalloc.RegisterAllocator -> com.android.tools.r8.internal.UP:
+com.android.tools.r8.ir.regalloc.RegisterAllocator -> com.android.tools.r8.internal.dQ:
     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
@@ -62253,7 +62465,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.VP:
+com.android.tools.r8.ir.regalloc.RegisterMove -> com.android.tools.r8.internal.eQ:
     com.android.tools.r8.ir.analysis.type.TypeElement type -> b
     com.android.tools.r8.ir.code.Instruction definition -> e
     boolean $assertionsDisabled -> f
@@ -62269,7 +62481,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.WP:
+com.android.tools.r8.ir.regalloc.RegisterMoveScheduler -> com.android.tools.r8.internal.fQ:
     java.util.Map valueMap -> b
     int tempRegister -> f
     java.util.Set moveSet -> a
@@ -62464,32 +62676,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:int computeHashCode():89:89 -> e0
+    1:1:int computeHashCode():89:89 -> f0
     1:1:boolean computeEquals(java.lang.Object):94:94 -> g
-    int estimatedDexCodeSizeUpperBoundInBytes() -> i0
-    com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider() -> r0
+    int estimatedDexCodeSizeUpperBoundInBytes() -> j0
+    com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider() -> s0
     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.k1:
     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.Z5:
+com.android.tools.r8.ir.synthetic.CallObjectInitCfCodeProvider -> com.android.tools.r8.internal.c6:
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):23:23 -> <init>
     1:6:com.android.tools.r8.graph.CfCode generateCfCode():28:33 -> a
-com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider -> com.android.tools.r8.internal.Je:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider -> com.android.tools.r8.internal.Le:
     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.ze:
-    com.android.tools.r8.ir.desugar.desugaredlibrary.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.DesugaredLibraryWrapperSynthesizer,boolean,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):236:237 -> <init>
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APICallbackWrapperCfCodeProvider -> com.android.tools.r8.internal.Be:
+    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.Ae:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConversionCfCodeProvider -> com.android.tools.r8.internal.Ce:
     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 -> a
     30:43:com.android.tools.r8.graph.CfCode generateCfCode():387:400 -> a
-com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterConstructorCfCodeProvider -> com.android.tools.r8.internal.Be:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterConstructorCfCodeProvider -> com.android.tools.r8.internal.De:
     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 -> a
@@ -62498,23 +62710,23 @@
     22:22:void com.android.tools.r8.cf.code.CfInstanceFieldWrite.<init>(com.android.tools.r8.graph.DexField):16:16 -> a
     22:22:com.android.tools.r8.graph.CfCode generateCfCode():581 -> a
     23:25:com.android.tools.r8.graph.CfCode generateCfCode():581:583 -> a
-com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterThrowRuntimeExceptionCfCodeProvider -> com.android.tools.r8.internal.Ce:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterThrowRuntimeExceptionCfCodeProvider -> com.android.tools.r8.internal.Ee:
     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 -> a
     12:12:com.android.tools.r8.graph.CfCode generateCfCode():608:608 -> a
     13:22:com.android.tools.r8.graph.CfCode generateCfCode():605:614 -> a
-com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterVivifiedWrapperCfCodeProvider -> com.android.tools.r8.internal.De:
-    com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer wrapperSynthesizer -> e
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterVivifiedWrapperCfCodeProvider -> com.android.tools.r8.internal.Fe:
     boolean itfCall -> f
     com.android.tools.r8.graph.DexField wrapperField -> c
     com.android.tools.r8.graph.DexMethod forwardMethod -> d
-    1:5: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.DesugaredLibraryWrapperSynthesizer,boolean):84:88 -> <init>
+    com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer wrapperSynthesizer -> e
+    1:5: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):84:88 -> <init>
     1:7:com.android.tools.r8.graph.CfCode generateCfCode():93:99 -> a
     8:8:void com.android.tools.r8.cf.code.CfInstanceFieldRead.<init>(com.android.tools.r8.graph.DexField):17:17 -> a
     8:8:com.android.tools.r8.graph.CfCode generateCfCode():99 -> a
     9:15:com.android.tools.r8.graph.CfCode generateCfCode():99:105 -> a
-    16:16:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):117:117 -> a
+    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 -> a
     16:16:com.android.tools.r8.graph.CfCode generateCfCode():105 -> a
       # {"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 -> a
@@ -62528,7 +62740,7 @@
     34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider.vivifiedTypeFor(com.android.tools.r8.graph.DexType):67:67 -> a
     34:34:com.android.tools.r8.graph.CfCode generateCfCode():124 -> a
     35:45:com.android.tools.r8.graph.CfCode generateCfCode():127:137 -> a
-    46:46:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):117:117 -> a
+    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 -> a
     46:46:com.android.tools.r8.graph.CfCode generateCfCode():137 -> a
       # {"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 -> a
@@ -62536,15 +62748,15 @@
     48:48:com.android.tools.r8.graph.CfCode generateCfCode():142 -> a
     49:49:com.android.tools.r8.graph.CfCode generateCfCode():141:141 -> a
     50:62:com.android.tools.r8.graph.CfCode generateCfCode():138:150 -> a
-com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterWrapperCfCodeProvider -> com.android.tools.r8.internal.Ee:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterWrapperCfCodeProvider -> com.android.tools.r8.internal.Ge:
     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.DesugaredLibraryWrapperSynthesizer,boolean):262:263 -> <init>
+    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
     1:2:void generatePushReceiver(java.util.List):268:269 -> b
     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.Fe:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterWrapperConversionCfCodeProvider -> com.android.tools.r8.internal.He:
     boolean $assertionsDisabled -> e
     com.android.tools.r8.graph.DexField wrapperField -> d
     com.android.tools.r8.graph.DexField reverseWrapperField -> c
@@ -62562,14 +62774,14 @@
     30:44:com.android.tools.r8.graph.CfCode generateCfCode():318:332 -> a
     45:45:com.android.tools.r8.graph.CfCode generateCfCode():330:330 -> a
     46:55:com.android.tools.r8.graph.CfCode generateCfCode():327:336 -> a
-com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$AbstractAPIConverterWrapperCfCodeProvider -> com.android.tools.r8.internal.Ge:
-    com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer wrapperSynthesizor -> d
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$AbstractAPIConverterWrapperCfCodeProvider -> com.android.tools.r8.internal.Ie:
+    com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer wrapperSynthesizor -> d
     boolean itfCall -> e
     com.android.tools.r8.graph.DexMethod forwardMethod -> c
-    1:4:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer,boolean):167:170 -> <init>
+    1:4:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer,boolean):167:170 -> <init>
     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
     1:10:com.android.tools.r8.graph.CfCode generateCfCode():179:188 -> a
-    11:11:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):117:117 -> a
+    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 -> a
     11:11:com.android.tools.r8.graph.CfCode generateCfCode():188 -> a
       # {"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 -> a
@@ -62577,7 +62789,7 @@
     13:13:com.android.tools.r8.graph.CfCode generateCfCode():192 -> a
     14:14:com.android.tools.r8.graph.CfCode generateCfCode():192:192 -> a
     15:34:com.android.tools.r8.graph.CfCode generateCfCode():189:208 -> a
-    35:35:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryWrapperSynthesizer.shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):117:117 -> a
+    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 -> a
     35:35:com.android.tools.r8.graph.CfCode generateCfCode():208 -> a
       # {"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 -> a
@@ -62589,7 +62801,7 @@
     40:40:com.android.tools.r8.graph.CfCode generateCfCode():214 -> a
     41:46:com.android.tools.r8.graph.CfCode generateCfCode():216:221 -> a
     void generatePushReceiver(java.util.List) -> b
-com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$EnumArrayConversionCfCodeProvider -> com.android.tools.r8.internal.He:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$EnumArrayConversionCfCodeProvider -> com.android.tools.r8.internal.Je:
     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>
@@ -62603,7 +62815,7 @@
     21:57:com.android.tools.r8.graph.CfCode generateCfCode():440:476 -> a
     58:58:com.android.tools.r8.graph.CfCode generateCfCode():474:474 -> a
     59:79:com.android.tools.r8.graph.CfCode generateCfCode():471:491 -> a
-com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$EnumConversionCfCodeProvider -> com.android.tools.r8.internal.Ie:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$EnumConversionCfCodeProvider -> com.android.tools.r8.internal.Ke:
     com.android.tools.r8.graph.DexType enumType -> d
     java.lang.Iterable enumFields -> c
     com.android.tools.r8.graph.DexType convertedType -> e
@@ -62863,13 +63075,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.PN:
+com.android.tools.r8.ir.synthetic.RecordCfCodeProvider$RecordEqualsCfCodeProvider -> com.android.tools.r8.internal.YN:
     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 -> a
     1:1:com.android.tools.r8.graph.CfCode generateCfCode():165 -> a
     2:28:com.android.tools.r8.graph.CfCode generateCfCode():166:192 -> a
-com.android.tools.r8.ir.synthetic.RecordCfCodeProvider$RecordGetFieldsAsObjectsCfCodeProvider -> com.android.tools.r8.internal.QN:
+com.android.tools.r8.ir.synthetic.RecordCfCodeProvider$RecordGetFieldsAsObjectsCfCodeProvider -> com.android.tools.r8.internal.ZN:
     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
@@ -62887,12 +63099,12 @@
     42:48:void lambda$loadFieldAsObject$1(com.android.tools.r8.graph.DexField,java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):125:131 -> a
     49:49:void lambda$loadFieldAsObject$1(com.android.tools.r8.graph.DexField,java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):129:129 -> a
     50:50:void lambda$loadFieldAsObject$1(com.android.tools.r8.graph.DexField,java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):126:126 -> a
-com.android.tools.r8.ir.synthetic.SynthesizedCode -> com.android.tools.r8.internal.PV:
+com.android.tools.r8.ir.synthetic.SynthesizedCode -> com.android.tools.r8.internal.YV:
     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 -> r0
-com.android.tools.r8.ir.synthetic.SyntheticCfCodeProvider -> com.android.tools.r8.internal.TV:
+    1:1:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():21:21 -> s0
+com.android.tools.r8.ir.synthetic.SyntheticCfCodeProvider -> com.android.tools.r8.internal.cW:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.DexType holder -> b
     1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):20:22 -> <init>
@@ -62902,7 +63114,7 @@
     2:2:com.android.tools.r8.graph.CfCode standardCfCodeFromInstructions(java.util.List):37 -> a
     3:3:com.android.tools.r8.graph.CfCode standardCfCodeFromInstructions(java.util.List):38:38 -> a
     1:1:com.android.tools.r8.graph.DexType getHolder():26:26 -> b
-com.android.tools.r8.ir.synthetic.SyntheticSourceCode -> com.android.tools.r8.internal.fW:
+com.android.tools.r8.ir.synthetic.SyntheticSourceCode -> com.android.tools.r8.internal.oW:
     int[] paramRegisters -> f
     java.util.function.Predicate doesNotEndBlock -> j
     java.util.function.Predicate endsBlock -> k
@@ -62951,7 +63163,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.d3:
+com.android.tools.r8.it.unimi.dsi.fastutil.Arrays -> com.android.tools.r8.internal.g3:
     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
@@ -63020,7 +63232,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.V4:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArraySet -> com.android.tools.r8.internal.Y4:
     boolean[] a -> b
     int size -> c
     1:4:void <init>(boolean[],int):104:107 -> <init>
@@ -63055,20 +63267,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.U4:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArraySet$1 -> com.android.tools.r8.internal.X4:
     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.W4:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArrays -> com.android.tools.r8.internal.Z4:
     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.Y4:
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollections -> com.android.tools.r8.internal.b5:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection -> com.android.tools.r8.internal.b5:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollections -> com.android.tools.r8.internal.e5:
     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.Z4:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollections$EmptyCollection -> com.android.tools.r8.internal.c5:
     1:1:void <init>():39:39 -> <init>
     1:1:boolean addAll(java.util.Collection):81:81 -> addAll
     boolean contains(boolean) -> b
@@ -63077,7 +63289,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.a5:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollections$UnmodifiableCollection -> com.android.tools.r8.internal.d5:
     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
@@ -63105,17 +63317,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.c5:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator -> com.android.tools.r8.internal.f5:
     boolean nextBoolean() -> g
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterators -> com.android.tools.r8.internal.g5:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterators -> com.android.tools.r8.internal.j5:
     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.d5:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterators$EmptyIterator -> com.android.tools.r8.internal.g5:
     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.e5:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterators$SingletonIterator -> com.android.tools.r8.internal.h5:
     boolean element -> b
     int curr -> c
     1:2:void <init>(boolean):110:111 -> <init>
@@ -63125,22 +63337,22 @@
     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.f5:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterators$UnmodifiableIterator -> com.android.tools.r8.internal.i5:
     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.BooleanSet -> com.android.tools.r8.internal.k5:
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanSets -> com.android.tools.r8.internal.n5:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanSet -> com.android.tools.r8.internal.n5:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanSets -> com.android.tools.r8.internal.q5:
     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.l5:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanSets$EmptySet -> com.android.tools.r8.internal.o5:
     1:1:void <init>():42:42 -> <init>
     boolean rem(boolean) -> c
     1:1:java.lang.Object clone():52:52 -> clone
     1:1:boolean equals(java.lang.Object):58:58 -> equals
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanSets$Singleton -> com.android.tools.r8.internal.m5:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanSets$Singleton -> com.android.tools.r8.internal.p5:
     boolean element -> b
     1:2:void <init>(boolean):89:90 -> <init>
     1:1:boolean addAll(java.util.Collection):115:115 -> addAll
@@ -63331,7 +63543,7 @@
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ObjectSortedMap$KeySet -> com.android.tools.r8.internal.x:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ObjectSortedMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ObjectSortedMap):122:122 -> <init>
-    1:1:int firstInt():145:145 -> X
+    1:1:int firstInt():145:145 -> Y
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet tailSet(int):160:160 -> c
     1:1:void clear():135:135 -> clear
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntComparator com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ObjectSortedMap$KeySet.comparator():140:140 -> comparator
@@ -63407,7 +63619,7 @@
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ReferenceSortedMap$KeySet -> com.android.tools.r8.internal.C:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ReferenceSortedMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ReferenceSortedMap):122:122 -> <init>
-    1:1:int firstInt():145:145 -> X
+    1:1:int firstInt():145:145 -> Y
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet tailSet(int):160:160 -> c
     1:1:void clear():135:135 -> clear
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntComparator com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ReferenceSortedMap$KeySet.comparator():140:140 -> comparator
@@ -63842,7 +64054,7 @@
     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>
-    1:3:int firstInt():1531:1531 -> X
+    1:3:int firstInt():1531:1531 -> Y
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet tailSet(int):1548:1548 -> c
     1:1:void clear():1526:1526 -> clear
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet headSet(int):1553:1553 -> d
@@ -65111,7 +65323,7 @@
     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>
-    1:3:int firstInt():1458:1458 -> X
+    1:3:int firstInt():1458:1458 -> Y
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet tailSet(int):1475:1475 -> c
     1:1:void clear():1453:1453 -> clear
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet headSet(int):1480:1480 -> d
@@ -66126,7 +66338,7 @@
     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.as:
-    int firstInt() -> X
+    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
@@ -66420,9 +66632,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.PA:
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap$FastEntrySet -> com.android.tools.r8.internal.QA:
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap -> com.android.tools.r8.internal.ZA:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap$Entry -> com.android.tools.r8.internal.UA:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap$FastEntrySet -> com.android.tools.r8.internal.VA:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap -> com.android.tools.r8.internal.eB:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values -> k
     java.lang.Object[] value -> c
     int size -> h
@@ -66477,14 +66689,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.RA:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$1 -> com.android.tools.r8.internal.WA:
     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.SA:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$EntryIterator -> com.android.tools.r8.internal.XA:
     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>
@@ -66492,13 +66704,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.TA:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$KeyIterator -> com.android.tools.r8.internal.YA:
     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.UA:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$KeySet -> com.android.tools.r8.internal.ZA:
     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>
@@ -66506,7 +66718,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.VA:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapEntry -> com.android.tools.r8.internal.aB:
     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>
@@ -66517,7 +66729,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.WA:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.bB:
     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>
@@ -66526,7 +66738,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.XA:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapIterator -> com.android.tools.r8.internal.cB:
     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
@@ -66545,11 +66757,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.YA:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$ValueIterator -> com.android.tools.r8.internal.dB:
     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.bB:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongArrayList -> com.android.tools.r8.internal.gB:
     long[] a -> b
     int size -> c
     1:3:void <init>(int):81:83 -> <init>
@@ -66625,7 +66837,7 @@
     6:6:void grow(int):250:250 -> l
     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.aB:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongArrayList$1 -> com.android.tools.r8.internal.fB:
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongArrayList this$0 -> d
     int pos -> b
     int last -> c
@@ -66639,18 +66851,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.cB:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongBidirectionalIterator -> com.android.tools.r8.internal.hB:
     long previousLong() -> b
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongCollection -> com.android.tools.r8.internal.dB:
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongIterator -> com.android.tools.r8.internal.fB:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongCollection -> com.android.tools.r8.internal.iB:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongIterator -> com.android.tools.r8.internal.kB:
     long nextLong() -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongList -> com.android.tools.r8.internal.gB:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongList -> com.android.tools.r8.internal.lB:
     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.mB:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongSet -> com.android.tools.r8.internal.rB:
 com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanMap -> com.android.tools.r8.internal.D0:
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanFunction.<init>():44:44 -> <init>
     1:1:void <init>():45 -> <init>
@@ -67361,7 +67573,7 @@
     1:7:int hashCode():57:63 -> hashCode
 com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReferenceSortedSet -> com.android.tools.r8.internal.i1:
     1:1:void <init>():23:23 -> <init>
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap -> com.android.tools.r8.internal.cG:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap -> com.android.tools.r8.internal.hG:
     java.lang.Object[] key -> b
     boolean[] value -> c
     int size -> d
@@ -67389,8 +67601,8 @@
     1:1:int size():252:252 -> size
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap.values():326:326 -> values
     1:1:java.util.Collection values():37 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$1 -> com.android.tools.r8.internal.ZF:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$EntrySet -> com.android.tools.r8.internal.bG:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$1 -> com.android.tools.r8.internal.eG:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$EntrySet -> com.android.tools.r8.internal.gG:
     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>
@@ -67400,7 +67612,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.aG:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$EntrySet$1 -> com.android.tools.r8.internal.fG:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$EntrySet this$1 -> d
     int curr -> b
     int next -> c
@@ -67409,7 +67621,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.gG:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap -> com.android.tools.r8.internal.lG:
     java.lang.Object[] key -> c
     int[] value -> d
     int size -> e
@@ -67440,8 +67652,8 @@
     1:1:int size():252:252 -> size
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap.values():326:326 -> values
     1:1:java.util.Collection values():37 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$1 -> com.android.tools.r8.internal.dG:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$EntrySet -> com.android.tools.r8.internal.fG:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$1 -> com.android.tools.r8.internal.iG:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$EntrySet -> com.android.tools.r8.internal.kG:
     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>
@@ -67451,7 +67663,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.eG:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$EntrySet$1 -> com.android.tools.r8.internal.jG:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$EntrySet this$1 -> d
     int curr -> b
     int next -> c
@@ -67460,10 +67672,10 @@
     1:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$EntrySet$1.next():147:147 -> next
     1:3:java.lang.Object next():136 -> next
     1:7:void remove():153:153 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntFunction -> com.android.tools.r8.internal.hG:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntFunction -> com.android.tools.r8.internal.mG:
     int getInt(java.lang.Object) -> a
     int put(java.lang.Object,int) -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap -> com.android.tools.r8.internal.qG:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap -> com.android.tools.r8.internal.vG:
     int size -> l
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values -> o
     java.lang.Object[] key -> c
@@ -67534,14 +67746,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.iG:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$1 -> com.android.tools.r8.internal.nG:
     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.jG:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$EntryIterator -> com.android.tools.r8.internal.oG:
     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>
@@ -67556,14 +67768,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.kG:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$KeyIterator -> com.android.tools.r8.internal.pG:
     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.lG:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$KeySet -> com.android.tools.r8.internal.qG:
     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>
@@ -67583,7 +67795,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.mG:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$MapEntry -> com.android.tools.r8.internal.rG:
     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>
@@ -67602,7 +67814,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.nG:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.sG:
     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>
@@ -67624,7 +67836,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.oG:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$MapIterator -> com.android.tools.r8.internal.tG:
     int curr -> d
     int index -> e
     int prev -> b
@@ -67642,7 +67854,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.pG:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$ValueIterator -> com.android.tools.r8.internal.uG:
     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
@@ -67657,11 +67869,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.tG:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap -> com.android.tools.r8.internal.yG:
     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.rG:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$FastEntrySet -> com.android.tools.r8.internal.sG:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap -> com.android.tools.r8.internal.CG:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$Entry -> com.android.tools.r8.internal.wG:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$FastEntrySet -> com.android.tools.r8.internal.xG:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap -> com.android.tools.r8.internal.HG:
     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
@@ -67719,14 +67931,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.uG:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$1 -> com.android.tools.r8.internal.zG:
     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.vG:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$EntryIterator -> com.android.tools.r8.internal.AG:
     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>
@@ -67734,11 +67946,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.wG:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$KeyIterator -> com.android.tools.r8.internal.BG:
     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.xG:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$KeySet -> com.android.tools.r8.internal.CG:
     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>
@@ -67747,7 +67959,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.yG:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$MapEntry -> com.android.tools.r8.internal.DG:
     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>
@@ -67766,7 +67978,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.zG:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.EG:
     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>
@@ -67775,7 +67987,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.AG:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$MapIterator -> com.android.tools.r8.internal.FG:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList wrapped -> f
     boolean mustReturnNullKey -> e
     int c -> d
@@ -67794,16 +68006,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.BG:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$ValueIterator -> com.android.tools.r8.internal.GG:
     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.DG:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap$Entry -> com.android.tools.r8.internal.EG:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap$FastEntrySet -> com.android.tools.r8.internal.FG:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap -> com.android.tools.r8.internal.OG:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntSortedMap$FastSortedEntrySet -> com.android.tools.r8.internal.IG:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap$Entry -> com.android.tools.r8.internal.JG:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap$FastEntrySet -> com.android.tools.r8.internal.KG:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap -> com.android.tools.r8.internal.TG:
     long[] value -> c
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet keys -> j
     java.lang.Object[] key -> b
@@ -67860,14 +68072,14 @@
     1:1:int size():429:429 -> size
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongCollection com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap.values():848:869 -> values
     1:22:java.util.Collection values():49 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$1 -> com.android.tools.r8.internal.GG:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$1 -> com.android.tools.r8.internal.LG:
     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
     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.HG:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$EntryIterator -> com.android.tools.r8.internal.MG:
     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>
@@ -67875,11 +68087,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.IG:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$KeyIterator -> com.android.tools.r8.internal.NG:
     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.JG:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$KeySet -> com.android.tools.r8.internal.OG:
     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>
@@ -67888,7 +68100,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.KG:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$MapEntry -> com.android.tools.r8.internal.PG:
     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>
@@ -67907,7 +68119,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.LG:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.QG:
     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>
@@ -67916,7 +68128,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.MG:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$MapIterator -> com.android.tools.r8.internal.RG:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList wrapped -> f
     boolean mustReturnNullKey -> e
     int c -> d
@@ -67935,13 +68147,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.NG:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$ValueIterator -> com.android.tools.r8.internal.SG:
     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.XG:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap -> com.android.tools.r8.internal.cH:
     java.lang.Object[] key -> b
     int size -> l
     java.lang.Object[] value -> c
@@ -68009,14 +68221,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.PG:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$1 -> com.android.tools.r8.internal.UG:
     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.QG:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$EntryIterator -> com.android.tools.r8.internal.VG:
     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>
@@ -68031,14 +68243,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.RG:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$KeyIterator -> com.android.tools.r8.internal.WG:
     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.SG:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$KeySet -> com.android.tools.r8.internal.XG:
     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>
@@ -68058,7 +68270,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.TG:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$MapEntry -> com.android.tools.r8.internal.YG:
     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>
@@ -68068,7 +68280,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.UG:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$MapEntrySet -> com.android.tools.r8.internal.ZG:
     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>
@@ -68090,7 +68302,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.VG:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$MapIterator -> com.android.tools.r8.internal.aH:
     int curr -> d
     int index -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap this$0 -> f
@@ -68108,17 +68320,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.WG:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$ValueIterator -> com.android.tools.r8.internal.bH:
     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.ZG:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry -> com.android.tools.r8.internal.YG:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectSortedMap$FastSortedEntrySet -> com.android.tools.r8.internal.aH:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap -> com.android.tools.r8.internal.jH:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap -> com.android.tools.r8.internal.eH:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry -> com.android.tools.r8.internal.dH:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectSortedMap$FastSortedEntrySet -> com.android.tools.r8.internal.fH:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap -> com.android.tools.r8.internal.oH:
     java.lang.Object[] value -> d
     int size -> l
     java.lang.Object[] key -> c
@@ -68189,14 +68401,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.bH:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$1 -> com.android.tools.r8.internal.gH:
     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.cH:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$EntryIterator -> com.android.tools.r8.internal.hH:
     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>
@@ -68211,14 +68423,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.dH:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$KeyIterator -> com.android.tools.r8.internal.iH:
     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.eH:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$KeySet -> com.android.tools.r8.internal.jH:
     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>
@@ -68238,7 +68450,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.fH:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$MapEntry -> com.android.tools.r8.internal.kH:
     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>
@@ -68248,7 +68460,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.gH:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.lH:
     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>
@@ -68270,7 +68482,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.hH:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$MapIterator -> com.android.tools.r8.internal.mH:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap this$0 -> f
     int curr -> d
     int index -> e
@@ -68288,16 +68500,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.iH:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$ValueIterator -> com.android.tools.r8.internal.nH:
     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.lH:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry -> com.android.tools.r8.internal.kH:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap -> com.android.tools.r8.internal.DH:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap -> com.android.tools.r8.internal.qH:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry -> com.android.tools.r8.internal.pH:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap -> com.android.tools.r8.internal.IH:
     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
@@ -68363,7 +68575,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.nH:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$1 -> com.android.tools.r8.internal.sH:
     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>
@@ -68386,20 +68598,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.mH:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$1$1 -> com.android.tools.r8.internal.rH:
     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.oH:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$2 -> com.android.tools.r8.internal.tH:
     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.pH:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry -> com.android.tools.r8.internal.uH:
     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
@@ -68426,7 +68638,7 @@
     1:1:boolean succ():757:757 -> j
     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.qH:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$EntryIterator -> com.android.tools.r8.internal.vH:
     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
@@ -68438,18 +68650,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.rH:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$KeyIterator -> com.android.tools.r8.internal.wH:
     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.sH:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$KeySet -> com.android.tools.r8.internal.xH:
     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.AH:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap -> com.android.tools.r8.internal.FH:
     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
@@ -68521,7 +68733,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.tH:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$1 -> com.android.tools.r8.internal.yH:
     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
@@ -68554,19 +68766,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.uH:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$2 -> com.android.tools.r8.internal.zH:
     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.vH:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$KeySet -> com.android.tools.r8.internal.AH:
     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.wH:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$SubmapEntryIterator -> com.android.tools.r8.internal.BH:
     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
@@ -68578,7 +68790,7 @@
     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.xH:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$SubmapIterator -> com.android.tools.r8.internal.CH:
     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:2:void updateNext():1728:1729 -> n
@@ -68589,20 +68801,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.yH:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$SubmapKeyIterator -> com.android.tools.r8.internal.DH:
     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.zH:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$SubmapValueIterator -> com.android.tools.r8.internal.EH:
     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.BH:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$TreeIterator -> com.android.tools.r8.internal.GH:
     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
@@ -68619,15 +68831,15 @@
     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.CH:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$ValueIterator -> com.android.tools.r8.internal.HH:
     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.EH:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList -> com.android.tools.r8.internal.LH:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap$FastSortedEntrySet -> com.android.tools.r8.internal.JH:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList -> com.android.tools.r8.internal.QH:
     java.lang.Object[] a -> b
     int size -> c
     1:3:void <init>(int):96:98 -> <init>
@@ -68700,7 +68912,7 @@
     728:728:java.lang.Object set(int,java.lang.Object):357:357 -> set
     720:720:java.lang.Object set(int,java.lang.Object):357:357 -> set
     1:1:int size():372:372 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList$1 -> com.android.tools.r8.internal.KH:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList$1 -> com.android.tools.r8.internal.PH:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList this$0 -> d
     int pos -> b
     int last -> c
@@ -68714,7 +68926,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.NH:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArraySet -> com.android.tools.r8.internal.SH:
     java.lang.Object[] a -> b
     int size -> c
     1:4:void <init>(java.lang.Object[],int):104:107 -> <init>
@@ -68749,20 +68961,20 @@
     2:2:java.util.Iterator iterator():29 -> iterator
     1:7:boolean remove(java.lang.Object):154:160 -> remove
     1:1:int size():149:149 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArraySet$1 -> com.android.tools.r8.internal.MH:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArraySet$1 -> com.android.tools.r8.internal.RH:
     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.OH:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrays -> com.android.tools.r8.internal.TH:
 # {"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.QH:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection -> com.android.tools.r8.internal.RH:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollections$EmptyCollection -> com.android.tools.r8.internal.SH:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator -> com.android.tools.r8.internal.VH:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection -> com.android.tools.r8.internal.WH:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollections$EmptyCollection -> com.android.tools.r8.internal.XH:
     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
@@ -68771,16 +68983,16 @@
     1:1:boolean removeAll(java.util.Collection):86:86 -> removeAll
     1:1:boolean retainAll(java.util.Collection):91:91 -> retainAll
     1:1:java.lang.Object[] toArray():49:49 -> toArray
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator -> com.android.tools.r8.internal.TH:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators -> com.android.tools.r8.internal.XH:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator -> com.android.tools.r8.internal.YH:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators -> com.android.tools.r8.internal.cI:
     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.UH:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators$EmptyIterator -> com.android.tools.r8.internal.ZH:
     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.VH:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators$SingletonIterator -> com.android.tools.r8.internal.aI:
     java.lang.Object element -> b
     int curr -> c
     1:2:void <init>(java.lang.Object):127:128 -> <init>
@@ -68790,24 +69002,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.WH:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators$UnmodifiableIterator -> com.android.tools.r8.internal.bI:
     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.YH:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectList -> com.android.tools.r8.internal.dI:
     void removeElements(int,int) -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator -> com.android.tools.r8.internal.ZH:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet -> com.android.tools.r8.internal.bI:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSets -> com.android.tools.r8.internal.eI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator -> com.android.tools.r8.internal.eI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet -> com.android.tools.r8.internal.gI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSets -> com.android.tools.r8.internal.jI:
     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.cI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSets$EmptySet -> com.android.tools.r8.internal.hI:
     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.dI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSets$Singleton -> com.android.tools.r8.internal.iI:
     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
@@ -68825,11 +69037,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.fI:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSets -> com.android.tools.r8.internal.hI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet -> com.android.tools.r8.internal.kI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSets -> com.android.tools.r8.internal.mI:
     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.gI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSets$EmptySet -> com.android.tools.r8.internal.lI:
     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
@@ -68840,17 +69052,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.pO:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanFunction -> com.android.tools.r8.internal.yO:
     boolean getBoolean(java.lang.Object) -> b
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap -> com.android.tools.r8.internal.sO:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap -> com.android.tools.r8.internal.BO:
     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.qO:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap$FastEntrySet -> com.android.tools.r8.internal.rO:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMaps -> com.android.tools.r8.internal.vO:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap$Entry -> com.android.tools.r8.internal.zO:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap$FastEntrySet -> com.android.tools.r8.internal.AO:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMaps -> com.android.tools.r8.internal.EO:
     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.tO:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMaps$EmptyMap -> com.android.tools.r8.internal.CO:
     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
@@ -68874,7 +69086,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.uO:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMaps$Singleton -> com.android.tools.r8.internal.DO:
     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
@@ -68924,7 +69136,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.EO:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap -> com.android.tools.r8.internal.NO:
     com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection values -> k
     java.lang.Object[] key -> b
     boolean[] value -> c
@@ -69020,14 +69232,14 @@
       # {"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.wO:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$1 -> com.android.tools.r8.internal.FO:
     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
     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.xO:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$EntryIterator -> com.android.tools.r8.internal.GO:
     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>
@@ -69035,11 +69247,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.yO:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$KeyIterator -> com.android.tools.r8.internal.HO:
     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.zO:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$KeySet -> com.android.tools.r8.internal.IO:
     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>
@@ -69048,7 +69260,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.AO:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapEntry -> com.android.tools.r8.internal.JO:
     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>
@@ -69067,7 +69279,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.BO:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.KO:
     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>
@@ -69076,7 +69288,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.CO:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapIterator -> com.android.tools.r8.internal.LO:
     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
@@ -69095,13 +69307,13 @@
     14:23:void remove():589 -> remove
     24:25:void remove():592:593 -> remove
     26:26:void remove():585:585 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$ValueIterator -> com.android.tools.r8.internal.DO:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$ValueIterator -> com.android.tools.r8.internal.MO:
     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.IO:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap -> com.android.tools.r8.internal.RO:
     java.lang.Object[] key -> c
     int[] value -> d
     int size -> e
@@ -69130,8 +69342,8 @@
     1:1:int size():252:252 -> size
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap.values():326:326 -> values
     1:1:java.util.Collection values():37 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$1 -> com.android.tools.r8.internal.FO:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$EntrySet -> com.android.tools.r8.internal.HO:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$1 -> com.android.tools.r8.internal.OO:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$EntrySet -> com.android.tools.r8.internal.QO:
     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>
@@ -69141,7 +69353,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.GO:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$EntrySet$1 -> com.android.tools.r8.internal.PO:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$EntrySet this$1 -> d
     int curr -> b
     int next -> c
@@ -69150,10 +69362,10 @@
     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.JO:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntFunction -> com.android.tools.r8.internal.SO:
     int getInt(java.lang.Object) -> a
     int put(java.lang.Object,int) -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap -> com.android.tools.r8.internal.SO:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap -> com.android.tools.r8.internal.bP:
     int size -> l
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values -> o
     java.lang.Object[] key -> c
@@ -69223,14 +69435,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.KO:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$1 -> com.android.tools.r8.internal.TO:
     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.LO:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$EntryIterator -> com.android.tools.r8.internal.UO:
     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>
@@ -69245,14 +69457,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.MO:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$KeyIterator -> com.android.tools.r8.internal.VO:
     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.NO:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$KeySet -> com.android.tools.r8.internal.WO:
     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>
@@ -69272,7 +69484,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.OO:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$MapEntry -> com.android.tools.r8.internal.XO:
     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>
@@ -69291,7 +69503,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.PO:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.YO:
     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>
@@ -69313,7 +69525,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.QO:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$MapIterator -> com.android.tools.r8.internal.ZO:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap this$0 -> f
     int curr -> d
     int index -> e
@@ -69331,7 +69543,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.RO:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$ValueIterator -> com.android.tools.r8.internal.aP:
     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
@@ -69346,11 +69558,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.VO:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap -> com.android.tools.r8.internal.eP:
     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.TO:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$FastEntrySet -> com.android.tools.r8.internal.UO:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap -> com.android.tools.r8.internal.eP:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$Entry -> com.android.tools.r8.internal.cP:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$FastEntrySet -> com.android.tools.r8.internal.dP:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap -> com.android.tools.r8.internal.nP:
     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
@@ -69410,14 +69622,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.WO:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$1 -> com.android.tools.r8.internal.fP:
     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.XO:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$EntryIterator -> com.android.tools.r8.internal.gP:
     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>
@@ -69425,11 +69637,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.YO:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$KeyIterator -> com.android.tools.r8.internal.hP:
     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.ZO:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$KeySet -> com.android.tools.r8.internal.iP:
     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>
@@ -69438,7 +69650,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.aP:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapEntry -> com.android.tools.r8.internal.jP:
     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>
@@ -69457,7 +69669,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.bP:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.kP:
     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>
@@ -69466,7 +69678,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.cP:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapIterator -> com.android.tools.r8.internal.lP:
     boolean mustReturnNullKey -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList wrapped -> f
     int c -> d
@@ -69485,16 +69697,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.dP:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$ValueIterator -> com.android.tools.r8.internal.mP:
     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.fP:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongMap$Entry -> com.android.tools.r8.internal.gP:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongMap$FastEntrySet -> com.android.tools.r8.internal.hP:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap -> com.android.tools.r8.internal.qP:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntSortedMap$FastSortedEntrySet -> com.android.tools.r8.internal.oP:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongMap$Entry -> com.android.tools.r8.internal.pP:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongMap$FastEntrySet -> com.android.tools.r8.internal.qP:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap -> com.android.tools.r8.internal.zP:
     long[] value -> c
     java.lang.Object[] key -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongMap$FastEntrySet entries -> i
@@ -69550,14 +69762,14 @@
     1:1:int size():429:429 -> size
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongCollection com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap.values():848:869 -> values
     1:22:java.util.Collection values():49 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$1 -> com.android.tools.r8.internal.iP:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$1 -> com.android.tools.r8.internal.rP:
     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
     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.jP:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$EntryIterator -> com.android.tools.r8.internal.sP:
     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>
@@ -69565,11 +69777,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.kP:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$KeyIterator -> com.android.tools.r8.internal.tP:
     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.lP:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$KeySet -> com.android.tools.r8.internal.uP:
     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>
@@ -69578,7 +69790,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.mP:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$MapEntry -> com.android.tools.r8.internal.vP:
     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>
@@ -69596,7 +69808,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.nP:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.wP:
     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>
@@ -69605,7 +69817,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.oP:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$MapIterator -> com.android.tools.r8.internal.xP:
     boolean mustReturnNullKey -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList wrapped -> f
     int c -> d
@@ -69624,13 +69836,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.pP:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$ValueIterator -> com.android.tools.r8.internal.yP:
     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.sP:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList -> com.android.tools.r8.internal.BP:
     java.lang.Object[] a -> b
     int size -> c
     1:3:void <init>(int):96:98 -> <init>
@@ -69703,7 +69915,7 @@
     728:728:java.lang.Object set(int,java.lang.Object):357:357 -> set
     720:720:java.lang.Object set(int,java.lang.Object):357:357 -> set
     1:1:int size():372:372 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList$1 -> com.android.tools.r8.internal.rP:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList$1 -> com.android.tools.r8.internal.AP:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList this$0 -> d
     int pos -> b
     int last -> c
@@ -69717,7 +69929,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.uP:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet -> com.android.tools.r8.internal.DP:
     java.lang.Object[] a -> b
     int size -> c
     1:4:void <init>(java.lang.Object[],int):104:107 -> <init>
@@ -69752,17 +69964,17 @@
     2:2:java.util.Iterator iterator():29 -> iterator
     1:7:boolean remove(java.lang.Object):154:160 -> remove
     1:1:int size():149:149 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet$1 -> com.android.tools.r8.internal.tP:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet$1 -> com.android.tools.r8.internal.CP:
     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.vP:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollections -> com.android.tools.r8.internal.yP:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection -> com.android.tools.r8.internal.EP:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollections -> com.android.tools.r8.internal.HP:
     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.wP:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollections$EmptyCollection -> com.android.tools.r8.internal.FP:
     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
@@ -69770,7 +69982,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.xP:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollections$UnmodifiableCollection -> com.android.tools.r8.internal.GP:
     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
@@ -69792,9 +70004,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.zP:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceList -> com.android.tools.r8.internal.IP:
     void removeElements(int,int) -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet -> com.android.tools.r8.internal.CP:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet -> com.android.tools.r8.internal.LP:
     java.lang.Object[] key -> b
     float f -> h
     int maxFill -> f
@@ -69839,8 +70051,8 @@
     2:5:boolean remove(java.lang.Object):332 -> remove
     6:13:boolean remove(java.lang.Object):336:343 -> remove
     1:1:int size():380:380 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet$1 -> com.android.tools.r8.internal.AP:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet$SetIterator -> com.android.tools.r8.internal.BP:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet$1 -> com.android.tools.r8.internal.JP:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet$SetIterator -> com.android.tools.r8.internal.KP:
     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
@@ -69859,16 +70071,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.DP:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSets -> com.android.tools.r8.internal.GP:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet -> com.android.tools.r8.internal.MP:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSets -> com.android.tools.r8.internal.PP:
     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.EP:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSets$EmptySet -> com.android.tools.r8.internal.NP:
     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.FP:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSets$Singleton -> com.android.tools.r8.internal.OP:
     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
@@ -69886,20 +70098,19 @@
     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.HP:
-com.android.tools.r8.jar.CfApplicationWriter -> com.android.tools.r8.internal.h6:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSortedSet -> com.android.tools.r8.internal.QP:
+com.android.tools.r8.jar.CfApplicationWriter -> com.android.tools.r8.internal.k6:
     com.android.tools.r8.graph.DexApplication application -> a
     com.android.tools.r8.graph.AppView appView -> b
-    boolean $assertionsDisabled -> j
+    boolean $assertionsDisabled -> i
     com.android.tools.r8.utils.InternalOptions options -> e
     com.android.tools.r8.naming.NamingLens namingLens -> d
     java.util.function.Predicate isTypeMissing -> g
-    com.android.tools.r8.naming.ProguardMapSupplier proguardMapSupplier -> h
+    com.android.tools.r8.cf.CfVersion MIN_VERSION_FOR_COMPILER_GENERATED_CODE -> h
     com.android.tools.r8.graph.GraphLens graphLens -> c
     com.android.tools.r8.dex.Marker marker -> f
-    com.android.tools.r8.cf.CfVersion MIN_VERSION_FOR_COMPILER_GENERATED_CODE -> i
-    1:20:void <clinit>():76:95 -> <clinit>
-    1:11:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.Marker,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.naming.ProguardMapSupplier):102:112 -> <init>
+    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)"]}
@@ -69908,98 +70119,100 @@
     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:17:void write(com.android.tools.r8.ClassFileConsumer):116:120 -> a
-    18:18:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):187:187 -> a
-    19:19:void com.android.tools.r8.org.objectweb.asm.ClassWriter.<init>(int):229:229 -> a
-    19:19:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):187 -> a
-    20:30: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
-    31:37:java.lang.String com.android.tools.r8.jar.CfApplicationWriter.getSourceDebugExtension(com.android.tools.r8.graph.DexAnnotationSet):359:365 -> a
-    31:37:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):198 -> a
-    38:38: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
-    39:46:com.android.tools.r8.cf.CfVersion com.android.tools.r8.jar.CfApplicationWriter.getClassFileVersion(com.android.tools.r8.graph.DexProgramClass):335:342 -> a
-    39:46: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
-    47:78:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):201:232 -> a
-    79:89: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
-    79:89: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
-    90:148:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):234:292 -> a
-    149:153:void com.android.tools.r8.utils.ExceptionUtils.withConsumeResourceHandler(com.android.tools.r8.utils.Reporter,java.util.function.Consumer):51:55 -> a
-    149:153: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
-    154:154: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
-    155:155:void lambda$writeClass$2(com.android.tools.r8.ClassFileConsumer,byte[],java.lang.String,com.android.tools.r8.DiagnosticsHandler):293:293 -> a
-    156:156:int compareTypesThroughLens(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):297:297 -> a
-    157:163:int compareMethodsThroughLens(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):306:312 -> a
-    164:167:int compareMethodsThroughLens(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):310:313 -> a
-    168:168:com.android.tools.r8.graph.DexType[] lambda$compareMethodsThroughLens$3(com.android.tools.r8.graph.DexMethod):311:311 -> a
-    169:172:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):317:320 -> a
-    173:173:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():436:436 -> a
-    173:173:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):320 -> 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.isDexBackend():232:232 -> 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:37:boolean com.android.tools.r8.jar.CfApplicationWriter.includeMarker(com.android.tools.r8.dex.Marker):128:130 -> a
+    35:37:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):144 -> a
+    38:45:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):144:151 -> a
+    46:46:boolean com.android.tools.r8.synthesis.SyntheticNaming.verifyNotInternalSynthetic(com.android.tools.r8.graph.DexType):208:208 -> a
+    46:46:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):151 -> a
+    47:59:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):153:165 -> a
+    60:60:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():761:761 -> a
+    60:60: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)"]}
-    174:174:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):320:320 -> a
-    175:175:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":508,"2":509,"3":510}}
-    508:508:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):320:320 -> a
-    509:509:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):320:320 -> a
-    510:510:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):320:320 -> a
-    496:498:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):321:323 -> a
-    499:507:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):322:330 -> a
-    511:518:com.android.tools.r8.graph.DexValue getSystemAnnotationValue(com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexType):348:355 -> a
-    519:525:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):404:410 -> a
-    526:529:java.lang.Object com.android.tools.r8.jar.CfApplicationWriter.getStaticValue(com.android.tools.r8.graph.DexEncodedField):397:400 -> a
-    526:529:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):411 -> a
-    530:531:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):412:413 -> a
-    532:540: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
-    541:541:boolean com.android.tools.r8.graph.DexEncodedMethod.isDeprecated():264:264 -> a
-    541:541: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
-    542:546: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:439 -> a
-    547:555:java.lang.String[] com.android.tools.r8.jar.CfApplicationWriter.getExceptions(com.android.tools.r8.graph.DexAnnotationSet):383:391 -> a
-    547:555: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
-    556:564: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
-    565:578: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
-    565:578: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
-    579:581: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
-    582:585: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
-    582:585: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
-    586:586: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
-    587:596:void writeAnnotations(com.android.tools.r8.jar.CfApplicationWriter$AnnotationConsumer,com.android.tools.r8.graph.DexAnnotation[]):500:509 -> a
-    597:602:void writeAnnotations(com.android.tools.r8.jar.CfApplicationWriter$AnnotationConsumer,com.android.tools.r8.graph.DexAnnotation[]):508:513 -> a
-    603:604:void writeAnnotation(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,com.android.tools.r8.graph.DexEncodedAnnotation):519:520 -> a
-    605:663:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):525:583 -> a
-    664:667:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):528:531 -> a
-    668:695:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):530:557 -> a
-    696:706:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):554:564 -> a
-    707:725:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):561:579 -> a
-    726:726:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):577:577 -> a
-    727:727:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):573:573 -> a
-    728:731:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):567:570 -> a
-    1:8:void writeApplication(com.android.tools.r8.ClassFileConsumer):137:144 -> b
-    9:12:boolean com.android.tools.r8.jar.CfApplicationWriter.includeMarker(com.android.tools.r8.dex.Marker):125:128 -> b
-    9:12:void writeApplication(com.android.tools.r8.ClassFileConsumer):144 -> b
-    13:13:boolean com.android.tools.r8.dex.Marker.isDexBackend():232:232 -> b
-    13:13:boolean com.android.tools.r8.jar.CfApplicationWriter.includeMarker(com.android.tools.r8.dex.Marker):128 -> b
-    13:13:void writeApplication(com.android.tools.r8.ClassFileConsumer):144 -> b
-    14:16:boolean com.android.tools.r8.jar.CfApplicationWriter.includeMarker(com.android.tools.r8.dex.Marker):128:130 -> b
-    14:16:void writeApplication(com.android.tools.r8.ClassFileConsumer):144 -> b
-    17:24:void writeApplication(com.android.tools.r8.ClassFileConsumer):144:151 -> b
-    25:25:boolean com.android.tools.r8.synthesis.SyntheticNaming.verifyNotInternalSynthetic(com.android.tools.r8.graph.DexType):207:207 -> b
-    25:25:void writeApplication(com.android.tools.r8.ClassFileConsumer):151 -> b
-    26:38:void writeApplication(com.android.tools.r8.ClassFileConsumer):153:165 -> b
-    39:39:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():761:761 -> b
-    39:39:void writeApplication(com.android.tools.r8.ClassFileConsumer):169 -> b
+    61:63:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):171:173 -> a
+    64:68:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):170:174 -> a
+    69:69:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):167:167 -> a
+    70:71:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):155:156 -> a
+    72:72:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():761:761 -> a
+    72:72: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)"]}
-    40:42:void writeApplication(com.android.tools.r8.ClassFileConsumer):171:173 -> b
-    43:47:void writeApplication(com.android.tools.r8.ClassFileConsumer):170:174 -> b
-    48:48:void writeApplication(com.android.tools.r8.ClassFileConsumer):167:167 -> b
-    49:50:void writeApplication(com.android.tools.r8.ClassFileConsumer):155:156 -> b
-    51:51:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():761:761 -> b
-    51:51:void writeApplication(com.android.tools.r8.ClassFileConsumer):160 -> b
+    73:74:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):161:162 -> a
+    75:94:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):158:177 -> a
+    95:95:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):187:187 -> a
+    96:96:void com.android.tools.r8.org.objectweb.asm.ClassWriter.<init>(int):229:229 -> a
+    96:96:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):187 -> a
+    97:107:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):188:198 -> a
+    108:114:java.lang.String com.android.tools.r8.jar.CfApplicationWriter.getSourceDebugExtension(com.android.tools.r8.graph.DexAnnotationSet):359:365 -> a
+    108:114:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):198 -> a
+    115:115: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
+    116:123:com.android.tools.r8.cf.CfVersion com.android.tools.r8.jar.CfApplicationWriter.getClassFileVersion(com.android.tools.r8.graph.DexProgramClass):335:342 -> a
+    116:123:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):200 -> a
+    124:155: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:232 -> a
+    156:166: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
+    156:166: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
+    167:225: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:292 -> a
+    226:230:void com.android.tools.r8.utils.ExceptionUtils.withConsumeResourceHandler(com.android.tools.r8.utils.Reporter,java.util.function.Consumer):51:55 -> a
+    226:230: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
+    231:231: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
+    232:232:void lambda$writeClass$2(com.android.tools.r8.ClassFileConsumer,byte[],java.lang.String,com.android.tools.r8.DiagnosticsHandler):293:293 -> a
+    233:233:int compareTypesThroughLens(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):297:297 -> a
+    234:240:int compareMethodsThroughLens(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):306:312 -> a
+    241:244:int compareMethodsThroughLens(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):310:313 -> a
+    245:245:com.android.tools.r8.graph.DexType[] lambda$compareMethodsThroughLens$3(com.android.tools.r8.graph.DexMethod):311:311 -> a
+    246:249:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):317:320 -> a
+    250:250:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():438:438 -> a
+    250:250: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)"]}
-    52:53:void writeApplication(com.android.tools.r8.ClassFileConsumer):161:162 -> b
-    54:73:void writeApplication(com.android.tools.r8.ClassFileConsumer):158:177 -> b
-    74:74: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
-    75:75: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.g6:
+    251:251:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):320:320 -> a
+    252:252:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":585,"2":586,"3":587}}
+    585:585:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):320:320 -> a
+    586:586:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):320:320 -> a
+    587:587:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):320:320 -> a
+    573:575:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):321:323 -> a
+    576:584:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):322:330 -> a
+    588:595:com.android.tools.r8.graph.DexValue getSystemAnnotationValue(com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexType):348:355 -> a
+    596:602:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):404:410 -> a
+    603:606:java.lang.Object com.android.tools.r8.jar.CfApplicationWriter.getStaticValue(com.android.tools.r8.graph.DexEncodedField):397:400 -> a
+    603:606:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):411 -> a
+    607:608:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):412:413 -> a
+    609:617: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
+    618:618:boolean com.android.tools.r8.graph.DexEncodedMethod.isDeprecated():264:264 -> a
+    618:618: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
+    619:623: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:439 -> a
+    624:632:java.lang.String[] com.android.tools.r8.jar.CfApplicationWriter.getExceptions(com.android.tools.r8.graph.DexAnnotationSet):383:391 -> a
+    624:632: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
+    633:641: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
+    642:655: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
+    642: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):448 -> a
+    656:658: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
+    659:662: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
+    659: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):452 -> a
+    663:663: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
+    664:673:void writeAnnotations(com.android.tools.r8.jar.CfApplicationWriter$AnnotationConsumer,com.android.tools.r8.graph.DexAnnotation[]):500:509 -> a
+    674:679:void writeAnnotations(com.android.tools.r8.jar.CfApplicationWriter$AnnotationConsumer,com.android.tools.r8.graph.DexAnnotation[]):508:513 -> a
+    680:681:void writeAnnotation(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,com.android.tools.r8.graph.DexEncodedAnnotation):519:520 -> a
+    682:740:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):525:583 -> a
+    741:744:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):528:531 -> a
+    745:772:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):530:557 -> a
+    773:783:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):554:564 -> a
+    784:802:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):561:579 -> a
+    803:803:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):577:577 -> a
+    804:804:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):573:573 -> a
+    805:808: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.j6:
     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.je:
+com.android.tools.r8.jetbrains.kotlin.DeprecationLevel$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.le:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     java.lang.String stringValueOf(int) -> a
@@ -70029,10 +70242,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.nF:
+com.android.tools.r8.jetbrains.kotlin.NoWhenBranchMatchedException -> com.android.tools.r8.internal.sF:
 # {"id":"sourceFile","fileName":"NoWhenBranchMatchedException.kt"}
     1:1:void <init>():9:9 -> <init>
-com.android.tools.r8.jetbrains.kotlin.Pair -> com.android.tools.r8.internal.oJ:
+com.android.tools.r8.jetbrains.kotlin.Pair -> com.android.tools.r8.internal.xJ:
 # {"id":"sourceFile","fileName":"Tuples.kt"}
     java.lang.Object first -> b
     java.lang.Object second -> c
@@ -70064,19 +70277,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.FX:
+com.android.tools.r8.jetbrains.kotlin.UNINITIALIZED_VALUE -> com.android.tools.r8.internal.OX:
 # {"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.JX:
+com.android.tools.r8.jetbrains.kotlin.UninitializedPropertyAccessException -> com.android.tools.r8.internal.SX:
 # {"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.LX:
+com.android.tools.r8.jetbrains.kotlin.Unit -> com.android.tools.r8.internal.UX:
 # {"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.bY:
+com.android.tools.r8.jetbrains.kotlin.UnsafeLazyImpl -> com.android.tools.r8.internal.kY:
 # {"id":"sourceFile","fileName":"Lazy.kt"}
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0 initializer -> b
     java.lang.Object _value -> c
@@ -70085,7 +70298,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.Q00:
+com.android.tools.r8.jetbrains.kotlin._Assertions -> com.android.tools.r8.internal.Z00:
 # {"id":"sourceFile","fileName":"AssertionsJVM.kt"}
     boolean ENABLED -> a
     1:1:void <clinit>():14:14 -> <clinit>
@@ -70161,7 +70374,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.e3:
+com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt -> com.android.tools.r8.internal.h3:
     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"}
@@ -70204,9 +70417,9 @@
     8:8:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysKt.toList(int[]):9972:9972 -> b
     8:8: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.f3:
+com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt__ArraysKt -> com.android.tools.r8.internal.i3:
 # {"id":"sourceFile","fileName":"Arrays.kt"}
-com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysJvmKt$asList$3 -> com.android.tools.r8.internal.g3:
+com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysJvmKt$asList$3 -> com.android.tools.r8.internal.j3:
 # {"id":"sourceFile","fileName":"_ArraysJvm.kt"}
     int[] $this_asList -> c
     1:1:void <init>(int[]):168:168 -> <init>
@@ -70227,10 +70440,10 @@
     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.h3:
+com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysKt -> com.android.tools.r8.internal.k3:
 # {"id":"sourceFile","fileName":"_Arrays.kt"}
     1:2:int indexOf(int[],int):1544:1545 -> a
-com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt -> com.android.tools.r8.internal.Qb:
+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"}
@@ -70323,23 +70536,23 @@
     1:1:java.lang.Iterable com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.withIndex(java.lang.Iterable):1628:1628 -> e
     1:1:java.lang.Iterable withIndex(java.lang.Iterable):0 -> e
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__CollectionsKt -> com.android.tools.r8.internal.Rb:
+com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__CollectionsKt -> com.android.tools.r8.internal.Tb:
 # {"id":"sourceFile","fileName":"Collections.kt"}
     1:1:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__CollectionsJVMKt.listOf(java.lang.Object):20:20 -> a
-com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__IteratorsJVMKt -> com.android.tools.r8.internal.Sb:
+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.Tb:
+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.Ub:
+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.Wb:
+com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt -> com.android.tools.r8.internal.Yb:
 # {"id":"sourceFile","fileName":"_Collections.kt"}
     1:2:java.util.Collection toCollection(java.lang.Iterable,java.util.Collection):1293:1294 -> a
     3:4:java.util.List toMutableList(java.lang.Iterable):1324:1325 -> a
     5:5:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toMutableList(java.util.Collection):1333:1333 -> a
     5:5:java.util.List toMutableList(java.lang.Iterable):1325 -> a
     6:6:java.util.List toMutableList(java.lang.Iterable):1326:1326 -> a
-com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt$withIndex$1 -> com.android.tools.r8.internal.Vb:
+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
@@ -70447,7 +70660,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.PB:
+com.android.tools.r8.jetbrains.kotlin.collections.MapsKt -> com.android.tools.r8.internal.UB:
     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
@@ -70463,13 +70676,13 @@
     34:34:java.util.Map com.android.tools.r8.jetbrains.kotlin.collections.MapsKt__MapsKt.toMap(java.lang.Iterable):548:548 -> a
     34:34: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.QB:
+com.android.tools.r8.jetbrains.kotlin.collections.MapsKt__MapsJVMKt -> com.android.tools.r8.internal.VB:
 # {"id":"sourceFile","fileName":"MapsJVM.kt"}
-com.android.tools.r8.jetbrains.kotlin.collections.MapsKt___MapsKt -> com.android.tools.r8.internal.RB:
+com.android.tools.r8.jetbrains.kotlin.collections.MapsKt___MapsKt -> com.android.tools.r8.internal.WB:
 # {"id":"sourceFile","fileName":"_Maps.kt"}
     1:2:void com.android.tools.r8.jetbrains.kotlin.collections.MapsKt__MapsKt.putAll(java.util.Map,java.lang.Iterable):415:416 -> a
     1:2:java.util.Map com.android.tools.r8.jetbrains.kotlin.collections.MapsKt__MapsKt.toMap(java.lang.Iterable,java.util.Map):560 -> a
-com.android.tools.r8.jetbrains.kotlin.internal.ProgressionUtilKt -> com.android.tools.r8.internal.VK:
+com.android.tools.r8.jetbrains.kotlin.internal.ProgressionUtilKt -> com.android.tools.r8.internal.eL:
 # {"id":"sourceFile","fileName":"progressionUtil.kt"}
     1:1:int mod(int,int):10:10 -> a
     2:2:int com.android.tools.r8.jetbrains.kotlin.internal.ProgressionUtilKt.differenceModulo(int,int,int):21:21 -> a
@@ -70528,9 +70741,9 @@
 # {"id":"sourceFile","fileName":"Functions.kt"}
 com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function9 -> com.android.tools.r8.internal.uk:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.ClassBasedDeclarationContainer -> com.android.tools.r8.internal.t9:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.ClassBasedDeclarationContainer -> com.android.tools.r8.internal.v9:
 # {"id":"sourceFile","fileName":"ClassBasedDeclarationContainer.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.ClassReference -> com.android.tools.r8.internal.Ba:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.ClassReference -> com.android.tools.r8.internal.Da:
 # {"id":"sourceFile","fileName":"ClassReference.kt"}
     java.util.Map FUNCTION_CLASSES -> b
     java.lang.Class jClass -> a
@@ -70554,7 +70767,7 @@
     1:1:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.internal.ClassReference.getJClass():10:10 -> toString
     1:1:java.lang.String toString():97 -> toString
     2:2:java.lang.String toString():97:97 -> toString
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.CollectionToArray -> com.android.tools.r8.internal.Ob:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.CollectionToArray -> com.android.tools.r8.internal.Qb:
 # {"id":"sourceFile","fileName":"CollectionToArray.kt"}
     java.lang.Object[] EMPTY -> a
     1:1:void <clinit>():127:127 -> <clinit>
@@ -70568,7 +70781,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.Td:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker -> com.android.tools.r8.internal.Vd:
 com.android.tools.r8.jetbrains.kotlin.jvm.internal.Intrinsics -> com.android.tools.r8.internal.Os:
     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}}
@@ -70607,7 +70820,7 @@
 # {"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.KP:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.Reflection -> com.android.tools.r8.internal.TP:
     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
@@ -70617,14 +70830,14 @@
     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.LP:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.ReflectionFactory -> com.android.tools.r8.internal.UP:
     1:1:void <init>():14:14 -> <init>
 com.android.tools.r8.jetbrains.kotlin.reflect.KClass -> com.android.tools.r8.internal.yv:
 # {"id":"sourceFile","fileName":"KClass.kt"}
-com.android.tools.r8.jetbrains.kotlin.text.CharsKt__CharKt -> com.android.tools.r8.internal.X8:
+com.android.tools.r8.jetbrains.kotlin.text.CharsKt__CharKt -> com.android.tools.r8.internal.Z8:
 # {"id":"sourceFile","fileName":"Char.kt"}
     1:4:boolean equals(char,char,boolean):237:240 -> a
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt -> com.android.tools.r8.internal.iV:
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt -> com.android.tools.r8.internal.rV:
     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
@@ -70651,15 +70864,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.jV:
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt__IndentKt -> com.android.tools.r8.internal.sV:
 # {"id":"sourceFile","fileName":"Indent.kt"}
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt__RegexExtensionsKt -> com.android.tools.r8.internal.kV:
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt__RegexExtensionsKt -> com.android.tools.r8.internal.tV:
 # {"id":"sourceFile","fileName":"RegexExtensions.kt"}
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringBuilderKt -> com.android.tools.r8.internal.lV:
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringBuilderKt -> com.android.tools.r8.internal.uV:
 # {"id":"sourceFile","fileName":"StringBuilder.kt"}
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringNumberConversionsKt -> com.android.tools.r8.internal.mV:
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringNumberConversionsKt -> com.android.tools.r8.internal.vV:
 # {"id":"sourceFile","fileName":"StringNumberConversions.kt"}
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt -> com.android.tools.r8.internal.nV:
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt -> com.android.tools.r8.internal.wV:
 # {"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
@@ -70685,7 +70898,7 @@
     693:695:boolean com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.regionMatches(java.lang.String,int,java.lang.String,int,int,boolean):654:656 -> a
     693:695:boolean com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.startsWith(java.lang.String,java.lang.String,boolean):420 -> a
     1:1:int getLastIndex(java.lang.CharSequence):379:379 -> b
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt___StringsKt -> com.android.tools.r8.internal.oV:
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt___StringsKt -> com.android.tools.r8.internal.xV:
 # {"id":"sourceFile","fileName":"_Strings.kt"}
 com.android.tools.r8.jetbrains.kotlinx.metadata.Flag -> com.android.tools.r8.internal.wj:
 # {"id":"sourceFile","fileName":"Flag.kt"}
@@ -71856,10 +72069,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.oF:
+com.android.tools.r8.jetbrains.kotlinx.metadata.NodesKt -> com.android.tools.r8.internal.tF:
 # {"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.Xa:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter -> com.android.tools.r8.internal.Za:
 # {"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>
@@ -71911,56 +72124,56 @@
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():468 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext getC():415:415 -> g
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder getT():414:414 -> h
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitConstructor$1 -> com.android.tools.r8.internal.Oa:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitConstructor$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):431:431 -> a
     2:433:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitConstructor$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder):0:431 -> a
     2:433:java.lang.Object invoke(java.lang.Object):431 -> a
     434:434:java.lang.Object invoke(java.lang.Object):431:431 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitFunction$1 -> com.android.tools.r8.internal.Pa:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitFunction$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):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.Qa:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitInlineClassUnderlyingType$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):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.Ra:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitProperty$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):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.Sa:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitSupertype$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):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.Ta:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitTypeAlias$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):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.Ua:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitTypeParameter$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):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.Va:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitVersionRequirement$1 -> com.android.tools.r8.internal.Xa:
 # {"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
@@ -71985,7 +72198,7 @@
     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.mJ:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter -> com.android.tools.r8.internal.vJ:
 # {"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>
@@ -72011,28 +72224,28 @@
     1:2:void visitEnd():501:502 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext getC():484:484 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder getT():483:483 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitFunction$1 -> com.android.tools.r8.internal.jJ:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitFunction$1 -> com.android.tools.r8.internal.sJ:
 # {"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.kJ:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitProperty$1 -> com.android.tools.r8.internal.tJ:
 # {"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.lJ:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitTypeAlias$1 -> com.android.tools.r8.internal.uJ:
 # {"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.HN:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext -> com.android.tools.r8.internal.QN:
 # {"id":"sourceFile","fileName":"readers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable types -> b
     java.util.List contextExtensions -> e
@@ -72052,7 +72265,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.JN:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadUtilsKt -> com.android.tools.r8.internal.SN:
 # {"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
@@ -72091,10 +72304,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.IN:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadUtilsKt$WhenMappings -> com.android.tools.r8.internal.RN:
 # {"id":"sourceFile","fileName":"readUtils.kt"}
     int[] $EnumSwitchMapping$0 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt -> com.android.tools.r8.internal.KN:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt -> com.android.tools.r8.internal.TN:
 # {"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
@@ -72379,7 +72592,7 @@
     5223:5223:int getPropertyGetterFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):504:504 -> a
     5224:5224:int getDefaultPropertyAccessorFlags(int):510:510 -> a
     1:1:int getPropertySetterFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):507:507 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext -> com.android.tools.r8.internal.QZ:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext -> com.android.tools.r8.internal.ZZ:
 # {"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
@@ -72389,7 +72602,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.RZ:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteUtilsKt -> com.android.tools.r8.internal.a00:
 # {"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:7:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder writeAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.StringTable):20:20 -> a
@@ -72397,10 +72610,10 @@
     8:8:int getClassNameIndex(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.StringTable,java.lang.String):111 -> a
     9:11:int getClassNameIndex(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.StringTable,java.lang.String):112:114 -> a
     12:87: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):29:104 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt -> com.android.tools.r8.internal.O00:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt -> com.android.tools.r8.internal.X00:
 # {"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.UZ:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1 -> com.android.tools.r8.internal.d00:
 # {"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
@@ -72427,21 +72640,21 @@
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.access$writeVersionRequirement(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):1 -> b
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():136 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder getT():130:130 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1$visitValueParameter$1 -> com.android.tools.r8.internal.SZ:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1$visitValueParameter$1 -> com.android.tools.r8.internal.b00:
 # {"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
     2:135:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1$visitValueParameter$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder):0:133 -> a
     2:135:java.lang.Object invoke(java.lang.Object):133 -> a
     136:136:java.lang.Object invoke(java.lang.Object):133:133 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1$visitVersionRequirement$1 -> com.android.tools.r8.internal.TZ:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1$visitVersionRequirement$1 -> com.android.tools.r8.internal.c00:
 # {"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.WZ:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeContract$1 -> com.android.tools.r8.internal.f00:
 # {"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
@@ -72453,14 +72666,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.VZ:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeContract$1$visitEffect$1 -> com.android.tools.r8.internal.e00:
 # {"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.a00:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1 -> com.android.tools.r8.internal.j00:
 # {"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
@@ -72482,24 +72695,24 @@
     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.XZ:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1$WhenMappings -> com.android.tools.r8.internal.g00:
 # {"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.YZ:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1$visitConclusionOfConditionalEffect$1 -> com.android.tools.r8.internal.h00:
 # {"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
     2:360:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1$visitConclusionOfConditionalEffect$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder):0:358 -> a
     2:360:java.lang.Object invoke(java.lang.Object):358 -> a
     361:361:java.lang.Object invoke(java.lang.Object):358:358 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1$visitConstructorArgument$1 -> com.android.tools.r8.internal.ZZ:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1$visitConstructorArgument$1 -> com.android.tools.r8.internal.i00:
 # {"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.e00:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1 -> com.android.tools.r8.internal.n00:
 # {"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
@@ -72521,28 +72734,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.b00:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1$visitAndArgument$1 -> com.android.tools.r8.internal.k00:
 # {"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.c00:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1$visitIsInstanceType$1 -> com.android.tools.r8.internal.l00:
 # {"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.d00:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1$visitOrArgument$1 -> com.android.tools.r8.internal.m00:
 # {"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.m00:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1 -> com.android.tools.r8.internal.v00:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder t -> b
     int $flags -> e
@@ -72577,7 +72790,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.f00:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitContract$1 -> com.android.tools.r8.internal.o00:
 # {"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
@@ -72596,7 +72809,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.g00:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitExtensions$1 -> com.android.tools.r8.internal.p00:
 # {"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
@@ -72604,42 +72817,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.h00:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitReceiverParameterType$1 -> com.android.tools.r8.internal.q00:
 # {"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.i00:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitReturnType$1 -> com.android.tools.r8.internal.r00:
 # {"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.j00:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitTypeParameter$1 -> com.android.tools.r8.internal.s00:
 # {"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.k00:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitValueParameter$1 -> com.android.tools.r8.internal.t00:
 # {"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.l00:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitVersionRequirement$1 -> com.android.tools.r8.internal.u00:
 # {"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.t00:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1 -> com.android.tools.r8.internal.C00:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder t -> b
     int $getterFlags -> f
@@ -72672,7 +72885,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.n00:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitExtensions$1 -> com.android.tools.r8.internal.w00:
 # {"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
@@ -72680,42 +72893,42 @@
     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.o00:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitReceiverParameterType$1 -> com.android.tools.r8.internal.x00:
 # {"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.p00:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitReturnType$1 -> com.android.tools.r8.internal.y00:
 # {"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.q00:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitSetterParameter$1 -> com.android.tools.r8.internal.z00:
 # {"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
     2:201:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitSetterParameter$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder):0:199 -> a
     2:201:java.lang.Object invoke(java.lang.Object):199 -> a
     202:202:java.lang.Object invoke(java.lang.Object):199:199 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitTypeParameter$1 -> com.android.tools.r8.internal.r00:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitTypeParameter$1 -> com.android.tools.r8.internal.A00:
 # {"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.s00:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitVersionRequirement$1 -> com.android.tools.r8.internal.B00:
 # {"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.y00:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1 -> com.android.tools.r8.internal.H00:
 # {"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
@@ -72754,14 +72967,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.u00:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitAbbreviatedType$1 -> com.android.tools.r8.internal.D00:
 # {"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.v00:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitArgument$1 -> com.android.tools.r8.internal.E00:
 # {"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
@@ -72771,7 +72984,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$visitFlexibleTypeUpperBound$1 -> com.android.tools.r8.internal.w00:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitFlexibleTypeUpperBound$1 -> com.android.tools.r8.internal.F00:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext $c -> d
     java.lang.String $typeFlexibilityId -> b
@@ -72780,14 +72993,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.x00:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitOuterType$1 -> com.android.tools.r8.internal.G00:
 # {"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.E00:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1 -> com.android.tools.r8.internal.N00:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder t -> b
     int $flags -> d
@@ -72815,14 +73028,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.z00:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitExpandedType$1 -> com.android.tools.r8.internal.I00:
 # {"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.A00:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitExtensions$1 -> com.android.tools.r8.internal.J00:
 # {"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
@@ -72833,28 +73046,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.B00:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitTypeParameter$1 -> com.android.tools.r8.internal.K00:
 # {"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.C00:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitUnderlyingType$1 -> com.android.tools.r8.internal.L00:
 # {"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.D00:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitVersionRequirement$1 -> com.android.tools.r8.internal.M00:
 # {"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.G00:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeParameter$1 -> com.android.tools.r8.internal.P00:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder t -> b
     int $flags -> f
@@ -72880,14 +73093,14 @@
     51:51:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType):43 -> a
     52:52:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType):43:43 -> a
     53:64:void visitEnd():48:59 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeParameter$1$visitUpperBound$1 -> com.android.tools.r8.internal.F00:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeParameter$1$visitUpperBound$1 -> com.android.tools.r8.internal.O00:
 # {"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.K00:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1 -> com.android.tools.r8.internal.T00:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder t -> b
     int $flags -> d
@@ -72906,7 +73119,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.H00:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1$visitExtensions$1 -> com.android.tools.r8.internal.Q00:
 # {"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
@@ -72917,21 +73130,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.I00:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1$visitType$1 -> com.android.tools.r8.internal.R00:
 # {"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.J00:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1$visitVarargElementType$1 -> com.android.tools.r8.internal.S00:
 # {"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.N00:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1 -> com.android.tools.r8.internal.W00:
 # {"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
@@ -72954,14 +73167,14 @@
     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.L00:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1$visitVersion$1 -> com.android.tools.r8.internal.U00:
 # {"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.M00:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1$visitVersion$2 -> com.android.tools.r8.internal.V00:
 # {"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
@@ -72993,23 +73206,23 @@
 # {"id":"sourceFile","fileName":"extensionNodes.kt"}
 com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmValueParameterExtension -> com.android.tools.r8.internal.Sw:
 # {"id":"sourceFile","fileName":"extensionNodes.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions -> com.android.tools.r8.internal.vC:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions -> com.android.tools.r8.internal.AC:
 # {"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.uC:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions$Companion -> com.android.tools.r8.internal.zC:
 # {"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.tC:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions$Companion$INSTANCES$2 -> com.android.tools.r8.internal.yC:
 # {"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.xL:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation -> com.android.tools.r8.internal.HL:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1 -> com.android.tools.r8.internal.GL:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation -> com.android.tools.r8.internal.QL:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
     java.util.List argument_ -> e
     int memoizedSerializedSize -> g
@@ -73069,11 +73282,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.yL:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$1 -> com.android.tools.r8.internal.HL:
     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.FL:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument -> com.android.tools.r8.internal.OL:
     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
@@ -73126,11 +73339,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.zL:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$1 -> com.android.tools.r8.internal.IL:
     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.AL:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Builder -> com.android.tools.r8.internal.JL:
     int nameId_ -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value value_ -> e
     int bitField0_ -> c
@@ -73173,7 +73386,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Builder.create():3963:3963 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Builder access$3600():3949 -> f
     1:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument buildPartial():3992:4003 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value -> com.android.tools.r8.internal.EL:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value -> com.android.tools.r8.internal.NL:
     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
@@ -73289,11 +73502,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.BL:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$1 -> com.android.tools.r8.internal.KL:
     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.CL:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder -> com.android.tools.r8.internal.LL:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type type_ -> d
     int flags_ -> n
     int arrayDimensionCount_ -> m
@@ -73365,7 +73578,7 @@
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value build():3060:3060 -> g
     1:49:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value buildPartial():3066:3114 -> h
     1:3:void ensureArrayElementIsMutable():3530:3532 -> i
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type -> com.android.tools.r8.internal.DL:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type -> com.android.tools.r8.internal.ML:
     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
@@ -73399,7 +73612,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.GL:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder -> com.android.tools.r8.internal.PL:
     java.util.List argument_ -> e
     int id_ -> d
     int bitField0_ -> c
@@ -73440,7 +73653,7 @@
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation build():4371:4371 -> g
     1:13:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation buildPartial():4377:4389 -> h
     1:3:void ensureArgumentIsMutable():4481:4483 -> i
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class -> com.android.tools.r8.internal.LL:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class -> com.android.tools.r8.internal.UL:
     java.util.List enumEntry_ -> r
     java.util.List property_ -> p
     int fqName_ -> f
@@ -73645,11 +73858,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.IL:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$1 -> com.android.tools.r8.internal.RL:
     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.JL:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder -> com.android.tools.r8.internal.SL:
     java.util.List sealedSubclassFqName_ -> r
     java.util.List enumEntry_ -> q
     java.util.List typeAlias_ -> p
@@ -73796,7 +74009,7 @@
     1:3:void ensureTypeAliasIsMutable():11126:11128 -> p
     1:3:void ensureTypeParameterIsMutable():10369:10371 -> q
     1:3:void ensureVersionRequirementIsMutable():11625:11627 -> r
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Kind -> com.android.tools.r8.internal.KL:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Kind -> com.android.tools.r8.internal.TL:
     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
@@ -73811,7 +74024,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.OL:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor -> com.android.tools.r8.internal.XL:
     java.util.List valueParameter_ -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor defaultInstance -> j
     int memoizedSerializedSize -> i
@@ -73874,11 +74087,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.ML:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$1 -> com.android.tools.r8.internal.VL:
     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.NL:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder -> com.android.tools.r8.internal.WL:
     int flags_ -> f
     java.util.List versionRequirement_ -> h
     int bitField0_ -> e
@@ -73915,7 +74128,7 @@
     1:18:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor buildPartial():14074:14091 -> h
     1:3:void ensureValueParameterIsMutable():14222:14224 -> i
     1:3:void ensureVersionRequirementIsMutable():14346:14348 -> j
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract -> com.android.tools.r8.internal.RL:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract -> com.android.tools.r8.internal.aM:
     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
@@ -73964,11 +74177,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.PL:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$1 -> com.android.tools.r8.internal.YL:
     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.QL:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder -> com.android.tools.r8.internal.ZL:
     java.util.List effect_ -> d
     int bitField0_ -> c
     1:91:void <init>():23872:23962 -> <init>
@@ -74006,7 +74219,7 @@
     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
     1:3:void ensureEffectIsMutable():23965:23967 -> h
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect -> com.android.tools.r8.internal.WL:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect -> com.android.tools.r8.internal.fM:
     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
@@ -74071,11 +74284,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.SL:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$1 -> com.android.tools.r8.internal.bM:
     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.TL:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder -> com.android.tools.r8.internal.cM:
     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
@@ -74120,7 +74333,7 @@
     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
     1:3:void ensureEffectConstructorArgumentIsMutable():24852:24854 -> h
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType -> com.android.tools.r8.internal.UL:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType -> com.android.tools.r8.internal.dM:
     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
@@ -74133,7 +74346,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.VL:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind -> com.android.tools.r8.internal.eM:
     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
@@ -74146,7 +74359,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.ZL:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry -> com.android.tools.r8.internal.iM:
     int memoizedSerializedSize -> g
     int bitField0_ -> d
     int name_ -> e
@@ -74190,11 +74403,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.XL:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$1 -> com.android.tools.r8.internal.gM:
     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.YL:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder -> com.android.tools.r8.internal.hM:
     int name_ -> f
     int bitField0_ -> e
     1:1:void <init>():20995:20995 -> <init>
@@ -74225,7 +74438,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder.create():21002:21002 -> g
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder access$19500():20989 -> g
     1:8:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry buildPartial():21029:21036 -> h
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression -> com.android.tools.r8.internal.dM:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression -> com.android.tools.r8.internal.mM:
     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
@@ -74312,11 +74525,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.aM:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$1 -> com.android.tools.r8.internal.jM:
     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.bM:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder -> com.android.tools.r8.internal.kM:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type isInstanceType_ -> g
     int isInstanceTypeId_ -> h
     java.util.List orArgument_ -> j
@@ -74374,7 +74587,7 @@
     1:34:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression buildPartial():25935:25968 -> h
     1:3:void ensureAndArgumentIsMutable():26319:26321 -> i
     1:3:void ensureOrArgumentIsMutable():26516:26518 -> j
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue -> com.android.tools.r8.internal.cM:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue -> com.android.tools.r8.internal.lM:
     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
@@ -74387,7 +74600,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.gM:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function -> com.android.tools.r8.internal.pM:
     int receiverTypeId_ -> l
     java.util.List versionRequirement_ -> o
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function defaultInstance -> s
@@ -74514,11 +74727,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.eM:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$1 -> com.android.tools.r8.internal.nM:
     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.fM:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder -> com.android.tools.r8.internal.oM:
     java.util.List versionRequirement_ -> p
     int receiverTypeId_ -> m
     int returnTypeId_ -> j
@@ -74628,7 +74841,7 @@
     1:3:void ensureTypeParameterIsMutable():15847:15849 -> j
     1:3:void ensureValueParameterIsMutable():16064:16066 -> k
     1:3:void ensureVersionRequirementIsMutable():16248:16250 -> l
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$MemberKind -> com.android.tools.r8.internal.hM:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$MemberKind -> com.android.tools.r8.internal.qM:
     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
@@ -74640,7 +74853,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.iM:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Modality -> com.android.tools.r8.internal.rM:
     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
@@ -74652,7 +74865,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.lM:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package -> com.android.tools.r8.internal.uM:
     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
@@ -74733,11 +74946,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.jM:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$1 -> com.android.tools.r8.internal.sM:
     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.kM:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder -> com.android.tools.r8.internal.tM:
     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
@@ -74797,7 +75010,7 @@
     1:3:void ensureFunctionIsMutable():12480:12482 -> j
     1:3:void ensurePropertyIsMutable():12605:12607 -> k
     1:3:void ensureTypeAliasIsMutable():12730:12732 -> l
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property -> com.android.tools.r8.internal.oM:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property -> com.android.tools.r8.internal.xM:
     int getterFlags_ -> n
     int setterFlags_ -> o
     int receiverTypeId_ -> l
@@ -74914,11 +75127,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.mM:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$1 -> com.android.tools.r8.internal.vM:
     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.nM:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder -> com.android.tools.r8.internal.wM:
     int getterFlags_ -> o
     java.util.List versionRequirement_ -> q
     int receiverTypeId_ -> m
@@ -75022,7 +75235,7 @@
     1:54:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property buildPartial():17369:17422 -> i
     1:3:void ensureTypeParameterIsMutable():17794:17796 -> j
     1:3:void ensureVersionRequirementIsMutable():18182:18184 -> k
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type -> com.android.tools.r8.internal.vM:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type -> com.android.tools.r8.internal.EM:
     int outerTypeId_ -> o
     int typeParameterName_ -> l
     int typeAliasName_ -> m
@@ -75153,11 +75366,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.pM:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$1 -> com.android.tools.r8.internal.yM:
     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.tM:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument -> com.android.tools.r8.internal.CM:
     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
@@ -75212,11 +75425,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.qM:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$1 -> com.android.tools.r8.internal.zM:
     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.rM:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder -> com.android.tools.r8.internal.AM:
     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
@@ -75260,7 +75473,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.sM:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection -> com.android.tools.r8.internal.BM:
     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
@@ -75275,7 +75488,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.uM:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder -> com.android.tools.r8.internal.DM:
     int typeAliasName_ -> n
     int typeParameter_ -> l
     int typeParameterName_ -> m
@@ -75398,7 +75611,7 @@
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type build():6257:6257 -> h
     1:61:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type buildPartial():6263:6323 -> i
     1:3:void ensureArgumentIsMutable():6438:6440 -> j
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias -> com.android.tools.r8.internal.yM:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias -> com.android.tools.r8.internal.HM:
     int memoizedSerializedSize -> o
     int expandedTypeId_ -> k
     int underlyingTypeId_ -> i
@@ -75502,11 +75715,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.wM:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$1 -> com.android.tools.r8.internal.FM:
     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.xM:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder -> com.android.tools.r8.internal.GM:
     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
@@ -75585,7 +75798,7 @@
     1:3:void ensureAnnotationIsMutable():20527:20529 -> j
     1:3:void ensureTypeParameterIsMutable():20218:20220 -> k
     1:3:void ensureVersionRequirementIsMutable():20651:20653 -> l
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter -> com.android.tools.r8.internal.CM:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter -> com.android.tools.r8.internal.LM:
     int memoizedSerializedSize -> m
     int upperBoundIdMemoizedSerializedSize -> k
     int name_ -> f
@@ -75670,11 +75883,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.zM:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$1 -> com.android.tools.r8.internal.IM:
     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.AM:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder -> com.android.tools.r8.internal.JM:
     int id_ -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance variance_ -> i
     java.util.List upperBound_ -> j
@@ -75722,7 +75935,7 @@
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter build():7813:7813 -> h
     1:30:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter buildPartial():7819:7848 -> i
     1:3:void ensureUpperBoundIsMutable():8067:8069 -> j
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance -> com.android.tools.r8.internal.BM:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance -> com.android.tools.r8.internal.KM:
     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
@@ -75735,7 +75948,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.FM:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable -> com.android.tools.r8.internal.OM:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
     java.util.List type_ -> d
     int memoizedSerializedSize -> g
@@ -75790,11 +76003,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.DM:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$1 -> com.android.tools.r8.internal.MM:
     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.EM:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder -> com.android.tools.r8.internal.NM:
     java.util.List type_ -> d
     int firstNullable_ -> e
     int bitField0_ -> c
@@ -75826,7 +76039,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.IM:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter -> com.android.tools.r8.internal.RM:
     int memoizedSerializedSize -> l
     byte memoizedIsInitialized -> k
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type varargElementType_ -> i
@@ -75906,11 +76119,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.GM:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$1 -> com.android.tools.r8.internal.PM:
     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.HM:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder -> com.android.tools.r8.internal.QM:
     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
@@ -75980,7 +76193,7 @@
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter build():18809 -> h
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter build():18809:18809 -> h
     1:28:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter buildPartial():18815:18842 -> i
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement -> com.android.tools.r8.internal.NM:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement -> com.android.tools.r8.internal.WM:
     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
@@ -76044,11 +76257,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.JM:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$1 -> com.android.tools.r8.internal.SM:
     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.KM:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder -> com.android.tools.r8.internal.TM:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level level_ -> f
     int message_ -> h
     int errorCode_ -> g
@@ -76102,7 +76315,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.LM:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level -> com.android.tools.r8.internal.UM:
     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
@@ -76115,7 +76328,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.MM:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind -> com.android.tools.r8.internal.VM:
     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
@@ -76128,7 +76341,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.QM:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable -> com.android.tools.r8.internal.ZM:
     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
@@ -76173,11 +76386,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.OM:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$1 -> com.android.tools.r8.internal.XM:
     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.PM:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder -> com.android.tools.r8.internal.YM:
     java.util.List requirement_ -> d
     int bitField0_ -> c
     1:85:void <init>():22498:22582 -> <init>
@@ -76215,7 +76428,7 @@
     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
     1:3:void ensureRequirementIsMutable():22585:22587 -> h
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Visibility -> com.android.tools.r8.internal.RM:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Visibility -> com.android.tools.r8.internal.aN:
     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
@@ -76229,7 +76442,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.J4:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.BinaryVersion -> com.android.tools.r8.internal.M4:
 # {"id":"sourceFile","fileName":"BinaryVersion.kt"}
     java.util.List rest -> e
     int patch -> d
@@ -76379,19 +76592,19 @@
     2:4:void <init>(int,int):256:258 -> <init>
     java.lang.Object get(int) -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField booleanFirst():245:245 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver -> com.android.tools.r8.internal.qE:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver -> com.android.tools.r8.internal.vE:
 # {"id":"sourceFile","fileName":"NameResolver.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoBufUtilKt -> com.android.tools.r8.internal.SM:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoBufUtilKt -> com.android.tools.r8.internal.bN:
 # {"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.tN:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt -> com.android.tools.r8.internal.CN:
 # {"id":"sourceFile","fileName":"protoTypeTableUtil.kt"}
     1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type receiverType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):56:57 -> a
     3:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type receiverType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):70:71 -> a
     5:7: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
     1:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type returnType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):48:50 -> b
     4:6: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 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable -> com.android.tools.r8.internal.yX:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable -> com.android.tools.r8.internal.HX:
 # {"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>
@@ -76399,7 +76612,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.IY:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement -> com.android.tools.r8.internal.RY:
 # {"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
@@ -76430,7 +76643,7 @@
     254:254:java.lang.String toString():81:81 -> toString
     255:255:java.lang.String toString():81:81 -> toString
     246:246:java.lang.String toString():81:81 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version -> com.android.tools.r8.internal.HY:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version -> com.android.tools.r8.internal.QY:
 # {"id":"sourceFile","fileName":"VersionRequirement.kt"}
     int minor -> b
     int patch -> c
@@ -76445,7 +76658,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.KY:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable -> com.android.tools.r8.internal.TY:
 # {"id":"sourceFile","fileName":"VersionRequirement.kt"}
     java.util.List infos -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable$Companion Companion -> b
@@ -76462,7 +76675,7 @@
     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.JY:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable$Companion -> com.android.tools.r8.internal.SY:
 # {"id":"sourceFile","fileName":"VersionRequirement.kt"}
     1:1:void <init>():14:14 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable create(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):18:18 -> a
@@ -77083,7 +77296,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.R4:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.BitEncoding -> com.android.tools.r8.internal.U4:
     boolean FORCE_8TO7_ENCODING -> a
     boolean $assertionsDisabled -> b
     1:13:void <clinit>():15:27 -> <clinit>
@@ -77146,7 +77359,7 @@
     126:142:byte[] com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.BitEncoding.decode7to8(byte[]):247:263 -> a
     126:142:byte[] decodeBytes(java.lang.String[]):192 -> a
     1:2:java.lang.String[] dropMarker(java.lang.String[]):199:200 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.ClassMapperLite -> com.android.tools.r8.internal.ca:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.ClassMapperLite -> com.android.tools.r8.internal.ea:
 # {"id":"sourceFile","fileName":"ClassMapperLite.kt"}
     java.util.Map map -> b
     java.lang.String kotlin -> a
@@ -77731,7 +77944,7 @@
     4:4:com.android.tools.r8.jetbrains.kotlin.Pair readPackageDataFrom(java.lang.String[],java.lang.String[]):37 -> c
     5:5: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
     5:5: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.kY:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.UtfEncodingKt -> com.android.tools.r8.internal.tY:
 # {"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.sv:
@@ -77796,7 +78009,7 @@
     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.oE:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.MutableVersionRequirementTable -> com.android.tools.r8.internal.tE:
 # {"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>
@@ -77835,7 +78048,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.hW:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.TableElementWrapper -> com.android.tools.r8.internal.qW:
 # {"id":"sourceFile","fileName":"MutableTable.kt"}
     byte[] bytes -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder builder -> a
@@ -77920,7 +78133,7 @@
     6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractParser.parsePartialFrom(java.io.InputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):196:196 -> b
     6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractParser.parseFrom(java.io.InputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):209 -> b
     6:6:java.lang.Object parseFrom(java.io.InputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):49 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString -> com.android.tools.r8.internal.Q5:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString -> com.android.tools.r8.internal.T5:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString EMPTY -> b
     boolean $assertionsDisabled -> c
     1:22:void <clinit>():60:81 -> <clinit>
@@ -77947,9 +78160,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.O5:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString$ByteIterator -> com.android.tools.r8.internal.R5:
     byte nextByte() -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString$Output -> com.android.tools.r8.internal.P5:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString$Output -> com.android.tools.r8.internal.S5:
     int bufferPos -> f
     byte[] EMPTY_BYTE_ARRAY -> g
     int flushedBuffersTotalBytes -> d
@@ -77973,7 +78186,7 @@
     3:3:java.lang.String toString():888:888 -> toString
     1:4:void write(int):794:797 -> write
     5:19:void write(byte[],int,int):802:816 -> write
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream -> com.android.tools.r8.internal.Ab:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream -> com.android.tools.r8.internal.Cb:
     byte[] buffer -> a
     int currentLimit -> h
     int recursionDepth -> i
@@ -78080,7 +78293,7 @@
     7:7:int readTag():158 -> o
     8:8:int readTag():158:158 -> o
     1:8:void recomputeBufferSizeAfterLimit():1001:1008 -> p
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream -> com.android.tools.r8.internal.Cb:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream -> com.android.tools.r8.internal.Eb:
     byte[] buffer -> a
     java.io.OutputStream output -> e
     int totalBytesWritten -> d
@@ -78174,7 +78387,7 @@
     1:6:void writeRawByte(int):1042 -> 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.Bb:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream$OutOfSpaceException -> com.android.tools.r8.internal.Db:
     1:1:void <init>():1016:1016 -> <init>
 com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite -> com.android.tools.r8.internal.ji:
     java.util.Map extensionsByNumber -> a
@@ -78769,7 +78982,7 @@
     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.wA:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString -> com.android.tools.r8.internal.BA:
     int hash -> e
     byte[] bytes -> d
     1:180:void <init>(byte[]):62:241 -> <init>
@@ -78805,8 +79018,8 @@
     1:9:int hashCode():251:259 -> hashCode
     1:1:java.util.Iterator iterator():52:52 -> iterator
     1:1:int size():76:76 -> size
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString$1 -> com.android.tools.r8.internal.uA:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString$LiteralByteIterator -> com.android.tools.r8.internal.vA:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString$1 -> com.android.tools.r8.internal.zA:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString$LiteralByteIterator -> com.android.tools.r8.internal.AA:
     int position -> b
     int limit -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString this$0 -> d
@@ -78817,12 +79030,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.sC:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLiteOrBuilder -> com.android.tools.r8.internal.xC:
     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.wJ:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser -> com.android.tools.r8.internal.FJ:
     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.XR:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString -> com.android.tools.r8.internal.gS:
     int treeDepth -> h
     int hash -> i
     int leftLength -> g
@@ -78872,8 +79085,8 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString$ByteIterator com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString.iterator():779:779 -> iterator
     1:1:java.util.Iterator iterator():70 -> iterator
     1:1:int size():269:269 -> size
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$1 -> com.android.tools.r8.internal.TR:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$Balancer -> com.android.tools.r8.internal.UR:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$1 -> com.android.tools.r8.internal.cS:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$Balancer -> com.android.tools.r8.internal.dS:
     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>
@@ -78902,7 +79115,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.VR:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$PieceIterator -> com.android.tools.r8.internal.eS:
     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>
@@ -78923,7 +79136,7 @@
     14:14: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.WR:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$RopeByteIterator -> com.android.tools.r8.internal.fS:
     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
@@ -78934,7 +79147,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.jT:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$1 -> com.android.tools.r8.internal.sT:
     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
@@ -79004,20 +79217,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.mT:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EmptySet -> com.android.tools.r8.internal.vT:
     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.kT:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EmptySet$1 -> com.android.tools.r8.internal.tT:
     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.lT:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EmptySet$2 -> com.android.tools.r8.internal.uT:
     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.nT:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$Entry -> com.android.tools.r8.internal.wT:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap this$0 -> d
     java.lang.Comparable key -> b
     java.lang.Object value -> c
@@ -79041,7 +79254,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.oT:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EntryIterator -> com.android.tools.r8.internal.xT:
     java.util.Iterator lazyOverflowIterator -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap this$0 -> e
     int pos -> b
@@ -79054,7 +79267,7 @@
     1:7:java.lang.Object next():532 -> next
     1:10:void remove():557:566 -> remove
     11:11:void remove():558:558 -> remove
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EntrySet -> com.android.tools.r8.internal.pT:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EntrySet -> com.android.tools.r8.internal.yT:
     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>
@@ -79066,9 +79279,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.IX:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.UninitializedMessageException -> com.android.tools.r8.internal.RX:
     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.jY:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Utf8 -> com.android.tools.r8.internal.sY:
     int incompleteStateFor(int,int) -> a
     int incompleteStateFor(int,int,int) -> a
     1:66:int partialIsValidUtf8(int,byte[],int,int):163:228 -> a
@@ -79077,10 +79290,10 @@
     1:1:int partialIsValidUtf8(byte[],int,int):252:252 -> b
     2:38:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Utf8.partialIsValidUtf8NonAscii(byte[],int,int):270:306 -> b
     2:38:int partialIsValidUtf8(byte[],int,int):256 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat -> com.android.tools.r8.internal.OZ:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat -> com.android.tools.r8.internal.XZ:
     int makeTag(int,int) -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$1 -> com.android.tools.r8.internal.HZ:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType -> com.android.tools.r8.internal.MZ:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$1 -> com.android.tools.r8.internal.QZ:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType -> com.android.tools.r8.internal.VZ:
     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
@@ -79109,18 +79322,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.IZ:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType$1 -> com.android.tools.r8.internal.RZ:
     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.JZ:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType$2 -> com.android.tools.r8.internal.SZ:
     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.KZ:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType$3 -> com.android.tools.r8.internal.TZ:
     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.LZ:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType$4 -> com.android.tools.r8.internal.UZ:
     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.NZ:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType -> com.android.tools.r8.internal.WZ:
     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
@@ -79920,7 +80133,7 @@
     java.util.List enumEntries -> k
     1:22:void <init>(int,java.lang.String,boolean,java.lang.String,com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo,java.util.List,java.util.List,java.util.List,java.util.List,java.util.List,java.util.List,com.android.tools.r8.kotlin.KotlinVersionRequirementInfo,com.android.tools.r8.kotlin.KotlinTypeReference,java.lang.String,com.android.tools.r8.kotlin.KotlinLocalDelegatedPropertyInfo,int[],java.lang.String,com.android.tools.r8.kotlin.KotlinTypeInfo,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker,int):82:103 -> <init>
     1:1:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):113:113 -> a
-    2:2:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():500:500 -> a
+    2:2:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():502:502 -> a
     2:2:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):114 -> a
     3:6:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):115:118 -> a
     7:11:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):117:121 -> a
@@ -79997,7 +80210,7 @@
     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():500:500 -> 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
@@ -80008,7 +80221,7 @@
     162:162: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:78: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:72 -> a
     79: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):67:73 -> a
-    86:86:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():500:500 -> a
+    86:86:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():502:502 -> 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):56 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     87:87: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
@@ -80944,7 +81157,7 @@
     16:16:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getModuleName(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage):69:69 -> a
     16:16:com.android.tools.r8.kotlin.KotlinPackageInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation):60 -> a
     17:17:com.android.tools.r8.kotlin.KotlinPackageInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation):65:65 -> a
-    18:18:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():500:500 -> a
+    18:18:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():502:502 -> a
     18:18:com.android.tools.r8.kotlin.KotlinPackageInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation):66 -> a
     19:19:com.android.tools.r8.kotlin.KotlinPackageInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation):61:61 -> a
     20:20:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmPackageExtension com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage):16:16 -> a
@@ -80953,7 +81166,7 @@
     21:21:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getLocalDelegatedProperties(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage):63:63 -> a
     21:21:com.android.tools.r8.kotlin.KotlinPackageInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation):71 -> a
     22:22:com.android.tools.r8.kotlin.KotlinPackageInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation):72:72 -> a
-    23:23:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():500:500 -> a
+    23:23:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():502:502 -> a
     23:23:com.android.tools.r8.kotlin.KotlinPackageInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation):73 -> a
     24:24:com.android.tools.r8.kotlin.KotlinPackageInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation):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
@@ -81169,7 +81382,7 @@
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambdaVisitor lambda$rewrite$0(com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambda) -> a
     1:5:com.android.tools.r8.kotlin.KotlinSyntheticClassInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.AppView):47:51 -> a
     6:11:com.android.tools.r8.kotlin.KotlinSyntheticClassInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.AppView):50:55 -> a
-    12:12:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():500:500 -> a
+    12:12:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():502:502 -> a
     12:12:com.android.tools.r8.kotlin.KotlinSyntheticClassInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.AppView):55 -> a
     13:16:com.android.tools.r8.kotlin.KotlinSyntheticClassInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.AppView):54:57 -> a
     17:21: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):79:83 -> a
@@ -81324,7 +81537,7 @@
     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.LA:
+com.android.tools.r8.logging.Log -> com.android.tools.r8.internal.QA:
     java.util.Set CLASS_FILTER -> b
     boolean ENABLED -> a
     1:1:void <clinit>():12:12 -> <clinit>
@@ -82137,7 +82350,7 @@
     int incrementNameIndex() -> a
     int getDictionaryIndex() -> b
     int incrementDictionaryIndex() -> c
-com.android.tools.r8.naming.MapVersion -> com.android.tools.r8.internal.BB:
+com.android.tools.r8.naming.MapVersion -> com.android.tools.r8.internal.GB:
     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
@@ -82247,7 +82460,7 @@
     2:2:com.android.tools.r8.naming.MethodNamingState access$200(com.android.tools.r8.naming.MethodNameMinifier,com.android.tools.r8.graph.DexType):92:92 -> a
     3:3:com.android.tools.r8.naming.MethodReservationState access$400(com.android.tools.r8.naming.MethodNameMinifier,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):92:92 -> a
     4:4:java.util.function.Function getNamingKeyTransform():168:168 -> a
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():471:471 -> a
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> a
     5:5:java.util.function.Function getNamingKeyTransform():168 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     6:7:java.util.function.Function getNamingKeyTransform():169:170 -> a
@@ -82297,7 +82510,7 @@
     695:695:boolean lambda$renameNonReboundMethodReference$6(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod):386:386 -> a
     1:1:com.android.tools.r8.com.google.common.collect.BiMap access$100(com.android.tools.r8.naming.MethodNameMinifier):92:92 -> b
     2:3:java.util.function.Function getReservationKeyTransform():157:158 -> b
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():471:471 -> b
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> b
     4:4:java.util.function.Function getReservationKeyTransform():158 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     5:8:java.util.function.Function getReservationKeyTransform():160:163 -> b
@@ -82888,7 +83101,7 @@
     1227:1227:java.lang.String toString():610:610 -> toString
     1228:1228: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.pL:
+com.android.tools.r8.naming.ProguardMapSupplier -> com.android.tools.r8.internal.yL:
     com.android.tools.r8.naming.ClassNameMapper classNameMapper -> a
     com.android.tools.r8.utils.InternalOptions options -> c
     com.android.tools.r8.utils.Reporter reporter -> d
@@ -82933,7 +83146,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():1762:1764 -> a
+    22:24:com.android.tools.r8.naming.MapVersion com.android.tools.r8.utils.InternalOptions.getMapFileVersion():1761:1763 -> 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
@@ -82952,8 +83165,8 @@
     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.oL:
-com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapChecker -> com.android.tools.r8.internal.pL$a:
+com.android.tools.r8.naming.ProguardMapSupplier$1 -> com.android.tools.r8.internal.xL:
+com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapChecker -> com.android.tools.r8.internal.yL$a:
     java.lang.StringBuilder contents -> b
     com.android.tools.r8.StringConsumer inner -> a
     boolean $assertionsDisabled -> c
@@ -82967,7 +83180,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.pL$a$a:
+com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapChecker$VerifyMappingFileHashResult -> com.android.tools.r8.internal.yL$a$a:
     boolean error -> a
     java.lang.String message -> b
     boolean $assertionsDisabled -> c
@@ -82979,7 +83192,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.qL:
+com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId -> com.android.tools.r8.internal.zL:
     java.lang.String id -> a
     java.lang.String hash -> b
     boolean $assertionsDisabled -> c
@@ -82988,7 +83201,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.sL:
+com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapIdBuilder -> com.android.tools.r8.internal.BL:
     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
@@ -82999,16 +83212,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.rL:
+com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapIdBuilder$1 -> com.android.tools.r8.internal.AL:
     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.tL:
+com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapWriter -> com.android.tools.r8.internal.CL:
     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.BN:
+com.android.tools.r8.naming.Range -> com.android.tools.r8.internal.KN:
     int to -> b
     boolean isCardinal -> c
     int from -> a
@@ -83114,7 +83327,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.wT:
+com.android.tools.r8.naming.SourceFileRewriter -> com.android.tools.r8.internal.FT:
     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
@@ -83150,13 +83363,13 @@
     16:16:com.android.tools.r8.SourceFileProvider com.android.tools.r8.naming.SourceFileRewriter.computeNonCompatProvider(com.android.tools.r8.utils.InternalOptions):46 -> a
     16:16: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
     17:18:boolean isDefaultOrEmpty(java.lang.String,com.android.tools.r8.utils.InternalOptions):56:57 -> a
-com.android.tools.r8.naming.SourceFileRewriter$1 -> com.android.tools.r8.internal.vT:
+com.android.tools.r8.naming.SourceFileRewriter$1 -> com.android.tools.r8.internal.ET:
     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.ja:
+com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo -> com.android.tools.r8.internal.la:
     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
@@ -83197,7 +83410,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.ia:
+com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping -> com.android.tools.r8.internal.ka:
     com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping NONE -> b
     boolean $assertionsDisabled -> h
     com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping NAME -> c
@@ -83233,7 +83446,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.pE:
+com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo -> com.android.tools.r8.internal.uE:
     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
@@ -83251,7 +83464,7 @@
     boolean isRecordFieldNamesComputationInfo() -> d
     boolean needsToComputeName() -> e
     boolean needsToRegisterReference() -> f
-com.android.tools.r8.naming.dexitembasedstring.RecordFieldNamesComputationInfo -> com.android.tools.r8.internal.bO:
+com.android.tools.r8.naming.dexitembasedstring.RecordFieldNamesComputationInfo -> com.android.tools.r8.internal.kO:
     com.android.tools.r8.graph.DexField[] fields -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():38:38 -> <clinit>
@@ -83269,8 +83482,8 @@
     boolean isRecordFieldNamesComputationInfo() -> d
     boolean needsToComputeName() -> e
     boolean needsToRegisterReference() -> f
-com.android.tools.r8.naming.dexitembasedstring.RecordFieldNamesComputationInfo$1 -> com.android.tools.r8.internal.YN:
-com.android.tools.r8.naming.dexitembasedstring.RecordFieldNamesComputationInfo$MatchingRecordFieldNamesComputationInfo -> com.android.tools.r8.internal.ZN:
+com.android.tools.r8.naming.dexitembasedstring.RecordFieldNamesComputationInfo$1 -> com.android.tools.r8.internal.hO:
+com.android.tools.r8.naming.dexitembasedstring.RecordFieldNamesComputationInfo$MatchingRecordFieldNamesComputationInfo -> com.android.tools.r8.internal.iO:
     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
@@ -83278,25 +83491,25 @@
     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):95:95 -> 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.aO:
+com.android.tools.r8.naming.dexitembasedstring.RecordFieldNamesComputationInfo$MissMatchingRecordFieldNamesComputationInfo -> com.android.tools.r8.internal.jO:
     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.y9:
+com.android.tools.r8.naming.identifiernamestring.ClassForNameIdentifierNameStringLookupResult -> com.android.tools.r8.internal.A9:
     1:1:void <init>(com.android.tools.r8.graph.DexType):14:14 -> <init>
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():622:622 -> a
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():624:624 -> a
     1:1:boolean isTypeCompatInstantiatedFromUse(com.android.tools.r8.utils.InternalOptions):24 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     boolean isTypeInitializedFromUse() -> d
-com.android.tools.r8.naming.identifiernamestring.ClassNameComparisonIdentifierNameStringLookupResult -> com.android.tools.r8.internal.ha:
+com.android.tools.r8.naming.identifiernamestring.ClassNameComparisonIdentifierNameStringLookupResult -> com.android.tools.r8.internal.ja:
     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.bg:
+com.android.tools.r8.naming.identifiernamestring.DexMemberBasedConstStringIdentifierNameStringLookupResult -> com.android.tools.r8.internal.ag:
     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.gg:
+com.android.tools.r8.naming.identifiernamestring.DexTypeBasedConstStringIdentifierNameStringLookupResult -> com.android.tools.r8.internal.fg:
     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
@@ -83321,9 +83534,9 @@
     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.GX:
+com.android.tools.r8.naming.identifiernamestring.UncategorizedMemberIdentifierNameStringLookupResult -> com.android.tools.r8.internal.PX:
     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.tc:
+com.android.tools.r8.naming.mappinginformation.CompilerSynthesizedMappingInformation -> com.android.tools.r8.internal.vc:
     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>
@@ -83336,8 +83549,8 @@
     4:4: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.rc:
-com.android.tools.r8.naming.mappinginformation.CompilerSynthesizedMappingInformation$Builder -> com.android.tools.r8.internal.sc:
+com.android.tools.r8.naming.mappinginformation.CompilerSynthesizedMappingInformation$1 -> com.android.tools.r8.internal.tc:
+com.android.tools.r8.naming.mappinginformation.CompilerSynthesizedMappingInformation$Builder -> com.android.tools.r8.internal.uc:
     1:1:void <init>():17:17 -> <init>
     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:
@@ -83404,7 +83617,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.RI:
+com.android.tools.r8.naming.mappinginformation.OutlineCallsiteMappingInformation -> com.android.tools.r8.internal.aJ:
     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>
@@ -83437,7 +83650,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.TI:
+com.android.tools.r8.naming.mappinginformation.OutlineMappingInformation -> com.android.tools.r8.internal.cJ:
     com.android.tools.r8.naming.MapVersion SUPPORTED_VERSION -> a
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:void <init>():12:12 -> <init>
@@ -83446,7 +83659,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.QR:
+com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation -> com.android.tools.r8.internal.ZR:
     java.util.List actions -> b
     java.util.List conditions -> a
     com.android.tools.r8.naming.MapVersion SUPPORTED_VERSION -> c
@@ -83648,19 +83861,19 @@
     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$1 -> com.android.tools.r8.internal.JR:
-com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$Builder -> com.android.tools.r8.internal.KR:
+com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$1 -> com.android.tools.r8.internal.TR:
+com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$Builder -> com.android.tools.r8.internal.UR:
     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.MR:
+com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$Condition -> com.android.tools.r8.internal.VR:
     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.NR:
+com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RemoveInnerFramesAction -> com.android.tools.r8.internal.WR:
     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
@@ -83677,13 +83890,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.OR:
+com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction -> com.android.tools.r8.internal.XR:
     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.PR:
+com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$ThrowsCondition -> com.android.tools.r8.internal.YR:
     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
@@ -83707,7 +83920,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.QX:
+com.android.tools.r8.naming.mappinginformation.UnknownJsonMappingInformation -> com.android.tools.r8.internal.ZX:
     java.lang.String id -> a
     java.lang.String payload -> b
     1:3:void <init>(java.lang.String,java.lang.String):16:18 -> <init>
@@ -83798,7 +84011,7 @@
     com.android.tools.r8.graph.GenericSignatureContextBuilder contextBuilder -> c
     1:4:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.GenericSignatureContextBuilder):35:38 -> <init>
     1:11:void run(java.lang.Iterable,java.util.concurrent.ExecutorService):45:55 -> a
-    12:12:boolean com.android.tools.r8.graph.AppView.hasLiveness():657:657 -> 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
@@ -83822,7 +84035,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.s9:
+com.android.tools.r8.optimize.ClassAndMemberPublicizer -> com.android.tools.r8.internal.u9:
     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
@@ -83949,7 +84162,7 @@
     1:1:void com.android.tools.r8.optimize.InvokeSingleTargetExtractor.invalid():35:35 -> g
     1:1:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):98 -> g
     2:2:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):53:53 -> g
-com.android.tools.r8.optimize.MemberRebindingAnalysis -> com.android.tools.r8.internal.ZB:
+com.android.tools.r8.optimize.MemberRebindingAnalysis -> com.android.tools.r8.internal.eC:
     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
@@ -84021,7 +84234,7 @@
     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):250:264 -> 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):326:326 -> 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):271 -> a
-    209:209:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():471:471 -> a
+    209:209:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> 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):326 -> 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):271 -> 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):326:329 -> a
@@ -84061,7 +84274,7 @@
     1:1:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexMethod):212:212 -> c
     2:6:com.android.tools.r8.optimize.MemberRebindingLens run(java.util.concurrent.ExecutorService):443:447 -> c
     1:18:boolean verifyFieldAccessCollectionContainsAllNonReboundFieldReferences(java.util.concurrent.ExecutorService):452:469 -> d
-com.android.tools.r8.optimize.MemberRebindingAnalysis$1 -> com.android.tools.r8.internal.YB:
+com.android.tools.r8.optimize.MemberRebindingAnalysis$1 -> com.android.tools.r8.internal.dC:
     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):481:481 -> <init>
@@ -84079,7 +84292,7 @@
     void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod) -> g
     1:1:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):500:500 -> g
     1:5:void registerFieldReference(com.android.tools.r8.graph.DexField):504:508 -> i
-com.android.tools.r8.optimize.MemberRebindingIdentityLens -> com.android.tools.r8.internal.cC:
+com.android.tools.r8.optimize.MemberRebindingIdentityLens -> com.android.tools.r8.internal.hC:
     boolean $assertionsDisabled -> h
     java.util.Map nonReboundFieldReferenceToDefinitionMap -> f
     java.util.Map nonReboundMethodReferenceToDefinitionMap -> g
@@ -84120,8 +84333,8 @@
     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.aC:
-com.android.tools.r8.optimize.MemberRebindingIdentityLens$Builder -> com.android.tools.r8.internal.bC:
+com.android.tools.r8.optimize.MemberRebindingIdentityLens$1 -> com.android.tools.r8.internal.fC:
+com.android.tools.r8.optimize.MemberRebindingIdentityLens$Builder -> com.android.tools.r8.internal.gC:
     java.util.Map nonReboundFieldReferenceToDefinitionMap -> c
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Map nonReboundMethodReferenceToDefinitionMap -> d
@@ -84143,7 +84356,7 @@
     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.eC:
+com.android.tools.r8.optimize.MemberRebindingIdentityLensFactory -> com.android.tools.r8.internal.jC:
     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
@@ -84157,7 +84370,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.dC:
+com.android.tools.r8.optimize.MemberRebindingIdentityLensFactory$NonReboundMemberReferencesRegistry -> com.android.tools.r8.internal.iC:
     java.util.Set seenFieldReferences -> h
     java.util.Set seenMethodReferences -> i
     com.android.tools.r8.graph.MethodAccessInfoCollection$ConcurrentBuilder methodAccessInfoCollectionBuilder -> g
@@ -84190,7 +84403,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.hC:
+com.android.tools.r8.optimize.MemberRebindingLens -> com.android.tools.r8.internal.mC:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.graph.AppView appView -> f
     java.util.Map methodMaps -> g
@@ -84223,8 +84436,8 @@
     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.fC:
-com.android.tools.r8.optimize.MemberRebindingLens$Builder -> com.android.tools.r8.internal.gC:
+com.android.tools.r8.optimize.MemberRebindingLens$1 -> com.android.tools.r8.internal.kC:
+com.android.tools.r8.optimize.MemberRebindingLens$Builder -> com.android.tools.r8.internal.lC:
     java.util.Map methodMaps -> b
     java.util.Map nonReboundFieldReferenceToDefinitionMap -> c
     com.android.tools.r8.graph.AppView appView -> a
@@ -84239,7 +84452,7 @@
     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.AN:
+com.android.tools.r8.optimize.PublicizerLens -> com.android.tools.r8.internal.JN:
     com.android.tools.r8.graph.AppView appView -> n
     boolean $assertionsDisabled -> p
     java.util.Set publicizedMethods -> o
@@ -84258,15 +84471,15 @@
     com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult) -> b
     boolean isLegitimateToHaveEmptyMappings() -> k
     1:1:com.android.tools.r8.optimize.PublicizerLens$PublicizedLensBuilder createBuilder():65:65 -> l
-com.android.tools.r8.optimize.PublicizerLens$1 -> com.android.tools.r8.internal.yN:
-com.android.tools.r8.optimize.PublicizerLens$PublicizedLensBuilder -> com.android.tools.r8.internal.zN:
+com.android.tools.r8.optimize.PublicizerLens$1 -> com.android.tools.r8.internal.HN:
+com.android.tools.r8.optimize.PublicizerLens$PublicizedLensBuilder -> com.android.tools.r8.internal.IN:
     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.xZ:
+com.android.tools.r8.optimize.VisibilityBridgeRemover -> com.android.tools.r8.internal.GZ:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():23:23 -> <clinit>
@@ -84292,7 +84505,7 @@
     42:50:void lambda$run$1(java.util.concurrent.ConcurrentHashMap,com.android.tools.r8.graph.DexProgramClass):88:96 -> a
     51:52:void lambda$run$3(com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):104:105 -> a
     53:53: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.y2:
+com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagator -> com.android.tools.r8.internal.B2:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner codeScanner -> b
     com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ArgumentPropagatorReprocessingCriteriaCollection reprocessingCriteriaCollection -> c
@@ -84317,7 +84530,7 @@
     57:74: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
     75:77: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):198:200 -> a
     75:77: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
-    78:78:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():504:504 -> a
+    78:78:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():506:506 -> a
     78:78: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):200 -> a
     78:78: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
     79:92:void com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagator.populateParameterOptimizationInfo(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,java.util.List,java.util.function.BiConsumer,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):200:213 -> a
@@ -84326,7 +84539,7 @@
     110:113:void lambda$tearDownCodeScanner$2(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexMethodSignature):156:159 -> a
     114:114:com.android.tools.r8.utils.collections.DexMethodSignatureSet lambda$tearDownCodeScanner$1(java.util.Set):158:158 -> a
     115:117:void onMethodPruned(com.android.tools.r8.graph.ProgramMethod):227:229 -> a
-com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorApplicationFixer -> com.android.tools.r8.internal.A2:
+com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorApplicationFixer -> com.android.tools.r8.internal.D2:
     com.android.tools.r8.graph.AppView appView -> f
     boolean $assertionsDisabled -> h
     com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens graphLens -> g
@@ -84347,7 +84560,7 @@
     27:29:void lambda$fixupMethods$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):96:98 -> a
     30:30:void com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorApplicationFixer.fixupOptimizationInfos(java.util.concurrent.ExecutorService):104:104 -> a
     30:30:void lambda$fixupApplication$0(java.util.concurrent.ExecutorService):65 -> a
-    31:31:com.android.tools.r8.graph.DexApplication com.android.tools.r8.graph.AppView.app():218:218 -> a
+    31:31:com.android.tools.r8.graph.DexApplication com.android.tools.r8.graph.AppView.app():220:220 -> a
     31:31:void com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorApplicationFixer.fixupOptimizationInfos(java.util.concurrent.ExecutorService):104 -> a
     31:31:void lambda$fixupApplication$0(java.util.concurrent.ExecutorService):65 -> a
     32:32:void com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorApplicationFixer.fixupOptimizationInfos(java.util.concurrent.ExecutorService):104:104 -> a
@@ -84369,7 +84582,7 @@
     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:11:com.android.tools.r8.graph.DexEncodedMethod lambda$fixupMethods$2(com.android.tools.r8.graph.DexEncodedMethod):86:93 -> b
-com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorApplicationFixer$1 -> com.android.tools.r8.internal.z2:
+com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorApplicationFixer$1 -> com.android.tools.r8.internal.C2:
     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):109:109 -> <init>
@@ -84378,7 +84591,7 @@
     12:12:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer com.android.tools.r8.graph.RewrittenPrototypeDescription.createMethodOptimizationInfoFixer():642:642 -> a
     12:12:void fixup(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo):130 -> a
     13:13:void fixup(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo):131:131 -> a
-com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner -> com.android.tools.r8.internal.B2:
+com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner -> com.android.tools.r8.internal.E2:
     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
@@ -84720,20 +84933,20 @@
     337:337:com.android.tools.r8.graph.DexMethod getRepresentative(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):542 -> a
     338:340:com.android.tools.r8.graph.DexMethod getRepresentative(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):543:545 -> a
     341:341:com.android.tools.r8.graph.DexMethod getRepresentative(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):544:544 -> a
-com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorEventConsumer -> com.android.tools.r8.internal.E2:
+com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorEventConsumer -> com.android.tools.r8.internal.H2:
     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.C2:
+com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorEventConsumer$1 -> com.android.tools.r8.internal.F2:
     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.D2:
+com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorEventConsumer$2 -> com.android.tools.r8.internal.G2:
     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.G2:
+com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens -> com.android.tools.r8.internal.J2:
     boolean $assertionsDisabled -> o
     java.util.Map prototypeChanges -> n
     1:1:void <clinit>():20:20 -> <clinit>
@@ -84753,7 +84966,7 @@
     3:4:com.android.tools.r8.graph.RewrittenPrototypeDescription getPrototypeChanges(com.android.tools.r8.graph.DexMethod):42:43 -> h
     1:1:com.android.tools.r8.graph.DexMethod com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens.internalGetPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):78:78 -> i
     1:1:boolean hasPrototypeChanges(com.android.tools.r8.graph.DexMethod):38 -> i
-com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder -> com.android.tools.r8.internal.F2:
+com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder -> com.android.tools.r8.internal.I2:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Map prototypeChanges -> d
     boolean $assertionsDisabled -> e
@@ -84771,7 +84984,7 @@
     12:13:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder recordMove(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):118:119 -> a
     14:21: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):125:132 -> a
     22:22: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):130:130 -> a
-com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorIROptimizer -> com.android.tools.r8.internal.H2:
+com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorIROptimizer -> com.android.tools.r8.internal.K2:
     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
@@ -84790,7 +85003,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.J2:
+com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorMethodReprocessingEnqueuer -> com.android.tools.r8.internal.M2:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():34:34 -> <clinit>
@@ -84801,7 +85014,7 @@
     28:28:boolean com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo.isConcreteCallSiteOptimizationInfo():0:0 -> a
     28:28:void lambda$enqueueMethodsWithNonTrivialOptimizationInfo$0(com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ProgramMethod):85 -> a
     29:32:void lambda$enqueueMethodsWithNonTrivialOptimizationInfo$0(com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ProgramMethod):85:88 -> a
-    33:33:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():504:504 -> a
+    33:33:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():506:506 -> a
     33:33:void lambda$enqueueMethodsWithNonTrivialOptimizationInfo$0(com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ProgramMethod):88 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     34:34:void lambda$enqueueMethodsWithNonTrivialOptimizationInfo$0(com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ProgramMethod):88:88 -> a
@@ -84813,7 +85026,7 @@
     73:74:void lambda$enqueueAffectedCallers$1(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens,java.util.List,com.android.tools.r8.graph.ProgramMethod):118 -> a
     75:77:void lambda$enqueueAffectedCallers$1(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens,java.util.List,com.android.tools.r8.graph.ProgramMethod):118:120 -> a
     78:78:void lambda$enqueueAffectedCallers$3(com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder,com.android.tools.r8.graph.GraphLens,java.util.List):130:130 -> a
-com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorMethodReprocessingEnqueuer$AffectedMethodUseRegistry -> com.android.tools.r8.internal.I2:
+com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorMethodReprocessingEnqueuer$AffectedMethodUseRegistry -> com.android.tools.r8.internal.L2:
     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):142:144 -> <init>
@@ -84834,7 +85047,7 @@
     1:9:void registerFieldAccess(com.android.tools.r8.graph.DexField):212:220 -> i
     10:10:void com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorMethodReprocessingEnqueuer$AffectedMethodUseRegistry.markAffected():148:148 -> i
     10:10:void registerFieldAccess(com.android.tools.r8.graph.DexField):221 -> i
-com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorOptimizationInfoPopulator -> com.android.tools.r8.internal.K2:
+com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorOptimizationInfoPopulator -> com.android.tools.r8.internal.N2:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.List stronglyConnectedProgramComponents -> e
     java.util.function.BiConsumer interfaceDispatchOutsideProgram -> f
@@ -84878,7 +85091,7 @@
     156:164:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState getMethodStateAfterUninstantiatedParameterRemoval(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):251:259 -> a
     165:165:com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownParameterState com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState.unknown():32:32 -> a
     165:165:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState getMethodStateAfterUninstantiatedParameterRemoval(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):260 -> a
-    166:168:java.util.ArrayList com.android.tools.r8.utils.ListUtils.newInitializedArrayList(int,java.lang.Object):199:201 -> a
+    166:168:java.util.ArrayList com.android.tools.r8.utils.ListUtils.newInitializedArrayList(int,java.lang.Object):207:209 -> a
     166:168:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState getMethodStateAfterUninstantiatedParameterRemoval(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):260 -> a
     169:185:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState getMethodStateAfterUninstantiatedParameterRemoval(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):261:277 -> a
     186:194:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState lambda$getMethodStateAfterUninstantiatedParameterRemoval$3(com.android.tools.r8.graph.ProgramMethod,int,com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState):265:273 -> a
@@ -84887,7 +85100,7 @@
     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):283:292 -> 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):293 -> b
-    12:14:java.util.ArrayList com.android.tools.r8.utils.ListUtils.newInitializedArrayList(int,java.lang.Object):199:201 -> 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):293 -> b
     15:21:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState getMethodStateAfterUnusedParameterRemoval(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):295:301 -> b
     22:24:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorOptimizationInfoPopulator.getUnusedParameterState(com.android.tools.r8.graph.DexType):316:318 -> b
@@ -84912,7 +85125,7 @@
     44:44: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
     44:44:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState getMethodStateAfterUnusedParameterRemoval(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):307 -> b
     45:46:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState getMethodStateAfterUnusedParameterRemoval(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):308:309 -> b
-com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer -> com.android.tools.r8.internal.N2:
+com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer -> com.android.tools.r8.internal.Q2:
     java.util.Map interfaceDispatchOutsideProgram -> c
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Map libraryVirtualMethods -> d
@@ -84937,7 +85150,7 @@
     42:51:com.android.tools.r8.utils.collections.DexMethodSignatureSet computeLibraryVirtualMethods(com.android.tools.r8.graph.DexClass):166:175 -> a
     52:52:void lambda$computeLibraryVirtualMethods$3(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexClassAndMethod):174:174 -> a
     1:1:com.android.tools.r8.graph.ImmediateProgramSubtypingInfo access$100(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer):67:67 -> b
-com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$AllowedPrototypeChanges -> com.android.tools.r8.internal.L2:
+com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$AllowedPrototypeChanges -> com.android.tools.r8.internal.O2:
     com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$AllowedPrototypeChanges EMPTY -> c
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet removableParameterIndices -> b
     boolean canRewriteToVoid -> a
@@ -84950,7 +85163,7 @@
     6:6:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$AllowedPrototypeChanges empty():91:91 -> a
     1:6:boolean equals(java.lang.Object):101:106 -> equals
     1:1:int hashCode():96:96 -> hashCode
-com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer -> com.android.tools.r8.internal.M2:
+com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer -> com.android.tools.r8.internal.P2:
     java.util.Map allowedPrototypeChangesForVirtualMethods -> c
     boolean $assertionsDisabled -> i
     com.android.tools.r8.utils.InternalOptions options -> b
@@ -85086,7 +85299,7 @@
     41:50:com.android.tools.r8.graph.RewrittenPrototypeDescription computePrototypeChangesForVirtualMethod(com.android.tools.r8.graph.ProgramMethod):663:672 -> b
     51:63:com.android.tools.r8.graph.RewrittenPrototypeDescription computePrototypeChangesForVirtualMethod(com.android.tools.r8.graph.ProgramMethod):669:681 -> b
     64:64:com.android.tools.r8.graph.RewrittenPrototypeDescription computePrototypeChangesForVirtualMethod(com.android.tools.r8.graph.ProgramMethod):680:680 -> b
-com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorUnoptimizableMethods -> com.android.tools.r8.internal.P2:
+com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorUnoptimizableMethods -> com.android.tools.r8.internal.S2:
     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
@@ -85118,7 +85331,7 @@
     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.r5:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomArrayTypeParameterState -> com.android.tools.r8.internal.u5:
     com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomArrayTypeParameterState INSTANCE -> a
     boolean $assertionsDisabled -> b
     1:3:void <clinit>():13:15 -> <clinit>
@@ -85134,7 +85347,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.s5:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomClassTypeParameterState -> com.android.tools.r8.internal.v5:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomClassTypeParameterState INSTANCE -> a
     1:3:void <clinit>():15:17 -> <clinit>
@@ -85150,7 +85363,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.u5:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomMethodState -> com.android.tools.r8.internal.x5:
     com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomMethodState INSTANCE -> a
     1:1:void <clinit>():15:15 -> <clinit>
     1:1:void <init>():17:17 -> <init>
@@ -85162,14 +85375,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.v5:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomParameterState -> com.android.tools.r8.internal.y5:
     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.z5:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomPrimitiveTypeParameterState -> com.android.tools.r8.internal.C5:
     com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomPrimitiveTypeParameterState INSTANCE -> a
     boolean $assertionsDisabled -> b
     1:3:void <clinit>():12:14 -> <clinit>
@@ -85182,7 +85395,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.A5:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomReceiverParameterState -> com.android.tools.r8.internal.D5:
     com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomReceiverParameterState INSTANCE -> a
     boolean $assertionsDisabled -> b
     1:3:void <clinit>():13:15 -> <clinit>
@@ -85198,7 +85411,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.zc:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteArrayTypeParameterState -> com.android.tools.r8.internal.Bc:
     com.android.tools.r8.ir.analysis.type.Nullability nullability -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():18:18 -> <clinit>
@@ -85235,7 +85448,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.Cc:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteClassTypeParameterState -> com.android.tools.r8.internal.Ec:
     boolean $assertionsDisabled -> e
     com.android.tools.r8.ir.analysis.type.DynamicType dynamicType -> d
     com.android.tools.r8.ir.analysis.value.AbstractValue abstractValue -> c
@@ -85274,7 +85487,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.Ec:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMethodState -> com.android.tools.r8.internal.Gc:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():12:12 -> <clinit>
     1:1:void <init>():12:12 -> <init>
@@ -85307,7 +85520,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.Fc:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState -> com.android.tools.r8.internal.Hc:
     java.util.List parameterStates -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():16:16 -> <clinit>
@@ -85375,10 +85588,10 @@
     4:4:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState mutableCopy():40 -> l
     5:8:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState mutableCopy():40:43 -> l
     1:1:int size():107:107 -> m
-com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom -> com.android.tools.r8.internal.Gc:
-com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown -> com.android.tools.r8.internal.Hc:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom -> com.android.tools.r8.internal.Ic:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown -> com.android.tools.r8.internal.Jc:
     com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown mutableCopy() -> a
-com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteParameterState -> com.android.tools.r8.internal.Jc:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteParameterState -> com.android.tools.r8.internal.Lc:
     java.util.Set inParameters -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():15:15 -> <clinit>
@@ -85403,7 +85616,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.Kc:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState -> com.android.tools.r8.internal.Mc:
     java.util.Map receiverBoundsToState -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():19:19 -> <clinit>
@@ -85500,9 +85713,9 @@
     1:1:boolean isEffectivelyBottom():113:113 -> k
     1:1:boolean isEffectivelyUnknown():117:117 -> l
     1:1:java.util.Collection values():183:183 -> m
-com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrBottom -> com.android.tools.r8.internal.Lc:
-com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrUnknown -> com.android.tools.r8.internal.Mc:
-com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePrimitiveTypeParameterState -> com.android.tools.r8.internal.Oc:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrBottom -> com.android.tools.r8.internal.Nc:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrUnknown -> com.android.tools.r8.internal.Oc:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePrimitiveTypeParameterState -> com.android.tools.r8.internal.Qc:
     com.android.tools.r8.ir.analysis.value.AbstractValue abstractValue -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():16:16 -> <clinit>
@@ -85537,7 +85750,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.Pc:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteReceiverParameterState -> com.android.tools.r8.internal.Rc:
     com.android.tools.r8.ir.analysis.type.DynamicType dynamicType -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():17:17 -> <clinit>
@@ -85566,14 +85779,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.Rc:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteReferenceTypeParameterState -> com.android.tools.r8.internal.Tc:
     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.XC:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameter -> com.android.tools.r8.internal.cD:
     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>
@@ -85581,11 +85794,11 @@
     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.YC:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameterFactory -> com.android.tools.r8.internal.dD:
     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.eD:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState -> com.android.tools.r8.internal.jD:
     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
@@ -85598,7 +85811,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.fD:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateBase -> com.android.tools.r8.internal.kD:
     1:1:void <init>():7:7 -> <init>
     com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState asMonomorphic() -> b
     boolean isPolymorphic() -> c
@@ -85663,10 +85876,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.tF:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.NonEmptyParameterState -> com.android.tools.r8.internal.yF:
     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.sJ:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState -> com.android.tools.r8.internal.BJ:
     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
@@ -85676,7 +85889,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.fU:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner -> com.android.tools.r8.internal.oU:
     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>
@@ -85685,15 +85898,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.dU:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner$1 -> com.android.tools.r8.internal.mU:
     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.eU:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner$2 -> com.android.tools.r8.internal.nU:
     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.RX:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownMethodState -> com.android.tools.r8.internal.aY:
     com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownMethodState INSTANCE -> a
     1:1:void <clinit>():16:16 -> <clinit>
     1:1:void <init>():18:18 -> <init>
@@ -85702,7 +85915,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.SX:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownParameterState -> com.android.tools.r8.internal.bY:
     com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownParameterState INSTANCE -> a
     1:1:void <clinit>():15:15 -> <clinit>
     1:1:void <init>():17:17 -> <init>
@@ -85712,7 +85925,7 @@
     2:2:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView):25 -> a
     com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState mutableCopy() -> f
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownParameterState get():20:20 -> g
-com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysis -> com.android.tools.r8.internal.uZ:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysis -> com.android.tools.r8.internal.DZ:
     java.util.Set monomorphicVirtualMethods -> g
     java.util.Map virtualRootMethodsPerClass -> f
     java.util.Map virtualRootMethods -> h
@@ -85722,7 +85935,7 @@
     6:7:void forEachSubClass(com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer):130:131 -> a
     8:8:void com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysis.promoteToFinalIfPossible(com.android.tools.r8.graph.DexProgramClass):211:211 -> a
     8:8:void forEachSubClass(com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer):132 -> a
-    9:9:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():504:504 -> a
+    9:9:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():506:506 -> a
     9:9:void com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysis.promoteToFinalIfPossible(com.android.tools.r8.graph.DexProgramClass):211 -> a
     9:9:void forEachSubClass(com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer):132 -> a
     10:14:void com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysis.promoteToFinalIfPossible(com.android.tools.r8.graph.DexProgramClass):211:215 -> a
@@ -85738,7 +85951,7 @@
     30:55:void lambda$prune$6(java.util.Map,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):177:202 -> a
     56:58:void lambda$prune$4(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):195:195 -> a
     59:59:void promoteToFinalIfPossible(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysis$VirtualRootMethod):220:220 -> a
-    60:60:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():504:504 -> a
+    60:60:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():506:506 -> a
     60:60: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)"]}
     61:66:void promoteToFinalIfPossible(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysis$VirtualRootMethod):220:225 -> a
@@ -85755,7 +85968,7 @@
     4:4:java.util.Map computeVirtualRootMethodsState(com.android.tools.r8.graph.DexProgramClass):157:157 -> m
     5:5:void com.android.tools.r8.graph.DexProgramClass.forEachProgramVirtualMethod(java.util.function.Consumer):276:276 -> m
     5:5:java.util.Map computeVirtualRootMethodsState(com.android.tools.r8.graph.DexProgramClass):157 -> m
-com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysis$VirtualRootMethod -> com.android.tools.r8.internal.tZ:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysis$VirtualRootMethod -> com.android.tools.r8.internal.CZ:
     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
@@ -85960,10 +86173,10 @@
     5:5:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionBySignature computeInterfaceState(com.android.tools.r8.graph.DexProgramClass):104 -> m
     6:6:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionBySignature computeInterfaceState(com.android.tools.r8.graph.DexProgramClass):119:119 -> m
     1:1:boolean lambda$propagateInterfaceStateToClassHierarchy$2(com.android.tools.r8.graph.DexProgramClass):129:129 -> n
-com.android.tools.r8.optimize.argumentpropagation.propagation.MethodArgumentPropagator -> com.android.tools.r8.internal.DC:
+com.android.tools.r8.optimize.argumentpropagation.propagation.MethodArgumentPropagator -> com.android.tools.r8.internal.IC:
     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.dZ:
+com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator -> com.android.tools.r8.internal.mZ:
     boolean $assertionsDisabled -> h
     java.util.Map propagationStates -> g
     1:1:void <clinit>():34:34 -> <clinit>
@@ -86065,7 +86278,7 @@
     5:5:void computePropagationState(com.android.tools.r8.graph.DexProgramClass):195 -> m
       # {"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 -> m
-com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState -> com.android.tools.r8.internal.cZ:
+com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState -> com.android.tools.r8.internal.lZ:
     java.util.Map activeUntilLowerBound -> b
     java.util.Map inactiveUntilUpperBound -> c
     com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator this$0 -> d
@@ -86101,7 +86314,7 @@
     1:1:void <init>():21:21 -> <init>
     boolean shouldReprocess(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteParameterState,com.android.tools.r8.graph.DexType) -> a
     boolean shouldReprocessDueToDynamicType() -> a
-com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ArgumentPropagatorReprocessingCriteriaCollection -> com.android.tools.r8.internal.O2:
+com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ArgumentPropagatorReprocessingCriteriaCollection -> com.android.tools.r8.internal.R2:
     java.util.Map reproccessingCriteria -> b
     java.util.Map delayedReproccessingCriteria -> c
     com.android.tools.r8.graph.AppView appView -> a
@@ -86130,7 +86343,7 @@
     101:113:void analyzeArgumentUses(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):70:82 -> a
     114:114: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.cD:
+com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.MethodReprocessingCriteria -> com.android.tools.r8.internal.hD:
     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
@@ -86145,7 +86358,7 @@
     19:27:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown widenMethodState(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState):65:73 -> a
     28:28:com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownMethodState com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState.unknown():19:19 -> a
     28:28:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown widenMethodState(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState):74 -> a
-com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.NonTrivialParameterReprocessingCriteria -> com.android.tools.r8.internal.BF:
+com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.NonTrivialParameterReprocessingCriteria -> com.android.tools.r8.internal.GF:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():25:25 -> <clinit>
     1:2:void <init>(boolean):27:28 -> <init>
@@ -86165,11 +86378,11 @@
     8:8:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteParameterState.isPrimitiveParameter():0:0 -> a
     8:8:boolean shouldReprocess(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteParameterState,com.android.tools.r8.graph.DexType):39 -> a
     9:10:boolean shouldReprocess(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteParameterState,com.android.tools.r8.graph.DexType):39:40 -> a
-com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria -> com.android.tools.r8.internal.rJ:
+com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria -> com.android.tools.r8.internal.AJ:
     1:1:void <init>():14:14 -> <init>
     boolean shouldReprocess(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteParameterState,com.android.tools.r8.graph.DexType) -> a
     boolean shouldReprocessDueToDynamicType() -> a
-com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria$Builder -> com.android.tools.r8.internal.qJ:
+com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria$Builder -> com.android.tools.r8.internal.zJ:
     boolean reprocessDueToAbstractValue -> a
     boolean reprocessDueToDynamicType -> b
     boolean reprocessDueToNullability -> c
@@ -86184,14 +86397,14 @@
     1:1:com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria$Builder setReprocessDueToDynamicType():67:67 -> c
     1:1:com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria$Builder setReprocessDueToNullability():72:72 -> d
     1:1:boolean shouldAlwaysReprocess():77:77 -> e
-com.android.tools.r8.optimize.argumentpropagation.utils.BidirectedGraph -> com.android.tools.r8.internal.y4:
+com.android.tools.r8.optimize.argumentpropagation.utils.BidirectedGraph -> com.android.tools.r8.internal.B4:
     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.le:
+com.android.tools.r8.optimize.argumentpropagation.utils.DepthFirstTopDownClassHierarchyTraversal -> com.android.tools.r8.internal.ne:
     java.util.Map states -> c
     com.android.tools.r8.graph.AppView appView -> a
     java.util.List newlySeenButNotFinishedRoots -> d
@@ -86228,12 +86441,12 @@
     13:15:void com.android.tools.r8.optimize.argumentpropagation.utils.DepthFirstTopDownClassHierarchyTraversal.markFinished(com.android.tools.r8.graph.DexProgramClass):183:185 -> k
     13:15:void traverse(com.android.tools.r8.graph.DexProgramClass):129 -> k
     void visit(com.android.tools.r8.graph.DexProgramClass) -> l
-com.android.tools.r8.optimize.argumentpropagation.utils.DepthFirstTopDownClassHierarchyTraversal$TraversalState -> com.android.tools.r8.internal.ke:
+com.android.tools.r8.optimize.argumentpropagation.utils.DepthFirstTopDownClassHierarchyTraversal$TraversalState -> com.android.tools.r8.internal.me:
     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.ProgramClassesBidirectedGraph -> com.android.tools.r8.internal.IK:
+com.android.tools.r8.optimize.argumentpropagation.utils.ProgramClassesBidirectedGraph -> com.android.tools.r8.internal.RK:
     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>
@@ -86246,7 +86459,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.FZ:
+com.android.tools.r8.optimize.argumentpropagation.utils.WideningUtils -> com.android.tools.r8.internal.OZ:
     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
@@ -86275,7 +86488,7 @@
     45:45:boolean isEffectivelyFinal(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):97 -> a
     46:48:boolean isEffectivelyFinal(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):100:102 -> a
     49:49:boolean isEffectivelyFinal(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):101:101 -> a
-com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting -> com.android.tools.r8.internal.G5:
+com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting -> com.android.tools.r8.internal.J5:
     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
@@ -86344,7 +86557,7 @@
     220:220: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
     220:220:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):239 -> a
     224:224: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.H5:
+com.android.tools.r8.optimize.bridgehoisting.BridgeHoistingLens -> com.android.tools.r8.internal.K5:
     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
@@ -86359,7 +86572,7 @@
     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.I5:
+com.android.tools.r8.optimize.bridgehoisting.BridgeHoistingResult -> com.android.tools.r8.internal.L5:
     com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneRepresentativeMap bridgeToHoistedBridgeMap -> b
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> c
@@ -86427,7 +86640,7 @@
     179:181:int computeParameterAnnotationsSize(java.lang.String,com.android.tools.r8.org.objectweb.asm.AnnotationWriter[],int):498:500 -> a
     182:205:void putParameterAnnotations(int,com.android.tools.r8.org.objectweb.asm.AnnotationWriter[],int,com.android.tools.r8.org.objectweb.asm.ByteVector):526:549 -> a
     1:8:int computeAnnotationsSize(java.lang.String):334:341 -> b
-com.android.tools.r8.org.objectweb.asm.Attribute -> com.android.tools.r8.internal.J3:
+com.android.tools.r8.org.objectweb.asm.Attribute -> com.android.tools.r8.internal.M3:
     byte[] content -> b
     java.lang.String type -> a
     com.android.tools.r8.org.objectweb.asm.Attribute nextAttribute -> c
@@ -86440,7 +86653,7 @@
     29:39:void putAttributes(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,int,com.android.tools.r8.org.objectweb.asm.ByteVector):336:346 -> a
     1:1:com.android.tools.r8.org.objectweb.asm.ByteVector write(com.android.tools.r8.org.objectweb.asm.ClassWriter,byte[],int,int,int):159:159 -> b
     2:8:int computeAttributesSize(com.android.tools.r8.org.objectweb.asm.SymbolTable,byte[],int,int,int):219:225 -> b
-com.android.tools.r8.org.objectweb.asm.Attribute$Set -> com.android.tools.r8.internal.I3:
+com.android.tools.r8.org.objectweb.asm.Attribute$Set -> com.android.tools.r8.internal.L3:
     com.android.tools.r8.org.objectweb.asm.Attribute[] data -> b
     int size -> a
     1:6:void <init>():351:356 -> <init>
@@ -86450,7 +86663,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.S5:
+com.android.tools.r8.org.objectweb.asm.ByteVector -> com.android.tools.r8.internal.V5:
     byte[] data -> a
     int length -> b
     1:2:void <init>():45:46 -> <init>
@@ -86470,7 +86683,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.Aa:
+com.android.tools.r8.org.objectweb.asm.ClassReader -> com.android.tools.r8.internal.Ca:
     int[] bootstrapMethodOffsets -> f
     byte[] classFileBuffer -> b
     int[] cpInfoOffsets -> c
@@ -86760,7 +86973,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.Ja:
+com.android.tools.r8.org.objectweb.asm.ClassTooLargeException -> com.android.tools.r8.internal.La:
     java.lang.String className -> b
     int constantPoolCount -> c
     1:1:void <init>(java.lang.String,int):0:0 -> <init>
@@ -86773,7 +86986,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.Na:
+com.android.tools.r8.org.objectweb.asm.ClassVisitor -> com.android.tools.r8.internal.Pa:
     com.android.tools.r8.org.objectweb.asm.ClassVisitor cv -> b
     int api -> a
     1:1:void <init>(int):58:58 -> <init>
@@ -86799,7 +87012,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.Wa:
+com.android.tools.r8.org.objectweb.asm.ClassWriter -> com.android.tools.r8.internal.Ya:
 # {"id":"sourceFile","fileName":"ClassWriter.java"}
     int numberOfInnerClasses -> n
     com.android.tools.r8.org.objectweb.asm.FieldWriter firstField -> j
@@ -86865,7 +87078,7 @@
     293:293:byte[] toByteArray():720:720 -> b
     294:294: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.fd:
+com.android.tools.r8.org.objectweb.asm.ConstantDynamic -> com.android.tools.r8.internal.hd:
     java.lang.Object[] bootstrapMethodArguments -> d
     java.lang.String name -> a
     java.lang.String descriptor -> b
@@ -86880,7 +87093,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.ld:
+com.android.tools.r8.org.objectweb.asm.Constants -> com.android.tools.r8.internal.nd:
 # {"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
@@ -86892,7 +87105,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.qd:
+com.android.tools.r8.org.objectweb.asm.Context -> com.android.tools.r8.internal.sd:
     int currentFrameType -> n
     java.lang.String currentMethodDescriptor -> f
     int currentFrameLocalCount -> o
@@ -86913,7 +87126,7 @@
     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.ud:
+com.android.tools.r8.org.objectweb.asm.CurrentFrame -> com.android.tools.r8.internal.wd:
     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.Kg:
@@ -87134,7 +87347,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.gD:
+com.android.tools.r8.org.objectweb.asm.MethodTooLargeException -> com.android.tools.r8.internal.lD:
     int codeSize -> e
     java.lang.String methodName -> c
     java.lang.String className -> b
@@ -87144,7 +87357,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.hD:
+com.android.tools.r8.org.objectweb.asm.MethodVisitor -> com.android.tools.r8.internal.mD:
     int api -> h
     com.android.tools.r8.org.objectweb.asm.MethodVisitor mv -> i
     1:1:void <init>(int):71:71 -> <init>
@@ -87197,7 +87410,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.iD:
+com.android.tools.r8.org.objectweb.asm.MethodWriter -> com.android.tools.r8.internal.nD:
     boolean hasSubroutines -> d0
     com.android.tools.r8.org.objectweb.asm.AnnotationWriter lastRuntimeInvisibleAnnotation -> I
     int nameIndex -> l
@@ -87389,7 +87602,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.ID:
+com.android.tools.r8.org.objectweb.asm.ModuleVisitor -> com.android.tools.r8.internal.ND:
     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>
@@ -87409,7 +87622,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.JD:
+com.android.tools.r8.org.objectweb.asm.ModuleWriter -> com.android.tools.r8.internal.OD:
     com.android.tools.r8.org.objectweb.asm.ByteVector usesIndex -> m
     int providesCount -> n
     com.android.tools.r8.org.objectweb.asm.ByteVector opens -> k
@@ -87439,7 +87652,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.yI:
+com.android.tools.r8.org.objectweb.asm.Opcodes -> com.android.tools.r8.internal.DI:
     java.lang.Integer FLOAT -> c
     java.lang.Integer DOUBLE -> d
     java.lang.Integer LONG -> e
@@ -87448,7 +87661,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.UN:
+com.android.tools.r8.org.objectweb.asm.RecordComponentVisitor -> com.android.tools.r8.internal.dO:
     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>
@@ -87464,7 +87677,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.VN:
+com.android.tools.r8.org.objectweb.asm.RecordComponentWriter -> com.android.tools.r8.internal.eO:
     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
@@ -87484,7 +87697,7 @@
     47:47:void putRecordComponentInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):213 -> a
     48:48:void collectAttributePrototypes(com.android.tools.r8.org.objectweb.asm.Attribute$Set):223:223 -> a
     1:9:int computeRecordComponentInfoSize():161:169 -> b
-com.android.tools.r8.org.objectweb.asm.SymbolTable -> com.android.tools.r8.internal.OV:
+com.android.tools.r8.org.objectweb.asm.SymbolTable -> com.android.tools.r8.internal.XV:
     com.android.tools.r8.org.objectweb.asm.ClassWriter classWriter -> a
     int typeCount -> k
     int bootstrapMethodCount -> i
@@ -87621,7 +87834,7 @@
     2:2:int addType(java.lang.String):1140 -> e
     3:10:int addType(java.lang.String):1141:1148 -> e
     1:1:com.android.tools.r8.org.objectweb.asm.ClassReader getSource():288:288 -> f
-com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry -> com.android.tools.r8.internal.NV:
+com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry -> com.android.tools.r8.internal.WV:
     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
@@ -87649,7 +87862,7 @@
     1:4:int com.android.tools.r8.org.objectweb.asm.Symbol.getArgumentsAndReturnSizes():238:241 -> a
     1:4:int com.android.tools.r8.org.objectweb.asm.Symbol.getArgumentsAndReturnSizes():0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.org.objectweb.asm.Type -> com.android.tools.r8.internal.jX:
+com.android.tools.r8.org.objectweb.asm.Type -> com.android.tools.r8.internal.sX:
     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
@@ -87708,7 +87921,7 @@
     1:1:com.android.tools.r8.org.objectweb.asm.Type getType(java.lang.String):177:177 -> g
     1:4:int hashCode():877:880 -> hashCode
     1:1:java.lang.String toString():893:893 -> toString
-com.android.tools.r8.org.objectweb.asm.TypePath -> com.android.tools.r8.internal.vX:
+com.android.tools.r8.org.objectweb.asm.TypePath -> com.android.tools.r8.internal.EX:
     byte[] typePathContainer -> a
     int typePathOffset -> b
     1:3:void <init>(byte[],int):72:74 -> <init>
@@ -87725,7 +87938,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.wX:
+com.android.tools.r8.org.objectweb.asm.TypeReference -> com.android.tools.r8.internal.FX:
     int targetTypeAndInfo -> a
     1:2:void <init>(int):193:194 -> <init>
     1:1:int getExceptionIndex():359:359 -> a
@@ -87808,7 +88021,7 @@
     1:1:com.android.tools.r8.org.objectweb.asm.tree.LabelNode com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation.get(java.lang.Object):558:558 -> get
     1:1:java.lang.Object get(java.lang.Object):427 -> get
     1:1:int hashCode():568:568 -> hashCode
-com.android.tools.r8.org.objectweb.asm.signature.SignatureReader -> com.android.tools.r8.internal.GS:
+com.android.tools.r8.org.objectweb.asm.signature.SignatureReader -> com.android.tools.r8.internal.PS:
     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
@@ -87820,7 +88033,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.HS:
+com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor -> com.android.tools.r8.internal.QS:
     1:1:void <init>(int):74:74 -> <init>
     com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor visitArrayType() -> a
     void visitBaseType(char) -> a
@@ -87889,7 +88102,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.ka:
+com.android.tools.r8.org.objectweb.asm.tree.ClassNode -> com.android.tools.r8.internal.ma:
     java.util.List invisibleTypeAnnotations -> f
     java.util.List visibleTypeAnnotations -> e
     java.util.List invisibleAnnotations -> d
@@ -88058,7 +88271,7 @@
     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.Tz:
+com.android.tools.r8.org.objectweb.asm.tree.LineNumberNode -> com.android.tools.r8.internal.Yz:
     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>
@@ -88068,14 +88281,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.JA:
+com.android.tools.r8.org.objectweb.asm.tree.LocalVariableAnnotationNode -> com.android.tools.r8.internal.OA:
     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.KA:
+com.android.tools.r8.org.objectweb.asm.tree.LocalVariableNode -> com.android.tools.r8.internal.PA:
     int index -> f
     java.lang.String name -> a
     java.lang.String signature -> c
@@ -88083,7 +88296,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.pB:
+com.android.tools.r8.org.objectweb.asm.tree.LookupSwitchInsnNode -> com.android.tools.r8.internal.uB:
     com.android.tools.r8.org.objectweb.asm.tree.LabelNode dflt -> g
     java.util.List labels -> i
     java.util.List keys -> h
@@ -88094,7 +88307,7 @@
     12:12:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):89 -> a
     13:15:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):89:91 -> a
     int getType() -> b
-com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode -> com.android.tools.r8.internal.LC:
+com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode -> com.android.tools.r8.internal.QC:
     java.lang.String owner -> g
     java.lang.String desc -> i
     java.lang.String name -> h
@@ -88103,7 +88316,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.PC:
+com.android.tools.r8.org.objectweb.asm.tree.MethodNode -> com.android.tools.r8.internal.UC:
     java.util.List attrs -> r
     java.util.List invisibleTypeAnnotations -> q
     com.android.tools.r8.org.objectweb.asm.tree.InsnList instructions -> x
@@ -88185,13 +88398,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.OC:
+com.android.tools.r8.org.objectweb.asm.tree.MethodNode$1 -> com.android.tools.r8.internal.TC:
     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.DD:
+com.android.tools.r8.org.objectweb.asm.tree.ModuleExportNode -> com.android.tools.r8.internal.ID:
     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.ED:
+com.android.tools.r8.org.objectweb.asm.tree.ModuleNode -> com.android.tools.r8.internal.JD:
     java.util.List packages -> b
     java.util.List uses -> f
     java.util.List opens -> e
@@ -88207,24 +88420,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.FD:
+com.android.tools.r8.org.objectweb.asm.tree.ModuleOpenNode -> com.android.tools.r8.internal.KD:
     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.GD:
+com.android.tools.r8.org.objectweb.asm.tree.ModuleProvideNode -> com.android.tools.r8.internal.LD:
     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.HD:
+com.android.tools.r8.org.objectweb.asm.tree.ModuleRequireNode -> com.android.tools.r8.internal.MD:
     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.TD:
+com.android.tools.r8.org.objectweb.asm.tree.MultiANewArrayInsnNode -> com.android.tools.r8.internal.YD:
     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.pJ:
+com.android.tools.r8.org.objectweb.asm.tree.ParameterNode -> com.android.tools.r8.internal.yJ:
     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.TN:
+com.android.tools.r8.org.objectweb.asm.tree.RecordComponentNode -> com.android.tools.r8.internal.cO:
     java.util.List visibleAnnotations -> b
     java.util.List attrs -> f
     java.util.List invisibleTypeAnnotations -> e
@@ -88235,7 +88448,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.iW:
+com.android.tools.r8.org.objectweb.asm.tree.TableSwitchInsnNode -> com.android.tools.r8.internal.rW:
     com.android.tools.r8.org.objectweb.asm.tree.LabelNode dflt -> i
     int max -> h
     java.util.List labels -> j
@@ -88247,7 +88460,7 @@
     8:8:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):90 -> a
     9:10:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):90:91 -> a
     int getType() -> b
-com.android.tools.r8.org.objectweb.asm.tree.TryCatchBlockNode -> com.android.tools.r8.internal.hX:
+com.android.tools.r8.org.objectweb.asm.tree.TryCatchBlockNode -> com.android.tools.r8.internal.qX:
     java.util.List invisibleTypeAnnotations -> f
     java.util.List visibleTypeAnnotations -> e
     com.android.tools.r8.org.objectweb.asm.tree.LabelNode start -> a
@@ -88259,24 +88472,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.qX:
+com.android.tools.r8.org.objectweb.asm.tree.TypeAnnotationNode -> com.android.tools.r8.internal.zX:
     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.uX:
+com.android.tools.r8.org.objectweb.asm.tree.TypeInsnNode -> com.android.tools.r8.internal.DX:
     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.lY:
+com.android.tools.r8.org.objectweb.asm.tree.Util -> com.android.tools.r8.internal.uY:
     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.DY:
+com.android.tools.r8.org.objectweb.asm.tree.VarInsnNode -> com.android.tools.r8.internal.MY:
     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
@@ -88384,7 +88597,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.s4:
+com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicValue -> com.android.tools.r8.internal.v4:
     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
@@ -88400,7 +88613,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.t4:
+com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicVerifier -> com.android.tools.r8.internal.w4:
     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>
@@ -88783,16 +88996,16 @@
     2:2: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
     2:2:com.android.tools.r8.org.objectweb.asm.tree.analysis.Value newEmptyValue(int):126 -> 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.vV:
+com.android.tools.r8.org.objectweb.asm.tree.analysis.Subroutine -> com.android.tools.r8.internal.EV:
     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.rY:
+com.android.tools.r8.org.objectweb.asm.tree.analysis.Value -> com.android.tools.r8.internal.AY:
 # {"id":"sourceFile","fileName":"Value.java"}
-com.android.tools.r8.org.objectweb.asm.util.CheckAnnotationAdapter -> com.android.tools.r8.internal.b9:
+com.android.tools.r8.org.objectweb.asm.util.CheckAnnotationAdapter -> com.android.tools.r8.internal.d9:
     boolean useNamedValue -> b
     boolean visitEndCalled -> c
     1:2:void <init>(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,boolean):55:56 -> <init>
@@ -88806,7 +89019,7 @@
     45:47:void visitEnd():119:121 -> a
     1:2:void checkName(java.lang.String):125:126 -> b
     3:4:void checkVisitEndNotCalled():131:132 -> b
-com.android.tools.r8.org.objectweb.asm.util.CheckClassAdapter -> com.android.tools.r8.internal.g9:
+com.android.tools.r8.org.objectweb.asm.util.CheckClassAdapter -> com.android.tools.r8.internal.i9:
     boolean visitNestHostCalled -> i
     java.lang.String nestMemberPackageName -> j
     boolean visitEndCalled -> k
@@ -89020,7 +89233,7 @@
     7:7:char com.android.tools.r8.org.objectweb.asm.util.CheckClassAdapter.getChar(java.lang.String,int):922:922 -> g
     7:7:int checkTypeParameter(java.lang.String,int):722 -> g
     8:8:int checkTypeParameter(java.lang.String,int):723:723 -> g
-com.android.tools.r8.org.objectweb.asm.util.CheckFieldAdapter -> com.android.tools.r8.internal.h9:
+com.android.tools.r8.org.objectweb.asm.util.CheckFieldAdapter -> com.android.tools.r8.internal.j9:
     boolean visitEndCalled -> c
     1:1:void <init>(int,com.android.tools.r8.org.objectweb.asm.FieldVisitor):70:70 -> <init>
     1:4:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):75:78 -> a
@@ -89039,7 +89252,7 @@
     110:114:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):98:102 -> a
     115:117:void visitEnd():107:109 -> a
     1:2:void checkVisitEndNotCalled():113:114 -> b
-com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter -> com.android.tools.r8.internal.k9:
+com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter -> com.android.tools.r8.internal.m9:
     boolean visitCodeCalled -> n
     java.util.Map labelInsnIndices -> r
     int visibleAnnotableParameterCount -> l
@@ -89384,14 +89597,14 @@
     1:2:void checkVisitEndNotCalled():1060:1061 -> e
     3:3:void checkUnsignedShort(int,java.lang.String):1133:1133 -> e
     1:2:void checkVisitMaxsNotCalled():1053:1054 -> f
-com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter$1 -> com.android.tools.r8.internal.i9:
+com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter$1 -> com.android.tools.r8.internal.k9:
     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:5:void throwError(com.android.tools.r8.org.objectweb.asm.tree.analysis.Analyzer,java.lang.Exception):470:474 -> a
     1:15:void visitEnd():451:465 -> c
     16:16:void visitEnd():462:462 -> c
     17:22:void visitEnd():455:460 -> c
-com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter$Method -> com.android.tools.r8.internal.j9:
+com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter$Method -> com.android.tools.r8.internal.l9:
     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
@@ -89401,7 +89614,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.m9:
+com.android.tools.r8.org.objectweb.asm.util.CheckModuleAdapter -> com.android.tools.r8.internal.o9:
     com.android.tools.r8.org.objectweb.asm.util.CheckModuleAdapter$NameSet requiredModules -> c
     boolean visitEndCalled -> i
     int classVersion -> h
@@ -89432,12 +89645,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.l9:
+com.android.tools.r8.org.objectweb.asm.util.CheckModuleAdapter$NameSet -> com.android.tools.r8.internal.n9:
     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.p9:
+com.android.tools.r8.org.objectweb.asm.util.CheckRecordComponentAdapter -> com.android.tools.r8.internal.r9:
     boolean visitEndCalled -> b
     1:1:void <init>(int,com.android.tools.r8.org.objectweb.asm.RecordComponentVisitor):74:74 -> <init>
     1:4:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):79:82 -> a
@@ -89456,7 +89669,7 @@
     114:118:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):102:106 -> a
     119:121:void visitEnd():111:113 -> a
     1:2:void checkVisitEndNotCalled():117:118 -> b
-com.android.tools.r8.org.objectweb.asm.util.Printer -> com.android.tools.r8.internal.DK:
+com.android.tools.r8.org.objectweb.asm.util.Printer -> com.android.tools.r8.internal.MK:
     java.util.List text -> c
     java.lang.StringBuilder stringBuilder -> b
     java.lang.String[] TYPES -> e
@@ -89497,7 +89710,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.jW:
+com.android.tools.r8.org.objectweb.asm.util.Textifier -> com.android.tools.r8.internal.sW:
     java.lang.String tab2 -> g
     java.lang.String tab -> f
     java.lang.String ltab -> i
@@ -89664,7 +89877,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.LW:
+com.android.tools.r8.org.objectweb.asm.util.TraceAnnotationVisitor -> com.android.tools.r8.internal.UW:
     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
@@ -89672,7 +89885,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.MW:
+com.android.tools.r8.org.objectweb.asm.util.TraceMethodVisitor -> com.android.tools.r8.internal.VW:
     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
@@ -89718,7 +89931,7 @@
     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.PW:
+com.android.tools.r8.org.objectweb.asm.util.TraceSignatureVisitor -> com.android.tools.r8.internal.YW:
     int arrayStack -> j
     java.lang.String separator -> k
     int argumentStack -> i
@@ -90062,10 +90275,10 @@
     1:11:void run(com.android.tools.r8.relocator.RelocatorCommand,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):79:89 -> c
     12:12:void com.android.tools.r8.naming.signature.GenericSignatureRewriter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):31:31 -> c
     12:12:void run(com.android.tools.r8.relocator.RelocatorCommand,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):89 -> c
-    13:29:void run(com.android.tools.r8.relocator.RelocatorCommand,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):89:105 -> c
-    30:30:java.lang.RuntimeException com.android.tools.r8.utils.ExceptionUtils.unwrapExecutionException(java.util.concurrent.ExecutionException):221:221 -> c
-    30:30:void run(com.android.tools.r8.relocator.RelocatorCommand,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):100 -> c
-    31:36:void run(com.android.tools.r8.relocator.RelocatorCommand,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):100:105 -> c
+    13:25:void run(com.android.tools.r8.relocator.RelocatorCommand,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):89:101 -> c
+    26:26:java.lang.RuntimeException com.android.tools.r8.utils.ExceptionUtils.unwrapExecutionException(java.util.concurrent.ExecutionException):221:221 -> c
+    26:26:void run(com.android.tools.r8.relocator.RelocatorCommand,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):96 -> c
+    27:32:void run(com.android.tools.r8.relocator.RelocatorCommand,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):96:101 -> c
     1:5:void run(com.android.tools.r8.relocator.RelocatorCommand):42:46 -> run
     6:6:void run(com.android.tools.r8.relocator.RelocatorCommand):45:45 -> run
     7:10:void run(com.android.tools.r8.relocator.RelocatorCommand,java.util.concurrent.ExecutorService):64:67 -> run
@@ -90255,7 +90468,7 @@
     4:4:com.android.tools.r8.graph.DexString lookupName(com.android.tools.r8.graph.DexField):132:132 -> a
     boolean verifyRenamingConsistentWithResolution(com.android.tools.r8.graph.DexMethod) -> b
     1:1:java.lang.String lookupPackageName(java.lang.String):112:112 -> b
-com.android.tools.r8.repackaging.Repackaging -> com.android.tools.r8.internal.rQ:
+com.android.tools.r8.repackaging.Repackaging -> com.android.tools.r8.internal.AQ:
     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
@@ -90264,10 +90477,10 @@
     1:5:void <init>(com.android.tools.r8.graph.AppView):66:70 -> <init>
     1:3:com.android.tools.r8.repackaging.RepackagingLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):76:78 -> a
     4:40:boolean verifyIdentityRepackaging(com.android.tools.r8.graph.AppView):86:122 -> a
-    41:41:void com.android.tools.r8.graph.AppView.rewriteWithLensAndApplication(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DirectMappedDexApplication):736:736 -> a
+    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():1204:1204 -> a
+    43:43:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isNone():1203:1203 -> 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
@@ -90288,7 +90501,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.mQ:
+com.android.tools.r8.repackaging.Repackaging$1 -> com.android.tools.r8.internal.vQ:
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():87:87 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView):87:87 -> <init>
@@ -90296,10 +90509,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.nQ:
+com.android.tools.r8.repackaging.Repackaging$2 -> com.android.tools.r8.internal.wQ:
     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.oQ:
+com.android.tools.r8.repackaging.Repackaging$DefaultRepackagingConfiguration -> com.android.tools.r8.internal.xQ:
     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
@@ -90309,23 +90522,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():1212:1212 -> a
+    6:6:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isRepackageClasses():1211:1211 -> 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():1216:1216 -> a
+    7:7:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isMinification():1215:1215 -> 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():1208:1208 -> a
+    21:21:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isFlattenPackageHierarchy():1207:1207 -> 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():1212:1212 -> a
+    33:33:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isRepackageClasses():1211:1211 -> 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():1216:1216 -> a
+    35:35:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isMinification():1215:1215 -> 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():1208:1208 -> a
+    41:41:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isFlattenPackageHierarchy():1207:1207 -> 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
@@ -90339,8 +90552,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.pQ:
-com.android.tools.r8.repackaging.Repackaging$RepackagingTreeFixer -> com.android.tools.r8.internal.qQ:
+com.android.tools.r8.repackaging.Repackaging$RepackagingConfiguration -> com.android.tools.r8.internal.yQ:
+com.android.tools.r8.repackaging.Repackaging$RepackagingTreeFixer -> com.android.tools.r8.internal.zQ:
     com.android.tools.r8.repackaging.RepackagingLens$Builder lensBuilder -> g
     com.android.tools.r8.com.google.common.collect.BiMap mappings -> f
     boolean $assertionsDisabled -> h
@@ -90359,7 +90572,7 @@
     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.sQ:
+com.android.tools.r8.repackaging.RepackagingAnnotationTracer -> com.android.tools.r8.internal.BQ:
     com.android.tools.r8.repackaging.RepackagingUseRegistry registry -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():18:18 -> <clinit>
@@ -90384,7 +90597,7 @@
     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.uQ:
+com.android.tools.r8.repackaging.RepackagingConstraintGraph -> com.android.tools.r8.internal.DQ:
     com.android.tools.r8.repackaging.RepackagingConstraintGraph$Node libraryBoundaryNode -> e
     com.android.tools.r8.graph.ProgramPackage pkg -> b
     java.util.Map nodes -> c
@@ -90412,7 +90625,7 @@
     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.tQ:
+com.android.tools.r8.repackaging.RepackagingConstraintGraph$Node -> com.android.tools.r8.internal.CQ:
     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>
@@ -90425,7 +90638,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.xQ:
+com.android.tools.r8.repackaging.RepackagingLens -> com.android.tools.r8.internal.GQ:
     com.android.tools.r8.com.google.common.collect.BiMap newTypes -> n
     boolean $assertionsDisabled -> p
     java.util.Map packageRenamings -> o
@@ -90438,15 +90651,15 @@
     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.vQ:
-com.android.tools.r8.repackaging.RepackagingLens$Builder -> com.android.tools.r8.internal.wQ:
+com.android.tools.r8.repackaging.RepackagingLens$1 -> com.android.tools.r8.internal.EQ:
+com.android.tools.r8.repackaging.RepackagingLens$Builder -> com.android.tools.r8.internal.FQ:
     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.yQ:
+com.android.tools.r8.repackaging.RepackagingUseRegistry -> com.android.tools.r8.internal.HQ:
     com.android.tools.r8.graph.InitClassLens initClassLens -> h
     boolean $assertionsDisabled -> k
     com.android.tools.r8.repackaging.RepackagingConstraintGraph constraintGraph -> g
@@ -90468,7 +90681,7 @@
     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():471:471 -> a
+    57:57:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> 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
@@ -90794,7 +91007,7 @@
     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.ge:
+com.android.tools.r8.retrace.internal.Definition -> com.android.tools.r8.internal.ie:
 # {"id":"sourceFile","fileName":"Definition.java"}
 com.android.tools.r8.retrace.internal.DirectClassNameMapperProguardMapProducer -> com.android.tools.r8.internal.mg:
     com.android.tools.r8.naming.ClassNameMapper getClassNameMapper() -> a
@@ -90826,14 +91039,14 @@
     1:1:com.android.tools.r8.references.ClassReference getHolderClass():82:82 -> getHolderClass
     1:1:java.lang.String getName():77:77 -> getName
     1:1:int hashCode():105:105 -> hashCode
-com.android.tools.r8.retrace.internal.MethodDefinition -> com.android.tools.r8.internal.KC:
+com.android.tools.r8.retrace.internal.MethodDefinition -> com.android.tools.r8.internal.PC:
     1:1:void <init>():13:13 -> <init>
     com.android.tools.r8.retrace.internal.MethodDefinition$FullMethodDefinition asFullMethodDefinition() -> a
     com.android.tools.r8.retrace.internal.MethodDefinition substituteHolder(com.android.tools.r8.references.ClassReference) -> a
     1:1:com.android.tools.r8.retrace.internal.MethodDefinition create(com.android.tools.r8.references.ClassReference,java.lang.String):16:16 -> a
     2:2:com.android.tools.r8.retrace.internal.MethodDefinition create(com.android.tools.r8.references.MethodReference):20:20 -> a
-com.android.tools.r8.retrace.internal.MethodDefinition$1 -> com.android.tools.r8.internal.HC:
-com.android.tools.r8.retrace.internal.MethodDefinition$BaseMethodDefinition -> com.android.tools.r8.internal.IC:
+com.android.tools.r8.retrace.internal.MethodDefinition$1 -> com.android.tools.r8.internal.MC:
+com.android.tools.r8.retrace.internal.MethodDefinition$BaseMethodDefinition -> com.android.tools.r8.internal.NC:
     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>
@@ -90843,7 +91056,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.JC:
+com.android.tools.r8.retrace.internal.MethodDefinition$FullMethodDefinition -> com.android.tools.r8.internal.OC:
     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>
@@ -90856,9 +91069,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.OQ:
+com.android.tools.r8.retrace.internal.RetraceAbortException -> com.android.tools.r8.internal.XQ:
     1:1:void <init>():7:7 -> <init>
-com.android.tools.r8.retrace.internal.RetraceClassResultImpl -> com.android.tools.r8.internal.SQ:
+com.android.tools.r8.retrace.internal.RetraceClassResultImpl -> com.android.tools.r8.internal.bR:
     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
@@ -90925,10 +91138,10 @@
     1:1:com.android.tools.r8.retrace.internal.RetraceThrownExceptionResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl.lookupThrownException(com.android.tools.r8.retrace.RetraceStackTraceContext):146:146 -> lookupThrownException
     1:1:com.android.tools.r8.retrace.RetraceThrownExceptionResult lookupThrownException(com.android.tools.r8.retrace.RetraceStackTraceContext):30 -> lookupThrownException
     1:1:java.util.stream.Stream stream():157:157 -> stream
-com.android.tools.r8.retrace.internal.RetraceClassResultImpl$1 -> com.android.tools.r8.internal.PQ:
-com.android.tools.r8.retrace.internal.RetraceClassResultImpl$ResultConstructor -> com.android.tools.r8.internal.QQ:
+com.android.tools.r8.retrace.internal.RetraceClassResultImpl$1 -> com.android.tools.r8.internal.YQ:
+com.android.tools.r8.retrace.internal.RetraceClassResultImpl$ResultConstructor -> com.android.tools.r8.internal.ZQ:
     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.RQ:
+com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl -> com.android.tools.r8.internal.aR:
     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
@@ -90971,7 +91184,7 @@
     16:16:com.android.tools.r8.retrace.RetraceFrameResult lookupFrame(com.android.tools.r8.retrace.RetraceStackTraceContext,java.util.OptionalInt,com.android.tools.r8.references.MethodReference):313 -> lookupFrame
     1:1:com.android.tools.r8.retrace.internal.RetraceMethodResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl.lookupMethod(java.lang.String):253:253 -> lookupMethod
     1:1:com.android.tools.r8.retrace.RetraceMethodResult lookupMethod(java.lang.String):182 -> lookupMethod
-com.android.tools.r8.retrace.internal.RetraceFieldResultImpl -> com.android.tools.r8.internal.VQ:
+com.android.tools.r8.retrace.internal.RetraceFieldResultImpl -> com.android.tools.r8.internal.eR:
     java.util.List memberNamings -> a
     com.android.tools.r8.retrace.internal.FieldDefinition fieldDefinition -> b
     com.android.tools.r8.retrace.Retracer retracer -> c
@@ -90995,8 +91208,8 @@
     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.TQ:
-com.android.tools.r8.retrace.internal.RetraceFieldResultImpl$ElementImpl -> com.android.tools.r8.internal.UQ:
+com.android.tools.r8.retrace.internal.RetraceFieldResultImpl$1 -> com.android.tools.r8.internal.cR:
+com.android.tools.r8.retrace.internal.RetraceFieldResultImpl$ElementImpl -> com.android.tools.r8.internal.dR:
     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
@@ -91011,7 +91224,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.YQ:
+com.android.tools.r8.retrace.internal.RetraceFrameResultImpl -> com.android.tools.r8.internal.hR:
     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
@@ -91056,7 +91269,7 @@
     1:25:boolean isAmbiguous():62: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.WQ:
+com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$ElementImpl -> com.android.tools.r8.internal.fR:
     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
@@ -91120,7 +91333,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.XQ:
+com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$MappedRangeForFrame -> com.android.tools.r8.internal.gR:
     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>
@@ -91138,7 +91351,7 @@
     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.bR:
+com.android.tools.r8.retrace.internal.RetraceMethodResultImpl -> com.android.tools.r8.internal.kR:
     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
@@ -91166,8 +91379,8 @@
     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.ZQ:
-com.android.tools.r8.retrace.internal.RetraceMethodResultImpl$ElementImpl -> com.android.tools.r8.internal.aR:
+com.android.tools.r8.retrace.internal.RetraceMethodResultImpl$1 -> com.android.tools.r8.internal.iR:
+com.android.tools.r8.retrace.internal.RetraceMethodResultImpl$ElementImpl -> com.android.tools.r8.internal.jR:
     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
@@ -91181,7 +91394,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.eR:
+com.android.tools.r8.retrace.internal.RetraceStackTraceContextImpl -> com.android.tools.r8.internal.nR:
     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>
@@ -91192,8 +91405,8 @@
     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.cR:
-com.android.tools.r8.retrace.internal.RetraceStackTraceContextImpl$Builder -> com.android.tools.r8.internal.dR:
+com.android.tools.r8.retrace.internal.RetraceStackTraceContextImpl$1 -> com.android.tools.r8.internal.lR:
+com.android.tools.r8.retrace.internal.RetraceStackTraceContextImpl$Builder -> com.android.tools.r8.internal.mR:
     com.android.tools.r8.references.ClassReference thrownException -> a
     java.util.OptionalInt rewritePosition -> b
     1:1:void <init>():81:81 -> <init>
@@ -91203,7 +91416,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.hR:
+com.android.tools.r8.retrace.internal.RetraceStackTraceCurrentEvaluationInformation -> com.android.tools.r8.internal.qR:
     com.android.tools.r8.retrace.internal.RetraceStackTraceCurrentEvaluationInformation EMPTY -> b
     int removeInnerFramesCount -> a
     1:1:void <clinit>():9:9 -> <clinit>
@@ -91211,13 +91424,13 @@
     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.fR:
-com.android.tools.r8.retrace.internal.RetraceStackTraceCurrentEvaluationInformation$Builder -> com.android.tools.r8.internal.gR:
+com.android.tools.r8.retrace.internal.RetraceStackTraceCurrentEvaluationInformation$1 -> com.android.tools.r8.internal.oR:
+com.android.tools.r8.retrace.internal.RetraceStackTraceCurrentEvaluationInformation$Builder -> com.android.tools.r8.internal.pR:
     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.kR:
+com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl -> com.android.tools.r8.internal.tR:
     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>
@@ -91230,14 +91443,14 @@
     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.iR:
-com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl$Builder -> com.android.tools.r8.internal.jR:
+com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl$1 -> com.android.tools.r8.internal.rR:
+com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl$Builder -> com.android.tools.r8.internal.sR:
     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.nR:
+com.android.tools.r8.retrace.internal.RetraceThrownExceptionResultImpl -> com.android.tools.r8.internal.wR:
     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>
@@ -91247,8 +91460,8 @@
     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.lR:
-com.android.tools.r8.retrace.internal.RetraceThrownExceptionResultImpl$RetraceThrownExceptionElementImpl -> com.android.tools.r8.internal.mR:
+com.android.tools.r8.retrace.internal.RetraceThrownExceptionResultImpl$1 -> com.android.tools.r8.internal.uR:
+com.android.tools.r8.retrace.internal.RetraceThrownExceptionResultImpl$RetraceThrownExceptionElementImpl -> com.android.tools.r8.internal.vR:
     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
@@ -91269,7 +91482,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.pR:
+com.android.tools.r8.retrace.internal.RetraceTypeResultImpl -> com.android.tools.r8.internal.yR:
     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>
@@ -91280,11 +91493,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.oR:
+com.android.tools.r8.retrace.internal.RetraceTypeResultImpl$ElementImpl -> com.android.tools.r8.internal.xR:
     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.qR:
+com.android.tools.r8.retrace.internal.RetraceUnknownJsonMappingInformationResultImpl -> com.android.tools.r8.internal.zR:
     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
@@ -91294,14 +91507,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.rR:
+com.android.tools.r8.retrace.internal.RetraceUnknownMappingInformationElementImpl -> com.android.tools.r8.internal.AR:
     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.sR:
+com.android.tools.r8.retrace.internal.RetraceUtils -> com.android.tools.r8.internal.BR:
     java.util.Set KEEP_SOURCEFILE_NAMES -> a
     boolean $assertionsDisabled -> b
     1:3:void <clinit>():31:33 -> <clinit>
@@ -91345,7 +91558,7 @@
     251:251:int com.android.tools.r8.retrace.internal.RetraceUtils.firstFromIndex(java.lang.String,int,java.util.function.Predicate):140:140 -> a
     251:251:int firstNonWhiteSpaceCharacterFromIndex(java.lang.String,int):127 -> a
     1:7:java.lang.String getOuterClassSimpleName(java.lang.String):69:75 -> b
-com.android.tools.r8.retrace.internal.RetracedClassReferenceImpl -> com.android.tools.r8.internal.tR:
+com.android.tools.r8.retrace.internal.RetracedClassReferenceImpl -> com.android.tools.r8.internal.CR:
     com.android.tools.r8.references.ClassReference classReference -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():10:10 -> <clinit>
@@ -91358,12 +91571,12 @@
     1:1:com.android.tools.r8.retrace.RetracedTypeReference getRetracedType():10 -> getRetracedType
     1:1:java.lang.String getTypeName():25:25 -> getTypeName
     1:1:int hashCode():56:56 -> hashCode
-com.android.tools.r8.retrace.internal.RetracedFieldReferenceImpl -> com.android.tools.r8.internal.xR:
+com.android.tools.r8.retrace.internal.RetracedFieldReferenceImpl -> com.android.tools.r8.internal.GR:
     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.uR:
-com.android.tools.r8.retrace.internal.RetracedFieldReferenceImpl$KnownRetracedFieldReferenceImpl -> com.android.tools.r8.internal.vR:
+com.android.tools.r8.retrace.internal.RetracedFieldReferenceImpl$1 -> com.android.tools.r8.internal.DR:
+com.android.tools.r8.retrace.internal.RetracedFieldReferenceImpl$KnownRetracedFieldReferenceImpl -> com.android.tools.r8.internal.ER:
     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>
@@ -91374,7 +91587,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.wR:
+com.android.tools.r8.retrace.internal.RetracedFieldReferenceImpl$UnknownRetracedFieldReferenceImpl -> com.android.tools.r8.internal.FR:
     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>
@@ -91383,7 +91596,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.BR:
+com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl -> com.android.tools.r8.internal.KR:
     java.util.Comparator comparator -> c
     int $r8$clinit -> d
     java.util.OptionalInt position -> b
@@ -91407,8 +91620,8 @@
     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.yR:
-com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl$KnownRetracedMethodReferenceImpl -> com.android.tools.r8.internal.zR:
+com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl$1 -> com.android.tools.r8.internal.HR:
+com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl$KnownRetracedMethodReferenceImpl -> com.android.tools.r8.internal.IR:
     com.android.tools.r8.references.MethodReference methodReference -> e
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():73:73 -> <clinit>
@@ -91424,14 +91637,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.AR:
+com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl$UnknownRetracedMethodReferenceImpl -> com.android.tools.r8.internal.JR:
     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.CR:
+com.android.tools.r8.retrace.internal.RetracedSingleFrameImpl -> com.android.tools.r8.internal.MR:
     com.android.tools.r8.retrace.RetracedMethodReference methodReference -> b
     com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$ElementImpl frameElement -> a
     int index -> c
@@ -91443,7 +91656,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.DR:
+com.android.tools.r8.retrace.internal.RetracedSourceFileImpl -> com.android.tools.r8.internal.NR:
     com.android.tools.r8.references.ClassReference classReference -> a
     java.lang.String filename -> b
     boolean $assertionsDisabled -> c
@@ -91454,7 +91667,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.ER:
+com.android.tools.r8.retrace.internal.RetracedTypeReferenceImpl -> com.android.tools.r8.internal.OR:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.references.TypeReference typeReference -> a
     1:1:void <clinit>():12:12 -> <clinit>
@@ -91467,7 +91680,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.FR:
+com.android.tools.r8.retrace.internal.RetracerImpl -> com.android.tools.r8.internal.PR:
     com.android.tools.r8.DiagnosticsHandler diagnosticsHandler -> b
     com.android.tools.r8.naming.ClassNameMapper classNameMapper -> a
     boolean $assertionsDisabled -> c
@@ -91496,7 +91709,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.ET:
+com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl -> com.android.tools.r8.internal.NT:
     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
@@ -91574,8 +91787,8 @@
     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.BT:
-com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl -> com.android.tools.r8.internal.DT:
+com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$1 -> com.android.tools.r8.internal.KT:
+com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl -> com.android.tools.r8.internal.MT:
     boolean $assertionsDisabled -> m
     java.lang.String sourceFile -> h
     boolean isAmbiguous -> j
@@ -91630,7 +91843,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.CT:
+com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder -> com.android.tools.r8.internal.LT:
     java.lang.String sourceFile -> g
     com.android.tools.r8.retrace.RetracedMethodReference methodContext -> c
     java.util.List methodArguments -> f
@@ -91693,7 +91906,7 @@
     1:1:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder.setTopFrame(boolean):602:602 -> d
     1:1:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder access$300(com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder,boolean):543 -> d
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-com.android.tools.r8.retrace.internal.StackTraceElementStringProxy -> com.android.tools.r8.internal.KT:
+com.android.tools.r8.retrace.internal.StackTraceElementStringProxy -> com.android.tools.r8.internal.TT:
     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
@@ -91739,20 +91952,20 @@
     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.FT:
-com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassNameType -> com.android.tools.r8.internal.GT:
+com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$1 -> com.android.tools.r8.internal.OT:
+com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassNameType -> com.android.tools.r8.internal.PT:
     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.HT:
+com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassStringIndex -> com.android.tools.r8.internal.QT:
     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.IT:
+com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder -> com.android.tools.r8.internal.RT:
     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
@@ -91794,7 +92007,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.JT:
+com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex -> com.android.tools.r8.internal.ST:
     com.android.tools.r8.utils.TriFunction retracedString -> c
     int endIndex -> b
     int startIndex -> a
@@ -91802,7 +92015,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.ZT:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser -> com.android.tools.r8.internal.iU:
     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
@@ -91853,61 +92066,61 @@
     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.LT:
-com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$BinaryNameGroup -> com.android.tools.r8.internal.MT:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$1 -> com.android.tools.r8.internal.UT:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$BinaryNameGroup -> com.android.tools.r8.internal.VT:
     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.OT:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$ClassNameGroup -> com.android.tools.r8.internal.XT:
     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.NT:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$ClassNameGroup$1 -> com.android.tools.r8.internal.WT:
     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.PT:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$FieldNameGroup -> com.android.tools.r8.internal.YT:
     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.QT:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$FieldOrReturnTypeGroup -> com.android.tools.r8.internal.ZT:
     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.RT:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$LineNumberGroup -> com.android.tools.r8.internal.aU:
     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.ST:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$MethodArgumentsGroup -> com.android.tools.r8.internal.bU:
     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.TT:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$MethodNameGroup -> com.android.tools.r8.internal.cU:
     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.UT:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$RegularExpressionGroup -> com.android.tools.r8.internal.dU:
     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.VT:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$RegularExpressionGroupHandler -> com.android.tools.r8.internal.eU:
     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.WT:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$SourceFileGroup -> com.android.tools.r8.internal.fU:
     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
@@ -91921,12 +92134,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.XT:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$SourceFileLineNumberGroup -> com.android.tools.r8.internal.gU:
     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.YT:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$TypeNameGroup -> com.android.tools.r8.internal.hU:
     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
@@ -92044,168 +92257,172 @@
     com.android.tools.r8.utils.InternalOptions options -> c
     java.util.Set removedClasses -> f
     boolean $assertionsDisabled -> g
-    1:1:void <clinit>():33:33 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,java.util.Set,com.android.tools.r8.shaking.Enqueuer$Mode,java.util.Set,com.android.tools.r8.shaking.AnnotationRemover$1):33:33 -> <init>
-    2:8:void <init>(com.android.tools.r8.graph.AppView,java.util.Set,com.android.tools.r8.shaking.Enqueuer$Mode,java.util.Set):46:52 -> <init>
-    1:1:com.android.tools.r8.shaking.AnnotationRemover$Builder builder(com.android.tools.r8.shaking.Enqueuer$Mode):56:56 -> a
-    2:19: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):74:91 -> a
-    20:20:boolean com.android.tools.r8.graph.DexAnnotation.isMemberClassesAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):177:177 -> a
-    20:20:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):92 -> a
-    21:21:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):92:92 -> a
-    22:22:boolean com.android.tools.r8.graph.DexAnnotation.isEnclosingMethodAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):168:168 -> a
-    22:22:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):93 -> a
-    23:23: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):93:93 -> a
-    24:24:boolean com.android.tools.r8.graph.DexAnnotation.isEnclosingClassAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):163:163 -> a
-    24:24: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):94 -> a
-    25:27:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):94:96 -> a
-    28:30:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):95:97 -> a
-    31:31:boolean com.android.tools.r8.graph.DexAnnotation.isThrowingAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):313:313 -> a
-    31:31: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):97 -> a
-    32:32:boolean com.android.tools.r8.graph.DexAnnotation.isSourceDebugExtension(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):334:334 -> a
-    32:32: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):100 -> a
-    33:35:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):101:103 -> a
-    36: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):102:106 -> a
-    41:41:boolean com.android.tools.r8.graph.DexAnnotation.isParameterNameAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):339:339 -> 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):107 -> a
-    42:42:boolean com.android.tools.r8.graph.DexAnnotation.isAnnotationDefaultAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):324:324 -> 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):110 -> 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):151:151 -> a
-    44:45:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):121:122 -> a
+    1:1:void <clinit>():34:34 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,java.util.Set,com.android.tools.r8.shaking.Enqueuer$Mode,java.util.Set,com.android.tools.r8.shaking.AnnotationRemover$1):34:34 -> <init>
+    2:8:void <init>(com.android.tools.r8.graph.AppView,java.util.Set,com.android.tools.r8.shaking.Enqueuer$Mode,java.util.Set):47:53 -> <init>
+    1:1:com.android.tools.r8.shaking.AnnotationRemover$Builder builder(com.android.tools.r8.shaking.Enqueuer$Mode):57:57 -> a
+    2:19: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):75:92 -> a
+    20:20:boolean com.android.tools.r8.graph.DexAnnotation.isMemberClassesAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):178:178 -> a
+    20:20: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):93 -> a
+    21:21: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):93:93 -> a
+    22:22:boolean com.android.tools.r8.graph.DexAnnotation.isEnclosingMethodAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):169:169 -> a
+    22:22:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):94 -> a
+    23:23: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):94:94 -> a
+    24:24:boolean com.android.tools.r8.graph.DexAnnotation.isEnclosingClassAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):164:164 -> a
+    24:24: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):95 -> a
+    25:27:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):95:97 -> a
+    28:30:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):96:98 -> a
+    31:31:boolean com.android.tools.r8.graph.DexAnnotation.isThrowingAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):314:314 -> a
+    31:31:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):98 -> a
+    32:32:boolean com.android.tools.r8.graph.DexAnnotation.isSourceDebugExtension(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):335:335 -> a
+    32:32:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):101 -> a
+    33:35:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):102:104 -> a
+    36: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):103:107 -> a
+    41:41:boolean com.android.tools.r8.graph.DexAnnotation.isParameterNameAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):340:340 -> 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):108 -> a
+    42:42:boolean com.android.tools.r8.graph.DexAnnotation.isAnnotationDefaultAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):325:325 -> 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):111 -> 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):158:158 -> a
+    44:45:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):122:123 -> a
     46:46:boolean com.android.tools.r8.graph.DexClass.isAnnotation():652:652 -> a
-    46:46: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 -> a
+    46:46: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)"]}
-    47:47:boolean com.android.tools.r8.graph.DexAnnotation.isJavaLangRetentionAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):329:329 -> a
-    47:47: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
-    48:65: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):127:144 -> a
-    66:66:com.android.tools.r8.shaking.AnnotationRemover ensureValid():166:166 -> a
-    67:73:void com.android.tools.r8.shaking.ProguardKeepAttributes.ensureValid(boolean):144:150 -> a
-    67:73:com.android.tools.r8.shaking.AnnotationRemover ensureValid():166 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    74:74:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    74:74:void com.android.tools.r8.shaking.ProguardKeepAttributes.ensureValid(boolean):150 -> a
-    74:74:com.android.tools.r8.shaking.AnnotationRemover ensureValid():166 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    75:78:void com.android.tools.r8.shaking.ProguardKeepAttributes.ensureValid(boolean):150:153 -> a
-    75:78:com.android.tools.r8.shaking.AnnotationRemover ensureValid():166 -> a
+    47:47:boolean com.android.tools.r8.graph.DexAnnotation.isJavaLangRetentionAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):330:330 -> a
+    47:47: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
+    48:63: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:143 -> a
+    64:64:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):444:444 -> a
+    64:64:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):143 -> a
+    65:70:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):146:151 -> a
+    71:71:com.android.tools.r8.shaking.AnnotationRemover ensureValid():173:173 -> a
+    72:78:void com.android.tools.r8.shaking.ProguardKeepAttributes.ensureValid(boolean):144:150 -> a
+    72:78:com.android.tools.r8.shaking.AnnotationRemover ensureValid():173 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     79:79:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    79:79:void com.android.tools.r8.shaking.ProguardKeepAttributes.ensureValid(boolean):153 -> a
-    79:79:com.android.tools.r8.shaking.AnnotationRemover ensureValid():166 -> a
+    79:79:void com.android.tools.r8.shaking.ProguardKeepAttributes.ensureValid(boolean):150 -> a
+    79:79:com.android.tools.r8.shaking.AnnotationRemover ensureValid():173 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    80:88:void com.android.tools.r8.shaking.ProguardKeepAttributes.ensureValid(boolean):153:161 -> a
-    80:88:com.android.tools.r8.shaking.AnnotationRemover ensureValid():166 -> a
+    80:83:void com.android.tools.r8.shaking.ProguardKeepAttributes.ensureValid(boolean):150:153 -> a
+    80:83:com.android.tools.r8.shaking.AnnotationRemover ensureValid():173 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    89:89:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    89:89:void com.android.tools.r8.shaking.ProguardKeepAttributes.ensureValid(boolean):161 -> a
-    89:89:com.android.tools.r8.shaking.AnnotationRemover ensureValid():166 -> a
+    84:84:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    84:84:void com.android.tools.r8.shaking.ProguardKeepAttributes.ensureValid(boolean):153 -> a
+    84:84:com.android.tools.r8.shaking.AnnotationRemover ensureValid():173 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    90:90:void com.android.tools.r8.shaking.ProguardKeepAttributes.ensureValid(boolean):161:161 -> a
-    90:90:com.android.tools.r8.shaking.AnnotationRemover ensureValid():166 -> a
+    85:93:void com.android.tools.r8.shaking.ProguardKeepAttributes.ensureValid(boolean):153:161 -> a
+    85:93:com.android.tools.r8.shaking.AnnotationRemover ensureValid():173 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    91:92:void run(java.util.concurrent.ExecutorService):171:172 -> a
-    93:101:void run(com.android.tools.r8.graph.DexProgramClass):176:184 -> a
-    102:104:void lambda$run$1(java.util.Set,com.android.tools.r8.graph.ProgramMember):186:188 -> a
-    105:105:void com.android.tools.r8.graph.ProgramMember.clearKotlinInfo():31:31 -> a
-    105:105:void lambda$run$1(java.util.Set,com.android.tools.r8.graph.ProgramMember):189 -> a
-    106:106:void lambda$verifyNoKeptKotlinMembersForClassesWithNoKotlinInfo$2(com.android.tools.r8.graph.ProgramMember):199:199 -> a
-    107:107:void processMember(com.android.tools.r8.graph.ProgramMember,com.android.tools.r8.graph.DexProgramClass,java.util.Set):211:211 -> a
-    107:107:void lambda$run$0(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.ProgramMember):183 -> a
-    108:108:com.android.tools.r8.shaking.KeepMemberInfo com.android.tools.r8.shaking.KeepInfoCollection.getMemberInfo(com.android.tools.r8.graph.ProgramMember):101:101 -> a
-    108:108:void processMember(com.android.tools.r8.graph.ProgramMember,com.android.tools.r8.graph.DexProgramClass,java.util.Set):211 -> a
-    108:108:void lambda$run$0(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.ProgramMember):183 -> a
-    109:110:void processMember(com.android.tools.r8.graph.ProgramMember,com.android.tools.r8.graph.DexProgramClass,java.util.Set):212:213 -> a
-    109:110:void lambda$run$0(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.ProgramMember):183 -> a
-    111:111:void com.android.tools.r8.graph.ProgramMember.clearGenericSignature():27:27 -> a
-    111:111:void processMember(com.android.tools.r8.graph.ProgramMember,com.android.tools.r8.graph.DexProgramClass,java.util.Set):214 -> a
-    111:111:void lambda$run$0(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.ProgramMember):183 -> a
-    112:112:void processMember(com.android.tools.r8.graph.ProgramMember,com.android.tools.r8.graph.DexProgramClass,java.util.Set):216:216 -> a
-    112:112:void lambda$run$0(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.ProgramMember):183 -> a
-    113:113:boolean com.android.tools.r8.shaking.KeepMemberInfo.isKotlinMetadataRemovalAllowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):30:30 -> a
-    113:113:void processMember(com.android.tools.r8.graph.ProgramMember,com.android.tools.r8.graph.DexProgramClass,java.util.Set):217 -> a
-    113:113:void lambda$run$0(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.ProgramMember):183 -> a
-    114:114:void com.android.tools.r8.graph.ProgramMember.clearKotlinInfo():31:31 -> a
-    114:114:void processMember(com.android.tools.r8.graph.ProgramMember,com.android.tools.r8.graph.DexProgramClass,java.util.Set):218 -> a
-    114:114:void lambda$run$0(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.ProgramMember):183 -> a
-    115:115:void processMember(com.android.tools.r8.graph.ProgramMember,com.android.tools.r8.graph.DexProgramClass,java.util.Set):221:221 -> a
-    115:115:void lambda$run$0(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.ProgramMember):183 -> a
-    116:116:boolean com.android.tools.r8.shaking.KeepMemberInfo.isKotlinMetadataRemovalAllowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):30:30 -> a
-    116:116:void processMember(com.android.tools.r8.graph.ProgramMember,com.android.tools.r8.graph.DexProgramClass,java.util.Set):222 -> a
-    116:116:void lambda$run$0(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.ProgramMember):183 -> a
+    94:94:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    94:94:void com.android.tools.r8.shaking.ProguardKeepAttributes.ensureValid(boolean):161 -> a
+    94:94:com.android.tools.r8.shaking.AnnotationRemover ensureValid():173 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
+    95:95:void com.android.tools.r8.shaking.ProguardKeepAttributes.ensureValid(boolean):161:161 -> a
+    95:95:com.android.tools.r8.shaking.AnnotationRemover ensureValid():173 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    96:97:void run(java.util.concurrent.ExecutorService):178:179 -> a
+    98:106:void run(com.android.tools.r8.graph.DexProgramClass):183:191 -> a
+    107:109:void lambda$run$1(java.util.Set,com.android.tools.r8.graph.ProgramMember):193:195 -> a
+    110:110:void com.android.tools.r8.graph.ProgramMember.clearKotlinInfo():31:31 -> a
+    110:110:void lambda$run$1(java.util.Set,com.android.tools.r8.graph.ProgramMember):196 -> a
+    111:111:void lambda$verifyNoKeptKotlinMembersForClassesWithNoKotlinInfo$2(com.android.tools.r8.graph.ProgramMember):206:206 -> a
+    112:112:void processMember(com.android.tools.r8.graph.ProgramMember,com.android.tools.r8.graph.DexProgramClass,java.util.Set):218:218 -> a
+    112:112:void lambda$run$0(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.ProgramMember):190 -> a
+    113:113:com.android.tools.r8.shaking.KeepMemberInfo com.android.tools.r8.shaking.KeepInfoCollection.getMemberInfo(com.android.tools.r8.graph.ProgramMember):101:101 -> a
+    113:113:void processMember(com.android.tools.r8.graph.ProgramMember,com.android.tools.r8.graph.DexProgramClass,java.util.Set):218 -> a
+    113:113:void lambda$run$0(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.ProgramMember):190 -> a
+    114:115:void processMember(com.android.tools.r8.graph.ProgramMember,com.android.tools.r8.graph.DexProgramClass,java.util.Set):219:220 -> a
+    114:115:void lambda$run$0(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.ProgramMember):190 -> a
+    116:116:void com.android.tools.r8.graph.ProgramMember.clearGenericSignature():27:27 -> a
+    116:116:void processMember(com.android.tools.r8.graph.ProgramMember,com.android.tools.r8.graph.DexProgramClass,java.util.Set):221 -> a
+    116:116:void lambda$run$0(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.ProgramMember):190 -> a
     117:117:void processMember(com.android.tools.r8.graph.ProgramMember,com.android.tools.r8.graph.DexProgramClass,java.util.Set):223:223 -> a
-    117:117:void lambda$run$0(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.ProgramMember):183 -> a
-    118:120:com.android.tools.r8.graph.DexEncodedAnnotation rewriteEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):238:240 -> a
-    121:121:com.android.tools.r8.graph.DexEncodedAnnotation rewriteEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":373,"2":374,"3":375}}
-    373:373:com.android.tools.r8.graph.DexEncodedAnnotation rewriteEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):243:243 -> 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.DexEncodedAnnotation rewriteEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):243 -> 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.DexEncodedAnnotation rewriteEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):243 -> a
-    365:371:com.android.tools.r8.graph.DexEncodedAnnotation rewriteEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):244:250 -> a
-    372:372:com.android.tools.r8.graph.DexEncodedAnnotation rewriteEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):249:249 -> a
-    376:376:com.android.tools.r8.graph.DexAnnotationElement lambda$rewriteEncodedAnnotation$3(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationElement):246:246 -> a
-    377:377:boolean lambda$rewriteAnnotationElement$4(com.android.tools.r8.graph.DexAnnotationElement,com.android.tools.r8.graph.DexEncodedMethod):266:266 -> a
-    378:380:void removeAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepInfo):271:273 -> a
-    381:381:boolean com.android.tools.r8.graph.DexClass.isAnnotation():652:652 -> a
-    381:381:void removeAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepInfo):273 -> a
+    117:117:void lambda$run$0(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.ProgramMember):190 -> a
+    118:118:boolean com.android.tools.r8.shaking.KeepMemberInfo.isKotlinMetadataRemovalAllowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):30:30 -> a
+    118:118:void processMember(com.android.tools.r8.graph.ProgramMember,com.android.tools.r8.graph.DexProgramClass,java.util.Set):224 -> a
+    118:118:void lambda$run$0(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.ProgramMember):190 -> a
+    119:119:void com.android.tools.r8.graph.ProgramMember.clearKotlinInfo():31:31 -> a
+    119:119:void processMember(com.android.tools.r8.graph.ProgramMember,com.android.tools.r8.graph.DexProgramClass,java.util.Set):225 -> a
+    119:119:void lambda$run$0(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.ProgramMember):190 -> a
+    120:120:void processMember(com.android.tools.r8.graph.ProgramMember,com.android.tools.r8.graph.DexProgramClass,java.util.Set):228:228 -> a
+    120:120:void lambda$run$0(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.ProgramMember):190 -> a
+    121:121:boolean com.android.tools.r8.shaking.KeepMemberInfo.isKotlinMetadataRemovalAllowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):30:30 -> a
+    121:121:void processMember(com.android.tools.r8.graph.ProgramMember,com.android.tools.r8.graph.DexProgramClass,java.util.Set):229 -> a
+    121:121:void lambda$run$0(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.ProgramMember):190 -> a
+    122:122:void processMember(com.android.tools.r8.graph.ProgramMember,com.android.tools.r8.graph.DexProgramClass,java.util.Set):230:230 -> a
+    122:122:void lambda$run$0(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.ProgramMember):190 -> a
+    123:125:com.android.tools.r8.graph.DexEncodedAnnotation rewriteEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):245:247 -> a
+    126:126:com.android.tools.r8.graph.DexEncodedAnnotation rewriteEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":385,"2":386,"3":387}}
+    385:385:com.android.tools.r8.graph.DexEncodedAnnotation rewriteEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):250:250 -> a
+    386:386:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    386:386:com.android.tools.r8.graph.DexEncodedAnnotation rewriteEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):250 -> a
+    387:387:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    387:387:com.android.tools.r8.graph.DexEncodedAnnotation rewriteEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):250 -> a
+    377:383:com.android.tools.r8.graph.DexEncodedAnnotation rewriteEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):251:257 -> a
+    384:384:com.android.tools.r8.graph.DexEncodedAnnotation rewriteEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):256:256 -> a
+    388:388:com.android.tools.r8.graph.DexAnnotationElement lambda$rewriteEncodedAnnotation$3(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationElement):253:253 -> a
+    389:389:boolean lambda$rewriteAnnotationElement$4(com.android.tools.r8.graph.DexAnnotationElement,com.android.tools.r8.graph.DexEncodedMethod):273:273 -> a
+    390:392:void removeAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepInfo):278:280 -> a
+    393:393:boolean com.android.tools.r8.graph.DexClass.isAnnotation():652:652 -> a
+    393:393: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)"]}
-    382:395:void removeAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepInfo):274:287 -> a
-    396:396:com.android.tools.r8.graph.DexAnnotation lambda$removeAnnotations$5(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):278:278 -> a
-    397:397: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):288:288 -> a
-    398:398:boolean shouldRetainAnnotationOnAnnotationClass(com.android.tools.r8.graph.DexAnnotation):293:293 -> a
-    399:399:boolean com.android.tools.r8.graph.DexAnnotation.isAnnotationDefaultAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):324:324 -> a
-    399:399:boolean shouldRetainAnnotationOnAnnotationClass(com.android.tools.r8.graph.DexAnnotation):293 -> a
-    400:400:boolean shouldRetainAnnotationOnAnnotationClass(com.android.tools.r8.graph.DexAnnotation):296:296 -> a
-    401:401:boolean com.android.tools.r8.graph.DexAnnotation.isJavaLangRetentionAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):329:329 -> a
-    401:401:boolean shouldRetainAnnotationOnAnnotationClass(com.android.tools.r8.graph.DexAnnotation):296 -> a
-    402:410:boolean shouldRetainRetentionAnnotationOnAnnotationClass(com.android.tools.r8.graph.DexAnnotation):312:320 -> a
-    402:410:boolean shouldRetainAnnotationOnAnnotationClass(com.android.tools.r8.graph.DexAnnotation):297 -> a
-    411:411:boolean com.android.tools.r8.graph.DexValue.isDexValueEnum():0:0 -> a
-    411:411:boolean shouldRetainRetentionAnnotationOnAnnotationClass(com.android.tools.r8.graph.DexAnnotation):320 -> a
-    411:411:boolean shouldRetainAnnotationOnAnnotationClass(com.android.tools.r8.graph.DexAnnotation):297 -> a
-    412:413:boolean shouldRetainRetentionAnnotationOnAnnotationClass(com.android.tools.r8.graph.DexAnnotation):321:322 -> a
-    412:413:boolean shouldRetainAnnotationOnAnnotationClass(com.android.tools.r8.graph.DexAnnotation):297 -> a
-    414:414:boolean shouldRetainAnnotationOnAnnotationClass(com.android.tools.r8.graph.DexAnnotation):299:299 -> a
-    415:426:void stripAttributes(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo):333:344 -> a
-    427:427:boolean lambda$stripAttributes$8(com.android.tools.r8.shaking.KeepClassInfo,com.android.tools.r8.graph.EnclosingMethodAttribute):335:335 -> a
-    428:428: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
-    428:428:boolean lambda$stripAttributes$8(com.android.tools.r8.shaking.KeepClassInfo,com.android.tools.r8.graph.EnclosingMethodAttribute):335 -> a
-    429:429:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():622:622 -> a
-    429:429: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
-    429:429:boolean lambda$stripAttributes$8(com.android.tools.r8.shaking.KeepClassInfo,com.android.tools.r8.graph.EnclosingMethodAttribute):335 -> a
-    430:430: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
-    430:430:boolean lambda$stripAttributes$8(com.android.tools.r8.shaking.KeepClassInfo,com.android.tools.r8.graph.EnclosingMethodAttribute):335 -> a
-    431:431:boolean lambda$stripAttributes$9(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute):341:341 -> a
-    432:440:boolean canRemoveInnerClassAttribute(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.graph.EnclosingMethodAttribute):352:360 -> a
-    441:441:boolean com.android.tools.r8.shaking.KeepInfo.isInnerClassesAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.EnclosingMethodAttribute):203:203 -> a
-    441:441:boolean canRemoveInnerClassAttribute(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.graph.EnclosingMethodAttribute):360 -> a
-    442:442:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():622:622 -> a
-    442:442:boolean com.android.tools.r8.shaking.KeepInfo.isInnerClassesAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.EnclosingMethodAttribute):206 -> a
-    442:442:boolean canRemoveInnerClassAttribute(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.graph.EnclosingMethodAttribute):360 -> a
-    443:443:boolean com.android.tools.r8.shaking.KeepInfo.isInnerClassesAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.EnclosingMethodAttribute):211:211 -> a
-    443:443:boolean canRemoveInnerClassAttribute(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.graph.EnclosingMethodAttribute):360 -> a
-    444:466:boolean canRemoveInnerClassAttribute(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.graph.EnclosingMethodAttribute):361:383 -> a
-    1:1:boolean filterAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):62:62 -> b
-    1:1:com.android.tools.r8.graph.DexAnnotation rewriteAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):230 -> b
-    2:3:boolean isAnnotationTypeLive(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.AppView):161:162 -> b
-    2:3:boolean isAnnotationTypeLive(com.android.tools.r8.graph.DexAnnotation):156 -> b
-    2:3:boolean filterAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):64 -> b
-    2:3:com.android.tools.r8.graph.DexAnnotation rewriteAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):230 -> b
-    4:4:boolean filterAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):63:63 -> b
-    4:4:com.android.tools.r8.graph.DexAnnotation rewriteAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):230 -> b
-    5:5:com.android.tools.r8.graph.DexAnnotation rewriteAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):232:232 -> b
-    6:8:boolean verifyNoKeptKotlinMembersForClassesWithNoKotlinInfo():195:197 -> b
-    9:19:com.android.tools.r8.graph.DexAnnotationElement rewriteAnnotationElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationElement):256:266 -> 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):282:282 -> b
+    394:407:void removeAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepInfo):281:294 -> a
+    408:408: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
+    409:409: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
+    410:410:boolean shouldRetainAnnotationOnAnnotationClass(com.android.tools.r8.graph.DexAnnotation):300:300 -> a
+    411:411:boolean com.android.tools.r8.graph.DexAnnotation.isAnnotationDefaultAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):325:325 -> a
+    411:411:boolean shouldRetainAnnotationOnAnnotationClass(com.android.tools.r8.graph.DexAnnotation):300 -> a
+    412:412:boolean shouldRetainAnnotationOnAnnotationClass(com.android.tools.r8.graph.DexAnnotation):303:303 -> a
+    413:413:boolean com.android.tools.r8.graph.DexAnnotation.isJavaLangRetentionAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):330:330 -> a
+    413:413:boolean shouldRetainAnnotationOnAnnotationClass(com.android.tools.r8.graph.DexAnnotation):303 -> a
+    414:422:boolean shouldRetainRetentionAnnotationOnAnnotationClass(com.android.tools.r8.graph.DexAnnotation):319:327 -> a
+    414:422:boolean shouldRetainAnnotationOnAnnotationClass(com.android.tools.r8.graph.DexAnnotation):304 -> a
+    423:423:boolean com.android.tools.r8.graph.DexValue.isDexValueEnum():0:0 -> a
+    423:423:boolean shouldRetainRetentionAnnotationOnAnnotationClass(com.android.tools.r8.graph.DexAnnotation):327 -> a
+    423:423:boolean shouldRetainAnnotationOnAnnotationClass(com.android.tools.r8.graph.DexAnnotation):304 -> a
+    424:425:boolean shouldRetainRetentionAnnotationOnAnnotationClass(com.android.tools.r8.graph.DexAnnotation):328:329 -> a
+    424:425:boolean shouldRetainAnnotationOnAnnotationClass(com.android.tools.r8.graph.DexAnnotation):304 -> a
+    426:426:boolean shouldRetainAnnotationOnAnnotationClass(com.android.tools.r8.graph.DexAnnotation):306:306 -> a
+    427:438:void stripAttributes(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo):340:351 -> a
+    439:439:boolean lambda$stripAttributes$8(com.android.tools.r8.shaking.KeepClassInfo,com.android.tools.r8.graph.EnclosingMethodAttribute):342:342 -> a
+    440:440: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
+    440:440:boolean lambda$stripAttributes$8(com.android.tools.r8.shaking.KeepClassInfo,com.android.tools.r8.graph.EnclosingMethodAttribute):342 -> a
+    441:441:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():624:624 -> a
+    441:441: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
+    441:441:boolean lambda$stripAttributes$8(com.android.tools.r8.shaking.KeepClassInfo,com.android.tools.r8.graph.EnclosingMethodAttribute):342 -> a
+    442:442:boolean com.android.tools.r8.shaking.KeepInfo.isEnclosingMethodAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.EnclosingMethodAttribute,com.android.tools.r8.graph.AppView):190:190 -> a
+    442:442:boolean lambda$stripAttributes$8(com.android.tools.r8.shaking.KeepClassInfo,com.android.tools.r8.graph.EnclosingMethodAttribute):342 -> a
+    443:443:boolean lambda$stripAttributes$9(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute):348:348 -> a
+    444:452:boolean canRemoveInnerClassAttribute(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.graph.EnclosingMethodAttribute):359:367 -> a
+    453:453:boolean com.android.tools.r8.shaking.KeepInfo.isInnerClassesAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.EnclosingMethodAttribute):203:203 -> a
+    453:453:boolean canRemoveInnerClassAttribute(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.graph.EnclosingMethodAttribute):367 -> a
+    454:454:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():624:624 -> a
+    454:454:boolean com.android.tools.r8.shaking.KeepInfo.isInnerClassesAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.EnclosingMethodAttribute):206 -> 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.shaking.KeepInfo.isInnerClassesAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.EnclosingMethodAttribute):211:211 -> 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:478:boolean canRemoveInnerClassAttribute(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.graph.EnclosingMethodAttribute):368:390 -> a
+    479:481:void clearAnnotations(com.android.tools.r8.graph.AppView):395:397 -> a
+    1:1:boolean filterAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):63:63 -> b
+    1:1:com.android.tools.r8.graph.DexAnnotation rewriteAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):237 -> b
+    2:3:boolean isAnnotationTypeLive(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.AppView):168:169 -> b
+    2:3:boolean isAnnotationTypeLive(com.android.tools.r8.graph.DexAnnotation):163 -> b
+    2:3:boolean filterAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):65 -> b
+    2:3:com.android.tools.r8.graph.DexAnnotation rewriteAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):237 -> b
+    4:4:boolean filterAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):64:64 -> b
+    4:4:com.android.tools.r8.graph.DexAnnotation rewriteAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):237 -> b
+    5:5:com.android.tools.r8.graph.DexAnnotation rewriteAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):239:239 -> b
+    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.Enqueuer$Mode mode -> b
     java.util.Set annotationsToRetain -> a
-    1:1:void <init>(com.android.tools.r8.shaking.Enqueuer$Mode):397:397 -> <init>
-    2:7:void <init>(com.android.tools.r8.shaking.Enqueuer$Mode):393:398 -> <init>
-    1:1:boolean isRetainedForFinalTreeShaking(com.android.tools.r8.graph.DexAnnotation):402:402 -> a
-    2:2:com.android.tools.r8.shaking.AnnotationRemover build(com.android.tools.r8.graph.AppView,java.util.Set):411:411 -> a
-    1:1:void retainAnnotation(com.android.tools.r8.graph.DexAnnotation):406:406 -> b
+    1:1:void <init>(com.android.tools.r8.shaking.Enqueuer$Mode):411:411 -> <init>
+    2:7:void <init>(com.android.tools.r8.shaking.Enqueuer$Mode):407:412 -> <init>
+    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:
     java.util.Set liveMethods -> s
     java.util.Set prunedTypes -> T
@@ -92272,17 +92489,17 @@
     18:21:java.util.Set pruneItems(java.util.Set,java.util.Set,java.util.concurrent.ExecutorService,java.util.List):442:445 -> a
     22:22:java.util.Set pruneItems(java.util.Set,java.util.Set,java.util.concurrent.ExecutorService,java.util.List):444:444 -> a
     23:26:void lambda$pruneItems$2(java.util.Set,java.util.Set):447:450 -> a
-    27:27:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():471:471 -> a
-    27:27:boolean canUseConstClassInstructions(com.android.tools.r8.utils.InternalOptions):702 -> a
+    27:29:java.util.Map pruneMapFromMembers(java.util.Map,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):471:473 -> a
+    30:30:java.util.Map pruneMapFromMembers(java.util.Map,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):472:472 -> a
+    31:31:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> a
+    31:31:boolean canUseConstClassInstructions(com.android.tools.r8.utils.InternalOptions):702 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    28:29:boolean canUseConstClassInstructions(com.android.tools.r8.utils.InternalOptions):705:706 -> a
-    30:41:void computeLargestCfVersion():712:712 -> a
-    30:41:boolean canUseConstClassInstructions(com.android.tools.r8.utils.InternalOptions):706 -> a
-    51:51:void computeLargestCfVersion():722:722 -> a
-    51:51:boolean canUseConstClassInstructions(com.android.tools.r8.utils.InternalOptions):706 -> a
-    52:52:boolean canUseConstClassInstructions(com.android.tools.r8.utils.InternalOptions):708:708 -> a
-    53:55:java.util.Map pruneMapFromMembers(java.util.Map,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):471:473 -> a
-    56:56:java.util.Map pruneMapFromMembers(java.util.Map,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):472:472 -> a
+    32:33:boolean canUseConstClassInstructions(com.android.tools.r8.utils.InternalOptions):705:706 -> a
+    34:45:void computeLargestCfVersion():712:712 -> a
+    34:45:boolean canUseConstClassInstructions(com.android.tools.r8.utils.InternalOptions):706 -> a
+    55:55:void computeLargestCfVersion():722:722 -> a
+    55:55:boolean canUseConstClassInstructions(com.android.tools.r8.utils.InternalOptions):706 -> a
+    56:56:boolean canUseConstClassInstructions(com.android.tools.r8.utils.InternalOptions):708:708 -> a
     57:68:void lambda$pruneMapFromMembers$4(com.android.tools.r8.graph.PrunedItems,java.util.Map):475:486 -> a
     69:71:boolean lambda$pruneMapFromMembers$3(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexMember):481:483 -> 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):499:501 -> a
@@ -92320,7 +92537,7 @@
     1236:1240:boolean isFieldOnlyWrittenInMethod(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod):1044:1048 -> a
     1244:1244:boolean isClassInliningAllowed(com.android.tools.r8.graph.DexProgramClass):1151:1151 -> a
     1245:1245:boolean isMinificationAllowed(com.android.tools.r8.graph.DexReference):1155:1155 -> a
-    1246:1246:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():607:607 -> a
+    1246:1246:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():609:609 -> a
     1246:1246:boolean isMinificationAllowed(com.android.tools.r8.graph.DexReference):1155 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1247:1248:boolean isMinificationAllowed(com.android.tools.r8.graph.DexReference):1155:1156 -> a
@@ -92452,7 +92669,7 @@
     16:16:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):691 -> c
     17:17:boolean com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper.isEmulatedLibraryClassType(com.android.tools.r8.graph.DexType):171:171 -> c
     17:17:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):692 -> c
-    18:18:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAPIConverter.isVivifiedType(com.android.tools.r8.graph.DexType):133:133 -> c
+    18:18:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.isVivifiedType(com.android.tools.r8.graph.DexType):133:133 -> c
     18:18:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):694 -> c
     19:19:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):687:687 -> c
     20:20:boolean isKeepUnusedArgumentsMethod(com.android.tools.r8.graph.ProgramMethod):838:838 -> c
@@ -92678,7 +92895,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.B9:
+com.android.tools.r8.shaking.ClassInitFieldSynthesizer -> com.android.tools.r8.internal.D9:
     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
@@ -92708,7 +92925,7 @@
     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.A9:
+com.android.tools.r8.shaking.ClassInitFieldSynthesizer$1 -> com.android.tools.r8.internal.C9:
     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:
@@ -92731,12 +92948,12 @@
     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() -> d
-com.android.tools.r8.shaking.ClassInlineRule$Type$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.Q9:
+com.android.tools.r8.shaking.ClassInlineRule$Type$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.S9:
 # {"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.Lb:
+com.android.tools.r8.shaking.CollectingGraphConsumer -> com.android.tools.r8.internal.Nb:
     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>
@@ -92815,7 +93032,7 @@
     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.fe:
+com.android.tools.r8.shaking.DefaultTreePrunerConfiguration -> com.android.tools.r8.internal.he:
     com.android.tools.r8.shaking.DefaultTreePrunerConfiguration INSTANCE -> a
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>():14:14 -> <init>
@@ -92831,7 +93048,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.ie:
+com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection -> com.android.tools.r8.internal.ke:
     java.util.Map dependentMinimumKeepInfo -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():29:29 -> <clinit>
@@ -92902,1487 +93119,1485 @@
     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$SetWithReportedReason directlyInitializedInterfaces -> D
+    com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason indirectlyInitializedInterfaces -> D
+    java.util.Map initClassReferences -> a0
+    java.util.Map deferredAnnotations -> c0
+    java.util.Set lockCandidates -> Z
     com.android.tools.r8.shaking.EnqueuerUseRegistryFactory useRegistryFactory -> o
-    com.android.tools.r8.utils.collections.ProgramMethodSet pendingMethodMove -> k0
+    com.android.tools.r8.utils.collections.ProgramMethodSet pendingCodeDesugaring -> i0
+    com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason liveTypes -> z
+    java.util.Set interfacesTransitionedToInstantiated -> A
+    com.android.tools.r8.utils.collections.ProgramMethodMap pendingMethodMoveInverse -> k0
     com.android.tools.r8.shaking.AnnotationRemover$Builder annotationRemoverBuilder -> p
+    java.util.Map superInvokeDependencies -> w
     java.util.Set exceptionGuardAnalyses -> g
     com.android.tools.r8.utils.InternalOptions options -> m
     com.android.tools.r8.graph.SubtypingInfo subtypingInfo -> l
-    java.util.Set initialPrunedTypes -> J
+    java.util.Set noClassMerging -> J
     java.util.Set analyses -> c
+    java.util.Map syntheticInterfaceMethodBridges -> m0
     com.android.tools.r8.graph.MethodAccessInfoCollection$IdentityBuilder methodAccessInfoCollection -> s
-    java.util.Set liveNonProgramTypes -> F
+    com.android.tools.r8.shaking.Enqueuer$LiveFieldsSet liveFields -> S
+    java.util.Set deadProtoTypeCandidates -> F
     com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder objectAllocationInfoCollection -> t
-    java.util.Set recordFieldValuesReferences -> c0
-    com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet targetedMethods -> M
-    java.util.Set virtualMethodsTargetedByInvokeDirect -> R
-    java.util.Map deferredParameterAnnotations -> e0
-    com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection desugaring -> i0
+    com.android.tools.r8.utils.collections.ProgramMethodSet pendingReflectiveUses -> V
+    java.util.Map activeIfRules -> e0
     com.android.tools.r8.shaking.RootSetUtils$RootSet rootSet -> n
-    java.util.Set lockCandidates -> a0
-    java.util.Map scopedMethodsForLiveTypes -> g0
-    java.util.Set failedMethodResolutionTargets -> N
-    com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason indirectlyInitializedInterfaces -> E
-    com.android.tools.r8.shaking.GraphReporter graphReporter -> h0
-    com.android.tools.r8.ir.desugar.itf.InterfaceProcessor interfaceProcessor -> m0
-    java.util.Set interfacesTransitionedToInstantiated -> B
-    com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason liveTypes -> A
-    com.android.tools.r8.shaking.MissingClasses$Builder missingClassesBuilder -> H
-    java.util.Map superInvokeDependencies -> x
-    java.util.Set deadProtoTypeCandidates -> G
+    java.util.Set failedFieldResolutionTargets -> N
+    com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection keepInfo -> X
+    java.util.Map reachableVirtualTargets -> W
+    java.util.Map reachableInstanceFields -> x
     java.util.Set checkCastAnalyses -> h
-    com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection keepInfo -> Y
     java.util.Set fieldAccessAnalyses -> d
-    java.util.Set failedFieldResolutionTargets -> O
-    com.android.tools.r8.androidapi.AndroidApiLevelCompute apiLevelCompute -> w
+    com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet targetedMethods -> L
+    java.util.Set bootstrapMethods -> O
+    java.util.Map unusedInterfaceTypes -> K
+    boolean $assertionsDisabled -> n0
     boolean forceProguardCompatibility -> a
-    java.util.Set noClassMerging -> K
-    com.android.tools.r8.shaking.EnqueuerWorklist workList -> U
-    com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet liveMethods -> S
-    java.util.Map initClassReferences -> b0
-    java.util.Map reachableInstanceFields -> y
-    com.android.tools.r8.utils.collections.ProgramMethodSet pendingCodeDesugaring -> j0
+    com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason initializedClasses -> B
+    java.util.Map synthesizingContexts -> y
+    com.android.tools.r8.shaking.MissingClasses$Builder missingClassesBuilder -> G
+    com.android.tools.r8.utils.collections.ProgramMethodSet pendingMethodMove -> j0
     java.util.Map callSites -> u
-    java.util.Map reachableVirtualTargets -> X
-    com.android.tools.r8.utils.collections.ProgramMethodMap pendingMethodMoveInverse -> l0
+    com.android.tools.r8.shaking.ProguardCompatibilityActions$Builder proguardCompatibilityActionsBuilder -> U
+    com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection dependentMinimumKeepInfo -> Y
+    java.util.Set initialDeadProtoTypes -> H
     java.util.concurrent.ExecutorService executorService -> k
     java.util.Set invokeAnalyses -> e
-    java.util.Map syntheticInterfaceMethodBridges -> n0
-    java.util.Set bootstrapMethods -> P
-    java.util.Map unusedInterfaceTypes -> L
-    java.util.Map deferredAnnotations -> d0
-    java.util.Map activeIfRules -> f0
-    com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason initializedClasses -> C
+    java.util.Set methodsTargetedByInvokeDynamic -> P
+    java.util.Set recordFieldValuesReferences -> b0
+    java.util.Map deferredParameterAnnotations -> d0
+    com.android.tools.r8.shaking.EnqueuerWorklist workList -> T
+    java.util.Map scopedMethodsForLiveTypes -> f0
+    com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection desugaring -> h0
+    com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason directlyInitializedInterfaces -> C
+    com.android.tools.r8.ir.desugar.itf.InterfaceProcessor interfaceProcessor -> l0
+    com.android.tools.r8.shaking.GraphReporter graphReporter -> g0
     java.util.Set identifierNameStrings -> v
-    java.util.Map synthesizingContexts -> z
     com.android.tools.r8.graph.AppView appView -> j
-    com.android.tools.r8.shaking.ProguardCompatibilityActions$Builder proguardCompatibilityActionsBuilder -> V
-    com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection dependentMinimumKeepInfo -> Z
     com.android.tools.r8.graph.FieldAccessInfoCollectionImpl fieldAccessInfoCollection -> r
-    com.android.tools.r8.shaking.Enqueuer$LiveFieldsSet liveFields -> T
     com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfo -> i
-    java.util.Set initialDeadProtoTypes -> I
+    java.util.Set initialPrunedTypes -> I
     com.android.tools.r8.shaking.Enqueuer$Mode mode -> b
+    java.util.Set liveNonProgramTypes -> E
     java.util.Set instanceOfAnalyses -> f
     com.android.tools.r8.shaking.Enqueuer$EnqueuerDefinitionSupplier enqueuerDefinitionSupplier -> q
-    com.android.tools.r8.utils.collections.ProgramMethodSet pendingReflectiveUses -> W
-    java.util.Set methodsTargetedByInvokeDynamic -> Q
-    boolean $assertionsDisabled -> o0
-    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):465:465 -> <init>
-    2:3852: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:4090 -> <init>
-    3853:3900: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):466:513 -> <init>
+    java.util.Set virtualMethodsTargetedByInvokeDirect -> Q
+    java.util.Set failedMethodResolutionTargets -> M
+    com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet liveMethods -> R
+    1:1:void <clinit>():189:189 -> <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):462:462 -> <init>
+    2:3845: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):239:4082 -> <init>
+    3846:3892: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:509 -> <init>
     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$98(com.android.tools.r8.graph.DexApplication) -> a
-    1:1:com.android.tools.r8.graph.AppInfoWithClassHierarchy access$1000(com.android.tools.r8.shaking.Enqueuer):190:190 -> a
-    2:2:void access$1600(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass):190:190 -> a
-    3:3:void access$1700(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDerivedContext):190:190 -> a
-    4:5:void recordFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDerivedContext):658:659 -> a
-    4:5:void access$1700(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDerivedContext):190 -> a
-    6:6: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
-    7:7:com.android.tools.r8.graph.DexProgramClass getProgramHolderOrNull(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.ProgramDefinition):776:776 -> a
-    7:7: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
-    8:8: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
-    9:9:void access$2200(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):190:190 -> a
-    10:10:void access$2300(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDerivedContext):190:190 -> a
-    11:11:void access$2400(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):190:190 -> a
-    12:12: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
+    1:1:com.android.tools.r8.graph.AppInfoWithClassHierarchy access$1000(com.android.tools.r8.shaking.Enqueuer):189:189 -> a
+    2:2:void access$1600(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass):189:189 -> a
+    3:3:void access$1700(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDerivedContext):189:189 -> a
+    4:5:void recordFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDerivedContext):650:651 -> a
+    4:5:void access$1700(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDerivedContext):189 -> a
+    6:6: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):189:189 -> a
+    7:7:com.android.tools.r8.graph.DexProgramClass getProgramHolderOrNull(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.ProgramDefinition):768:768 -> a
+    7:7: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):189 -> a
+    8:8: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):189:189 -> a
+    9:9:void access$2200(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):189:189 -> a
+    10:10:void access$2300(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDerivedContext):189:189 -> a
+    11:11:void access$2400(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):189:189 -> a
+    12:12: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):189:189 -> a
     13:13:boolean com.android.tools.r8.graph.DexMethodHandle.isMethodHandle():294:294 -> a
-    13:13:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):1222 -> a
+    13:13:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):1214 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    14:16:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):1222:1224 -> a
+    14:16:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):1214:1216 -> a
     17:17:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.methodHandleReferencedIn(com.android.tools.r8.graph.ProgramMethod):87:87 -> a
-    17:17:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):1226 -> a
+    17:17:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):1218 -> a
     18:18:boolean com.android.tools.r8.graph.DexClass.isAnnotation():652:652 -> a
-    18:18:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):1227 -> a
-    19:23:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):1228:1232 -> a
-    24:24:void lambda$new$0(com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):492:492 -> a
-    25:25:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):545:545 -> a
-    25:25:void lambda$new$0(com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):492 -> a
-    26:26:com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfo():517:517 -> a
-    27:27:com.android.tools.r8.shaking.EnqueuerUseRegistryFactory lambda$createUseRegistryFactory$1(com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):535:535 -> a
-    28:28:com.android.tools.r8.shaking.Enqueuer registerFieldAccessAnalysis(com.android.tools.r8.graph.analysis.EnqueuerFieldAccessAnalysis):550:550 -> a
-    29:29:com.android.tools.r8.shaking.Enqueuer registerInvokeAnalysis(com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):555:555 -> a
-    30:30:com.android.tools.r8.shaking.Enqueuer registerCheckCastAnalysis(com.android.tools.r8.graph.analysis.EnqueuerCheckCastAnalysis):565:565 -> a
-    31:31:void setAnnotationRemoverBuilder(com.android.tools.r8.shaking.AnnotationRemover$Builder):575:575 -> a
-    32:32:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexType):589:589 -> a
-    33:33:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexProgramClass):596:596 -> a
-    33:33:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexType):591 -> a
-    34:34:boolean addLiveMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):600:600 -> a
-    35:35:void recordMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDerivedContext):643:643 -> a
-    36:39:void recordMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer):650:653 -> a
-    40:40:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):671:671 -> a
-    41:41:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer):678:678 -> a
-    41:41:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):671 -> a
-    42:42:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer):678:678 -> a
-    42:42: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
+    18:18:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):1219 -> a
+    19:23:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):1220:1224 -> a
+    24:24:void lambda$new$0(com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):489:489 -> a
+    25:25:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):537:537 -> a
+    25:25:void lambda$new$0(com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):489 -> a
+    26:26:com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfo():513:513 -> a
+    27:27:com.android.tools.r8.shaking.EnqueuerUseRegistryFactory lambda$createUseRegistryFactory$1(com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):527:527 -> a
+    28:28:com.android.tools.r8.shaking.Enqueuer registerFieldAccessAnalysis(com.android.tools.r8.graph.analysis.EnqueuerFieldAccessAnalysis):542:542 -> a
+    29:29:com.android.tools.r8.shaking.Enqueuer registerInvokeAnalysis(com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):547:547 -> a
+    30:30:com.android.tools.r8.shaking.Enqueuer registerCheckCastAnalysis(com.android.tools.r8.graph.analysis.EnqueuerCheckCastAnalysis):557:557 -> a
+    31:31:void setAnnotationRemoverBuilder(com.android.tools.r8.shaking.AnnotationRemover$Builder):567:567 -> a
+    32:32:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexType):581:581 -> a
+    33:33:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexProgramClass):588:588 -> a
+    33:33:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexType):583 -> a
+    34:34:boolean addLiveMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):592:592 -> a
+    35:35:void recordMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDerivedContext):635:635 -> a
+    36:39:void recordMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer):642:645 -> a
+    40:40:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):663:663 -> a
+    41:41:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer):670:670 -> a
+    41:41:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):663 -> a
+    42:42:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer):670:670 -> a
+    42:42: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):189 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    43:50:com.android.tools.r8.graph.DexClass internalDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer):685:692 -> a
-    51:55:void addLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,java.util.function.BiConsumer):710:714 -> a
-    51:55:com.android.tools.r8.graph.DexClass internalDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer):691 -> a
-    56:56:void lambda$internalDefinitionFor$2(com.android.tools.r8.graph.ProgramDerivedContext,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ClasspathOrLibraryDefinition):694:694 -> a
-    57:57:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer):722:722 -> a
+    43:50:com.android.tools.r8.graph.DexClass internalDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer):677:684 -> a
+    51:55:void addLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,java.util.function.BiConsumer):702:706 -> a
+    51:55:com.android.tools.r8.graph.DexClass internalDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer):683 -> a
+    56:56:void lambda$internalDefinitionFor$2(com.android.tools.r8.graph.ProgramDerivedContext,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ClasspathOrLibraryDefinition):686:686 -> a
+    57:57:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer):714:714 -> a
     58:58:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    58:58:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer):722 -> a
-    59:61:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer):724:726 -> a
-    62:66:void warnIfLibraryTypeInheritsFromProgramType(com.android.tools.r8.graph.DexLibraryClass):787:791 -> a
-    62:66:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer):726 -> a
-    67:67:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer):728:728 -> a
+    58:58:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer):714 -> a
+    59:61:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer):716:718 -> a
+    62:66:void warnIfLibraryTypeInheritsFromProgramType(com.android.tools.r8.graph.DexLibraryClass):779:783 -> a
+    62:66:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer):718 -> a
+    67:67:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer):720:720 -> a
     68:68:void com.android.tools.r8.graph.DexClass.forEachClassField(java.util.function.Consumer):144:144 -> a
-    68:68:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer):728 -> a
-    69:69:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer):735:735 -> a
+    68:68:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer):720 -> a
+    69:69:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer):727:727 -> a
     70:70:void com.android.tools.r8.graph.DexClass.forEachClassMethod(java.util.function.Consumer):154:154 -> a
-    70:70:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer):735 -> a
-    71:72:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer):744:745 -> a
-    73:74:void lambda$processNewLiveNonProgramType$3(com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer,com.android.tools.r8.graph.DexClassAndField):731:732 -> a
-    75:75:void lambda$processNewLiveNonProgramType$3(com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer,com.android.tools.r8.graph.DexClassAndField):730:730 -> a
-    76:78:void lambda$processNewLiveNonProgramType$4(com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer,com.android.tools.r8.graph.DexClassAndMethod):737:739 -> a
-    79:82:void lambda$processNewLiveNonProgramType$4(com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer,com.android.tools.r8.graph.DexClassAndMethod):738:741 -> a
-    83:93:void addNonProgramClassToWorklist(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ClasspathOrLibraryDefinition,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer):755:765 -> a
-    94:94:void lambda$enqueueAllIfNotShrinking$5(com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField):845:845 -> a
-    95:95:void lambda$enqueueAllIfNotShrinking$6(com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod):847:847 -> a
-    96:96:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):855:855 -> a
+    70:70:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer):727 -> a
+    71:72:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer):736:737 -> a
+    73:74:void lambda$processNewLiveNonProgramType$3(com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer,com.android.tools.r8.graph.DexClassAndField):723:724 -> a
+    75:75:void lambda$processNewLiveNonProgramType$3(com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer,com.android.tools.r8.graph.DexClassAndField):722:722 -> a
+    76:78:void lambda$processNewLiveNonProgramType$4(com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer,com.android.tools.r8.graph.DexClassAndMethod):729:731 -> a
+    79:82:void lambda$processNewLiveNonProgramType$4(com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer,com.android.tools.r8.graph.DexClassAndMethod):730:733 -> a
+    83:93: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
+    94:94:void lambda$enqueueAllIfNotShrinking$5(com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField):837:837 -> a
+    95:95:void lambda$enqueueAllIfNotShrinking$6(com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod):839:839 -> a
+    96:96:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):847:847 -> a
     97:97:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():485:485 -> a
-    97:97:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):855 -> a
+    97:97:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):847 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    98:98:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):855:855 -> a
+    98:98:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):847:847 -> a
     99:99:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():473:473 -> a
-    99:99:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):856 -> a
+    99:99:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):848 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    100:101:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):856:857 -> a
+    100:101:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):848:849 -> a
     102:102:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():473:473 -> a
-    102:102:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):858 -> a
+    102:102:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):850 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    103:103:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):858:858 -> a
-    104:104:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):863:863 -> a
+    103:103:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):850:850 -> a
+    104:104:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):855:855 -> a
     105:105:boolean com.android.tools.r8.graph.DexClass.isAnnotation():652:652 -> a
-    105:105:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):864 -> a
+    105:105:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):856 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    106:116:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):865:875 -> a
-    117:121:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):873:877 -> a
+    106:116:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):857:867 -> a
+    117:121:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):865:869 -> a
     122:122:boolean com.android.tools.r8.graph.DexClass.isExternalizable(com.android.tools.r8.graph.AppView):832:832 -> a
-    122:122:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):877 -> a
+    122:122:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):869 -> a
     123:123:boolean com.android.tools.r8.graph.AppInfoWithClassHierarchy.isExternalizable(com.android.tools.r8.graph.DexType):442:442 -> a
     123:123:boolean com.android.tools.r8.graph.DexClass.isExternalizable(com.android.tools.r8.graph.AppView):832 -> a
-    123:123:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):877 -> a
-    124:124:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):878:878 -> a
-    125:125:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):886:886 -> a
+    123:123:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):869 -> a
+    124:124:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):870:870 -> a
+    125:125:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):878:878 -> a
     126:126:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():485:485 -> a
-    126:126:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):886 -> a
+    126:126:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):878 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    127:127:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):886:886 -> a
+    127:127:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):878:878 -> a
     128:128:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():473:473 -> a
-    128:128:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):887 -> a
+    128:128:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):879 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    129:131:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):887:889 -> a
+    129:131:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):879:881 -> a
     132:132:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():473:473 -> a
-    132:132:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):892 -> a
+    132:132:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):884 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    133:133:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):892:892 -> a
-    134:134:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):891:891 -> a
-    135:135:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):889:889 -> a
-    136:136:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):899:899 -> a
+    133:133:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):884:884 -> a
+    134:134:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):883:883 -> a
+    135:135:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):881:881 -> a
+    136:136:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):891:891 -> a
     137:137:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():485:485 -> a
-    137:137:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):899 -> a
+    137:137:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):891 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    138:138:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):899:899 -> a
+    138:138:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):891:891 -> a
     139:139:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():473:473 -> a
-    139:139:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):900 -> a
+    139:139:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):892 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    140:142:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):900:902 -> a
+    140:142:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):892:894 -> a
     143:143:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():473:473 -> a
-    143:143:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):905 -> a
+    143:143:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):897 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    144:144:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):905:905 -> a
-    145:145:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):904:904 -> a
-    146:146:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):902:902 -> a
-    147:150:boolean registerMethodWithTargetAndContext(java.util.function.BiPredicate,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):941:944 -> a
-    151:151:boolean registerFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):950:950 -> a
-    151:151:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldReadType):1460 -> a
-    152:171:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldReadType):1464:1483 -> a
+    144:144:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):897:897 -> a
+    145:145:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):896:896 -> a
+    146:146:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):894:894 -> a
+    147:150:boolean registerMethodWithTargetAndContext(java.util.function.BiPredicate,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):933:936 -> a
+    151:151:boolean registerFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):942:942 -> a
+    151:151:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldReadType):1452 -> a
+    152:171:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldReadType):1456:1475 -> a
     172:172: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":1678,"2":1679,"3":1680}}
-    1678:1678:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldReadType):1483:1483 -> a
-    1679:1679:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldReadType):1483:1483 -> a
-    1680:1680:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldReadType):1483:1483 -> a
-    1657:1668:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldReadType):1485:1496 -> a
-    1669:1669:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    1669:1669:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldReadType):1496 -> a
-    1670:1675:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldReadType):1499:1504 -> a
-    1676:1676:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.fieldReferencedIn(com.android.tools.r8.graph.ProgramMethod):62:62 -> a
-    1676:1676:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldReadType):1505 -> a
-    1677:1677:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldReadType):1504:1504 -> a
-    1681:1681:boolean registerFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):958:958 -> a
-    1681:1681:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1518 -> a
-    1682:1701:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1522:1541 -> a
-    1702:1702: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":3261,"2":3262,"3":3263}}
-    3261:3261:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1541:1541 -> a
-    3262:3262:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1541:1541 -> a
-    3263:3263:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1541:1541 -> a
-    3245:3254:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1543:1552 -> a
-    3255:3255:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    3255:3255:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1552 -> a
-    3256:3258:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1555:1557 -> a
-    3259:3259:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.fieldReferencedIn(com.android.tools.r8.graph.ProgramMethod):62:62 -> a
-    3259:3259:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1560 -> a
-    3260:3260:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1561:1561 -> a
-    3264:3265:boolean registerReflectiveFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):966:967 -> a
-    3266:3297:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean,boolean):973:1004 -> a
-    3298:3298:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1010:1010 -> a
-    3299:3299:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():471:471 -> a
-    3299:3299:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1010 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1670,"2":1671,"3":1672}}
+    1670:1670:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldReadType):1475:1475 -> a
+    1671:1671:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldReadType):1475:1475 -> a
+    1672:1672:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldReadType):1475:1475 -> a
+    1649:1660:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldReadType):1477:1488 -> a
+    1661:1661:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    1661:1661:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldReadType):1488 -> a
+    1662:1667:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldReadType):1491:1496 -> a
+    1668:1668:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.fieldReferencedIn(com.android.tools.r8.graph.ProgramMethod):62:62 -> a
+    1668:1668:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldReadType):1497 -> a
+    1669:1669:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldReadType):1496:1496 -> a
+    1673:1673:boolean registerFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):950:950 -> a
+    1673:1673:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1510 -> a
+    1674:1693:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1514:1533 -> a
+    1694:1694: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":3245,"2":3246,"3":3247}}
+    3245:3245:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1533:1533 -> a
+    3246:3246:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1533:1533 -> a
+    3247:3247:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1533:1533 -> a
+    3229:3238:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1535:1544 -> a
+    3239:3239:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    3239:3239:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1544 -> a
+    3240:3242:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1547:1549 -> a
+    3243:3243:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.fieldReferencedIn(com.android.tools.r8.graph.ProgramMethod):62:62 -> a
+    3243:3243:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1552 -> a
+    3244:3244:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1553:1553 -> a
+    3248:3249:boolean registerReflectiveFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):958:959 -> a
+    3250:3281:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean,boolean):965:996 -> a
+    3282:3282:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1002:1002 -> a
+    3283:3283:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> a
+    3283:3283:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1002 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3300:3302:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1010:1012 -> a
-    3303:3303:com.android.tools.r8.graph.DexProgramClass getProgramHolderOrNull(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.ProgramDefinition):776:776 -> a
-    3303:3303:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1012 -> a
-    3304:3313:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1014:1023 -> a
-    3314:3314:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2443:2443 -> a
-    3314:3314:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1025 -> a
-    3315:3318:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2450:2453 -> a
-    3315:3318:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2444 -> a
-    3315:3318:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1025 -> a
-    3319:3319: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":3378,"2":3379,"3":3380}}
-    3378:3378:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2453:2453 -> a
-    3378:3378:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2444 -> a
-    3378:3378:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1025 -> a
-    3379:3379:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2453:2453 -> a
-    3379:3379:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2444 -> a
-    3379:3379:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1025 -> a
-    3380:3380:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2453:2453 -> a
-    3380:3380:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2444 -> a
-    3380:3380:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1025 -> a
-    3320:3320: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":3382,"2":3383,"3":3384,"4":3385}}
-    3382:3382:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2455:2455 -> a
-    3382:3382:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2444 -> a
-    3382:3382:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1025 -> a
-    3383:3383:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2455:2455 -> a
-    3383:3383:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2444 -> a
-    3383:3383:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1025 -> a
-    3384:3384:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2455:2455 -> a
-    3384:3384:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2444 -> a
-    3384:3384:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1025 -> a
-    3385:3385:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2455:2455 -> a
-    3385:3385:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2444 -> a
-    3385:3385:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1025 -> a
-    3321:3326:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2456:2461 -> a
-    3321:3326:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2444 -> a
-    3321:3326:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1025 -> a
-    3327:3327: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":3391,"2":3392,"3":3393}}
-    3391:3391:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2461:2461 -> a
-    3391:3391:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2444 -> a
-    3391:3391:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1025 -> a
-    3392:3392:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2461:2461 -> a
-    3392:3392:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2444 -> a
-    3392:3392:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1025 -> a
-    3393:3393:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2461:2461 -> a
-    3393:3393:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2444 -> a
-    3393:3393:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1025 -> a
-    3328:3328: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":3397,"2":3398,"3":3399,"4":3400}}
-    3397:3397:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2465:2465 -> a
-    3397:3397:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2444 -> a
-    3397:3397:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1025 -> a
-    3398:3398:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2465:2465 -> a
-    3398:3398:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2444 -> a
-    3398:3398:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1025 -> a
-    3399:3399:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2465:2465 -> a
-    3399:3399:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2444 -> a
-    3399:3399:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1025 -> a
-    3400:3400:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2465:2465 -> a
-    3400:3400:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2444 -> a
-    3400:3400:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1025 -> a
-    3329:3330:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2467:2468 -> a
-    3329:3330:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2444 -> a
-    3329:3330:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1025 -> a
-    3331:3331:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2445:2445 -> a
-    3331:3331:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1025 -> a
-    3332:3332:com.android.tools.r8.shaking.InstantiatedObject com.android.tools.r8.shaking.InstantiatedObject.of(com.android.tools.r8.ir.desugar.LambdaDescriptor):17:17 -> a
-    3332:3332:void transitionMethodsForInstantiatedLambda(com.android.tools.r8.ir.desugar.LambdaDescriptor):2475 -> a
-    3332:3332:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1026 -> a
-    3333:3333:void transitionMethodsForInstantiatedLambda(com.android.tools.r8.ir.desugar.LambdaDescriptor):2475:2475 -> a
-    3333:3333:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1026 -> a
-    3334:3334:void transitionMethodsForInstantiatedLambda(com.android.tools.r8.ir.desugar.LambdaDescriptor):2474:2474 -> a
-    3334:3334:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1026 -> a
-    3335:3365:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1027:1057 -> a
-    3366:3366:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFromLambdaCreatedIn(com.android.tools.r8.graph.ProgramMethod):58:58 -> a
-    3366:3366:void traceInvokeInterfaceFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1303 -> a
-    3366:3366:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1045 -> a
-    3367:3367:void traceInvokeInterfaceFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1303:1303 -> a
-    3367:3367:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1045 -> a
-    3368:3368:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFromLambdaCreatedIn(com.android.tools.r8.graph.ProgramMethod):58:58 -> a
-    3368:3368:void traceInvokeDirectFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1282 -> a
-    3368:3368:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1051 -> a
-    3369:3369:void traceInvokeDirectFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1282:1282 -> a
-    3369:3369:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1051 -> a
-    3370:3370:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1054:1054 -> a
-    3371:3371:void traceNewInstanceFromLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1421:1421 -> a
-    3371:3371:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1054 -> a
-    3372:3372:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFromLambdaCreatedIn(com.android.tools.r8.graph.ProgramMethod):58:58 -> a
-    3372:3372:void traceNewInstanceFromLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1422 -> a
-    3372:3372:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1054 -> a
-    3373:3373:void traceNewInstanceFromLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1421:1421 -> a
-    3373:3373:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1054 -> a
-    3374:3374:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFromLambdaCreatedIn(com.android.tools.r8.graph.ProgramMethod):58:58 -> a
-    3374:3374:void traceInvokeVirtualFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1379 -> a
-    3374:3374:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1048 -> a
-    3375:3375:void traceInvokeVirtualFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1379:1379 -> a
-    3375:3375:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1048 -> a
-    3376:3376:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFromLambdaCreatedIn(com.android.tools.r8.graph.ProgramMethod):58:58 -> a
-    3376:3376:void traceInvokeStaticFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1324 -> a
-    3376:3376:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1042 -> a
-    3377:3377:void traceInvokeStaticFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1324:1324 -> a
-    3377:3377:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1042 -> a
-    3401:3401:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$traceCallSite$7(com.android.tools.r8.graph.DexCallSite):1027:1027 -> a
-    3402:3402:void lambda$traceCheckCast$8(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerCheckCastAnalysis):1062:1062 -> a
-    3403:3407:void handleLockCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1086:1090 -> a
-    3403:3407:void traceConstClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,boolean):1076 -> a
-    3408:3408:void traceConstClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,boolean):1077:1077 -> a
-    3409:3421:boolean isConstClassMaybeUsedAsLock(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1106:1118 -> a
-    3422:3422:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):1582:1582 -> a
-    3422:3422:boolean isConstClassMaybeUsedAsLock(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1119 -> a
+    3284:3286:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1002:1004 -> a
+    3287:3287:com.android.tools.r8.graph.DexProgramClass getProgramHolderOrNull(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.ProgramDefinition):768:768 -> a
+    3287:3287:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1004 -> a
+    3288:3297:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1006:1015 -> a
+    3298:3298:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2435:2435 -> a
+    3298:3298:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1017 -> a
+    3299:3302:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2442:2445 -> a
+    3299:3302:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2436 -> a
+    3299:3302:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1017 -> a
+    3303:3303: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":3362,"2":3363,"3":3364}}
+    3362:3362:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2445:2445 -> a
+    3362:3362:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2436 -> a
+    3362:3362:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1017 -> a
+    3363:3363:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2445:2445 -> a
+    3363:3363:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2436 -> a
+    3363:3363:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1017 -> a
+    3364:3364:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2445:2445 -> a
+    3364:3364:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2436 -> a
+    3364:3364:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1017 -> a
+    3304:3304: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":3366,"2":3367,"3":3368,"4":3369}}
+    3366:3366:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2447:2447 -> a
+    3366:3366:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2436 -> a
+    3366:3366:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1017 -> a
+    3367:3367:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2447:2447 -> a
+    3367:3367:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2436 -> a
+    3367:3367:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1017 -> a
+    3368:3368:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2447:2447 -> a
+    3368:3368:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2436 -> a
+    3368:3368:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1017 -> a
+    3369:3369:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2447:2447 -> a
+    3369:3369:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2436 -> a
+    3369:3369:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1017 -> a
+    3305:3310:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2448:2453 -> a
+    3305:3310:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2436 -> a
+    3305:3310:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1017 -> a
+    3311:3311: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":3375,"2":3376,"3":3377}}
+    3375:3375:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2453:2453 -> a
+    3375:3375:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2436 -> a
+    3375:3375:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1017 -> a
+    3376:3376:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2453:2453 -> a
+    3376:3376:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2436 -> a
+    3376:3376:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1017 -> a
+    3377:3377:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2453:2453 -> a
+    3377:3377:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2436 -> a
+    3377:3377:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1017 -> a
+    3312:3312: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":3381,"2":3382,"3":3383,"4":3384}}
+    3381:3381:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2457:2457 -> a
+    3381:3381:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2436 -> a
+    3381:3381:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1017 -> a
+    3382:3382:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2457:2457 -> a
+    3382:3382:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2436 -> a
+    3382:3382:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1017 -> a
+    3383:3383:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2457:2457 -> a
+    3383:3383:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2436 -> a
+    3383:3383:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1017 -> a
+    3384:3384:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2457:2457 -> a
+    3384:3384:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2436 -> a
+    3384:3384:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1017 -> a
+    3313:3314:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2459:2460 -> a
+    3313:3314:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2436 -> a
+    3313:3314:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1017 -> a
+    3315:3315:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2437:2437 -> a
+    3315:3315:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1017 -> a
+    3316:3316:com.android.tools.r8.shaking.InstantiatedObject com.android.tools.r8.shaking.InstantiatedObject.of(com.android.tools.r8.ir.desugar.LambdaDescriptor):17:17 -> a
+    3316:3316:void transitionMethodsForInstantiatedLambda(com.android.tools.r8.ir.desugar.LambdaDescriptor):2467 -> a
+    3316:3316:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1018 -> a
+    3317:3317:void transitionMethodsForInstantiatedLambda(com.android.tools.r8.ir.desugar.LambdaDescriptor):2467:2467 -> a
+    3317:3317:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1018 -> a
+    3318:3318:void transitionMethodsForInstantiatedLambda(com.android.tools.r8.ir.desugar.LambdaDescriptor):2466:2466 -> a
+    3318:3318:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1018 -> a
+    3319:3349:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1019:1049 -> a
+    3350:3350:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFromLambdaCreatedIn(com.android.tools.r8.graph.ProgramMethod):58:58 -> a
+    3350:3350:void traceInvokeInterfaceFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1295 -> a
+    3350:3350:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1037 -> a
+    3351:3351:void traceInvokeInterfaceFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1295:1295 -> a
+    3351:3351:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1037 -> a
+    3352:3352:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFromLambdaCreatedIn(com.android.tools.r8.graph.ProgramMethod):58:58 -> a
+    3352:3352:void traceInvokeDirectFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1274 -> a
+    3352:3352:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1043 -> a
+    3353:3353:void traceInvokeDirectFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1274:1274 -> a
+    3353:3353:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1043 -> a
+    3354:3354:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1046:1046 -> a
+    3355:3355:void traceNewInstanceFromLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1413:1413 -> a
+    3355:3355:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1046 -> a
+    3356:3356:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFromLambdaCreatedIn(com.android.tools.r8.graph.ProgramMethod):58:58 -> a
+    3356:3356:void traceNewInstanceFromLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1414 -> a
+    3356:3356:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1046 -> a
+    3357:3357:void traceNewInstanceFromLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1413:1413 -> a
+    3357:3357:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1046 -> a
+    3358:3358:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFromLambdaCreatedIn(com.android.tools.r8.graph.ProgramMethod):58:58 -> a
+    3358:3358:void traceInvokeVirtualFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1371 -> a
+    3358:3358:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1040 -> a
+    3359:3359:void traceInvokeVirtualFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1371:1371 -> a
+    3359:3359:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1040 -> a
+    3360:3360:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFromLambdaCreatedIn(com.android.tools.r8.graph.ProgramMethod):58:58 -> a
+    3360:3360:void traceInvokeStaticFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1316 -> a
+    3360:3360:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1034 -> a
+    3361:3361:void traceInvokeStaticFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1316:1316 -> a
+    3361:3361:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1034 -> a
+    3385:3385:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$traceCallSite$7(com.android.tools.r8.graph.DexCallSite):1019:1019 -> a
+    3386:3386:void lambda$traceCheckCast$8(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerCheckCastAnalysis):1054:1054 -> a
+    3387:3391:void handleLockCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1078:1082 -> a
+    3387:3391:void traceConstClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,boolean):1068 -> a
+    3392:3392:void traceConstClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,boolean):1069:1069 -> a
+    3393:3405:boolean isConstClassMaybeUsedAsLock(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1098:1110 -> a
+    3406:3406:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):1582:1582 -> a
+    3406:3406:boolean isConstClassMaybeUsedAsLock(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1111 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3423:3430:boolean isConstClassMaybeUsedAsLock(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1119:1126 -> a
-    3431:3431:boolean lambda$isConstClassMaybeUsedAsLock$10(com.android.tools.r8.code.CfOrDexInstruction):1111:1111 -> a
-    3432:3432:boolean com.android.tools.r8.cf.code.CfInstruction.isLabel():0:0 -> a
-    3432:3432:boolean lambda$isConstClassMaybeUsedAsLock$10(com.android.tools.r8.code.CfOrDexInstruction):1111 -> a
-    3433:3433:boolean lambda$isConstClassMaybeUsedAsLock$10(com.android.tools.r8.code.CfOrDexInstruction):1112:1112 -> a
-    3434:3434:boolean com.android.tools.r8.cf.code.CfInstruction.isPosition():0:0 -> a
-    3434:3434:boolean lambda$isConstClassMaybeUsedAsLock$10(com.android.tools.r8.code.CfOrDexInstruction):1112 -> a
-    3435:3435:com.android.tools.r8.shaking.KeepReason lambda$internalTraceConstClassOrCheckCast$11(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):1143:1143 -> a
-    3436:3442:com.android.tools.r8.utils.Visibility computeMinimumRequiredVisibilityForInitClassField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1205:1211 -> a
-    3443:3443:void traceTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1240:1240 -> a
-    3443:3443:void internalTraceConstClassOrCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,boolean):1133 -> a
-    3444:3452:void internalTraceConstClassOrCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,boolean):1134:1142 -> a
-    3453:3453:void lambda$traceInvokeDirect$14(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1258:1258 -> a
-    3454:3456:boolean registerDeferredActionForDeadProtoBuilder(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Action):1270:1272 -> a
-    3457:3457: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):1274:1274 -> a
-    3458:3458:boolean lambda$registerDeferredActionForDeadProtoBuilder$15(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.Action):1275:1275 -> a
-    3459:3464:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1287:1292 -> a
-    3465:3465:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    3465:3465:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1292 -> a
-    3466:3467:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1294:1295 -> a
-    3468:3468:void lambda$traceInvokeDirect$17(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):1295:1295 -> a
-    3469:3469:void lambda$traceNewInstance$22(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1407:1407 -> a
-    3470:3470: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):1430:1430 -> a
-    3471:3471:boolean com.android.tools.r8.graph.DexClass.isAnnotation():652:652 -> a
-    3471:3471: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 -> a
-    3472:3475: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:1435 -> a
-    3476:3476: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):1433:1433 -> a
-    3477:3477: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):1467:1467 -> a
-    3478:3478:void lambda$traceStaticFieldRead$26(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):1590:1590 -> a
-    3479:3479:java.lang.Boolean lambda$traceStaticFieldRead$27(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):1619:1619 -> a
-    3480:3492:void markTypeAsLive(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):1751:1763 -> a
-    3493:3495:void markTypeAsLive(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition):1767:1769 -> a
-    3496:3496:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):1774:1774 -> a
-    3497:3501:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1788:1792 -> a
-    3502:3502:boolean com.android.tools.r8.shaking.Enqueuer$Mode.isFinalMainDexTracing():221:221 -> a
-    3502:3502:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1792 -> a
-    3503:3506:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1792:1792 -> a
-    3507:3507: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":5437,"2":5438,"3":5439}}
-    5437:5437:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1792:1792 -> a
-    5438:5438:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1792:1792 -> a
-    5439:5439:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1792:1792 -> a
-    5302:5304:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1795:1797 -> a
-    5305:5305:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap.isUnboxedEnum(com.android.tools.r8.graph.DexProgramClass):28:28 -> a
-    5305:5305:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1797 -> a
-    5306:5346:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1797:1837 -> a
-    5347:5347:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    5347:5347:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1837 -> a
-    5348:5359:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1840:1851 -> a
-    5360:5363:void warnIfClassExtendsInterfaceOrImplementsClass(com.android.tools.r8.graph.DexProgramClass):796:799 -> a
-    5360:5363:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1855 -> a
-    5364:5364: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":5440,"2":5441,"3":5442}}
-    5440:5440:void warnIfClassExtendsInterfaceOrImplementsClass(com.android.tools.r8.graph.DexProgramClass):799:799 -> a
-    5440:5440:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1855 -> a
-    5441:5441:void warnIfClassExtendsInterfaceOrImplementsClass(com.android.tools.r8.graph.DexProgramClass):799:799 -> a
-    5441:5441:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1855 -> a
-    5442:5442:void warnIfClassExtendsInterfaceOrImplementsClass(com.android.tools.r8.graph.DexProgramClass):799:799 -> a
-    5442:5442:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1855 -> a
-    5365:5367:void warnIfClassExtendsInterfaceOrImplementsClass(com.android.tools.r8.graph.DexProgramClass):802:804 -> a
-    5365:5367:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1855 -> a
-    5368:5380:void warnIfClassExtendsInterfaceOrImplementsClass(com.android.tools.r8.graph.DexProgramClass):799:811 -> a
-    5368:5380:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1855 -> a
-    5381:5381: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":5454,"2":5455,"3":5456}}
-    5454:5454:void warnIfClassExtendsInterfaceOrImplementsClass(com.android.tools.r8.graph.DexProgramClass):811:811 -> a
-    5454:5454:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1855 -> a
-    5455:5455:void warnIfClassExtendsInterfaceOrImplementsClass(com.android.tools.r8.graph.DexProgramClass):811:811 -> a
-    5455:5455:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1855 -> a
-    5456:5456:void warnIfClassExtendsInterfaceOrImplementsClass(com.android.tools.r8.graph.DexProgramClass):811:811 -> a
-    5456:5456:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1855 -> a
-    5382:5384:void warnIfClassExtendsInterfaceOrImplementsClass(com.android.tools.r8.graph.DexProgramClass):814:816 -> a
-    5382:5384:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1855 -> a
-    5385:5385:void warnIfClassExtendsInterfaceOrImplementsClass(com.android.tools.r8.graph.DexProgramClass):811:811 -> a
-    5385:5385:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1855 -> a
-    5386:5405:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1859:1878 -> a
-    5406:5417:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):910:921 -> a
-    5406:5417:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1879 -> a
-    5418:5421:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1883:1886 -> a
-    5422:5422:boolean com.android.tools.r8.graph.DexClass.isAnnotation():652:652 -> a
-    5422:5422:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1889 -> a
-    5423:5429:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1890:1896 -> a
-    5430:5430:java.util.Set com.android.tools.r8.shaking.RootSetUtils$RootSetBase.getDependentKeepClassCompatRule(com.android.tools.r8.graph.DexType):1607:1607 -> a
-    5430:5430:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1896 -> a
+    3407:3414:boolean isConstClassMaybeUsedAsLock(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1111:1118 -> a
+    3415:3415:boolean lambda$isConstClassMaybeUsedAsLock$10(com.android.tools.r8.code.CfOrDexInstruction):1103:1103 -> a
+    3416:3416:boolean com.android.tools.r8.cf.code.CfInstruction.isLabel():0:0 -> a
+    3416:3416:boolean lambda$isConstClassMaybeUsedAsLock$10(com.android.tools.r8.code.CfOrDexInstruction):1103 -> a
+    3417:3417:boolean lambda$isConstClassMaybeUsedAsLock$10(com.android.tools.r8.code.CfOrDexInstruction):1104:1104 -> a
+    3418:3418:boolean com.android.tools.r8.cf.code.CfInstruction.isPosition():0:0 -> a
+    3418:3418:boolean lambda$isConstClassMaybeUsedAsLock$10(com.android.tools.r8.code.CfOrDexInstruction):1104 -> a
+    3419:3419:com.android.tools.r8.shaking.KeepReason lambda$internalTraceConstClassOrCheckCast$11(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):1135:1135 -> a
+    3420:3426:com.android.tools.r8.utils.Visibility computeMinimumRequiredVisibilityForInitClassField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1197:1203 -> a
+    3427:3427:void traceTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1232:1232 -> a
+    3427:3427:void internalTraceConstClassOrCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,boolean):1125 -> a
+    3428:3436:void internalTraceConstClassOrCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,boolean):1126:1134 -> a
+    3437:3437:void lambda$traceInvokeDirect$14(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1250:1250 -> a
+    3438:3440:boolean registerDeferredActionForDeadProtoBuilder(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Action):1262:1264 -> a
+    3441:3441: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):1266:1266 -> a
+    3442:3442:boolean lambda$registerDeferredActionForDeadProtoBuilder$15(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.Action):1267:1267 -> a
+    3443:3448:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1279:1284 -> a
+    3449:3449:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    3449:3449:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1284 -> a
+    3450:3451:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1286:1287 -> a
+    3452:3452:void lambda$traceInvokeDirect$17(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):1287:1287 -> a
+    3453:3453:void lambda$traceNewInstance$22(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1399:1399 -> a
+    3454:3454:void traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):1422:1422 -> a
+    3455:3455:boolean com.android.tools.r8.graph.DexClass.isAnnotation():652:652 -> a
+    3455:3455: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):1424 -> a
+    3456:3459: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):1424:1427 -> a
+    3460:3460: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):1425:1425 -> a
+    3461:3461: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):1459:1459 -> a
+    3462:3462:void lambda$traceStaticFieldRead$26(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):1582:1582 -> a
+    3463:3463:java.lang.Boolean lambda$traceStaticFieldRead$27(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):1611:1611 -> a
+    3464:3476:void markTypeAsLive(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):1743:1755 -> a
+    3477:3479:void markTypeAsLive(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition):1759:1761 -> a
+    3480:3480:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):1766:1766 -> a
+    3481:3485:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1780:1784 -> a
+    3486:3486:boolean com.android.tools.r8.shaking.Enqueuer$Mode.isFinalMainDexTracing():220:220 -> a
+    3486:3486:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1784 -> a
+    3487:3490:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1784:1784 -> a
+    3491:3491: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":5413,"2":5414,"3":5415}}
+    5413:5413:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1784:1784 -> a
+    5414:5414:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1784:1784 -> a
+    5415:5415:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1784:1784 -> a
+    5278:5280:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1787:1789 -> a
+    5281:5281:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap.isUnboxedEnum(com.android.tools.r8.graph.DexProgramClass):28:28 -> a
+    5281:5281:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1789 -> a
+    5282:5322:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1789:1829 -> a
+    5323:5323:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    5323:5323:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1829 -> a
+    5324:5335:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1832:1843 -> a
+    5336:5339:void warnIfClassExtendsInterfaceOrImplementsClass(com.android.tools.r8.graph.DexProgramClass):788:791 -> a
+    5336:5339:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1847 -> a
+    5340:5340: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":5416,"2":5417,"3":5418}}
+    5416:5416:void warnIfClassExtendsInterfaceOrImplementsClass(com.android.tools.r8.graph.DexProgramClass):791:791 -> a
+    5416:5416:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1847 -> a
+    5417:5417:void warnIfClassExtendsInterfaceOrImplementsClass(com.android.tools.r8.graph.DexProgramClass):791:791 -> a
+    5417:5417:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1847 -> a
+    5418:5418:void warnIfClassExtendsInterfaceOrImplementsClass(com.android.tools.r8.graph.DexProgramClass):791:791 -> a
+    5418:5418:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1847 -> a
+    5341:5343:void warnIfClassExtendsInterfaceOrImplementsClass(com.android.tools.r8.graph.DexProgramClass):794:796 -> a
+    5341:5343:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1847 -> a
+    5344:5356:void warnIfClassExtendsInterfaceOrImplementsClass(com.android.tools.r8.graph.DexProgramClass):791:803 -> a
+    5344:5356:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1847 -> a
+    5357:5357: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":5430,"2":5431,"3":5432}}
+    5430:5430:void warnIfClassExtendsInterfaceOrImplementsClass(com.android.tools.r8.graph.DexProgramClass):803:803 -> a
+    5430:5430:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1847 -> a
+    5431:5431:void warnIfClassExtendsInterfaceOrImplementsClass(com.android.tools.r8.graph.DexProgramClass):803:803 -> a
+    5431:5431:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1847 -> a
+    5432:5432:void warnIfClassExtendsInterfaceOrImplementsClass(com.android.tools.r8.graph.DexProgramClass):803:803 -> a
+    5432:5432:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1847 -> a
+    5358:5360:void warnIfClassExtendsInterfaceOrImplementsClass(com.android.tools.r8.graph.DexProgramClass):806:808 -> a
+    5358:5360:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1847 -> a
+    5361:5361:void warnIfClassExtendsInterfaceOrImplementsClass(com.android.tools.r8.graph.DexProgramClass):803:803 -> a
+    5361:5361:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1847 -> a
+    5362:5381:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1851:1870 -> a
+    5382:5393:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):902:913 -> a
+    5382:5393:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1871 -> a
+    5394:5397:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1875:1878 -> a
+    5398:5398:boolean com.android.tools.r8.graph.DexClass.isAnnotation():652:652 -> a
+    5398:5398:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1881 -> a
+    5399:5405:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1882:1888 -> a
+    5406:5406:java.util.Set com.android.tools.r8.shaking.RootSetUtils$RootSetBase.getDependentKeepClassCompatRule(com.android.tools.r8.graph.DexType):1607:1607 -> a
+    5406:5406:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1888 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    5431:5435:void compatEnqueueHolderIfDependentNonStaticMember(com.android.tools.r8.graph.DexProgramClass,java.util.Set):927:931 -> a
-    5431:5435:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1895 -> a
-    5436:5436:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1898:1898 -> a
-    5457:5457:com.android.tools.r8.graph.DexAnnotation$AnnotatedKind lambda$markTypeAsLive$32(com.android.tools.r8.graph.ProgramDefinition):1892:1892 -> a
-    5458:5458:void lambda$markTypeAsLive$33(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1898:1898 -> a
-    5459:5462:void processDeferredAnnotations(com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.function.Function):1906:1909 -> a
-    5463:5465:void processDeferredAnnotations(com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.function.Function):1908:1910 -> a
-    5466:5466:boolean lambda$processDeferredAnnotations$34(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotation):1909:1909 -> a
-    5467:5467:void lambda$processDeferredAnnotations$36(java.util.function.Function,com.android.tools.r8.graph.DexAnnotation,java.util.List):1912:1912 -> a
-    5468:5468:void lambda$processDeferredAnnotations$35(com.android.tools.r8.graph.DexAnnotation,java.util.function.Function,com.android.tools.r8.graph.ProgramDefinition):1915:1915 -> a
-    5469:5469:void lambda$processDeferredAnnotations$35(com.android.tools.r8.graph.DexAnnotation,java.util.function.Function,com.android.tools.r8.graph.ProgramDefinition):1914:1914 -> a
-    5470:5473:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.ClassDefinition):1920:1923 -> a
-    5474:5476:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.ClassDefinition):1922:1924 -> a
-    5477:5477:void com.android.tools.r8.graph.MethodCollection.forEachVirtualMethod(java.util.function.Consumer):126:126 -> a
-    5477:5477:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.ClassDefinition):1924 -> a
+    5407:5411:void compatEnqueueHolderIfDependentNonStaticMember(com.android.tools.r8.graph.DexProgramClass,java.util.Set):919:923 -> a
+    5407:5411:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1887 -> a
+    5412:5412:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1890:1890 -> a
+    5433:5433:com.android.tools.r8.graph.DexAnnotation$AnnotatedKind lambda$markTypeAsLive$32(com.android.tools.r8.graph.ProgramDefinition):1884:1884 -> a
+    5434:5434:void lambda$markTypeAsLive$33(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1890:1890 -> a
+    5435:5438:void processDeferredAnnotations(com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.function.Function):1898:1901 -> a
+    5439:5441:void processDeferredAnnotations(com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.function.Function):1900:1902 -> a
+    5442:5442:boolean lambda$processDeferredAnnotations$34(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotation):1901:1901 -> a
+    5443:5443:void lambda$processDeferredAnnotations$36(java.util.function.Function,com.android.tools.r8.graph.DexAnnotation,java.util.List):1904:1904 -> a
+    5444:5444:void lambda$processDeferredAnnotations$35(com.android.tools.r8.graph.DexAnnotation,java.util.function.Function,com.android.tools.r8.graph.ProgramDefinition):1907:1907 -> a
+    5445:5445:void lambda$processDeferredAnnotations$35(com.android.tools.r8.graph.DexAnnotation,java.util.function.Function,com.android.tools.r8.graph.ProgramDefinition):1906:1906 -> a
+    5446:5449:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.ClassDefinition):1912:1915 -> a
+    5450:5452:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.ClassDefinition):1914:1916 -> a
+    5453:5453:void com.android.tools.r8.graph.MethodCollection.forEachVirtualMethod(java.util.function.Consumer):126:126 -> a
+    5453:5453:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.ClassDefinition):1916 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    5478:5478:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1929:1929 -> a
-    5479:5481:boolean lambda$ensureMethodsContinueToWidenAccess$38(com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):1931:1933 -> a
-    5482:5487:boolean com.android.tools.r8.graph.AppInfoWithClassHierarchy.methodDefinedInInterfaces(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):509:514 -> a
-    5482:5487:boolean lambda$ensureMethodsContinueToWidenAccess$38(com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):1933 -> a
+    5454:5454:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1921:1921 -> a
+    5455:5457:boolean lambda$ensureMethodsContinueToWidenAccess$38(com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):1923:1925 -> a
+    5458:5463:boolean com.android.tools.r8.graph.AppInfoWithClassHierarchy.methodDefinedInInterfaces(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):509:514 -> a
+    5458:5463:boolean lambda$ensureMethodsContinueToWidenAccess$38(com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):1925 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    5488:5488:void lambda$ensureMethodsContinueToWidenAccess$39(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.ProgramMethod):1934:1934 -> a
-    5489:5492:void processAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2014:2017 -> a
-    5493:5498:boolean shouldKeepAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,boolean):2047:2052 -> a
-    5493:5498:void processAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2018 -> a
-    5499:5516:void processAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2022:2039 -> a
-    5517:5517:java.util.List lambda$processAnnotation$42(com.android.tools.r8.graph.DexAnnotation):2026:2026 -> a
-    5518:5521:com.android.tools.r8.graph.FieldResolutionResult resolveField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDefinition):2058:2061 -> a
-    5522:5523:void recordFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDerivedContext):658:659 -> a
-    5522:5523:com.android.tools.r8.graph.FieldResolutionResult resolveField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDefinition):2060 -> a
-    5524:5525:com.android.tools.r8.graph.FieldResolutionResult resolveField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDefinition):2063:2064 -> a
-    5526:5527:void recordFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDerivedContext):658:659 -> a
-    5526:5527:com.android.tools.r8.graph.FieldResolutionResult resolveField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDefinition):2065 -> a
-    5528:5559:void handleInvokeOfDirectTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2222:2253 -> a
-    5560:5584:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2258:2282 -> a
-    5585:5585:boolean com.android.tools.r8.errors.dontwarn.DontWarnConfiguration.matches(com.android.tools.r8.graph.Definition):27:27 -> a
-    5585:5585:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2282 -> a
-    5586:5587:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2287:2288 -> a
-    5588:5588: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":7887,"2":7888,"3":7889}}
-    7887:7887:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2288:2288 -> a
-    7888:7888:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2288:2288 -> a
-    7889:7889:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2288:2288 -> a
-    7876:7886:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2288:2298 -> a
-    7890:7892: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):2276:2278 -> a
-    7893:7897:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2310:2314 -> a
-    7898:7898:void com.android.tools.r8.graph.DexProgramClass.forEachProgramField(java.util.function.Consumer):199:199 -> a
-    7898:7898:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2314 -> a
-    7899:7899:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2320:2320 -> a
-    7900:7902:void lambda$keepClassAndAllMembers$45(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramField):2316:2318 -> a
-    7903:7905:void lambda$keepClassAndAllMembers$46(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramMethod):2322:2324 -> a
-    7906:7906:void ignoreMissingClass(com.android.tools.r8.graph.DexType):2329:2329 -> a
-    7906:7906:void ignoreMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2333 -> a
-    7906:7906:void access$2700(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):190 -> a
+    5464:5464:void lambda$ensureMethodsContinueToWidenAccess$39(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.ProgramMethod):1926:1926 -> a
+    5465:5468:void processAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2006:2009 -> a
+    5469:5474:boolean shouldKeepAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,boolean):2039:2044 -> a
+    5469:5474:void processAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2010 -> a
+    5475:5492:void processAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2014:2031 -> a
+    5493:5493:java.util.List lambda$processAnnotation$42(com.android.tools.r8.graph.DexAnnotation):2018:2018 -> a
+    5494:5497:com.android.tools.r8.graph.FieldResolutionResult resolveField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDefinition):2050:2053 -> a
+    5498:5499:void recordFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDerivedContext):650:651 -> a
+    5498:5499:com.android.tools.r8.graph.FieldResolutionResult resolveField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDefinition):2052 -> a
+    5500:5501:com.android.tools.r8.graph.FieldResolutionResult resolveField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDefinition):2055:2056 -> a
+    5502:5503:void recordFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDerivedContext):650:651 -> a
+    5502:5503:com.android.tools.r8.graph.FieldResolutionResult resolveField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDefinition):2057 -> a
+    5504:5535:void handleInvokeOfDirectTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2214:2245 -> a
+    5536:5560:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2250:2274 -> a
+    5561:5561:boolean com.android.tools.r8.errors.dontwarn.DontWarnConfiguration.matches(com.android.tools.r8.graph.Definition):27:27 -> a
+    5561:5561:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2274 -> a
+    5562:5563:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2279:2280 -> a
+    5564:5564: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":7855,"2":7856,"3":7857}}
+    7855:7855:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2280:2280 -> a
+    7856:7856:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2280:2280 -> a
+    7857:7857:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2280:2280 -> a
+    7844:7854:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2280:2290 -> a
+    7858:7860: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):2268:2270 -> a
+    7861:7865:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2302:2306 -> a
+    7866:7866:void com.android.tools.r8.graph.DexProgramClass.forEachProgramField(java.util.function.Consumer):199:199 -> a
+    7866:7866:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2306 -> a
+    7867:7867:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2312:2312 -> a
+    7868:7870:void lambda$keepClassAndAllMembers$45(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramField):2308:2310 -> a
+    7871:7873:void lambda$keepClassAndAllMembers$46(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramMethod):2314:2316 -> a
+    7874:7874:void ignoreMissingClass(com.android.tools.r8.graph.DexType):2321:2321 -> a
+    7874:7874:void ignoreMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2325 -> a
+    7874:7874:void access$2700(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):189 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    7907:7907:void ignoreMissingClass(com.android.tools.r8.graph.DexType):2329:2329 -> a
-    7907:7907:void ignoreMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2333 -> a
-    7908:7908:void ignoreMissingClass(com.android.tools.r8.graph.DexType):2329:2329 -> a
-    7908:7908:void ignoreMissingClasspathOrLibraryClass(com.android.tools.r8.graph.DexType):2337 -> a
-    7908:7908:void ignoreMissingClasspathOrLibraryClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ClasspathOrLibraryDefinition):2342 -> a
-    7909:7909: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):2382:2382 -> a
-    7910:7910:boolean com.android.tools.r8.graph.DexClass.isAnnotation():652:652 -> a
-    7910:7910: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):2382 -> a
+    7875:7875:void ignoreMissingClass(com.android.tools.r8.graph.DexType):2321:2321 -> a
+    7875:7875:void ignoreMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2325 -> a
+    7876:7876:void ignoreMissingClass(com.android.tools.r8.graph.DexType):2321:2321 -> a
+    7876:7876:void ignoreMissingClasspathOrLibraryClass(com.android.tools.r8.graph.DexType):2329 -> a
+    7876:7876:void ignoreMissingClasspathOrLibraryClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ClasspathOrLibraryDefinition):2334 -> a
+    7877:7877: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):2374:2374 -> a
+    7878:7878:boolean com.android.tools.r8.graph.DexClass.isAnnotation():652:652 -> a
+    7878:7878: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):2374 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    7911:7917: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):2382:2388 -> a
-    7918:7919: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):2417:2418 -> a
-    7918:7919: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):2391 -> a
-    7920:7921: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):2395:2396 -> a
-    7922:7922:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    7922:7922: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):2396 -> a
-    7923:7925: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):2399:2401 -> a
-    7926:7926:boolean com.android.tools.r8.graph.DexClass.isAnnotation():652:652 -> a
-    7926:7926:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2479 -> a
-    7926:7926: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):2404 -> a
-    7927:7928:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2479:2480 -> a
-    7927:7928: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):2404 -> a
-    7929:7929:com.android.tools.r8.shaking.InstantiatedObject com.android.tools.r8.shaking.InstantiatedObject.of(com.android.tools.r8.graph.DexProgramClass):13:13 -> a
-    7929:7929:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2482 -> a
-    7929:7929: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):2404 -> a
-    7930:7930:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2482:2482 -> a
-    7930:7930: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):2404 -> a
-    7931:7931:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2481:2481 -> a
-    7931:7931: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):2404 -> a
-    7932:7941:void transitionFieldsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2666:2675 -> a
-    7932:7941: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
-    7942:7942:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2679:2679 -> a
-    7942:7942: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
-    7943:7943:boolean com.android.tools.r8.graph.DexClass.isAnnotation():652:652 -> a
-    7943:7943:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2679 -> a
-    7943:7943: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
-    7944:7946:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2679:2681 -> a
-    7944:7946: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
-    7947:7947:void lambda$processNewlyInstantiatedClass$47(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2389:2389 -> a
-    7948:7948:void markAnnotationAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2423:2423 -> a
-    7949:7949:boolean com.android.tools.r8.graph.DexClass.isAnnotation():652:652 -> a
-    7949:7949:void markAnnotationAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2423 -> a
+    7879:7885: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):2374:2380 -> a
+    7886:7887: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):2409:2410 -> a
+    7886:7887: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):2383 -> a
+    7888:7889: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):2387:2388 -> a
+    7890:7890:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    7890:7890: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):2388 -> a
+    7891:7893: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):2391:2393 -> a
+    7894:7894:boolean com.android.tools.r8.graph.DexClass.isAnnotation():652:652 -> a
+    7894:7894:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2471 -> a
+    7894:7894: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):2396 -> a
+    7895:7896:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2471:2472 -> a
+    7895:7896: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):2396 -> a
+    7897:7897:com.android.tools.r8.shaking.InstantiatedObject com.android.tools.r8.shaking.InstantiatedObject.of(com.android.tools.r8.graph.DexProgramClass):13:13 -> a
+    7897:7897:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2474 -> a
+    7897:7897: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):2396 -> a
+    7898:7898:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2474:2474 -> a
+    7898:7898: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):2396 -> a
+    7899:7899:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2473:2473 -> a
+    7899:7899: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):2396 -> a
+    7900:7909:void transitionFieldsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2658:2667 -> a
+    7900:7909: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
+    7910:7910:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2671:2671 -> a
+    7910:7910: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):2400 -> a
+    7911:7911:boolean com.android.tools.r8.graph.DexClass.isAnnotation():652:652 -> a
+    7911:7911:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2671 -> a
+    7911:7911: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):2400 -> a
+    7912:7914:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2671:2673 -> a
+    7912:7914: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):2400 -> a
+    7915:7915:void lambda$processNewlyInstantiatedClass$47(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2381:2381 -> a
+    7916:7916:void markAnnotationAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2415:2415 -> a
+    7917:7917:boolean com.android.tools.r8.graph.DexClass.isAnnotation():652:652 -> a
+    7917:7917:void markAnnotationAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2415 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    7950:7954:void markAnnotationAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2423:2427 -> a
-    7955:7956:void transitionDependentItemsForInstantiatedInterface(com.android.tools.r8.graph.DexProgramClass):2685:2686 -> a
-    7955:7956:void markAnnotationAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2428 -> a
-    7957:7965:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2494:2502 -> a
-    7966:7980:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2578:2592 -> a
-    7966:7980:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2504 -> a
-    7981:7981:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2589:2589 -> a
-    7981:7981:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2504 -> a
-    7982:7982:boolean com.android.tools.r8.shaking.InstantiatedObject.isClass():0:0 -> a
-    7982:7982:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2599 -> a
-    7982:7982:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2504 -> a
-    7983:7985:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2599:2601 -> a
-    7983:7985:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2504 -> a
-    7986:7990:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2600:2604 -> a
-    7986:7990:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2504 -> a
-    7991:7997:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2603:2609 -> a
-    7991:7997:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2504 -> a
-    7998:7998:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2606:2606 -> a
-    7998:7998:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2504 -> a
-    7999:8002:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2506:2509 -> a
-    8003:8003:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass):2520:2520 -> a
-    8004:8004:boolean com.android.tools.r8.shaking.InstantiatedObject.isLambda():0:0 -> a
-    8004:8004:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass):2520 -> a
-    8005:8007:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass):2520:2520 -> a
-    8008:8008:java.util.Map getReachableVirtualTargets(com.android.tools.r8.graph.DexProgramClass):2515:2515 -> a
-    8008:8008:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass):2522 -> a
-    8009:8010:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass):2522:2523 -> a
-    8011:8025:void lambda$markProgramMethodOverridesAsLive$54(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):2525:2539 -> a
-    8026:8036:void lambda$markProgramMethodOverridesAsLive$53(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):2541:2551 -> a
-    8037:8037:void com.android.tools.r8.graph.LookupResult.forEach(java.util.function.Consumer):33:33 -> a
-    8037:8037:void lambda$markProgramMethodOverridesAsLive$53(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):2551 -> a
+    7918:7922:void markAnnotationAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2415:2419 -> a
+    7923:7924:void transitionDependentItemsForInstantiatedInterface(com.android.tools.r8.graph.DexProgramClass):2677:2678 -> a
+    7923:7924:void markAnnotationAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2420 -> a
+    7925:7933:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2486:2494 -> a
+    7934:7948:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2570:2584 -> a
+    7934:7948:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2496 -> a
+    7949:7949:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2581:2581 -> a
+    7949:7949:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2496 -> a
+    7950:7950:boolean com.android.tools.r8.shaking.InstantiatedObject.isClass():0:0 -> a
+    7950:7950:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2591 -> a
+    7950:7950:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2496 -> a
+    7951:7953:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2591:2593 -> a
+    7951:7953:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2496 -> a
+    7954:7958:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2592:2596 -> a
+    7954:7958:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2496 -> a
+    7959:7965:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2595:2601 -> a
+    7959:7965:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2496 -> a
+    7966:7966:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2598:2598 -> a
+    7966:7966:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2496 -> a
+    7967:7970:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2498:2501 -> a
+    7971:7971:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass):2512:2512 -> a
+    7972:7972:boolean com.android.tools.r8.shaking.InstantiatedObject.isLambda():0:0 -> a
+    7972:7972:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass):2512 -> a
+    7973:7975:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass):2512:2512 -> a
+    7976:7976:java.util.Map getReachableVirtualTargets(com.android.tools.r8.graph.DexProgramClass):2507:2507 -> a
+    7976:7976:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass):2514 -> a
+    7977:7978:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass):2514:2515 -> a
+    7979:7993:void lambda$markProgramMethodOverridesAsLive$54(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):2517:2531 -> a
+    7994:8004:void lambda$markProgramMethodOverridesAsLive$53(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):2533:2543 -> a
+    8005:8005:void com.android.tools.r8.graph.LookupResult.forEach(java.util.function.Consumer):33:33 -> a
+    8005:8005:void lambda$markProgramMethodOverridesAsLive$53(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 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8038:8038:void lambda$markProgramMethodOverridesAsLive$53(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):2559:2559 -> a
-    8039:8040:void lambda$markProgramMethodOverridesAsLive$48(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):2546:2547 -> a
-    8041:8041:boolean lambda$markProgramMethodOverridesAsLive$49(com.android.tools.r8.graph.DexDefinition):2550:2550 -> a
-    8042:8042: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
-    8042:8042:boolean lambda$markProgramMethodOverridesAsLive$49(com.android.tools.r8.graph.DexDefinition):2550 -> a
+    8006:8006:void lambda$markProgramMethodOverridesAsLive$53(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):2551:2551 -> a
+    8007:8008:void lambda$markProgramMethodOverridesAsLive$48(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):2538:2539 -> a
+    8009:8009:boolean lambda$markProgramMethodOverridesAsLive$49(com.android.tools.r8.graph.DexDefinition):2542:2542 -> a
+    8010:8010: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
+    8010:8010:boolean lambda$markProgramMethodOverridesAsLive$49(com.android.tools.r8.graph.DexDefinition):2542 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8043:8043:void lambda$markProgramMethodOverridesAsLive$51(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.LookupTarget):2553:2553 -> a
-    8044:8046:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markProgramMethodOverridesAsLive$50(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod):2556:2556 -> a
-    8047:8053:void lambda$markProgramMethodOverridesAsLive$52(com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.graph.DexEncodedMethod):2562:2568 -> a
-    8054:8054:void lambda$markProgramMethodOverridesAsLive$52(com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.graph.DexEncodedMethod):2566:2566 -> a
-    8055:8055:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):2618:2618 -> a
-    8056:8098:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.LookupTarget):4170:4212 -> a
-    8056:8098:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):2622 -> a
-    8099:8099:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):2625:2625 -> a
-    8100:8100:boolean com.android.tools.r8.shaking.InstantiatedObject.isClass():0:0 -> a
-    8100:8100:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):2630 -> a
-    8101:8101:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):2633:2633 -> a
-    8102:8102:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):2632:2632 -> a
-    8103:8103:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markLibraryOrClasspathOverrideLive$55(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod):2628:2628 -> a
-    8104:8115:void markOverridesAsLibraryMethodOverrides(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):2639:2650 -> a
-    8116:8118:void lambda$markOverridesAsLibraryMethodOverrides$56(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexType):2652:2654 -> a
-    8119:8138:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2750:2769 -> a
-    8139:8139:void lambda$markFieldAsLive$57(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2769:2769 -> a
-    8140:8140:void lambda$markFieldAsReachable$59(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2795:2795 -> a
-    8141:8143:void traceFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod):2806:2808 -> a
-    8144:8144:boolean isFieldLive(com.android.tools.r8.graph.DexEncodedField):2847:2847 -> a
-    8145:8146:boolean isFieldWrittenInMethodSatisfying(com.android.tools.r8.graph.ProgramField,java.util.function.Predicate):2857:2858 -> a
-    8147:8147:boolean isMethodLive(com.android.tools.r8.graph.DexEncodedMethod):2901:2901 -> a
-    8148:8148:boolean isMethodLive(com.android.tools.r8.graph.ProgramMethod):2905:2905 -> a
-    8148:8148:void lambda$desugar$88(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):3600 -> a
-    8149:8149:boolean isMethodLive(com.android.tools.r8.graph.DexEncodedMethod):2901:2901 -> a
-    8149:8149:boolean isMethodLive(com.android.tools.r8.graph.ProgramMethod):2905 -> a
-    8149:8149:void lambda$desugar$88(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):3600 -> a
-    8150:8150:void lambda$desugar$88(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):3603:3603 -> a
-    8151:8152:boolean isNonProgramTypeLive(com.android.tools.r8.graph.DexClass):2927:2928 -> a
-    8153:8163:boolean isReachable(com.android.tools.r8.graph.Definition):2932:2942 -> a
-    8164:8164:boolean isFieldLive(com.android.tools.r8.graph.ProgramField):2843:2843 -> a
-    8164:8164:boolean isReachable(com.android.tools.r8.graph.Definition):2943 -> a
-    8165:8165:boolean isFieldReferenced(com.android.tools.r8.graph.ProgramField):2839:2839 -> a
-    8165:8165:boolean isReachable(com.android.tools.r8.graph.Definition):2943 -> a
-    8166:8168:boolean isReachable(com.android.tools.r8.graph.Definition):2945:2947 -> a
-    8169:8169:boolean isMethodTargeted(com.android.tools.r8.graph.ProgramMethod):2913:2913 -> a
-    8169:8169:boolean isReachable(com.android.tools.r8.graph.Definition):2947 -> a
-    8170:8170:boolean isMethodTargeted(com.android.tools.r8.graph.DexEncodedMethod):2909:2909 -> a
-    8170:8170:boolean isMethodTargeted(com.android.tools.r8.graph.ProgramMethod):2913 -> a
-    8170:8170:boolean isReachable(com.android.tools.r8.graph.Definition):2947 -> a
-    8171:8171:boolean isReachable(com.android.tools.r8.graph.Definition):2951:2951 -> a
-    8172:8172:void forAllLiveClasses(java.util.function.Consumer):2955:2955 -> a
-    8173:8189:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2960:2976 -> a
-    8190:8193: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):2085:2088 -> a
-    8190:8193:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2980 -> a
-    8194:8199: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:2092 -> a
-    8194:8199:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2980 -> a
-    8200:8204: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):2091:2095 -> a
-    8200:8204:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2980 -> a
-    8205:8205:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2985:2985 -> a
-    8206:8206:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.ProgramMethod.getContextClass():135:135 -> a
-    8206:8206:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2993 -> a
+    8011:8011:void lambda$markProgramMethodOverridesAsLive$51(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.LookupTarget):2545:2545 -> a
+    8012:8014:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markProgramMethodOverridesAsLive$50(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod):2548:2548 -> a
+    8015:8021:void lambda$markProgramMethodOverridesAsLive$52(com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.graph.DexEncodedMethod):2554:2560 -> a
+    8022:8022:void lambda$markProgramMethodOverridesAsLive$52(com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.graph.DexEncodedMethod):2558:2558 -> a
+    8023:8023:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):2610:2610 -> a
+    8024:8066:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.LookupTarget):4162:4204 -> a
+    8024:8066:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):2614 -> a
+    8067:8067:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):2617:2617 -> a
+    8068:8068:boolean com.android.tools.r8.shaking.InstantiatedObject.isClass():0:0 -> a
+    8068:8068:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):2622 -> a
+    8069:8069:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):2625:2625 -> a
+    8070:8070:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):2624:2624 -> a
+    8071:8071:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markLibraryOrClasspathOverrideLive$55(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod):2620:2620 -> a
+    8072:8083:void markOverridesAsLibraryMethodOverrides(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):2631:2642 -> a
+    8084:8086:void lambda$markOverridesAsLibraryMethodOverrides$56(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexType):2644:2646 -> a
+    8087:8106:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2742:2761 -> a
+    8107:8107:void lambda$markFieldAsLive$57(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2761:2761 -> a
+    8108:8108:void lambda$markFieldAsReachable$59(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2787:2787 -> a
+    8109:8111:void traceFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod):2798:2800 -> a
+    8112:8112:boolean isFieldLive(com.android.tools.r8.graph.DexEncodedField):2839:2839 -> a
+    8113:8114:boolean isFieldWrittenInMethodSatisfying(com.android.tools.r8.graph.ProgramField,java.util.function.Predicate):2849:2850 -> a
+    8115:8115:boolean isMethodLive(com.android.tools.r8.graph.DexEncodedMethod):2893:2893 -> a
+    8116:8116:boolean isMethodLive(com.android.tools.r8.graph.ProgramMethod):2897:2897 -> a
+    8116:8116:void lambda$desugar$88(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):3592 -> a
+    8117:8117:boolean isMethodLive(com.android.tools.r8.graph.DexEncodedMethod):2893:2893 -> a
+    8117:8117:boolean isMethodLive(com.android.tools.r8.graph.ProgramMethod):2897 -> a
+    8117:8117:void lambda$desugar$88(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):3592 -> a
+    8118:8118:void lambda$desugar$88(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):3595:3595 -> a
+    8119:8120:boolean isNonProgramTypeLive(com.android.tools.r8.graph.DexClass):2919:2920 -> a
+    8121:8131:boolean isReachable(com.android.tools.r8.graph.Definition):2924:2934 -> a
+    8132:8132:boolean isFieldLive(com.android.tools.r8.graph.ProgramField):2835:2835 -> a
+    8132:8132:boolean isReachable(com.android.tools.r8.graph.Definition):2935 -> a
+    8133:8133:boolean isFieldReferenced(com.android.tools.r8.graph.ProgramField):2831:2831 -> a
+    8133:8133:boolean isReachable(com.android.tools.r8.graph.Definition):2935 -> a
+    8134:8136:boolean isReachable(com.android.tools.r8.graph.Definition):2937:2939 -> a
+    8137:8137:boolean isMethodTargeted(com.android.tools.r8.graph.ProgramMethod):2905:2905 -> a
+    8137:8137:boolean isReachable(com.android.tools.r8.graph.Definition):2939 -> a
+    8138:8138:boolean isMethodTargeted(com.android.tools.r8.graph.DexEncodedMethod):2901:2901 -> a
+    8138:8138:boolean isMethodTargeted(com.android.tools.r8.graph.ProgramMethod):2905 -> a
+    8138:8138:boolean isReachable(com.android.tools.r8.graph.Definition):2939 -> a
+    8139:8139:boolean isReachable(com.android.tools.r8.graph.Definition):2943:2943 -> a
+    8140:8140:void forAllLiveClasses(java.util.function.Consumer):2947:2947 -> a
+    8141:8157:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2952:2968 -> a
+    8158:8161: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):2077:2080 -> a
+    8158:8161:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2972 -> a
+    8162:8167: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):2079:2084 -> a
+    8162:8167:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2972 -> a
+    8168:8172: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):2083:2087 -> a
+    8168:8172:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2972 -> a
+    8173:8173:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2977:2977 -> a
+    8174:8174:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.ProgramMethod.getContextClass():135:135 -> a
+    8174:8174:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2985 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8207:8207:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2996:2996 -> a
-    8208:8208:java.util.Map getReachableVirtualTargets(com.android.tools.r8.graph.DexProgramClass):2515:2515 -> a
-    8208:8208:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2997 -> a
-    8209:8217:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2997:3005 -> a
-    8218:8218:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    8218:8218:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3005 -> a
-    8219:8234:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3010:3025 -> a
-    8235:8235:void com.android.tools.r8.graph.LookupResult.forEach(java.util.function.Consumer):33:33 -> a
-    8235:8235:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3032 -> a
+    8175:8175:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2988:2988 -> a
+    8176:8176:java.util.Map getReachableVirtualTargets(com.android.tools.r8.graph.DexProgramClass):2507:2507 -> a
+    8176:8176:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2989 -> a
+    8177:8185:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2989:2997 -> a
+    8186:8186:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    8186:8186:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2997 -> a
+    8187:8202:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3002:3017 -> a
+    8203:8203:void com.android.tools.r8.graph.LookupResult.forEach(java.util.function.Consumer):33:33 -> a
+    8203:8203:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3024 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8236:8236:void lambda$markVirtualMethodAsReachable$62(com.android.tools.r8.graph.DexType,java.util.function.Consumer,java.util.function.Consumer):3029:3029 -> a
-    8237:8237:void lambda$markVirtualMethodAsReachable$65(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.LookupTarget):3034:3034 -> a
-    8238:8240:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markVirtualMethodAsReachable$64(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.ProgramMethod):3037:3037 -> a
-    8241:8244:void markVirtualDispatchTargetAsLive(com.android.tools.r8.graph.LookupTarget,java.util.function.Function):3043:3046 -> a
-    8245:8245:void lambda$markVirtualDispatchTargetAsLive$68(com.android.tools.r8.graph.LookupTarget,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):3046:3046 -> a
-    8246:8248:void markVirtualDispatchTargetAsLive(com.android.tools.r8.graph.DexClassAndMethod,java.util.function.Function):3051:3053 -> a
-    8246:8248:void lambda$markVirtualDispatchTargetAsLive$66(java.util.function.Function,com.android.tools.r8.graph.DexClassAndMethod):3044 -> a
-    8249:8252:void markVirtualDispatchTargetAsLive(com.android.tools.r8.graph.LookupLambdaTarget,java.util.function.Function):3059:3062 -> a
-    8249:8252:void lambda$markVirtualDispatchTargetAsLive$67(java.util.function.Function,com.android.tools.r8.graph.LookupLambdaTarget):3045 -> a
-    8253:8253:void markVirtualDispatchTargetAsLive(com.android.tools.r8.graph.LookupLambdaTarget,java.util.function.Function):3061:3061 -> a
-    8253:8253:void lambda$markVirtualDispatchTargetAsLive$67(java.util.function.Function,com.android.tools.r8.graph.LookupLambdaTarget):3045 -> a
-    8254:8255: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):3071:3072 -> a
-    8256:8259:void lambda$markFailedMethodResolutionTargets$69(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexEncodedMethod):3074:3077 -> a
-    8260:8260:void lambda$markSuperMethodAsReachable$71(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):3126:3126 -> a
-    8261:8261:void lambda$traceMainDex$73(com.android.tools.r8.shaking.MainDexInfo$Builder,com.android.tools.r8.graph.DexEncodedMethod):3167:3167 -> a
-    8262:8268:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3179:3185 -> a
-    8269:8269:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):545:545 -> a
-    8269:8269:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3185 -> a
-    8270:8272:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3189:3191 -> a
-    8273:8273:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):545:545 -> a
-    8273:8273: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 -> a
-    8274:8274: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:3193 -> a
-    8275:8275:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):545:545 -> a
-    8275:8275: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
-    8276:8298:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3196:3218 -> a
-    8299:8302:void finalizeLibraryMethodOverrideInformation():3672:3675 -> a
-    8299:8302:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3219 -> a
-    8303:8304:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3220:3221 -> a
-    8305:8307:boolean verifyKeptGraph():3682:3684 -> a
-    8305:8307: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
-    8308:8313: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:3227 -> a
-    8314:8314:boolean com.android.tools.r8.shaking.Enqueuer$Mode.isWhyAreYouKeeping():233:233 -> a
-    8314:8314:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3227 -> a
-    8315:8315:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3232:3232 -> a
-    8316:8316:void lambda$traceApplication$77(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):3220:3220 -> a
-    8317:8318:void includeMinimumKeepInfo(com.android.tools.r8.shaking.RootSetUtils$RootSetBase):3237:3238 -> a
-    8319:8324:void applyMinimumKeepInfo(com.android.tools.r8.graph.DexProgramClass):3246:3251 -> a
-    8325:8325:void lambda$applyMinimumKeepInfo$78(com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3250:3250 -> a
-    8326:8329:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3259:3262 -> a
+    8204:8204:void lambda$markVirtualMethodAsReachable$62(com.android.tools.r8.graph.DexType,java.util.function.Consumer,java.util.function.Consumer):3021:3021 -> a
+    8205:8205:void lambda$markVirtualMethodAsReachable$65(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.LookupTarget):3026:3026 -> a
+    8206:8208:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markVirtualMethodAsReachable$64(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.ProgramMethod):3029:3029 -> a
+    8209:8212:void markVirtualDispatchTargetAsLive(com.android.tools.r8.graph.LookupTarget,java.util.function.Function):3035:3038 -> a
+    8213:8213:void lambda$markVirtualDispatchTargetAsLive$68(com.android.tools.r8.graph.LookupTarget,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):3038:3038 -> a
+    8214:8216:void markVirtualDispatchTargetAsLive(com.android.tools.r8.graph.DexClassAndMethod,java.util.function.Function):3043:3045 -> a
+    8214:8216:void lambda$markVirtualDispatchTargetAsLive$66(java.util.function.Function,com.android.tools.r8.graph.DexClassAndMethod):3036 -> a
+    8217:8220:void markVirtualDispatchTargetAsLive(com.android.tools.r8.graph.LookupLambdaTarget,java.util.function.Function):3051:3054 -> a
+    8217:8220:void lambda$markVirtualDispatchTargetAsLive$67(java.util.function.Function,com.android.tools.r8.graph.LookupLambdaTarget):3037 -> a
+    8221:8221:void markVirtualDispatchTargetAsLive(com.android.tools.r8.graph.LookupLambdaTarget,java.util.function.Function):3053:3053 -> a
+    8221:8221:void lambda$markVirtualDispatchTargetAsLive$67(java.util.function.Function,com.android.tools.r8.graph.LookupLambdaTarget):3037 -> a
+    8222:8223: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):3063:3064 -> a
+    8224:8227:void lambda$markFailedMethodResolutionTargets$69(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexEncodedMethod):3066:3069 -> a
+    8228:8228:void lambda$markSuperMethodAsReachable$71(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):3118:3118 -> a
+    8229:8229:void lambda$traceMainDex$73(com.android.tools.r8.shaking.MainDexInfo$Builder,com.android.tools.r8.graph.DexEncodedMethod):3159:3159 -> a
+    8230:8236:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3171:3177 -> a
+    8237:8237:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):537:537 -> a
+    8237:8237:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3177 -> a
+    8238:8240: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:3183 -> a
+    8241:8241:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):537:537 -> a
+    8241:8241:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3183 -> a
+    8242:8242:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3185:3185 -> a
+    8243:8243:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):537:537 -> a
+    8243:8243:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3185 -> a
+    8244:8266:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3188:3210 -> a
+    8267:8270:void finalizeLibraryMethodOverrideInformation():3664:3667 -> a
+    8267:8270:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3211 -> a
+    8271:8272: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:3213 -> a
+    8273:8275:boolean verifyKeptGraph():3674:3676 -> a
+    8273:8275:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3213 -> a
+    8276:8281:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3214:3219 -> a
+    8282:8282:boolean com.android.tools.r8.shaking.Enqueuer$Mode.isWhyAreYouKeeping():232:232 -> a
+    8282:8282:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3219 -> a
+    8283:8283: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:3224 -> a
+    8284:8284:void lambda$traceApplication$77(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):3212:3212 -> a
+    8285:8286:void includeMinimumKeepInfo(com.android.tools.r8.shaking.RootSetUtils$RootSetBase):3229:3230 -> a
+    8287:8292:void applyMinimumKeepInfo(com.android.tools.r8.graph.DexProgramClass):3238:3243 -> a
+    8293:8293:void lambda$applyMinimumKeepInfo$78(com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3242:3242 -> a
+    8294:8297:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3251:3254 -> a
+    8298:8298:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateUnconditionalMinimumKeepInfo():74:74 -> a
+    8298:8298:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3255 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    8299:8299:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3256:3256 -> a
+    8300:8300:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):114:114 -> a
+    8300:8300:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3256 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    8301:8301: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
+    8301:8301:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):114 -> a
+    8301:8301:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3256 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
+    8302:8302:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3258:3258 -> a
+    8303:8308:void applyMinimumKeepInfo(com.android.tools.r8.graph.ProgramField):3289:3294 -> a
+    8309:8309:void lambda$applyMinimumKeepInfo$80(com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3293:3293 -> a
+    8310:8313:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3300:3303 -> a
+    8314:8314:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateUnconditionalMinimumKeepInfo():74:74 -> a
+    8314:8314:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3304 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    8315:8315:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3305:3305 -> a
+    8316:8316:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):114:114 -> a
+    8316:8316:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3305 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    8317:8317: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
+    8317:8317:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):114 -> a
+    8317:8317:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3305 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
+    8318:8318:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3307:3307 -> a
+    8319:8324:void applyMinimumKeepInfo(com.android.tools.r8.graph.ProgramMethod):3334:3339 -> a
+    8325:8325:void lambda$applyMinimumKeepInfo$82(com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3338:3338 -> a
+    8326:8329:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3347:3350 -> a
     8330:8330:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateUnconditionalMinimumKeepInfo():74:74 -> a
-    8330:8330:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3263 -> a
+    8330:8330:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3351 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8331:8331:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3264:3264 -> a
+    8331:8331:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3352:3352 -> a
     8332:8332:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):114:114 -> a
-    8332:8332:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3264 -> a
+    8332:8332:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3352 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     8333:8333: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
     8333:8333:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):114 -> a
-    8333:8333:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3264 -> a
+    8333:8333:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3352 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    8334:8334:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3266:3266 -> a
-    8335:8340:void applyMinimumKeepInfo(com.android.tools.r8.graph.ProgramField):3297:3302 -> a
-    8341:8341:void lambda$applyMinimumKeepInfo$80(com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3301:3301 -> a
-    8342:8345:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3308:3311 -> a
-    8346:8346:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateUnconditionalMinimumKeepInfo():74:74 -> a
-    8346:8346:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3312 -> a
+    8334:8340:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3348:3354 -> a
+    8341:8344:void applyMinimumKeepInfoDependentOn(com.android.tools.r8.shaking.EnqueuerEvent):3390:3393 -> a
+    8345:8345:void lambda$applyMinimumKeepInfoDependentOn$84(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3396:3396 -> a
+    8346:8346:void lambda$applyMinimumKeepInfoDependentOn$85(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3398:3398 -> a
+    8347:8347:void lambda$applyMinimumKeepInfoDependentOn$86(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3400:3400 -> a
+    8348:8361:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3571:3584 -> a
+    8362:8362: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):71:71 -> a
+    8362:8362:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3585 -> a
+    8363:8383:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3600:3620 -> a
+    8384:8384:boolean isMethodLive(com.android.tools.r8.graph.ProgramMethod):2897:2897 -> a
+    8384:8384:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3622 -> a
+    8385:8385:boolean isMethodLive(com.android.tools.r8.graph.DexEncodedMethod):2893:2893 -> a
+    8385:8385:boolean isMethodLive(com.android.tools.r8.graph.ProgramMethod):2897 -> a
+    8385:8385:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3622 -> a
+    8386:8394:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3623:3631 -> a
+    8395:8395:void lambda$desugar$89(com.android.tools.r8.ir.desugar.ProgramAdditions,com.android.tools.r8.graph.ProgramMethod):3603:3603 -> a
+    8396:8396:void lambda$desugar$90(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$R8CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):3610:3610 -> a
+    8397:8399:void recordLambdaSynthesizingContext(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.ProgramMethod):3635:3637 -> a
+    8400:8402:void recordConstantDynamicSynthesizingContext(com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass,com.android.tools.r8.graph.ProgramMethod):3642:3644 -> a
+    8403:8435:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3684:3716 -> a
+    8436:8436:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    8436:8436:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3716 -> a
+    8437:8437:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3717:3717 -> a
+    8438:8438:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> a
+    8438:8438:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3718 -> a
+    8439:8473:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3719:3753 -> a
+    8474:8476:java.util.Set toDescriptorSet(java.util.Set):3877:3879 -> a
+    8474:8476:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3753 -> a
+    8477:8483:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3753:3759 -> a
+    8484:8486:java.util.Set toDescriptorSet(java.util.Set):3877:3879 -> a
+    8484:8486:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3759 -> a
+    8487:8504:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3759:3776 -> a
+    8505:8510:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap joinIdentifierNameStrings(java.util.Set,java.util.Set):3886:3891 -> a
+    8505:8510:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3783 -> a
+    8511:8520:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3784:3793 -> a
+    8521:8521:void lambda$createEnqueuerResult$91(java.util.Set,com.android.tools.r8.graph.DexProgramClass):3687:3687 -> a
+    8522:8522:boolean lambda$createEnqueuerResult$92(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessInfoImpl):3693:3693 -> a
+    8523:8533:java.util.Set amendWithCompanionMethods(java.util.Set):3797:3807 -> a
+    8534:8535:void lambda$amendWithCompanionMethods$94(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3803:3804 -> a
+    8536:8552:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3825:3841 -> a
+    8553:8557:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3897:3901 -> a
+    8558:8558:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():318:318 -> a
+    8558:8558:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3901 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8347:8347:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3313:3313 -> a
-    8348:8348:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):114:114 -> a
-    8348:8348:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3313 -> a
+    8559:8559:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3902:3902 -> a
+    8560:8560:com.android.tools.r8.shaking.EnqueuerWorklist$EnqueuerAction com.android.tools.r8.shaking.EnqueuerWorklist.poll():322:322 -> a
+    8560:8560:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3902 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8349:8349: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
-    8349:8349:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):114 -> a
-    8349:8349:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3313 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    8350:8350:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3315:3315 -> a
-    8351:8356:void applyMinimumKeepInfo(com.android.tools.r8.graph.ProgramMethod):3342:3347 -> a
-    8357:8357:void lambda$applyMinimumKeepInfo$82(com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3346:3346 -> a
-    8358:8361:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3355:3358 -> a
-    8362:8362:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateUnconditionalMinimumKeepInfo():74:74 -> a
-    8362:8362:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3359 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8363:8363:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3360:3360 -> a
-    8364:8364:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):114:114 -> a
-    8364:8364:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3360 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8365:8365: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
-    8365:8365:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):114 -> a
-    8365:8365:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3360 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    8366:8372:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3356:3362 -> a
-    8373:8376:void applyMinimumKeepInfoDependentOn(com.android.tools.r8.shaking.EnqueuerEvent):3398:3401 -> a
-    8377:8377:void lambda$applyMinimumKeepInfoDependentOn$84(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3404:3404 -> a
-    8378:8378:void lambda$applyMinimumKeepInfoDependentOn$85(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3406:3406 -> a
-    8379:8379:void lambda$applyMinimumKeepInfoDependentOn$86(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3408:3408 -> a
-    8380:8393:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3579:3592 -> a
-    8394:8394: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):71:71 -> a
-    8394:8394:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3593 -> a
-    8395:8415:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3608:3628 -> a
-    8416:8416:boolean isMethodLive(com.android.tools.r8.graph.ProgramMethod):2905:2905 -> a
-    8416:8416:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3630 -> a
-    8417:8417:boolean isMethodLive(com.android.tools.r8.graph.DexEncodedMethod):2901:2901 -> a
-    8417:8417:boolean isMethodLive(com.android.tools.r8.graph.ProgramMethod):2905 -> a
-    8417:8417:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3630 -> a
-    8418:8426:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3631:3639 -> a
-    8427:8427:void lambda$desugar$89(com.android.tools.r8.ir.desugar.ProgramAdditions,com.android.tools.r8.graph.ProgramMethod):3611:3611 -> a
-    8428:8428:void lambda$desugar$90(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$R8CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):3618:3618 -> a
-    8429:8431:void recordLambdaSynthesizingContext(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.ProgramMethod):3643:3645 -> a
-    8432:8434:void recordConstantDynamicSynthesizingContext(com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass,com.android.tools.r8.graph.ProgramMethod):3650:3652 -> a
-    8435:8467:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3692:3724 -> a
-    8468:8468:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    8468:8468:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3724 -> a
-    8469:8469:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3725:3725 -> a
-    8470:8470:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> a
-    8470:8470:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3726 -> a
-    8471:8505:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3727:3761 -> a
-    8506:8508:java.util.Set toDescriptorSet(java.util.Set):3885:3887 -> a
-    8506:8508:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3761 -> a
-    8509:8515:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3761:3767 -> a
-    8516:8518:java.util.Set toDescriptorSet(java.util.Set):3885:3887 -> a
-    8516:8518:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3767 -> a
-    8519:8536:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3767:3784 -> a
-    8537:8542:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap joinIdentifierNameStrings(java.util.Set,java.util.Set):3894:3899 -> a
-    8537:8542:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3791 -> a
-    8543:8552:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3792:3801 -> a
-    8553:8553:void lambda$createEnqueuerResult$91(java.util.Set,com.android.tools.r8.graph.DexProgramClass):3695:3695 -> a
-    8554:8554:boolean lambda$createEnqueuerResult$92(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessInfoImpl):3701:3701 -> a
-    8555:8565:java.util.Set amendWithCompanionMethods(java.util.Set):3805:3815 -> a
-    8566:8567:void lambda$amendWithCompanionMethods$94(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3811:3812 -> a
-    8568:8584:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3833:3849 -> a
-    8585:8589:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3905:3909 -> a
+    8561:8577:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3903:3919 -> a
+    8578:8578: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):2015:2015 -> a
+    8578:8578:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3920 -> a
+    8579:8589:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3921:3931 -> a
     8590:8590:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():318:318 -> a
-    8590:8590:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3909 -> a
+    8590:8590:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3931 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8591:8591:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3910:3910 -> a
-    8592:8592:com.android.tools.r8.shaking.EnqueuerWorklist$EnqueuerAction com.android.tools.r8.shaking.EnqueuerWorklist.poll():322:322 -> a
-    8592:8592:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3910 -> a
+    8591:8595:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3938:3942 -> a
+    8596:8596:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():318:318 -> a
+    8596:8596:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3942 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8593:8609:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3911:3927 -> a
-    8610:8610: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):2015:2015 -> a
-    8610:8610:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3928 -> a
-    8611:8621:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3929:3939 -> a
-    8622:8622:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():318:318 -> a
-    8622:8622:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3939 -> a
+    8597:8598:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3948:3949 -> a
+    8599:8599:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():318:318 -> a
+    8599:8599:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3949 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8623:8627:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3946:3950 -> a
-    8628:8628:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():318:318 -> a
-    8628:8628:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3950 -> a
+    8600:8616:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3954:3970 -> a
+    8617:8617:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():318:318 -> a
+    8617:8617:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3970 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8629:8630:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3956:3957 -> a
-    8631:8631:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():318:318 -> a
-    8631:8631:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3957 -> a
+    8618:8633:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3978:3993 -> a
+    8634:8634:java.util.Set lambda$trace$95(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):3916:3916 -> a
+    8635:8635:void lambda$trace$96(com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):3948:3948 -> a
+    8636:8636:void lambda$postProcessingDesugaring$97(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):4008:4008 -> a
+    8637:8637:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():761:761 -> a
+    8637:8637:void lambda$postProcessingDesugaring$97(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):4012 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8632:8648:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3962:3978 -> a
-    8649:8649:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():318:318 -> a
-    8649:8649:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3978 -> a
+    8638:8641:void lambda$postProcessingDesugaring$97(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):4012:4015 -> a
+    8642:8642: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
+    8642:8642:void lambda$postProcessingDesugaring$97(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):4008 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8650:8665:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3986:4001 -> a
-    8666:8666:java.util.Set lambda$trace$95(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):3924:3924 -> a
-    8667:8667:void lambda$trace$96(com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):3956:3956 -> a
-    8668:8668:void lambda$postProcessingDesugaring$97(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):4016:4016 -> a
-    8669:8669:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():761:761 -> a
-    8669:8669:void lambda$postProcessingDesugaring$97(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):4020 -> a
+    8643:8649:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet):4055:4061 -> a
+    8650:8652:void lambda$addConsequentRootSet$99(com.android.tools.r8.graph.DexType,java.util.Set):4063:4065 -> a
+    8653:8657:void compatEnqueueHolderIfDependentNonStaticMember(com.android.tools.r8.graph.DexProgramClass,java.util.Set):919:923 -> a
+    8653:8657:void lambda$addConsequentRootSet$99(com.android.tools.r8.graph.DexType,java.util.Set):4066 -> a
+    8658:8665:void identifySyntheticInterfaceMethodBridges(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction):4087:4094 -> a
+    8666:8669:void identifySyntheticInterfaceMethodBridges(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction):4093:4096 -> a
+    8670:8670:void identifySyntheticInterfaceMethodBridges(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction):4095:4095 -> a
+    8671:8678:void retainAnnotationForFinalTreeShaking(java.util.List):4115:4122 -> a
+    8679:8679:void retainAnnotationForFinalTreeShaking(java.util.List):4119:4119 -> a
+    8680:8683:void markFieldAsKept(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):4154:4157 -> a
+    8684:8690:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4229:4235 -> a
+    8691:8691:com.android.tools.r8.shaking.Enqueuer$Mode getMode():517:517 -> a
+    8691:8691:void traceNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod):4289 -> a
+    8691:8691:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4238 -> a
+    8692:8692:void traceNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod):4289:4289 -> a
+    8692:8692:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4238 -> a
+    8693:8693:boolean addToPendingDesugaring(com.android.tools.r8.graph.ProgramMethod):3546:3546 -> a
+    8693:8693:void traceNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod):4290 -> a
+    8693:8693:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4238 -> a
+    8694:8696:boolean mustMoveToInterfaceCompanionMethod(com.android.tools.r8.graph.ProgramMethod):3540:3542 -> a
+    8694:8696:boolean addToPendingDesugaring(com.android.tools.r8.graph.ProgramMethod):3547 -> a
+    8694:8696:void traceNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod):4290 -> a
+    8694:8696:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4238 -> a
+    8697:8712:boolean addToPendingDesugaring(com.android.tools.r8.graph.ProgramMethod):3549:3564 -> a
+    8697:8712:void traceNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod):4290 -> a
+    8697:8712:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4238 -> a
+    8713:8713:void traceNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod):4295:4295 -> a
+    8713:8713:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4238 -> a
+    8714:8718:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4240:4244 -> a
+    8719:8719:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    8719:8719:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4244 -> a
+    8720:8720:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedViaSuperFrom(com.android.tools.r8.graph.ProgramMethod):42:42 -> a
+    8720:8720:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4246 -> a
+    8721:8721:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4246:4246 -> a
+    8722:8722:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedViaSuperFrom(com.android.tools.r8.graph.ProgramMethod):42:42 -> a
+    8722:8722:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4247 -> a
+    8723:8728:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4247:4252 -> a
+    8729:8729:void lambda$markMethodAsLive$100(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):4252:4252 -> a
+    8730:8730:void lambda$markMethodAsTargeted$101(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):4272:4272 -> a
+    8731:8731:void lambda$traceMethodDefinitionExcludingCode$102(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexAnnotation):4282:4282 -> a
+    8732:8732:void lambda$traceCode$103(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):4303:4303 -> a
+    8733:8733:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):4329:4329 -> a
+    8734:8749:boolean addCompatInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):4353:4368 -> a
+    8734:8749:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):4331 -> a
+    8750:8750:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):4335:4335 -> a
+    8751:8751:boolean com.android.tools.r8.graph.DexClass.isAnnotation():652:652 -> a
+    8751:8751:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):4336 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8670:8673:void lambda$postProcessingDesugaring$97(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):4020:4023 -> a
-    8674:8674: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
-    8674:8674:void lambda$postProcessingDesugaring$97(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):4016 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8675:8681:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet):4063:4069 -> a
-    8682:8684:void lambda$addConsequentRootSet$99(com.android.tools.r8.graph.DexType,java.util.Set):4071:4073 -> a
-    8685:8689:void compatEnqueueHolderIfDependentNonStaticMember(com.android.tools.r8.graph.DexProgramClass,java.util.Set):927:931 -> a
-    8685:8689:void lambda$addConsequentRootSet$99(com.android.tools.r8.graph.DexType,java.util.Set):4074 -> a
-    8690:8697:void identifySyntheticInterfaceMethodBridges(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction):4095:4102 -> a
-    8698:8701:void identifySyntheticInterfaceMethodBridges(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction):4101:4104 -> a
-    8702:8702:void identifySyntheticInterfaceMethodBridges(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction):4103:4103 -> a
-    8703:8710:void retainAnnotationForFinalTreeShaking(java.util.List):4123:4130 -> a
-    8711:8711:void retainAnnotationForFinalTreeShaking(java.util.List):4127:4127 -> a
-    8712:8715:void markFieldAsKept(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):4162:4165 -> a
-    8716:8722:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4237:4243 -> a
-    8723:8723:com.android.tools.r8.shaking.Enqueuer$Mode getMode():525:525 -> a
-    8723:8723:void traceNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod):4297 -> a
-    8723:8723:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4246 -> a
-    8724:8724:void traceNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod):4297:4297 -> a
-    8724:8724:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4246 -> a
-    8725:8725:boolean addToPendingDesugaring(com.android.tools.r8.graph.ProgramMethod):3554:3554 -> a
-    8725:8725:void traceNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod):4298 -> a
-    8725:8725:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4246 -> a
-    8726:8728:boolean mustMoveToInterfaceCompanionMethod(com.android.tools.r8.graph.ProgramMethod):3548:3550 -> a
-    8726:8728:boolean addToPendingDesugaring(com.android.tools.r8.graph.ProgramMethod):3555 -> a
-    8726:8728:void traceNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod):4298 -> a
-    8726:8728:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4246 -> a
-    8729:8744:boolean addToPendingDesugaring(com.android.tools.r8.graph.ProgramMethod):3557:3572 -> a
-    8729:8744:void traceNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod):4298 -> a
-    8729:8744:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4246 -> a
-    8745:8745:void traceNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod):4303:4303 -> a
-    8745:8745:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4246 -> a
-    8746:8750:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4248:4252 -> a
-    8751:8751:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    8751:8751:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4252 -> a
-    8752:8752:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedViaSuperFrom(com.android.tools.r8.graph.ProgramMethod):42:42 -> a
-    8752:8752:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4254 -> a
-    8753:8753:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4254:4254 -> a
-    8754:8754:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedViaSuperFrom(com.android.tools.r8.graph.ProgramMethod):42:42 -> a
-    8754:8754:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4255 -> a
-    8755:8760:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4255:4260 -> a
-    8761:8761:void lambda$markMethodAsLive$100(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):4260:4260 -> a
-    8762:8762:void lambda$markMethodAsTargeted$101(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):4280:4280 -> a
-    8763:8763:void lambda$traceMethodDefinitionExcludingCode$102(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexAnnotation):4290:4290 -> a
-    8764:8764:void lambda$traceCode$103(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):4311:4311 -> a
-    8765:8765:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):4337:4337 -> a
-    8766:8781:boolean addCompatInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):4361:4376 -> a
-    8766:8781:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):4339 -> a
-    8782:8782:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):4343:4343 -> a
-    8783:8783:boolean com.android.tools.r8.graph.DexClass.isAnnotation():652:652 -> a
-    8783:8783:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):4344 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8784:8794:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):4345:4355 -> a
-    8795:8795:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):4352:4352 -> a
-    8796:8802:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4394:4400 -> a
-    8803:8810:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4503:4510 -> a
-    8803:8810:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4401 -> a
-    8811:8823:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4509:4521 -> a
-    8811:8823:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4401 -> a
-    8824:8824:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
-    8824:8824:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4523 -> a
-    8824:8824:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4401 -> a
-    8825:8827:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4524:4526 -> a
-    8825:8827:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4401 -> a
-    8828:8828:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4404:4404 -> a
-    8829:8850:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4533:4554 -> a
-    8829:8850:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4405 -> a
-    8851:8864:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4553:4566 -> a
-    8851:8864:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4405 -> a
-    8865:8865:boolean com.android.tools.r8.ir.code.Instruction.isNewArrayEmpty():0:0 -> a
-    8865:8865:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4566 -> a
-    8865:8865:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4405 -> a
-    8866:8914:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4571:4619 -> a
-    8866:8914:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4405 -> a
-    8915:8915:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
-    8915:8915:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4624 -> a
-    8915:8915:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4405 -> a
-    8916:8918:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4625:4627 -> a
-    8916:8918:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4405 -> a
-    8919:8919:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4408:4408 -> a
-    8920:8923:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4704:4707 -> a
-    8920:8923:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4409 -> a
-    8924:8924:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):54:54 -> a
-    8924:8924:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4708 -> a
-    8924:8924:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4409 -> a
-    8925:8925: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
-    8925:8925:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):54 -> a
-    8925:8925:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4708 -> a
-    8925:8925:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4409 -> a
-    8926:8926:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4708:4708 -> a
-    8926:8926:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4409 -> a
-    8927:8931:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4412:4416 -> a
-    8932:8938:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4714:4720 -> a
-    8932:8938:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4417 -> a
-    8939:8939:boolean com.android.tools.r8.ir.code.Instruction.isConstClass():0:0 -> a
-    8939:8939:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4720 -> a
-    8939:8939:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4417 -> a
-    8940:8944:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4721:4725 -> a
-    8940:8944:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4417 -> a
-    8945:8945: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":9040,"2":9041,"3":9042}}
-    9040:9040:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4725:4725 -> a
-    9040:9040:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4417 -> a
-    9041:9041:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4725:4725 -> a
-    9041:9041:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4417 -> a
-    9042:9042:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4725:4725 -> a
-    9042:9042:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4417 -> a
-    8946:8950:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4728:4732 -> a
-    8946:8950:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4417 -> a
-    8951:8951:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4725:4725 -> a
-    8951:8951:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4417 -> a
-    8952:8952:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
-    8952:8952:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4737 -> a
-    8952:8952:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4417 -> a
-    8953:8953:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4737:4737 -> a
-    8953:8953:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4417 -> a
-    8954:8954:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
-    8954:8954:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4739 -> a
-    8954:8954:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4417 -> a
-    8955:8956:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4740:4741 -> a
-    8955:8956:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4417 -> a
-    8957:8966:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4420:4429 -> a
-    8967:8967:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> a
-    8967:8967:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4429 -> a
-    8968:8972:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4430:4434 -> a
-    8973:8973:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
-    8973:8973:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4438 -> a
-    8974:8974:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4438:4438 -> a
-    8975:8975:boolean com.android.tools.r8.graph.DexClass.canBeInstantiatedByNewInstance():644:644 -> a
-    8975:8975:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4439 -> a
-    8976:8976:boolean com.android.tools.r8.graph.DexClass.isAnnotation():652:652 -> a
-    8976:8976:boolean com.android.tools.r8.graph.DexClass.canBeInstantiatedByNewInstance():644 -> a
-    8976:8976:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4439 -> a
-    8977:8977:boolean com.android.tools.r8.graph.DexClass.canBeInstantiatedByNewInstance():644:644 -> a
-    8977:8977:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4439 -> a
-    8978:9008:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4439:4469 -> a
-    9009:9009:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
-    9009:9009:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4470 -> a
-    9010:9015:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4469:4474 -> a
-    9016:9016:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
-    9016:9016:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4476 -> a
-    9017:9031:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4476:4490 -> a
-    9032:9032:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
-    9032:9032:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4491 -> a
-    9033:9037:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4492:4496 -> a
-    9038:9039:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4493:4494 -> a
-    9043:9043:void lambda$handleReflectiveBehavior$106(com.android.tools.r8.shaking.KeepFieldInfo$Joiner):4475:4475 -> a
-    9044:9050:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4637:4643 -> a
-    9051:9051:boolean com.android.tools.r8.ir.code.Instruction.isNewArrayEmpty():0:0 -> a
-    9051:9051:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4643 -> a
-    9052:9065:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4648:4661 -> a
-    9066:9066:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
-    9066:9066:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4662 -> a
-    9067:9082:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4663:4678 -> a
-    9083:9083:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
-    9083:9083:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4679 -> a
-    9084:9084:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4680:4680 -> a
-    9085:9085:void com.android.tools.r8.graph.DexProgramClass.forEachProgramVirtualMethod(java.util.function.Consumer):276:276 -> a
-    9085:9085:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4680 -> a
-    9086:9090:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4689:4693 -> a
-    9091:9091:void lambda$handleJavaLangReflectProxyNewProxyInstance$107(com.android.tools.r8.shaking.KeepClassInfo$Joiner):4674:4674 -> a
-    9092:9094:void lambda$handleJavaLangReflectProxyNewProxyInstance$109(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.ProgramMethod):4682:4684 -> a
-    9095:9095:void lambda$handleJavaLangReflectProxyNewProxyInstance$108(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):4683:4683 -> a
-    9096:9107:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4748:4759 -> a
+    8752:8762:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):4337:4347 -> a
+    8763:8763:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):4344:4344 -> a
+    8764:8770:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4386:4392 -> a
+    8771:8778:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4495:4502 -> a
+    8771:8778:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4393 -> a
+    8779:8791:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4501:4513 -> a
+    8779:8791:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4393 -> a
+    8792:8792:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
+    8792:8792:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4515 -> a
+    8792:8792:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4393 -> a
+    8793:8795:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4516:4518 -> a
+    8793:8795:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4393 -> a
+    8796:8796:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4396:4396 -> a
+    8797:8818:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4525:4546 -> a
+    8797:8818:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4397 -> a
+    8819:8832:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4545:4558 -> a
+    8819:8832:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4397 -> a
+    8833:8833:boolean com.android.tools.r8.ir.code.Instruction.isNewArrayEmpty():0:0 -> a
+    8833:8833:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4558 -> a
+    8833:8833:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4397 -> a
+    8834:8882:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4563:4611 -> a
+    8834:8882:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4397 -> a
+    8883:8883:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
+    8883:8883:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4616 -> a
+    8883:8883:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4397 -> a
+    8884:8886:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4617:4619 -> a
+    8884:8886:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4397 -> a
+    8887:8887:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4400:4400 -> a
+    8888:8891:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4696:4699 -> a
+    8888:8891:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4401 -> a
+    8892:8892:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):54:54 -> a
+    8892:8892:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4700 -> a
+    8892:8892:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4401 -> a
+    8893:8893: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
+    8893:8893:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):54 -> a
+    8893:8893:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4700 -> a
+    8893:8893:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4401 -> a
+    8894:8894:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4700:4700 -> a
+    8894:8894:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4401 -> a
+    8895:8899:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4404:4408 -> a
+    8900:8906:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4706:4712 -> a
+    8900:8906:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4409 -> a
+    8907:8907:boolean com.android.tools.r8.ir.code.Instruction.isConstClass():0:0 -> a
+    8907:8907:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4712 -> a
+    8907:8907:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4409 -> a
+    8908:8912:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4713:4717 -> a
+    8908:8912:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4409 -> a
+    8913:8913: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":9008,"2":9009,"3":9010}}
+    9008:9008:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4717:4717 -> a
+    9008:9008:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4409 -> a
+    9009:9009:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4717:4717 -> a
+    9009:9009:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4409 -> a
+    9010:9010:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4717:4717 -> a
+    9010:9010:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4409 -> a
+    8914:8918:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4720:4724 -> a
+    8914:8918:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4409 -> a
+    8919:8919:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4717:4717 -> a
+    8919:8919:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4409 -> a
+    8920:8920:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
+    8920:8920:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4729 -> a
+    8920:8920:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4409 -> a
+    8921:8921:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4729:4729 -> a
+    8921:8921:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4409 -> a
+    8922:8922:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
+    8922:8922:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4731 -> a
+    8922:8922:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4409 -> a
+    8923:8924:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4732:4733 -> a
+    8923:8924:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4409 -> a
+    8925:8934:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4412:4421 -> a
+    8935:8935:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> a
+    8935:8935:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4421 -> a
+    8936:8940:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4422:4426 -> a
+    8941:8941:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
+    8941:8941:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4430 -> a
+    8942:8942:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4430:4430 -> a
+    8943:8943:boolean com.android.tools.r8.graph.DexClass.canBeInstantiatedByNewInstance():644:644 -> a
+    8943:8943:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4431 -> a
+    8944:8944:boolean com.android.tools.r8.graph.DexClass.isAnnotation():652:652 -> a
+    8944:8944:boolean com.android.tools.r8.graph.DexClass.canBeInstantiatedByNewInstance():644 -> a
+    8944:8944:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4431 -> a
+    8945:8945:boolean com.android.tools.r8.graph.DexClass.canBeInstantiatedByNewInstance():644:644 -> a
+    8945:8945:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4431 -> a
+    8946:8976:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4431:4461 -> a
+    8977:8977:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
+    8977:8977:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4462 -> a
+    8978:8983:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4461:4466 -> a
+    8984:8984:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
+    8984:8984:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4468 -> a
+    8985:8999:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4468:4482 -> a
+    9000:9000:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
+    9000:9000:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4483 -> a
+    9001:9005:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4484:4488 -> a
+    9006:9007:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4485:4486 -> a
+    9011:9011:void lambda$handleReflectiveBehavior$106(com.android.tools.r8.shaking.KeepFieldInfo$Joiner):4467:4467 -> a
+    9012:9018:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4629:4635 -> a
+    9019:9019:boolean com.android.tools.r8.ir.code.Instruction.isNewArrayEmpty():0:0 -> a
+    9019:9019:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4635 -> a
+    9020:9033:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4640:4653 -> a
+    9034:9034:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
+    9034:9034:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4654 -> a
+    9035:9050:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4655:4670 -> a
+    9051:9051:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
+    9051:9051:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4671 -> a
+    9052:9052:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4672:4672 -> a
+    9053:9053:void com.android.tools.r8.graph.DexProgramClass.forEachProgramVirtualMethod(java.util.function.Consumer):276:276 -> a
+    9053:9053:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4672 -> a
+    9054:9058:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4681:4685 -> a
+    9059:9059:void lambda$handleJavaLangReflectProxyNewProxyInstance$107(com.android.tools.r8.shaking.KeepClassInfo$Joiner):4666:4666 -> a
+    9060:9062:void lambda$handleJavaLangReflectProxyNewProxyInstance$109(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.ProgramMethod):4674:4676 -> a
+    9063:9063:void lambda$handleJavaLangReflectProxyNewProxyInstance$108(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):4675:4675 -> a
+    9064:9075:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4740:4751 -> a
     1:1:boolean com.android.tools.r8.shaking.EnqueuerEvent.isUnconditionalKeepInfoEvent():0:0 -> b
-    1:1:boolean isPreconditionForMinimumKeepInfoSatisfied(com.android.tools.r8.shaking.EnqueuerEvent):2873 -> b
-    2:4:boolean isPreconditionForMinimumKeepInfoSatisfied(com.android.tools.r8.shaking.EnqueuerEvent):2876:2878 -> b
+    1:1:boolean isPreconditionForMinimumKeepInfoSatisfied(com.android.tools.r8.shaking.EnqueuerEvent):2865 -> b
+    2:4:boolean isPreconditionForMinimumKeepInfoSatisfied(com.android.tools.r8.shaking.EnqueuerEvent):2868:2870 -> b
     5:5:boolean com.android.tools.r8.shaking.EnqueuerEvent.isLiveClassEvent():0:0 -> b
-    5:5:boolean isPreconditionForMinimumKeepInfoSatisfied(com.android.tools.r8.shaking.EnqueuerEvent):2882 -> b
-    6:6:boolean isPreconditionForMinimumKeepInfoSatisfied(com.android.tools.r8.shaking.EnqueuerEvent):2883:2883 -> b
+    5:5:boolean isPreconditionForMinimumKeepInfoSatisfied(com.android.tools.r8.shaking.EnqueuerEvent):2874 -> b
+    6:6:boolean isPreconditionForMinimumKeepInfoSatisfied(com.android.tools.r8.shaking.EnqueuerEvent):2875:2875 -> b
     7:7:boolean com.android.tools.r8.shaking.EnqueuerEvent.isInstantiatedClassEvent():0:0 -> b
-    7:7:boolean isPreconditionForMinimumKeepInfoSatisfied(com.android.tools.r8.shaking.EnqueuerEvent):2885 -> b
-    8:11:boolean isPreconditionForMinimumKeepInfoSatisfied(com.android.tools.r8.shaking.EnqueuerEvent):2886:2889 -> b
+    7:7:boolean isPreconditionForMinimumKeepInfoSatisfied(com.android.tools.r8.shaking.EnqueuerEvent):2877 -> b
+    8:11:boolean isPreconditionForMinimumKeepInfoSatisfied(com.android.tools.r8.shaking.EnqueuerEvent):2878:2881 -> b
     com.android.tools.r8.graph.DexApplication lambda$synthesize$87(com.android.tools.r8.graph.DexApplication) -> b
     12:12:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.targetedBySuperFrom(com.android.tools.r8.graph.ProgramMethod):79:79 -> b
-    12:12:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):3109 -> b
-    13:17: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):2073:2077 -> b
-    13:17:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):3110 -> b
-    18:21: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):2076:2079 -> b
-    18:21:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):3110 -> b
-    22:25:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):3115:3118 -> b
-    26:49:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):3116:3139 -> b
+    12:12:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):3101 -> b
+    13:17: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):2065:2069 -> b
+    13:17:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):3102 -> b
+    18:21: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):2068:2071 -> b
+    18:21:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):3102 -> b
+    22:25:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):3107:3110 -> b
+    26:49:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):3108:3131 -> b
     50:50:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> b
-    50:50:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):3138 -> b
-    51:54:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):3141:3144 -> b
+    50:50:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):3130 -> b
+    51:54:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):3133:3136 -> b
     55:55:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedViaSuperFrom(com.android.tools.r8.graph.ProgramMethod):42:42 -> b
-    55:55:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):3145 -> b
-    56:57:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):3145:3146 -> b
+    55:55:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):3137 -> b
+    56:57:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):3137:3138 -> b
     58:58:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedViaSuperFrom(com.android.tools.r8.graph.ProgramMethod):42:42 -> b
-    58:58:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):3147 -> b
-    59:59:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):3147:3147 -> b
-    60:60:com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder access$1100(com.android.tools.r8.shaking.Enqueuer):190:190 -> b
-    61:61:void access$700(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):190:190 -> b
-    62:62:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):545:545 -> b
-    63:63:com.android.tools.r8.shaking.Enqueuer registerExceptionGuardAnalysis(com.android.tools.r8.graph.analysis.EnqueuerExceptionGuardAnalysis):570:570 -> b
-    64:65:void setInitialDeadProtoTypes(java.util.Set):579:580 -> b
-    66:66:void recordTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):622:622 -> b
-    67:70:void recordTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer):632:635 -> b
-    71:71:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer):678:678 -> b
-    71:71:void recordTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer):639 -> b
-    72:73:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNull(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):770:771 -> b
-    74:74:boolean registerFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):950:950 -> b
-    74:74:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1574 -> b
-    75:98:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1578:1601 -> b
+    58:58:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):3139 -> b
+    59:59:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):3139:3139 -> b
+    60:60:com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder access$1100(com.android.tools.r8.shaking.Enqueuer):189:189 -> b
+    61:61:void access$700(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):189:189 -> b
+    62:62:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):537:537 -> b
+    63:63:com.android.tools.r8.shaking.Enqueuer registerExceptionGuardAnalysis(com.android.tools.r8.graph.analysis.EnqueuerExceptionGuardAnalysis):562:562 -> b
+    64:65:void setInitialDeadProtoTypes(java.util.Set):571:572 -> b
+    66:66:void recordTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):614:614 -> b
+    67:70:void recordTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer):624:627 -> b
+    71:71:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer):670:670 -> b
+    71:71:void recordTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer):631 -> b
+    72:73:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNull(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):762:763 -> b
+    74:74:boolean registerFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):942:942 -> b
+    74:74:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1566 -> b
+    75:98:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1570:1593 -> b
     99:99: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":1731,"2":1732,"3":1733}}
-    1731:1731:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1601:1601 -> b
-    1732:1732:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1601:1601 -> b
-    1733:1733:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1601:1601 -> b
-    1702:1711:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1603:1612 -> b
-    1712:1712:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> b
-    1712:1712:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1612 -> b
-    1713:1717:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1616:1620 -> b
-    1718:1723:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1617:1622 -> b
-    1724:1724:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexProgramClass):596:596 -> b
-    1724:1724:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1622 -> b
-    1725:1728:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1626:1629 -> b
-    1729:1729:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.fieldReferencedIn(com.android.tools.r8.graph.ProgramMethod):62:62 -> b
-    1729:1729:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):2743 -> b
-    1729:1729:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1632 -> b
-    1730:1730:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):2743:2743 -> b
-    1730:1730:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1632 -> b
-    1734:1734:boolean registerReflectiveFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):954:954 -> b
-    1735:1736:void traceCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,boolean):1062:1063 -> b
-    1737:1737:void lambda$traceExceptionGuard$13(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerExceptionGuardAnalysis):1249:1249 -> b
-    1738:1738:void traceExceptionGuard(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1249:1249 -> b
-    1739:1739:void traceTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1240:1240 -> b
-    1739:1739:void traceExceptionGuard(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1250 -> b
-    1740:1745:void traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1308:1313 -> b
-    1746:1746:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> b
-    1746:1746:void traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1313 -> b
-    1747:1748:void traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1315:1316 -> b
-    1749:1749:void lambda$traceInvokeInterface$18(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):1316:1316 -> b
-    1750:1750: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):1525:1525 -> b
-    1751:1751:java.lang.Boolean lambda$traceStaticFieldWrite$29(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):1687:1687 -> b
-    1752:1752:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$ensureMethodsContinueToWidenAccess$37(com.android.tools.r8.graph.DexType):1923:1923 -> b
-    1753:1787:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1939:1973 -> b
-    1788:1788:boolean com.android.tools.r8.graph.DexClass.isPublic():725:725 -> b
-    1788:1788:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1975 -> b
-    1789:1789:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1976:1976 -> b
-    1790:1790:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):1774:1774 -> b
-    1790:1790:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1979 -> b
-    1791:1791:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1977:1977 -> b
-    1792:1792:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):1774:1774 -> b
-    1792:1792:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1947 -> b
-    1793:1793:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):1996:1996 -> b
-    1794:1794:com.android.tools.r8.graph.DexAnnotation$AnnotatedKind com.android.tools.r8.graph.DexAnnotation$AnnotatedKind.from(com.android.tools.r8.graph.ProgramDefinition):40:40 -> b
-    1794:1794:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):1997 -> b
-    1795:1795:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2002:2002 -> b
-    1795:1795:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):1994 -> b
-    1796:1797:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation[],com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2007:2008 -> b
-    1796:1797:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2002 -> b
-    1796:1797:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):1994 -> b
-    1798:1798:void markNonStaticDirectMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2217:2217 -> b
-    1799:1799:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2432:2432 -> b
-    1800:1800:boolean com.android.tools.r8.graph.DexClass.isAnnotation():652:652 -> b
-    1800:1800:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2432 -> b
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1723,"2":1724,"3":1725}}
+    1723:1723:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1593:1593 -> b
+    1724:1724:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1593:1593 -> b
+    1725:1725:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1593:1593 -> b
+    1694:1703:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1595:1604 -> b
+    1704:1704:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> b
+    1704:1704:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1604 -> b
+    1705:1709:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1608:1612 -> b
+    1710:1715:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1609:1614 -> b
+    1716:1716:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexProgramClass):588:588 -> b
+    1716:1716:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1614 -> b
+    1717:1720:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1618:1621 -> b
+    1721:1721:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.fieldReferencedIn(com.android.tools.r8.graph.ProgramMethod):62:62 -> b
+    1721:1721:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):2735 -> b
+    1721:1721:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1624 -> b
+    1722:1722:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):2735:2735 -> b
+    1722:1722:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1624 -> b
+    1726:1726:boolean registerReflectiveFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):946:946 -> b
+    1727:1728:void traceCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,boolean):1054:1055 -> b
+    1729:1729:void lambda$traceExceptionGuard$13(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerExceptionGuardAnalysis):1241:1241 -> b
+    1730:1730:void traceExceptionGuard(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1241:1241 -> b
+    1731:1731:void traceTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1232:1232 -> b
+    1731:1731:void traceExceptionGuard(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1242 -> b
+    1732:1737:void traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1300:1305 -> b
+    1738:1738:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> b
+    1738:1738:void traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1305 -> b
+    1739:1740:void traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1307:1308 -> b
+    1741:1741:void lambda$traceInvokeInterface$18(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):1308:1308 -> b
+    1742:1742: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):1517:1517 -> b
+    1743:1743:java.lang.Boolean lambda$traceStaticFieldWrite$29(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):1679:1679 -> b
+    1744:1744:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$ensureMethodsContinueToWidenAccess$37(com.android.tools.r8.graph.DexType):1915:1915 -> b
+    1745:1779:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1931:1965 -> b
+    1780:1780:boolean com.android.tools.r8.graph.DexClass.isPublic():725:725 -> b
+    1780:1780:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1967 -> b
+    1781:1781:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1968:1968 -> b
+    1782:1782:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):1766:1766 -> b
+    1782:1782:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1971 -> b
+    1783:1783:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1969:1969 -> b
+    1784:1784:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):1766:1766 -> b
+    1784:1784:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1939 -> b
+    1785:1785:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):1988:1988 -> 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):1989 -> b
+    1787:1787:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):1994:1994 -> b
+    1787:1787:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):1986 -> b
+    1788:1789:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation[],com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):1999:2000 -> b
+    1788:1789:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):1994 -> b
+    1788:1789:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):1986 -> b
+    1790:1790:void markNonStaticDirectMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2209:2209 -> b
+    1791:1791:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2424:2424 -> b
+    1792:1792:boolean com.android.tools.r8.graph.DexClass.isAnnotation():652:652 -> b
+    1792:1792:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2424 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1801:1806:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2432:2437 -> b
-    1807:1808:void transitionDependentItemsForInstantiatedInterface(com.android.tools.r8.graph.DexProgramClass):2685:2686 -> b
-    1807:1808:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2438 -> b
-    1809:1811:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2778:2780 -> b
-    1812:1828:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2779:2795 -> b
-    1829:1829:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2789:2789 -> b
-    1830:1839:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2812:2821 -> b
-    1840:1840:boolean isFieldReferenced(com.android.tools.r8.graph.DexEncodedField):2834:2834 -> b
-    1841:1841:boolean isFieldLive(com.android.tools.r8.graph.ProgramField):2843:2843 -> b
-    1842:1842:boolean isMethodTargeted(com.android.tools.r8.graph.DexEncodedMethod):2909:2909 -> b
-    1843:1844:boolean isTypeLive(com.android.tools.r8.graph.DexClass):2917:2918 -> b
-    1845:1845:boolean isTypeLive(com.android.tools.r8.graph.DexProgramClass):2923:2923 -> b
-    1845:1845:boolean isTypeLive(com.android.tools.r8.graph.DexClass):2918 -> b
-    1846:1846:boolean isTypeLive(com.android.tools.r8.graph.DexClass):2919:2919 -> b
-    1847:1847:boolean lambda$markVirtualMethodAsReachable$63(com.android.tools.r8.graph.DexDefinition):3031:3031 -> b
-    1848:1848: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
-    1848:1848:boolean lambda$markVirtualMethodAsReachable$63(com.android.tools.r8.graph.DexDefinition):3031 -> b
+    1793:1798:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2424:2429 -> b
+    1799:1800:void transitionDependentItemsForInstantiatedInterface(com.android.tools.r8.graph.DexProgramClass):2677:2678 -> b
+    1799:1800:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2430 -> b
+    1801:1803:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2770:2772 -> b
+    1804:1820:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2771:2787 -> b
+    1821:1821:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2781:2781 -> b
+    1822:1831:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2804:2813 -> b
+    1832:1832:boolean isFieldReferenced(com.android.tools.r8.graph.DexEncodedField):2826:2826 -> b
+    1833:1833:boolean isFieldLive(com.android.tools.r8.graph.ProgramField):2835:2835 -> b
+    1834:1834:boolean isMethodTargeted(com.android.tools.r8.graph.DexEncodedMethod):2901:2901 -> b
+    1835:1836:boolean isTypeLive(com.android.tools.r8.graph.DexClass):2909:2910 -> b
+    1837:1837:boolean isTypeLive(com.android.tools.r8.graph.DexProgramClass):2915:2915 -> b
+    1837:1837:boolean isTypeLive(com.android.tools.r8.graph.DexClass):2910 -> b
+    1838:1838:boolean isTypeLive(com.android.tools.r8.graph.DexClass):2911:2911 -> b
+    1839:1839:boolean lambda$markVirtualMethodAsReachable$63(com.android.tools.r8.graph.DexDefinition):3023:3023 -> b
+    1840:1840: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
+    1840:1840:boolean lambda$markVirtualMethodAsReachable$63(com.android.tools.r8.graph.DexDefinition):3023 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1849:1849:void lambda$markEnumValuesAsReachable$70(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3102:3102 -> b
-    1850:1860:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3156:3166 -> b
-    1861:1861:boolean com.android.tools.r8.shaking.Enqueuer$Mode.isInitialMainDexTracing():217:217 -> b
-    1861:1861:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3166 -> b
-    1862:1865:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3167:3170 -> b
-    1866:1866:boolean com.android.tools.r8.shaking.Enqueuer$Mode.isGenerateMainDexList():225:225 -> b
-    1866:1866:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3170 -> b
-    1867:1871:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3169:3173 -> b
-    1872:1872:com.android.tools.r8.shaking.MainDexInfo com.android.tools.r8.shaking.MainDexInfo$Builder.build(com.android.tools.r8.shaking.MainDexInfo):406:406 -> b
-    1872:1872:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3174 -> b
-    1873:1873:void lambda$traceApplication$74(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3209:3209 -> b
-    1874:1874:void lambda$traceApplication$75(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3211:3211 -> b
-    1875:1875:void lambda$traceApplication$76(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3213:3213 -> b
-    1876:1876:void lambda$applyMinimumKeepInfoWhenLive$79(com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3260:3260 -> b
-    1877:1877:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3273:3273 -> b
-    1878:1878:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():485:485 -> b
-    1878:1878:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3274 -> b
+    1841:1841:void lambda$markEnumValuesAsReachable$70(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3094:3094 -> b
+    1842:1852:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3148:3158 -> b
+    1853:1853:boolean com.android.tools.r8.shaking.Enqueuer$Mode.isInitialMainDexTracing():216:216 -> b
+    1853:1853:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3158 -> b
+    1854:1857:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3159:3162 -> b
+    1858:1858:boolean com.android.tools.r8.shaking.Enqueuer$Mode.isGenerateMainDexList():224:224 -> b
+    1858:1858:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3162 -> b
+    1859:1863:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3161:3165 -> b
+    1864:1864:com.android.tools.r8.shaking.MainDexInfo com.android.tools.r8.shaking.MainDexInfo$Builder.build(com.android.tools.r8.shaking.MainDexInfo):406:406 -> b
+    1864:1864:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3166 -> b
+    1865:1865:void lambda$traceApplication$74(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3201:3201 -> b
+    1866:1866:void lambda$traceApplication$75(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3203:3203 -> b
+    1867:1867:void lambda$traceApplication$76(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3205:3205 -> b
+    1868:1868:void lambda$applyMinimumKeepInfoWhenLive$79(com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3252:3252 -> b
+    1869:1869:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3265:3265 -> b
+    1870:1870:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():485:485 -> b
+    1870:1870:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3266 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1879:1879:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3275:3275 -> b
-    1880:1880:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():473:473 -> b
-    1880:1880:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3275 -> b
-    1881:1882:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3275:3276 -> b
-    1883:1883:void lambda$applyMinimumKeepInfoWhenLive$81(com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3309:3309 -> b
-    1884:1884:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3320:3320 -> b
-    1885:1885:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():485:485 -> b
-    1885:1885:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3321 -> b
+    1871:1871:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3267:3267 -> b
+    1872:1872:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():473:473 -> b
+    1872:1872:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3267 -> b
+    1873:1874:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3267:3268 -> b
+    1875:1875:void lambda$applyMinimumKeepInfoWhenLive$81(com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3301:3301 -> b
+    1876:1876:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3312:3312 -> b
+    1877:1877:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():485:485 -> b
+    1877:1877:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3313 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1886:1886:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3322:3322 -> b
-    1887:1887:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():473:473 -> b
-    1887:1887:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3322 -> b
-    1888:1889:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3322:3323 -> b
-    1890:1890:void lambda$applyMinimumKeepInfoWhenLiveOrTargeted$83(com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3356:3356 -> b
-    1891:1891:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3369:3369 -> b
-    1892:1892:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():485:485 -> b
-    1892:1892:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3370 -> b
+    1878:1878:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3314:3314 -> b
+    1879:1879:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():473:473 -> b
+    1879:1879:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3314 -> b
+    1880:1881:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3314:3315 -> b
+    1882:1882:void lambda$applyMinimumKeepInfoWhenLiveOrTargeted$83(com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3348:3348 -> b
+    1883:1883:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3361:3361 -> 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):3362 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1893:1893:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3371:3371 -> b
-    1894:1894:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():473:473 -> b
-    1894:1894:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3371 -> b
-    1895:1898:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3371:3374 -> 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):3375 -> b
-    1900:1901:void enqueueHolderWithDependentInstanceConstructor(com.android.tools.r8.graph.ProgramMethod,java.util.Set):1989:1990 -> b
-    1900:1901:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3375 -> b
-    1902:1904:void recordTwrCloseResourceMethodSynthesizingContext(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):3657:3659 -> b
-    1905:1905:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():4080:4080 -> b
-    1906:1906: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):1956:1956 -> b
-    1906:1906:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():4080 -> b
-    1907:1908:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():4081:4082 -> b
-    1909:1918:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):4110:4119 -> b
-    1909:1918:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():4083 -> b
-    1919:1919:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():4087:4087 -> b
-    1920:1928:java.util.Set getImmediateSubtypesInInstantiatedHierarchy(com.android.tools.r8.graph.DexProgramClass):4221:4229 -> b
-    1929:1933:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4327:4331 -> b
-    1934:1934:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4330:4330 -> b
-    1935:1939:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):4385:4389 -> b
-    1940:1940:void lambda$handleReflectiveBehavior$105(com.android.tools.r8.shaking.KeepClassInfo$Joiner):4448:4448 -> b
-    1:1:com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection access$1200(com.android.tools.r8.shaking.Enqueuer):190:190 -> c
-    2:6:com.android.tools.r8.shaking.EnqueuerUseRegistryFactory createUseRegistryFactory():533:537 -> c
-    7:7:com.android.tools.r8.shaking.Enqueuer registerInstanceOfAnalysis(com.android.tools.r8.graph.analysis.EnqueuerInstanceOfAnalysis):560:560 -> c
-    8:9:void setInitialPrunedTypes(java.util.Set):584:585 -> c
-    10:10:com.android.tools.r8.shaking.KeepClassInfo getKeepInfo(com.android.tools.r8.graph.DexProgramClass):704:704 -> c
-    11:11:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNullFromReflectiveAccess(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):782:782 -> c
-    12:12:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer):678:678 -> c
-    12:12:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNullFromReflectiveAccess(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):782 -> c
-    13:13:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNullFromReflectiveAccess(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):783:783 -> c
-    14:14:boolean registerFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):958:958 -> c
-    14:14:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1645 -> c
-    15:34:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1649:1668 -> c
+    1885:1885:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3363:3363 -> 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):3363 -> b
+    1887:1890:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3363:3366 -> b
+    1891:1891:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():473:473 -> b
+    1891:1891:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3367 -> b
+    1892:1893:void enqueueHolderWithDependentInstanceConstructor(com.android.tools.r8.graph.ProgramMethod,java.util.Set):1981:1982 -> b
+    1892:1893:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3367 -> b
+    1894:1896:void recordTwrCloseResourceMethodSynthesizingContext(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):3649:3651 -> b
+    1897:1897:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():4072:4072 -> b
+    1898:1898: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):1956:1956 -> b
+    1898:1898:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():4072 -> b
+    1899:1900:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():4073:4074 -> b
+    1901:1910:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):4102:4111 -> b
+    1901:1910:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():4075 -> b
+    1911:1911:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():4079:4079 -> b
+    1912:1920:java.util.Set getImmediateSubtypesInInstantiatedHierarchy(com.android.tools.r8.graph.DexProgramClass):4213:4221 -> b
+    1921:1925:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4319:4323 -> b
+    1926:1926:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4322:4322 -> b
+    1927:1931:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):4377:4381 -> b
+    1932:1932:void lambda$handleReflectiveBehavior$105(com.android.tools.r8.shaking.KeepClassInfo$Joiner):4440:4440 -> b
+    1:1:com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection access$1200(com.android.tools.r8.shaking.Enqueuer):189:189 -> c
+    2:6:com.android.tools.r8.shaking.EnqueuerUseRegistryFactory createUseRegistryFactory():525:529 -> c
+    7:7:com.android.tools.r8.shaking.Enqueuer registerInstanceOfAnalysis(com.android.tools.r8.graph.analysis.EnqueuerInstanceOfAnalysis):552:552 -> c
+    8:9:void setInitialPrunedTypes(java.util.Set):576:577 -> c
+    10:10:com.android.tools.r8.shaking.KeepClassInfo getKeepInfo(com.android.tools.r8.graph.DexProgramClass):696:696 -> c
+    11:11:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNullFromReflectiveAccess(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):774:774 -> c
+    12:12:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer):670:670 -> c
+    12:12:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNullFromReflectiveAccess(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):774 -> c
+    13:13:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNullFromReflectiveAccess(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):775:775 -> c
+    14:14:boolean registerFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):950:950 -> c
+    14:14:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1637 -> c
+    15:34:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1641:1660 -> c
     35:35: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":1736,"2":1737,"3":1738}}
-    1736:1736:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1668:1668 -> c
-    1737:1737:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1668:1668 -> c
-    1738:1738:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1668:1668 -> c
-    1705:1714:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1670:1679 -> c
-    1715:1715:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> c
-    1715:1715:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1679 -> c
-    1716:1722:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1682:1688 -> c
-    1723:1728:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1685:1690 -> c
-    1729:1729:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexProgramClass):596:596 -> c
-    1729:1729:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1690 -> c
-    1730:1733:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1695:1698 -> c
-    1734:1734:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.fieldReferencedIn(com.android.tools.r8.graph.ProgramMethod):62:62 -> c
-    1734:1734:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):2743 -> c
-    1734:1734:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1701 -> c
-    1735:1735:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):2743:2743 -> c
-    1735:1735:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1701 -> c
-    1739:1739:boolean registerReflectiveFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):962:962 -> c
-    1740:1751:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1157:1168 -> c
-    1752:1780:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1167:1195 -> c
-    1781:1781:boolean com.android.tools.r8.utils.Visibility.isPackagePrivate():16:16 -> c
-    1781:1781:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1199 -> c
-    1782:1782:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1199:1199 -> 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):1200 -> c
-    1784:1784:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1200:1200 -> c
-    1785:1785:void lambda$traceInstanceOf$12(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInstanceOfAnalysis):1244:1244 -> c
-    1786:1792:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1254:1260 -> c
-    1793:1793:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):54:54 -> c
-    1793:1793:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1264 -> c
-    1794:1794: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
-    1794:1794:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):54 -> c
-    1794:1794:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1264 -> c
-    1795:1795:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1264:1264 -> c
-    1796:1820:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1329:1353 -> 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):1353 -> 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):2073:2077 -> c
-    1822:1826:void handleInvokeOfStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2100 -> c
-    1822:1826:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1355 -> 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):2076:2079 -> c
-    1827:1830:void handleInvokeOfStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2100 -> c
-    1827:1830:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1355 -> c
-    1831:1845:void handleInvokeOfStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2101:2115 -> c
-    1831:1845:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1355 -> c
-    1846:1846:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1356:1356 -> c
-    1847:1847:void lambda$traceInvokeStatic$19(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):1356:1356 -> c
-    1848:1848: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):1580:1580 -> c
-    1849:1849:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$30(com.android.tools.r8.graph.DexType):1782:1782 -> c
-    1850:1850:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2304:2304 -> c
-    1851:1851:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():607:607 -> c
-    1851:1851:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2304 -> c
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1728,"2":1729,"3":1730}}
+    1728:1728:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1660:1660 -> c
+    1729:1729:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1660:1660 -> c
+    1730:1730:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1660:1660 -> c
+    1697:1706:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1662:1671 -> c
+    1707:1707:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> c
+    1707:1707:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1671 -> c
+    1708:1714:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1674:1680 -> c
+    1715:1720:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1677:1682 -> c
+    1721:1721:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexProgramClass):588:588 -> c
+    1721:1721:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1682 -> c
+    1722:1725:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1687:1690 -> c
+    1726:1726:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.fieldReferencedIn(com.android.tools.r8.graph.ProgramMethod):62:62 -> c
+    1726:1726:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):2735 -> c
+    1726:1726:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1693 -> c
+    1727:1727:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):2735:2735 -> c
+    1727:1727:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1693 -> c
+    1731:1731:boolean registerReflectiveFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):954:954 -> c
+    1732:1743:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1149:1160 -> c
+    1744:1772:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1159:1187 -> c
+    1773:1773:boolean com.android.tools.r8.utils.Visibility.isPackagePrivate():16:16 -> c
+    1773:1773:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1191 -> c
+    1774:1774:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1191:1191 -> c
+    1775:1775:boolean com.android.tools.r8.utils.Visibility.isPackagePrivate():16:16 -> c
+    1775:1775:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1192 -> c
+    1776:1776:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1192:1192 -> c
+    1777:1777:void lambda$traceInstanceOf$12(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInstanceOfAnalysis):1236:1236 -> c
+    1778:1784:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1246:1252 -> c
+    1785:1785:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):54:54 -> c
+    1785:1785:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1256 -> c
+    1786:1786: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
+    1786:1786:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):54 -> c
+    1786:1786:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1256 -> c
+    1787:1787:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1256:1256 -> c
+    1788:1812:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1321:1345 -> c
+    1813:1813:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> c
+    1813:1813:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1345 -> c
+    1814:1818: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):2065:2069 -> c
+    1814:1818:void handleInvokeOfStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2092 -> c
+    1814:1818:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1347 -> c
+    1819:1822: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):2068:2071 -> c
+    1819:1822:void handleInvokeOfStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2092 -> c
+    1819:1822:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1347 -> c
+    1823:1837:void handleInvokeOfStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2093:2107 -> c
+    1823:1837:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1347 -> c
+    1838:1838:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1348:1348 -> c
+    1839:1839:void lambda$traceInvokeStatic$19(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):1348:1348 -> c
+    1840:1840: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):1572:1572 -> c
+    1841:1841:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$30(com.android.tools.r8.graph.DexType):1774:1774 -> c
+    1842:1842:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2296:2296 -> c
+    1843:1843:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():609:609 -> c
+    1843:1843:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2296 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1852:1852:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2305:2305 -> c
-    1853:1859:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2346:2346 -> c
-    1860:1860: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":4232,"2":4233,"3":4234}}
-    4232:4232:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2346:2346 -> c
-    4233:4233:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2346:2346 -> c
-    4234:4234:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2346:2346 -> c
-    1861:1861: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,"4":4243}}
-    4240:4240:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2352:2352 -> c
-    4241:4241:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2352:2352 -> c
-    4242:4242:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2352:2352 -> c
-    4243:4243:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2352:2352 -> c
-    4213:4226:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2352:2365 -> c
-    4227:4227:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):264:264 -> c
-    4227:4227:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2365 -> c
-    4228:4228:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexType):260:260 -> c
-    4228:4228:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):264 -> c
-    4228:4228:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2365 -> c
-    4229:4231:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2366:2368 -> c
-    4244:4245:boolean isFieldRead(com.android.tools.r8.graph.ProgramField):2851:2852 -> c
-    4246:4246:boolean isMethodLive(com.android.tools.r8.graph.ProgramMethod):2905:2905 -> c
-    4247:4247:boolean isMethodLive(com.android.tools.r8.graph.DexEncodedMethod):2901:2901 -> c
-    4247:4247:boolean isMethodLive(com.android.tools.r8.graph.ProgramMethod):2905 -> c
-    4248:4252:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):3083:3087 -> c
-    4248:4252:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3095 -> c
-    4253:4253:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):0:0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4270,"2":4271,"3":4272}}
-    4270:4270:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):3087:3087 -> c
-    4270:4270:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3095 -> c
-    4271:4271:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):3087:3087 -> c
-    4271:4271:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3095 -> c
-    4272:4272:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):3087:3087 -> c
-    4272:4272:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3095 -> c
-    4254:4254:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):3087:3087 -> c
-    4254:4254:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3095 -> c
-    4255:4260:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):3086:3091 -> c
-    4255:4260:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3095 -> c
-    4261:4269:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3095:3103 -> c
-    4273:4273:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$markSuperMethodAsReachable$72(com.android.tools.r8.graph.DexEncodedMethod):3142:3142 -> c
-    4274:4279:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3284:3289 -> c
-    4280:4280:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):114:114 -> c
-    4280:4280:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3289 -> c
+    1844:1844:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2297:2297 -> c
+    1845:1851:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2338:2338 -> c
+    1852:1852: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":4216,"2":4217,"3":4218}}
+    4216:4216:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2338:2338 -> c
+    4217:4217:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2338:2338 -> c
+    4218:4218:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2338:2338 -> c
+    1853:1853: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":4224,"2":4225,"3":4226,"4":4227}}
+    4224:4224:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2344:2344 -> c
+    4225:4225:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2344:2344 -> c
+    4226:4226:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2344:2344 -> c
+    4227:4227:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2344:2344 -> c
+    4197:4210:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2344:2357 -> c
+    4211:4211:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):265:265 -> c
+    4211:4211:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2357 -> c
+    4212:4212:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexType):261:261 -> c
+    4212:4212:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):265 -> c
+    4212:4212:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2357 -> c
+    4213:4215:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2358:2360 -> c
+    4228:4229:boolean isFieldRead(com.android.tools.r8.graph.ProgramField):2843:2844 -> c
+    4230:4230:boolean isMethodLive(com.android.tools.r8.graph.ProgramMethod):2897:2897 -> c
+    4231:4231:boolean isMethodLive(com.android.tools.r8.graph.DexEncodedMethod):2893:2893 -> c
+    4231:4231:boolean isMethodLive(com.android.tools.r8.graph.ProgramMethod):2897 -> c
+    4232:4236:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):3075:3079 -> c
+    4232:4236:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3087 -> c
+    4237:4237:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):0:0 -> c
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4254,"2":4255,"3":4256}}
+    4254:4254:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):3079:3079 -> c
+    4254:4254:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3087 -> c
+    4255:4255:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):3079:3079 -> c
+    4255:4255:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3087 -> c
+    4256:4256:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):3079:3079 -> c
+    4256:4256:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3087 -> c
+    4238:4238:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):3079:3079 -> c
+    4238:4238:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3087 -> c
+    4239:4244:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):3078:3083 -> c
+    4239:4244:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3087 -> c
+    4245:4253:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3087:3095 -> c
+    4257:4257:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$markSuperMethodAsReachable$72(com.android.tools.r8.graph.DexEncodedMethod):3134:3134 -> c
+    4258:4263:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3276:3281 -> c
+    4264:4264:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):114:114 -> c
+    4264:4264:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3281 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4281:4281: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
-    4281:4281:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):114 -> c
-    4281:4281:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3289 -> c
+    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):114 -> c
+    4265:4265:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3281 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    4282:4282:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3291:3291 -> c
-    4283:4283:boolean com.android.tools.r8.shaking.EnqueuerEvent.isUnconditionalKeepInfoEvent():0:0 -> c
-    4283:4283:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3291 -> c
-    4284:4284:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3292:3292 -> c
-    4285:4290:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3329:3334 -> c
-    4291:4291:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):114:114 -> c
-    4291:4291:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3334 -> c
+    4266:4266:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3283:3283 -> 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):3283 -> c
+    4268:4268:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3284:3284 -> c
+    4269:4274:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3321:3326 -> c
+    4275:4275:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):114:114 -> c
+    4275:4275:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3326 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4292:4292: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
-    4292:4292:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):114 -> c
-    4292:4292:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3334 -> c
+    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):114 -> c
+    4276:4276:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3326 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    4293:4293:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3336:3336 -> 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.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3336 -> c
-    4295:4295:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3337:3337 -> c
-    4296:4301:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3384:3389 -> c
-    4302:4302:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):114:114 -> c
-    4302:4302:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3389 -> c
+    4277:4277:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3328:3328 -> 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):3328 -> c
+    4279:4279:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3329:3329 -> c
+    4280:4285:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3376:3381 -> c
+    4286:4286:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):114:114 -> c
+    4286:4286:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3381 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4303:4303: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
-    4303:4303:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):114 -> c
-    4303:4303:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3389 -> c
+    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):114 -> c
+    4287:4287:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3381 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    4304:4304:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3392:3392 -> c
-    4305:4305:boolean com.android.tools.r8.shaking.EnqueuerEvent.isUnconditionalKeepInfoEvent():0:0 -> c
-    4305:4305:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3392 -> c
-    4306:4306:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3393:3393 -> c
-    4307:4313:boolean verifyReferences(com.android.tools.r8.graph.DexApplication):3820:3826 -> c
-    4314:4325:boolean verifyReferencedType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3856:3867 -> c
-    4314:4325:boolean verifyReferences(com.android.tools.r8.graph.DexApplication):3826 -> c
-    4326:4326:boolean isMethodTargeted(com.android.tools.r8.graph.DexEncodedMethod):2909:2909 -> c
-    4326:4326:boolean verifyReferencedType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3867 -> c
-    4326:4326:boolean verifyReferences(com.android.tools.r8.graph.DexApplication):3826 -> c
-    4327:4327:boolean verifyReferencedType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3868:3868 -> c
-    4327:4327:boolean verifyReferences(com.android.tools.r8.graph.DexApplication):3826 -> c
-    4328:4330:boolean verifyReferencedMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3876:3878 -> c
-    4328:4330:boolean verifyReferencedType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3868 -> c
-    4328:4330:boolean verifyReferences(com.android.tools.r8.graph.DexApplication):3826 -> c
-    4331:4350:void markMethodAsKept(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4137:4156 -> c
+    4288:4288:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3384:3384 -> 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):3384 -> c
+    4290:4290:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3385:3385 -> c
+    4291:4297:boolean verifyReferences(com.android.tools.r8.graph.DexApplication):3812:3818 -> c
+    4298:4309:boolean verifyReferencedType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3848:3859 -> c
+    4298:4309:boolean verifyReferences(com.android.tools.r8.graph.DexApplication):3818 -> c
+    4310:4310:boolean isMethodTargeted(com.android.tools.r8.graph.DexEncodedMethod):2901:2901 -> c
+    4310:4310:boolean verifyReferencedType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3859 -> c
+    4310:4310:boolean verifyReferences(com.android.tools.r8.graph.DexApplication):3818 -> c
+    4311:4311:boolean verifyReferencedType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3860:3860 -> c
+    4311:4311:boolean verifyReferences(com.android.tools.r8.graph.DexApplication):3818 -> c
+    4312:4314:boolean verifyReferencedMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3868:3870 -> c
+    4312:4314:boolean verifyReferencedType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3860 -> c
+    4312:4314:boolean verifyReferences(com.android.tools.r8.graph.DexApplication):3818 -> c
+    4315:4334:void markMethodAsKept(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4129:4148 -> 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):1299 -> d
+    1:1:void traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1291 -> 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
     2:2:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):54 -> d
-    2:2:void traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1299 -> d
-    3:3:void traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1299:1299 -> d
-    4:4:com.android.tools.r8.graph.FieldAccessInfoCollectionImpl access$1900(com.android.tools.r8.shaking.Enqueuer):190:190 -> d
-    5:5:boolean addTargetedMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):604:604 -> d
-    5:5:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4264 -> d
-    6:13:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4269:4276 -> d
-    14:15:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.ProgramMethod):4380:4381 -> d
-    14:15:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4277 -> d
+    2:2:void traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1291 -> d
+    3:3:void traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1291:1291 -> d
+    4:4:com.android.tools.r8.graph.FieldAccessInfoCollectionImpl access$1900(com.android.tools.r8.shaking.Enqueuer):189:189 -> d
+    5:5:boolean addTargetedMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):596:596 -> d
+    5:5:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4256 -> d
+    6:13:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4261:4268 -> d
+    14:15:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.ProgramMethod):4372:4373 -> d
+    14:15:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4269 -> d
     16:16:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportCompatKeepMethod(com.android.tools.r8.graph.ProgramMethod):189:189 -> d
-    16:16:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.ProgramMethod):4381 -> d
-    16:16:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4277 -> d
-    17:17:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.ProgramMethod):4380:4380 -> d
-    17:17:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4277 -> d
-    18:18:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4280:4280 -> d
-    19:34:void enqueueAllIfNotShrinking():823:838 -> d
-    35:35:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):264:264 -> d
-    35:35:void enqueueAllIfNotShrinking():838 -> d
-    36:36:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexType):260:260 -> d
-    36:36:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):264 -> d
-    36:36:void enqueueAllIfNotShrinking():838 -> d
-    37:43:void enqueueAllIfNotShrinking():838:844 -> d
+    16:16:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.ProgramMethod):4373 -> d
+    16:16:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4269 -> d
+    17:17:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.ProgramMethod):4372:4372 -> d
+    17:17:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4269 -> d
+    18:18:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4272:4272 -> d
+    19:34:void enqueueAllIfNotShrinking():815:830 -> d
+    35:35:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):265:265 -> d
+    35:35:void enqueueAllIfNotShrinking():830 -> d
+    36:36:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexType):261:261 -> d
+    36:36:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):265 -> d
+    36:36:void enqueueAllIfNotShrinking():830 -> d
+    37:43:void enqueueAllIfNotShrinking():830:836 -> d
     44:44:void com.android.tools.r8.graph.DexProgramClass.forEachProgramField(java.util.function.Consumer):199:199 -> d
-    44:44:void enqueueAllIfNotShrinking():844 -> d
-    45:45:void enqueueAllIfNotShrinking():846:846 -> d
-    46:46:void lambda$traceSafeCheckCast$9(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerCheckCastAnalysis):1067:1067 -> d
-    47:47:void traceInstanceOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1244:1244 -> d
-    48:48:void traceTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1240:1240 -> d
-    48:48:void traceInstanceOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1245 -> d
-    49:49:void lambda$traceInvokeSuper$20(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):1371:1371 -> d
-    50:57:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1384:1391 -> d
-    58:70:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1386:1398 -> d
+    44:44:void enqueueAllIfNotShrinking():836 -> d
+    45:45:void enqueueAllIfNotShrinking():838:838 -> d
+    46:46:void lambda$traceSafeCheckCast$9(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerCheckCastAnalysis):1059:1059 -> d
+    47:47:void traceInstanceOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1236:1236 -> d
+    48:48:void traceTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1232:1232 -> d
+    48:48:void traceInstanceOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1237 -> d
+    49:49:void lambda$traceInvokeSuper$20(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):1363:1363 -> d
+    50:57:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1376:1383 -> d
+    58:70:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1378:1390 -> d
     71:71:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> d
-    71:71:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1398 -> d
-    72:73:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1400:1401 -> d
-    74:74:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1441:1441 -> d
-    75:75: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):1652:1652 -> d
-    76:84:void markTypeAsLive(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):1735:1743 -> d
-    85:85:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):1774:1774 -> d
-    85:85:void markTypeAsLive(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):1747 -> d
-    86:90:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1778:1782 -> d
-    91:93:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1781:1783 -> d
-    94:94:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1779:1779 -> d
-    95:95:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$31(com.android.tools.r8.graph.DexType):1849:1849 -> d
-    96:100:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.ProgramField):2862:2866 -> d
+    71:71:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1390 -> d
+    72:73:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1392:1393 -> d
+    74:74:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1433:1433 -> d
+    75:75: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):1644:1644 -> d
+    76:84:void markTypeAsLive(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):1727:1735 -> d
+    85:85:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):1766:1766 -> d
+    85:85:void markTypeAsLive(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):1739 -> d
+    86:90:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1770:1774 -> d
+    91:93:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1773:1775 -> d
+    94:94:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1771:1771 -> d
+    95:95:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$31(com.android.tools.r8.graph.DexType):1841:1841 -> d
+    96:100:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.ProgramField):2854:2858 -> d
     101:101:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():792:792 -> d
-    101:101:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.ProgramField):2866 -> d
-    102:103:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.ProgramField):2868:2869 -> d
-    104:104:boolean isMethodTargeted(com.android.tools.r8.graph.ProgramMethod):2913:2913 -> d
-    105:105:boolean isMethodTargeted(com.android.tools.r8.graph.DexEncodedMethod):2909:2909 -> d
-    105:105:boolean isMethodTargeted(com.android.tools.r8.graph.ProgramMethod):2913 -> d
-    106:106:boolean isTypeLive(com.android.tools.r8.graph.DexProgramClass):2923:2923 -> d
+    101:101:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.ProgramField):2858 -> d
+    102:103:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.ProgramField):2860:2861 -> d
+    104:104:boolean isMethodTargeted(com.android.tools.r8.graph.ProgramMethod):2905:2905 -> d
+    105:105:boolean isMethodTargeted(com.android.tools.r8.graph.DexEncodedMethod):2901:2901 -> d
+    105:105:boolean isMethodTargeted(com.android.tools.r8.graph.ProgramMethod):2905 -> d
+    106:106:boolean isTypeLive(com.android.tools.r8.graph.DexProgramClass):2915:2915 -> 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):1320 -> e
+    1:1:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1312 -> e
     2:2:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):50:50 -> e
     2:2:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):54 -> e
-    2:2:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1320 -> e
-    3:3:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1320:1320 -> e
+    2:2:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1312 -> e
+    3:3:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1312:1312 -> e
     4:4:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> e
-    4:4:com.android.tools.r8.shaking.KeepReason lambda$handleReflectiveBehavior$104(com.android.tools.r8.graph.ProgramMethod):4441 -> e
-    5:5:com.android.tools.r8.utils.InternalOptions access$2100(com.android.tools.r8.shaking.Enqueuer):190:190 -> e
-    6:6:com.android.tools.r8.androidapi.AndroidApiLevelCompute getApiLevelCompute():521:521 -> e
-    7:7:void recordTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):618:618 -> e
-    8:8:void lambda$traceInvokeVirtual$21(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):1401:1401 -> e
-    9:17:void traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1405:1413 -> e
+    4:4:com.android.tools.r8.shaking.KeepReason lambda$handleReflectiveBehavior$104(com.android.tools.r8.graph.ProgramMethod):4433 -> e
+    5:5:com.android.tools.r8.utils.InternalOptions access$2100(com.android.tools.r8.shaking.Enqueuer):189:189 -> e
+    6:6:com.android.tools.r8.shaking.GraphReporter getGraphReporter():521:521 -> e
+    7:7:void recordTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):610:610 -> e
+    8:8:void lambda$traceInvokeVirtual$21(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):1393:1393 -> e
+    9:17:void traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1397:1405 -> e
     18:18:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.instantiatedIn(com.android.tools.r8.graph.ProgramMethod):34:34 -> e
-    18:18:void traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1417 -> e
-    19:19:void traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1413:1413 -> e
-    20:20:void traceInstanceFieldReadFromMethodHandle(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1445:1445 -> e
-    21:21:java.util.Map lambda$processAnnotation$41(com.android.tools.r8.graph.DexType):2024:2024 -> e
-    22:22:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):2799:2799 -> e
-    23:23:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):1774:1774 -> e
-    23:23:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):2799 -> e
-    24:25:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):2800:2801 -> e
-    26:27:void markVirtualMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2827:2828 -> e
+    18:18:void traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1409 -> e
+    19:19:void traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1405:1405 -> e
+    20:20:void traceInstanceFieldReadFromMethodHandle(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1437:1437 -> e
+    21:21:java.util.Map lambda$processAnnotation$41(com.android.tools.r8.graph.DexType):2016:2016 -> e
+    22:22:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):2791:2791 -> e
+    23:23:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):1766:1766 -> e
+    23:23:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):2791 -> e
+    24:25:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):2792:2793 -> e
+    26:27:void markVirtualMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2819:2820 -> e
     28:28:boolean com.android.tools.r8.shaking.KeepReason.isDueToReflectiveUse():0:0 -> e
-    28:28:void markVirtualMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2829 -> e
-    29:32:void markVirtualMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2827:2830 -> e
-    33:36:java.util.Set lambda$createEnqueuerResult$93(com.android.tools.r8.graph.DexProgramClass):3745:3748 -> 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():529:529 -> f
-    3:3:void recordCompilerSynthesizedTypeReference(com.android.tools.r8.graph.DexType):608:608 -> f
-    4:4:void ignoreMissingClass(com.android.tools.r8.graph.DexType):2329:2329 -> f
-    4:4:void recordCompilerSynthesizedTypeReference(com.android.tools.r8.graph.DexType):610 -> f
-    5:7:void recordCompilerSynthesizedTypeReference(com.android.tools.r8.graph.DexType):611:613 -> f
-    8:12:void addLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,java.util.function.BiConsumer):710:714 -> f
-    8:12:void recordCompilerSynthesizedTypeReference(com.android.tools.r8.graph.DexType):612 -> f
-    13:14:void traceSafeCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1067:1068 -> f
-    15:15:void traceInstanceFieldReadFromRecordMethodHandle(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1449:1449 -> f
-    16:26:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1705:1715 -> f
-    16:26:void traceInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1362 -> f
-    27:32:void traceInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1363:1368 -> f
+    28:28:void markVirtualMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2821 -> e
+    29:32:void markVirtualMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2819:2822 -> e
+    33:36:java.util.Set lambda$createEnqueuerResult$93(com.android.tools.r8.graph.DexProgramClass):3737:3740 -> e
+    1:1:com.android.tools.r8.shaking.Enqueuer$Mode access$300(com.android.tools.r8.shaking.Enqueuer):189:189 -> f
+    2:2:void recordCompilerSynthesizedTypeReference(com.android.tools.r8.graph.DexType):600:600 -> f
+    3:3:void ignoreMissingClass(com.android.tools.r8.graph.DexType):2321:2321 -> f
+    3:3:void recordCompilerSynthesizedTypeReference(com.android.tools.r8.graph.DexType):602 -> f
+    4:6:void recordCompilerSynthesizedTypeReference(com.android.tools.r8.graph.DexType):603:605 -> f
+    7:11:void addLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,java.util.function.BiConsumer):702:706 -> f
+    7:11:void recordCompilerSynthesizedTypeReference(com.android.tools.r8.graph.DexType):604 -> f
+    12:12:com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection getKeepInfo():692:692 -> f
+    13:14:void traceSafeCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1059:1060 -> f
+    15:15:void traceInstanceFieldReadFromRecordMethodHandle(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1441:1441 -> f
+    16:26:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1697:1707 -> f
+    16:26:void traceInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1354 -> f
+    27:32:void traceInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1355:1360 -> f
     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):1368 -> f
-    34:35:void traceInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1370:1371 -> f
-    36:36:com.android.tools.r8.utils.collections.ProgramFieldSet lambda$markFieldAsReachable$58(com.android.tools.r8.graph.DexProgramClass):2786:2786 -> f
-    37:38:void lambda$markDirectStaticOrConstructorMethodAsLive$60(com.android.tools.r8.graph.ProgramMethod):2816:2817 -> f
+    33:33:void traceInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1360 -> f
+    34:35:void traceInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1362:1363 -> f
+    36:36:com.android.tools.r8.utils.collections.ProgramFieldSet lambda$markFieldAsReachable$58(com.android.tools.r8.graph.DexProgramClass):2778:2778 -> f
+    37:38:void lambda$markDirectStaticOrConstructorMethodAsLive$60(com.android.tools.r8.graph.ProgramMethod):2808:2809 -> 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):1375 -> g
+    1:1:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1367 -> 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
     2:2:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):54 -> g
-    2:2:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1375 -> g
-    3:3:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1375:1375 -> 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():700:700 -> g
-    6:6:void traceTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1240:1240 -> g
-    7:7:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1509:1509 -> g
-    8:8:java.util.Set lambda$markInterfaceTypeAsLiveViaInheritanceClause$40(com.android.tools.r8.graph.DexProgramClass):1970:1970 -> g
-    9:9:void lambda$markDirectStaticOrConstructorMethodAsLive$61(com.android.tools.r8.graph.ProgramMethod):2821:2821 -> 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():525:525 -> h
-    3:3:void traceInstanceFieldWriteFromMethodHandle(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1513:1513 -> h
-    4:15:void markDirectAndIndirectClassInitializersAsLive(com.android.tools.r8.graph.DexProgramClass):2120:2131 -> h
-    16:22:boolean markDirectClassInitializerAsLive(com.android.tools.r8.graph.DexProgramClass):2152:2158 -> h
-    16:22:void markDirectAndIndirectClassInitializersAsLive(com.android.tools.r8.graph.DexProgramClass):2135 -> h
-    23:26:void markDirectAndIndirectClassInitializersAsLive(com.android.tools.r8.graph.DexProgramClass):2141:2144 -> h
-    27:31:void traceCode(com.android.tools.r8.graph.ProgramMethod):4307:4311 -> h
-    1:1:com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet access$600(com.android.tools.r8.shaking.Enqueuer):190:190 -> i
-    2:2:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1565:1565 -> i
-    3:18:void markInterfaceInitializedDirectly(com.android.tools.r8.graph.DexProgramClass):2168:2183 -> i
-    19:21:long getNumberOfLiveItems():4053:4055 -> i
-    22:22:void markReferencedTypesAsLive(com.android.tools.r8.graph.ProgramMethod):4315:4315 -> i
-    22:22:void traceMethodDefinitionExcludingCode(com.android.tools.r8.graph.ProgramMethod):4284 -> i
-    23:23:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):1774:1774 -> i
-    23:23:void markReferencedTypesAsLive(com.android.tools.r8.graph.ProgramMethod):4315 -> i
-    23:23:void traceMethodDefinitionExcludingCode(com.android.tools.r8.graph.ProgramMethod):4284 -> i
-    24:27:void markParameterAndReturnTypesAsLive(com.android.tools.r8.graph.ProgramMethod):4320:4323 -> i
-    24:27:void markReferencedTypesAsLive(com.android.tools.r8.graph.ProgramMethod):4316 -> i
-    24:27:void traceMethodDefinitionExcludingCode(com.android.tools.r8.graph.ProgramMethod):4284 -> i
-    28:36:void traceMethodDefinitionExcludingCode(com.android.tools.r8.graph.ProgramMethod):4285:4293 -> i
-    1:1:java.util.Set access$800(com.android.tools.r8.shaking.Enqueuer):190:190 -> j
-    2:2:com.android.tools.r8.shaking.EnqueuerUseRegistryFactory getUseRegistryFactory():541:541 -> j
-    3:4:void traceRecordFieldValues(com.android.tools.r8.graph.DexField[],com.android.tools.r8.graph.ProgramMethod):1151:1152 -> j
-    5:5:void traceStaticFieldReadFromMethodHandle(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1569:1569 -> j
-    6:23:boolean markInterfaceInitializedIndirectly(com.android.tools.r8.graph.DexProgramClass):2193:2210 -> j
-    1:1:com.android.tools.r8.shaking.RootSetUtils$RootSet access$900(com.android.tools.r8.shaking.Enqueuer):190:190 -> k
-    2:2:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1636:1636 -> k
-    3:5:boolean verifyMethodIsTargeted(com.android.tools.r8.graph.ProgramMethod):1723:1725 -> k
-    6:39:void transitionDependentItemsForInstantiatedItem(com.android.tools.r8.graph.DexProgramClass):2690:2723 -> k
-    40:43:void postProcessingDesugaring():4006:4009 -> k
-    44:44:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():318:318 -> k
-    44:44:void postProcessingDesugaring():4009 -> k
+    2:2:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1367 -> g
+    3:3:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1367:1367 -> g
+    4:4:com.android.tools.r8.shaking.GraphReporter access$400(com.android.tools.r8.shaking.Enqueuer):189:189 -> g
+    5:5:com.android.tools.r8.shaking.Enqueuer$Mode getMode():517:517 -> g
+    6:6:void traceTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1232:1232 -> g
+    7:7:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1501:1501 -> g
+    8:8:java.util.Set lambda$markInterfaceTypeAsLiveViaInheritanceClause$40(com.android.tools.r8.graph.DexProgramClass):1962:1962 -> g
+    9:9:void lambda$markDirectStaticOrConstructorMethodAsLive$61(com.android.tools.r8.graph.ProgramMethod):2813:2813 -> g
+    1:1:com.android.tools.r8.shaking.EnqueuerWorklist access$500(com.android.tools.r8.shaking.Enqueuer):189:189 -> h
+    2:2:void traceInstanceFieldWriteFromMethodHandle(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1505:1505 -> h
+    3:14:void markDirectAndIndirectClassInitializersAsLive(com.android.tools.r8.graph.DexProgramClass):2112:2123 -> h
+    15:21:boolean markDirectClassInitializerAsLive(com.android.tools.r8.graph.DexProgramClass):2144:2150 -> h
+    15:21:void markDirectAndIndirectClassInitializersAsLive(com.android.tools.r8.graph.DexProgramClass):2127 -> h
+    22:25:void markDirectAndIndirectClassInitializersAsLive(com.android.tools.r8.graph.DexProgramClass):2133:2136 -> h
+    26:28:long getNumberOfLiveItems():4045:4047 -> h
+    29:33:void traceCode(com.android.tools.r8.graph.ProgramMethod):4299:4303 -> h
+    1:1:com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet access$600(com.android.tools.r8.shaking.Enqueuer):189:189 -> i
+    2:2:com.android.tools.r8.shaking.EnqueuerUseRegistryFactory getUseRegistryFactory():533:533 -> i
+    3:3:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1557:1557 -> i
+    4:19:void markInterfaceInitializedDirectly(com.android.tools.r8.graph.DexProgramClass):2160:2175 -> i
+    20:20:void markReferencedTypesAsLive(com.android.tools.r8.graph.ProgramMethod):4307:4307 -> i
+    20:20:void traceMethodDefinitionExcludingCode(com.android.tools.r8.graph.ProgramMethod):4276 -> i
+    21:21:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):1766:1766 -> i
+    21:21:void markReferencedTypesAsLive(com.android.tools.r8.graph.ProgramMethod):4307 -> i
+    21:21:void traceMethodDefinitionExcludingCode(com.android.tools.r8.graph.ProgramMethod):4276 -> i
+    22:25:void markParameterAndReturnTypesAsLive(com.android.tools.r8.graph.ProgramMethod):4312:4315 -> i
+    22:25:void markReferencedTypesAsLive(com.android.tools.r8.graph.ProgramMethod):4308 -> i
+    22:25:void traceMethodDefinitionExcludingCode(com.android.tools.r8.graph.ProgramMethod):4276 -> i
+    26:34:void traceMethodDefinitionExcludingCode(com.android.tools.r8.graph.ProgramMethod):4277:4285 -> i
+    1:1:java.util.Set access$800(com.android.tools.r8.shaking.Enqueuer):189:189 -> j
+    2:3:void traceRecordFieldValues(com.android.tools.r8.graph.DexField[],com.android.tools.r8.graph.ProgramMethod):1143:1144 -> j
+    4:4:void traceStaticFieldReadFromMethodHandle(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1561:1561 -> j
+    5:22:boolean markInterfaceInitializedIndirectly(com.android.tools.r8.graph.DexProgramClass):2185:2202 -> j
+    23:26:void postProcessingDesugaring():3998:4001 -> j
+    27:27:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():318:318 -> j
+    27:27:void postProcessingDesugaring():4001 -> j
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    45:65:void postProcessingDesugaring():4009:4029 -> k
-    66:69:void postProcessingDesugaring():4028:4031 -> k
-    70:86:void postProcessingDesugaring():4030:4046 -> k
-    87:87:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():318:318 -> k
-    87:87:void postProcessingDesugaring():4046 -> k
+    28:48:void postProcessingDesugaring():4001:4021 -> j
+    49:52:void postProcessingDesugaring():4020:4023 -> j
+    53:69:void postProcessingDesugaring():4022:4038 -> j
+    70:70:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():318:318 -> j
+    70:70:void postProcessingDesugaring():4038 -> j
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    88:88:void postProcessingDesugaring():4047:4047 -> k
-    89:89:com.android.tools.r8.shaking.EnqueuerWorklist$EnqueuerAction com.android.tools.r8.shaking.EnqueuerWorklist.poll():322:322 -> k
-    89:89:void postProcessingDesugaring():4047 -> k
+    71:71:void postProcessingDesugaring():4039:4039 -> j
+    72:72:com.android.tools.r8.shaking.EnqueuerWorklist$EnqueuerAction com.android.tools.r8.shaking.EnqueuerWorklist.poll():322:322 -> j
+    72:72:void postProcessingDesugaring():4039 -> j
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    90:90:void postProcessingDesugaring():4048:4048 -> k
-    1:1:void traceStaticFieldWriteFromMethodHandle(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1640:1640 -> l
-    2:10:void transitionUnusedInterfaceToLive(com.android.tools.r8.graph.DexProgramClass):2730:2738 -> l
-    11:18:void synthesize():3524:3531 -> l
-    19:24:void synthesizeInterfaceMethodBridges(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3663:3668 -> l
-    19:24:void synthesize():3532 -> l
-    25:36:void synthesize():3533:3544 -> l
-    1:1:boolean verifyTypeIsLive(com.android.tools.r8.graph.DexProgramClass):1730:1730 -> m
+    73:73:void postProcessingDesugaring():4040:4040 -> j
+    1:1:com.android.tools.r8.shaking.RootSetUtils$RootSet access$900(com.android.tools.r8.shaking.Enqueuer):189:189 -> k
+    2:2:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1628:1628 -> k
+    3:5:boolean verifyMethodIsTargeted(com.android.tools.r8.graph.ProgramMethod):1715:1717 -> k
+    6:39:void transitionDependentItemsForInstantiatedItem(com.android.tools.r8.graph.DexProgramClass):2682:2715 -> k
+    40:47:void synthesize():3516:3523 -> k
+    48:53:void synthesizeInterfaceMethodBridges(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3655:3660 -> k
+    48:53:void synthesize():3524 -> k
+    54:65:void synthesize():3525:3536 -> k
+    1:1:void traceStaticFieldWriteFromMethodHandle(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1632:1632 -> l
+    2:10:void transitionUnusedInterfaceToLive(com.android.tools.r8.graph.DexProgramClass):2722:2730 -> l
+    1:1:boolean verifyTypeIsLive(com.android.tools.r8.graph.DexProgramClass):1722:1722 -> m
 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.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):4851:4851 -> <init>
-    2:4:void <init>(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.ProgramDefinition):4856:4858 -> <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):4843:4843 -> <init>
+    2:4:void <init>(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.ProgramDefinition):4848:4850 -> <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):4868:4891 -> b
-    25:25:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():471:471 -> b
-    25:25:boolean addField(com.android.tools.r8.graph.DexField):4891 -> b
+    1:24:boolean addField(com.android.tools.r8.graph.DexField):4860:4883 -> b
+    25:25:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> b
+    25:25:boolean addField(com.android.tools.r8.graph.DexField):4883 -> 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):4891:4896 -> b
-    32:47:boolean addMethod(com.android.tools.r8.graph.DexMethod):4904:4919 -> b
-    48:48:boolean addType(com.android.tools.r8.graph.DexType):4947:4947 -> b
+    26:31:boolean addField(com.android.tools.r8.graph.DexField):4883:4888 -> b
+    32:47:boolean addMethod(com.android.tools.r8.graph.DexMethod):4896:4911 -> b
+    48:48:boolean addType(com.android.tools.r8.graph.DexType):4939:4939 -> b
 com.android.tools.r8.shaking.Enqueuer$EnqueuerDefinitionSupplier -> com.android.tools.r8.shaking.v:
     com.android.tools.r8.shaking.Enqueuer enqueuer -> a
-    1:2:void <init>(com.android.tools.r8.shaking.Enqueuer):4956:4957 -> <init>
-    1:1:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):4961:4961 -> 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):4961:4961 -> a
+    1:2:void <init>(com.android.tools.r8.shaking.Enqueuer):4948:4949 -> <init>
+    1:1:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):4953:4953 -> 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):4953:4953 -> a
 com.android.tools.r8.shaking.Enqueuer$LiveFieldsSet -> com.android.tools.r8.shaking.w:
     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):4801:4801 -> <init>
-    2:7:void <init>(com.android.tools.r8.shaking.Enqueuer,java.util.function.BiConsumer):4797:4802 -> <init>
-    1:1:java.util.Set access$1500(com.android.tools.r8.shaking.Enqueuer$LiveFieldsSet):4795:4795 -> a
-    2:5:boolean add(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):4806:4809 -> a
-    6:6:boolean contains(com.android.tools.r8.graph.DexEncodedField):4813:4813 -> a
-    7:7:boolean contains(com.android.tools.r8.graph.ProgramField):4817:4817 -> a
-    8:8:boolean contains(com.android.tools.r8.graph.DexEncodedField):4813:4813 -> a
-    8:8:boolean contains(com.android.tools.r8.graph.ProgramField):4817 -> a
+    1:1:void <init>(com.android.tools.r8.shaking.Enqueuer,java.util.function.BiConsumer):4793:4793 -> <init>
+    2:7:void <init>(com.android.tools.r8.shaking.Enqueuer,java.util.function.BiConsumer):4789:4794 -> <init>
+    1:1:java.util.Set access$1500(com.android.tools.r8.shaking.Enqueuer$LiveFieldsSet):4787:4787 -> a
+    2:5:boolean add(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):4798:4801 -> a
+    6:6:boolean contains(com.android.tools.r8.graph.DexEncodedField):4805:4805 -> a
+    7:7:boolean contains(com.android.tools.r8.graph.ProgramField):4809:4809 -> a
+    8:8:boolean contains(com.android.tools.r8.graph.DexEncodedField):4805:4805 -> a
+    8:8:boolean contains(com.android.tools.r8.graph.ProgramField):4809 -> a
 com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet -> com.android.tools.r8.shaking.x:
     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):4827:4827 -> <init>
-    2:7:void <init>(com.android.tools.r8.shaking.Enqueuer,java.util.function.BiConsumer):4823:4828 -> <init>
-    1:1:java.util.Set access$1400(com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet):4821:4821 -> a
-    2:5:boolean add(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4832:4835 -> a
-    6:6:boolean contains(com.android.tools.r8.graph.DexEncodedMethod):4839:4839 -> a
-    7:7:boolean contains(com.android.tools.r8.graph.ProgramMethod):4843:4843 -> a
-    8:8:boolean contains(com.android.tools.r8.graph.DexEncodedMethod):4839:4839 -> a
-    8:8:boolean contains(com.android.tools.r8.graph.ProgramMethod):4843 -> a
-    9:9:java.util.Set getItems():4847:4847 -> a
+    1:1:void <init>(com.android.tools.r8.shaking.Enqueuer,java.util.function.BiConsumer):4819:4819 -> <init>
+    2:7:void <init>(com.android.tools.r8.shaking.Enqueuer,java.util.function.BiConsumer):4815:4820 -> <init>
+    1:1:java.util.Set access$1400(com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet):4813:4813 -> a
+    2:5:boolean add(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4824:4827 -> a
+    6:6:boolean contains(com.android.tools.r8.graph.DexEncodedMethod):4831:4831 -> a
+    7:7:boolean contains(com.android.tools.r8.graph.ProgramMethod):4835:4835 -> a
+    8:8:boolean contains(com.android.tools.r8.graph.DexEncodedMethod):4831:4831 -> a
+    8:8:boolean contains(com.android.tools.r8.graph.ProgramMethod):4835 -> a
+    9:9:java.util.Set getItems():4839:4839 -> a
 com.android.tools.r8.shaking.Enqueuer$Mode -> com.android.tools.r8.shaking.y$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
@@ -94390,40 +94605,40 @@
     com.android.tools.r8.shaking.Enqueuer$Mode INITIAL_TREE_SHAKING -> b
     com.android.tools.r8.shaking.Enqueuer$Mode WHY_ARE_YOU_KEEPING -> g
     com.android.tools.r8.shaking.Enqueuer$Mode GENERATE_MAIN_DEX_LIST -> f
-    1:6:void <clinit>():193:198 -> <clinit>
-    1:1:void <init>(java.lang.String,int):192:192 -> <init>
-    1:1:boolean isFinalTreeShaking():209:209 -> a
-    1:1:boolean isInitialOrFinalTreeShaking():213:213 -> b
-    1:1:boolean isInitialTreeShaking():205:205 -> c
-    1:1:boolean isInitialMainDexTracing():217:217 -> d
-    1:1:boolean isMainDexTracing():229 -> d
-    2:2:boolean isFinalMainDexTracing():221:221 -> d
-    2:2:boolean isMainDexTracing():229 -> d
-    3:3:boolean isGenerateMainDexList():225:225 -> d
-    3:3:boolean isMainDexTracing():229 -> d
-    1:1:boolean isTreeShaking():201:201 -> e
+    1:6:void <clinit>():192:197 -> <clinit>
+    1:1:void <init>(java.lang.String,int):191:191 -> <init>
+    1:1:boolean isFinalTreeShaking():208:208 -> a
+    1:1:boolean isInitialOrFinalTreeShaking():212:212 -> b
+    1:1:boolean isInitialTreeShaking():204:204 -> c
+    1:1:boolean isInitialMainDexTracing():216:216 -> d
+    1:1:boolean isMainDexTracing():228 -> d
+    2:2:boolean isFinalMainDexTracing():220:220 -> d
+    2:2:boolean isMainDexTracing():228 -> d
+    3:3:boolean isGenerateMainDexList():224:224 -> d
+    3:3:boolean isMainDexTracing():228 -> d
+    1:1:boolean isTreeShaking():200:200 -> e
 com.android.tools.r8.shaking.Enqueuer$ResolutionSearchKey -> com.android.tools.r8.shaking.z:
     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):4965:4965 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.DexMethod,boolean):4970:4972 -> <init>
-    1:1:com.android.tools.r8.graph.DexMethod access$2800(com.android.tools.r8.shaking.Enqueuer$ResolutionSearchKey):4965:4965 -> a
-    1:1:boolean access$2900(com.android.tools.r8.shaking.Enqueuer$ResolutionSearchKey):4965:4965 -> b
-    1:5:boolean equals(java.lang.Object):4977:4981 -> equals
-    1:1:int hashCode():4986:4986 -> hashCode
+    1:1:void <init>(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.Enqueuer$1):4957:4957 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexMethod,boolean):4962:4964 -> <init>
+    1:1:com.android.tools.r8.graph.DexMethod access$2800(com.android.tools.r8.shaking.Enqueuer$ResolutionSearchKey):4957:4957 -> a
+    1:1:boolean access$2900(com.android.tools.r8.shaking.Enqueuer$ResolutionSearchKey):4957:4957 -> b
+    1:5:boolean equals(java.lang.Object):4969:4973 -> equals
+    1:1:int hashCode():4978:4978 -> hashCode
 com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason -> com.android.tools.r8.shaking.A:
     java.util.Map deferredActions -> b
     java.util.Set items -> a
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():4764:4764 -> <clinit>
-    1:4:void <init>():4764:4767 -> <init>
-    5:5:void <init>(com.android.tools.r8.shaking.Enqueuer$1):4764:4764 -> <init>
-    1:1:java.util.Set access$1300(com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason):4764:4764 -> a
-    2:4:boolean add(java.lang.Object,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):4770:4772 -> a
-    5:5:boolean contains(java.lang.Object):4779:4779 -> a
-    6:7:boolean registerDeferredAction(java.lang.Object,com.android.tools.r8.utils.Action):4783:4784 -> a
-    8:8:java.util.Set getItems():4791:4791 -> a
-    1:1:java.util.List lambda$registerDeferredAction$0(java.lang.Object):4784:4784 -> b
+    1:1:void <clinit>():4756:4756 -> <clinit>
+    1:4:void <init>():4756:4759 -> <init>
+    5:5:void <init>(com.android.tools.r8.shaking.Enqueuer$1):4756:4756 -> <init>
+    1:1:java.util.Set access$1300(com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason):4756:4756 -> a
+    2:4:boolean add(java.lang.Object,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):4762:4764 -> a
+    5:5:boolean contains(java.lang.Object):4771:4771 -> a
+    6:7:boolean registerDeferredAction(java.lang.Object,com.android.tools.r8.utils.Action):4775:4776 -> a
+    8:8:java.util.Set getItems():4783:4783 -> a
+    1:1:java.util.List lambda$registerDeferredAction$0(java.lang.Object):4776:4776 -> b
 com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions -> com.android.tools.r8.shaking.B:
     java.util.Map methodProcessingContexts -> b
     java.util.Map liveMethods -> d
@@ -94434,25 +94649,25 @@
     java.util.Map syntheticClasspathClasses -> f
     com.android.tools.r8.contexts.CompilationContext$ProcessorContext processorContext -> a
     java.util.Map injectedInterfaces -> g
-    1:1:void <clinit>():3413:3413 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.contexts.CompilationContext$ProcessorContext):3435:3435 -> <init>
-    2:22:void <init>(com.android.tools.r8.contexts.CompilationContext$ProcessorContext):3416:3436 -> <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):3441:3441 -> a
-    2:7:boolean isEmpty():3445:3450 -> a
-    8:9:void addLiveClasspathClass(com.android.tools.r8.graph.DexClasspathClass):3455:3456 -> a
-    10:12:void addLiveMethod(com.android.tools.r8.graph.ProgramMethod):3464:3466 -> a
-    13:15:void injectInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClass):3474:3476 -> a
-    16:16:java.util.Set lambda$injectInterface$1(com.android.tools.r8.graph.DexProgramClass):3475:3475 -> a
-    17:20:void enqueueWorkItems(com.android.tools.r8.shaking.Enqueuer):3496:3499 -> a
+    1:1:void <clinit>():3405:3405 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.contexts.CompilationContext$ProcessorContext):3427:3427 -> <init>
+    2:22:void <init>(com.android.tools.r8.contexts.CompilationContext$ProcessorContext):3408:3428 -> <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):3433:3433 -> a
+    2:7:boolean isEmpty():3437:3442 -> a
+    8:9:void addLiveClasspathClass(com.android.tools.r8.graph.DexClasspathClass):3447:3448 -> a
+    10:12:void addLiveMethod(com.android.tools.r8.graph.ProgramMethod):3456:3458 -> a
+    13:15:void injectInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClass):3466:3468 -> a
+    16:16:java.util.Set lambda$injectInterface$1(com.android.tools.r8.graph.DexProgramClass):3467:3467 -> a
+    17:20:void enqueueWorkItems(com.android.tools.r8.shaking.Enqueuer):3488:3491 -> a
     21:21:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.fakeReportShouldNotBeUsed():71:71 -> a
-    21:21:void enqueueWorkItems(com.android.tools.r8.shaking.Enqueuer):3499 -> a
-    22:40:void enqueueWorkItems(com.android.tools.r8.shaking.Enqueuer):3501:3519 -> a
-    41:41:void lambda$enqueueWorkItems$2(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.utils.Pair):3506:3506 -> a
-    42:44:void lambda$enqueueWorkItems$3(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,java.util.Set):3515:3515 -> a
-    45:45:void lambda$enqueueWorkItems$4(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.ProgramMethod):3519:3519 -> a
-    1:1:void addMethodWithDesugaredCodeForTracing(com.android.tools.r8.graph.ProgramMethod):3470:3470 -> b
-    1:1:void addNeverInlineMethod(com.android.tools.r8.graph.ProgramMethod):3492:3492 -> c
-    1:3:com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext getMethodContext(com.android.tools.r8.graph.ProgramMethod):3440:3440 -> d
+    21:21:void enqueueWorkItems(com.android.tools.r8.shaking.Enqueuer):3491 -> a
+    22:40:void enqueueWorkItems(com.android.tools.r8.shaking.Enqueuer):3493:3511 -> a
+    41:41:void lambda$enqueueWorkItems$2(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.utils.Pair):3498:3498 -> a
+    42:44:void lambda$enqueueWorkItems$3(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,java.util.Set):3507:3507 -> a
+    45:45:void lambda$enqueueWorkItems$4(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.ProgramMethod):3511:3511 -> a
+    1:1:void addMethodWithDesugaredCodeForTracing(com.android.tools.r8.graph.ProgramMethod):3462:3462 -> b
+    1:1:void addNeverInlineMethod(com.android.tools.r8.graph.ProgramMethod):3484:3484 -> c
+    1:3:com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext getMethodContext(com.android.tools.r8.graph.ProgramMethod):3432:3432 -> d
 com.android.tools.r8.shaking.EnqueuerEvent -> com.android.tools.r8.internal.hh:
     1:1:void <init>():13:13 -> <init>
     com.android.tools.r8.shaking.EnqueuerEvent$ClassEnqueuerEvent asClassEvent() -> a
@@ -95150,7 +95365,7 @@
     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 isAccessModificationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):165:165 -> a
-    6:7:boolean com.android.tools.r8.utils.InternalOptions.isAccessModificationEnabled():684:685 -> a
+    6:7:boolean com.android.tools.r8.utils.InternalOptions.isAccessModificationEnabled():686:687 -> a
     6:7:boolean isAccessModificationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):165 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     8:8:boolean internalIsAccessModificationAllowed():170:170 -> a
@@ -95181,8 +95396,8 @@
     21:21:boolean isLessThanOrEquals(com.android.tools.r8.shaking.KeepInfo):226 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:1:boolean isAnnotationRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):70:70 -> b
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():622:622 -> b
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isAnnotationRemovalEnabled():597 -> b
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():624:624 -> b
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isAnnotationRemovalEnabled():599 -> b
     2:2:boolean isAnnotationRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):70 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     3:3:boolean internalIsAnnotationRemovalAllowed():74:74 -> b
@@ -95190,19 +95405,19 @@
     4:4:boolean internalIsAccessModificationRequiredForRepackaging():153:153 -> b
     1:1:boolean internalIsAnnotationRemovalAllowed():74:74 -> c
     2:2:boolean isInnerClassesAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):194:194 -> c
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():622:622 -> c
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():624:624 -> c
     3:3:boolean isInnerClassesAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):197 -> c
     4:4:boolean isInnerClassesAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):197:197 -> c
     1:1:boolean internalIsCheckDiscardedEnabled():82:82 -> d
     2:2:boolean isMinificationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):108:108 -> d
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():607:607 -> d
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():609:609 -> d
     3:3:boolean isMinificationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):108 -> d
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4:4:boolean internalIsMinificationAllowed():112:112 -> d
     4:4:boolean isMinificationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):108 -> d
     1:1:boolean internalIsMinificationAllowed():112:112 -> e
     2:2:boolean isOptimizationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):122:122 -> e
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isOptimizationEnabled():612:612 -> e
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isOptimizationEnabled():614:614 -> e
     3:3:boolean isOptimizationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):122 -> e
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4:4:boolean internalIsOptimizationAllowed():126:126 -> e
@@ -95217,13 +95432,13 @@
     1:1:boolean internalIsCheckDiscardedEnabled():82:82 -> h
     1:1:boolean isCheckDiscardedEnabled(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):78 -> h
     2:2:boolean isShrinkingAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):136:136 -> h
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isTreeShakingEnabled():602:602 -> h
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isTreeShakingEnabled():604:604 -> h
     3:3:boolean isShrinkingAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):136 -> h
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4:4:boolean internalIsShrinkingAllowed():140:140 -> h
     4:4:boolean isShrinkingAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):136 -> h
     1:1:boolean isSignatureAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):174:174 -> i
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():622:622 -> i
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():624:624 -> i
     2:2:boolean isSignatureAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):177 -> i
     3:3:boolean isSignatureAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):177:177 -> i
 com.android.tools.r8.shaking.KeepInfo$Builder -> com.android.tools.r8.shaking.w0:
@@ -95608,7 +95823,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.Lz:
+com.android.tools.r8.shaking.LibraryMethodOverrideAnalysis -> com.android.tools.r8.internal.Qz:
     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
@@ -95642,7 +95857,7 @@
     10:14:void logResults():163:167 -> b
     15:22:void logResults():164:171 -> b
     23:29:void logResults():168:174 -> b
-com.android.tools.r8.shaking.LibraryMethodOverrideAnalysis$LibraryEscapeAnalysisConfiguration -> com.android.tools.r8.internal.Kz:
+com.android.tools.r8.shaking.LibraryMethodOverrideAnalysis$LibraryEscapeAnalysisConfiguration -> com.android.tools.r8.internal.Pz:
     com.android.tools.r8.shaking.LibraryMethodOverrideAnalysis$LibraryEscapeAnalysisConfiguration INSTANCE -> a
     1:1:void <clinit>():185:185 -> <clinit>
     1:1:void <init>():188:188 -> <init>
@@ -95650,9 +95865,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.Oz:
+com.android.tools.r8.shaking.LibraryModeledPredicate -> com.android.tools.r8.internal.Tz:
     boolean isModeled(com.android.tools.r8.graph.DexType) -> d
-com.android.tools.r8.shaking.MainDexDirectReferenceTracer -> com.android.tools.r8.internal.uB:
+com.android.tools.r8.shaking.MainDexDirectReferenceTracer -> com.android.tools.r8.internal.zB:
     com.android.tools.r8.graph.AppView appView -> b
     java.util.function.Consumer consumer -> c
     com.android.tools.r8.shaking.MainDexDirectReferenceTracer$AnnotationDirectReferenceCollector annotationDirectReferenceCollector -> a
@@ -95663,7 +95878,7 @@
     1:1:com.android.tools.r8.graph.AppView access$200(com.android.tools.r8.shaking.MainDexDirectReferenceTracer):30:30 -> a
     2:2:void access$400(com.android.tools.r8.shaking.MainDexDirectReferenceTracer,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):30:30 -> a
     3:10:void run(java.util.Set):44:51 -> a
-    11:11:boolean com.android.tools.r8.graph.DexAnnotation.hasSynthesizedClassAnnotation(com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):404:404 -> a
+    11:11:boolean com.android.tools.r8.graph.DexAnnotation.hasSynthesizedClassAnnotation(com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):405:405 -> a
     11:11:void run(java.util.Set):50 -> a
     12:12:void run(java.util.Set):52:52 -> a
     13:13:void com.android.tools.r8.shaking.MainDexDirectReferenceTracer.traceAnnotationsDirectDependencies(com.android.tools.r8.graph.DexAnnotationSet):96:96 -> a
@@ -95676,8 +95891,8 @@
     34:38: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
     39:42:void traceMethodDirectDependencies(com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):100:103 -> 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.rB:
-com.android.tools.r8.shaking.MainDexDirectReferenceTracer$AnnotationDirectReferenceCollector -> com.android.tools.r8.internal.sB:
+com.android.tools.r8.shaking.MainDexDirectReferenceTracer$1 -> com.android.tools.r8.internal.wB:
+com.android.tools.r8.shaking.MainDexDirectReferenceTracer$AnnotationDirectReferenceCollector -> com.android.tools.r8.internal.xB:
     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>
@@ -95689,7 +95904,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.tB:
+com.android.tools.r8.shaking.MainDexDirectReferenceTracer$DirectReferencesCollector -> com.android.tools.r8.internal.yB:
     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>
@@ -95848,14 +96063,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.vB:
+com.android.tools.r8.shaking.MainDexInfo$MainDexGroup -> com.android.tools.r8.internal.AB:
     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.wB:
+com.android.tools.r8.shaking.MainDexListBuilder -> com.android.tools.r8.internal.BB:
     java.util.Map annotationTypeContainEnum -> c
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.shaking.MainDexInfo$Builder mainDexInfoBuilder -> d
@@ -95936,7 +96151,7 @@
     1:1:void <init>(com.android.tools.r8.shaking.MemberValuePropagationRule$1):17:17 -> <init>
     2:2:void <init>():21:21 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> d
-com.android.tools.r8.shaking.MemberValuePropagationRule$Type$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.lC:
+com.android.tools.r8.shaking.MemberValuePropagationRule$Type$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.qC:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     java.lang.String stringValueOf(int) -> a
@@ -95999,7 +96214,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:1:com.android.tools.r8.shaking.KeepInfo$Joiner lambda$getOrCreateMinimumKeepInfoFor$5(com.android.tools.r8.graph.DexReference):95:95 -> b
     2:2:boolean isEmpty():105:105 -> b
-com.android.tools.r8.shaking.MissingClasses -> com.android.tools.r8.internal.pD:
+com.android.tools.r8.shaking.MissingClasses -> com.android.tools.r8.internal.uD:
     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>
@@ -96007,8 +96222,8 @@
     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.nD:
-com.android.tools.r8.shaking.MissingClasses$Builder -> com.android.tools.r8.internal.oD:
+com.android.tools.r8.shaking.MissingClasses$1 -> com.android.tools.r8.internal.sD:
+com.android.tools.r8.shaking.MissingClasses$Builder -> com.android.tools.r8.internal.tD:
     java.util.Map newMissingClasses -> b
     java.util.Set newIgnoredMissingClasses -> c
     java.util.Set alreadyMissingClasses -> a
@@ -96033,12 +96248,12 @@
     45:58:java.util.Set com.android.tools.r8.shaking.MissingClasses$Builder.rewriteMissingClassContextsForSingleMissingClass(com.android.tools.r8.graph.AppView,java.util.Set,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):180:193 -> a
     45:58:void com.android.tools.r8.shaking.MissingClasses$Builder.rewriteMissingClassContexts(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):171 -> a
     45:58:java.util.Map getMissingClassesToBeReported(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):233 -> a
-    59:59:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):264:264 -> a
+    59:59:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):265:265 -> a
     59:59:java.util.Set com.android.tools.r8.shaking.MissingClasses$Builder.rewriteMissingClassContextsForSingleMissingClass(com.android.tools.r8.graph.AppView,java.util.Set,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):193 -> a
     59:59:void com.android.tools.r8.shaking.MissingClasses$Builder.rewriteMissingClassContexts(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):171 -> a
     59:59:java.util.Map getMissingClassesToBeReported(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):233 -> a
-    60:60:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexType):260:260 -> a
-    60:60:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):264 -> a
+    60:60:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexType):261:261 -> a
+    60:60:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):265 -> a
     60:60:java.util.Set com.android.tools.r8.shaking.MissingClasses$Builder.rewriteMissingClassContextsForSingleMissingClass(com.android.tools.r8.graph.AppView,java.util.Set,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):193 -> a
     60:60:void com.android.tools.r8.shaking.MissingClasses$Builder.rewriteMissingClassContexts(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):171 -> a
     60:60:java.util.Map getMissingClassesToBeReported(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):233 -> a
@@ -96077,10 +96292,10 @@
     119:119:boolean lambda$getIsCompilerSynthesizedAllowedMissingClassesPredicate$7(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType):293 -> a
     1:1:void ignoreNewMissingClass(com.android.tools.r8.graph.DexType):110:110 -> b
     2:5:com.android.tools.r8.shaking.MissingClasses reportMissingClasses(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):135:138 -> b
-    6:6:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():500:500 -> b
+    6:6:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():502:502 -> b
     6:6:com.android.tools.r8.shaking.MissingClasses reportMissingClasses(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):139 -> b
     7:7:com.android.tools.r8.shaking.MissingClasses reportMissingClasses(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):139:139 -> b
-    8:8:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():500:500 -> b
+    8:8:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():502:502 -> b
     8:8:com.android.tools.r8.shaking.MissingClasses reportMissingClasses(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):141 -> b
     9:9:com.android.tools.r8.shaking.MissingClasses reportMissingClasses(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):141:141 -> b
     10:12:com.android.tools.r8.shaking.MissingClasses com.android.tools.r8.shaking.MissingClasses$Builder.build():311:313 -> b
@@ -96090,12 +96305,12 @@
     14:14:java.util.function.Predicate getIsAllowedMissingClassesPredicate(com.android.tools.r8.graph.AppView):262:262 -> b
     15:16:java.util.Set com.android.tools.r8.shaking.MissingClasses$Builder.getAllowedMissingClasses(com.android.tools.r8.graph.DexItemFactory):273:274 -> b
     15:16:java.util.function.Predicate getIsAllowedMissingClassesPredicate(com.android.tools.r8.graph.AppView):262 -> b
-    17:17:java.lang.Iterable com.android.tools.r8.graph.DexItemFactory.getJavaConversionTypes():505:505 -> b
+    17:17:java.lang.Iterable com.android.tools.r8.graph.DexItemFactory.getJavaConversionTypes():511:511 -> b
     17:17:java.util.Set com.android.tools.r8.shaking.MissingClasses$Builder.getAllowedMissingClasses(com.android.tools.r8.graph.DexItemFactory):282 -> b
     17:17:java.util.function.Predicate getIsAllowedMissingClassesPredicate(com.android.tools.r8.graph.AppView):262 -> b
     18:18:java.util.Set com.android.tools.r8.shaking.MissingClasses$Builder.getAllowedMissingClasses(com.android.tools.r8.graph.DexItemFactory):282:282 -> b
     18:18:java.util.function.Predicate getIsAllowedMissingClassesPredicate(com.android.tools.r8.graph.AppView):262 -> b
-    19:19:java.lang.Iterable com.android.tools.r8.graph.DexItemFactory.getJ$ConversionTypes():514:514 -> b
+    19:19:java.lang.Iterable com.android.tools.r8.graph.DexItemFactory.getJ$ConversionTypes():520:520 -> b
     19:19:java.util.Set com.android.tools.r8.shaking.MissingClasses$Builder.getAllowedMissingClasses(com.android.tools.r8.graph.DexItemFactory):283 -> b
     19:19:java.util.function.Predicate getIsAllowedMissingClassesPredicate(com.android.tools.r8.graph.AppView):262 -> b
     20:21:java.util.Set com.android.tools.r8.shaking.MissingClasses$Builder.getAllowedMissingClasses(com.android.tools.r8.graph.DexItemFactory):283:284 -> b
@@ -96145,7 +96360,7 @@
     1:1:void <init>(com.android.tools.r8.shaking.NoVerticalClassMergingRule$1):14:14 -> <init>
     2:2:void <init>():18:18 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> d
-com.android.tools.r8.shaking.ProguardAccessFlags -> com.android.tools.r8.internal.WK:
+com.android.tools.r8.shaking.ProguardAccessFlags -> com.android.tools.r8.internal.fL:
     java.util.List NAMES -> c
     int PPP_MASK -> b
     int flags -> a
@@ -96390,7 +96605,7 @@
     1:7:com.android.tools.r8.position.Position getPosition():73:79 -> c
     8:9:com.android.tools.r8.shaking.ProguardClassSpecification$Builder setMemberRules(java.util.List):87:88 -> c
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> d
-com.android.tools.r8.shaking.ProguardClassType -> com.android.tools.r8.internal.dL:
+com.android.tools.r8.shaking.ProguardClassType -> com.android.tools.r8.internal.mL:
     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
@@ -96409,25 +96624,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.XK:
+com.android.tools.r8.shaking.ProguardClassType$1 -> com.android.tools.r8.internal.gL:
     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.YK:
+com.android.tools.r8.shaking.ProguardClassType$2 -> com.android.tools.r8.internal.hL:
     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.ZK:
+com.android.tools.r8.shaking.ProguardClassType$3 -> com.android.tools.r8.internal.iL:
     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.aL:
+com.android.tools.r8.shaking.ProguardClassType$4 -> com.android.tools.r8.internal.jL:
     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.bL:
+com.android.tools.r8.shaking.ProguardClassType$5 -> com.android.tools.r8.internal.kL:
     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.cL:
+com.android.tools.r8.shaking.ProguardClassType$6 -> com.android.tools.r8.internal.lL:
     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.gL:
+com.android.tools.r8.shaking.ProguardCompatibilityActions -> com.android.tools.r8.internal.pL:
     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>
@@ -96447,8 +96662,8 @@
     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.eL:
-com.android.tools.r8.shaking.ProguardCompatibilityActions$Builder -> com.android.tools.r8.internal.fL:
+com.android.tools.r8.shaking.ProguardCompatibilityActions$1 -> com.android.tools.r8.internal.nL:
+com.android.tools.r8.shaking.ProguardCompatibilityActions$Builder -> com.android.tools.r8.internal.oL:
     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
@@ -97914,9 +98129,9 @@
     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.hL:
+com.android.tools.r8.shaking.ProguardConfigurationSource -> com.android.tools.r8.internal.qL:
     java.nio.file.Path getBaseDirectory() -> a
-com.android.tools.r8.shaking.ProguardConfigurationSourceBytes -> com.android.tools.r8.internal.iL:
+com.android.tools.r8.shaking.ProguardConfigurationSourceBytes -> com.android.tools.r8.internal.rL:
     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>
@@ -97924,14 +98139,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.jL:
+com.android.tools.r8.shaking.ProguardConfigurationSourceFile -> com.android.tools.r8.internal.sL:
     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.kL:
+com.android.tools.r8.shaking.ProguardConfigurationSourceStrings -> com.android.tools.r8.internal.tL:
     java.util.List config -> b
     com.android.tools.r8.origin.Origin origin -> c
     java.nio.file.Path basePath -> a
@@ -98072,7 +98287,7 @@
     1:1:void <init>():65:65 -> <init>
     2:2:void <init>():62:62 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> d
-com.android.tools.r8.shaking.ProguardKeepAttributes -> com.android.tools.r8.internal.lL:
+com.android.tools.r8.shaking.ProguardKeepAttributes -> com.android.tools.r8.internal.uL:
     boolean runtimeInvisibleAnnotations -> m
     boolean runtimeVisibleParameterAnnotations -> n
     boolean runtimeInvisibleParameterAnnotations -> o
@@ -98189,7 +98404,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.nL:
+com.android.tools.r8.shaking.ProguardKeepRuleType -> com.android.tools.r8.internal.wL:
     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
@@ -98204,7 +98419,7 @@
     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.mL:
+com.android.tools.r8.shaking.ProguardKeepRuleType$1 -> com.android.tools.r8.internal.vL:
     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.e2:
@@ -98307,7 +98522,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.uL:
+com.android.tools.r8.shaking.ProguardMemberType -> com.android.tools.r8.internal.DL:
     com.android.tools.r8.shaking.ProguardMemberType CONSTRUCTOR -> h
     com.android.tools.r8.shaking.ProguardMemberType INIT -> g
     com.android.tools.r8.shaking.ProguardMemberType CLINIT -> f
@@ -98369,7 +98584,7 @@
     1:1:boolean equals(java.lang.Object):209:209 -> equals
     1:1:int hashCode():214:214 -> hashCode
     1:1:java.lang.String toString():204:204 -> toString
-com.android.tools.r8.shaking.ProguardPackageMatcher -> com.android.tools.r8.internal.vL:
+com.android.tools.r8.shaking.ProguardPackageMatcher -> com.android.tools.r8.internal.EL:
     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
@@ -98456,7 +98671,7 @@
     1:1:void <init>(java.util.List,com.android.tools.r8.shaking.ProguardPathList$1):103:103 -> <init>
     2:3:void <init>(java.util.List):106:107 -> <init>
     1:4:boolean matches(java.lang.String):112:115 -> a
-com.android.tools.r8.shaking.ProguardRuleParserException -> com.android.tools.r8.internal.wL:
+com.android.tools.r8.shaking.ProguardRuleParserException -> com.android.tools.r8.internal.FL:
     com.android.tools.r8.position.Position position -> e
     com.android.tools.r8.origin.Origin origin -> d
     java.lang.String snippet -> c
@@ -98685,7 +98900,7 @@
     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() -> d
     1:11:com.android.tools.r8.shaking.ReprocessMethodRule build():39:49 -> e
-com.android.tools.r8.shaking.RootSetUtils -> com.android.tools.r8.internal.SR:
+com.android.tools.r8.shaking.RootSetUtils -> com.android.tools.r8.internal.bS:
 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
@@ -99088,7 +99303,7 @@
     407:408:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1109 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     409:414:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1110:1115 -> a
-    415:415:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():607:607 -> a
+    415:415:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():609:609 -> a
     415:415:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1115 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     416:417:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1115:1116 -> a
@@ -99162,7 +99377,7 @@
     1928:1932:boolean isInterfaceMethodNeedingDesugaring(com.android.tools.r8.graph.ProgramDefinition):1530:1534 -> a
     1928:1932: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):1443 -> a
     1933:1951: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):1444:1462 -> a
-    1952:1952:boolean com.android.tools.r8.utils.InternalOptions.isOptimizationEnabled():612:612 -> a
+    1952:1952:boolean com.android.tools.r8.utils.InternalOptions.isOptimizationEnabled():614:614 -> a
     1952:1952: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):1462 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1953:1955: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):1462:1464 -> a
@@ -99174,7 +99389,7 @@
     1964:1965: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 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1966:1976: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:1481 -> a
-    1977:1978:boolean com.android.tools.r8.utils.InternalOptions.isAccessModificationEnabled():684:685 -> a
+    1977:1978:boolean com.android.tools.r8.utils.InternalOptions.isAccessModificationEnabled():686:687 -> a
     1977:1978: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):1481 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1979:1981: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):1481:1483 -> a
@@ -99182,8 +99397,8 @@
     1982:1983: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):1483 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1984:1988: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):1484:1488 -> a
-    1989:1989:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():622:622 -> a
-    1989:1989:boolean com.android.tools.r8.utils.InternalOptions.isAnnotationRemovalEnabled():597 -> a
+    1989:1989:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():624:624 -> a
+    1989:1989:boolean com.android.tools.r8.utils.InternalOptions.isAnnotationRemovalEnabled():599 -> a
     1989:1989: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):1488 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     1990:1992: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):1488:1490 -> a
@@ -99191,7 +99406,7 @@
     1993:1994: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
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1995:1999: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):1491:1495 -> a
-    2000:2000:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():607:607 -> a
+    2000:2000:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():609:609 -> a
     2000:2000: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)"]}
     2001:2003: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
@@ -99199,7 +99414,7 @@
     2004:2005: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)"]}
     2006:2010: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:1502 -> a
-    2011:2011:boolean com.android.tools.r8.utils.InternalOptions.isOptimizationEnabled():612:612 -> a
+    2011:2011:boolean com.android.tools.r8.utils.InternalOptions.isOptimizationEnabled():614:614 -> a
     2011:2011: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):1502 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     2012:2014: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):1502:1504 -> a
@@ -99265,7 +99480,7 @@
     181:186:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):254 -> b
     187:189:void evaluateCheckDiscardRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardCheckDiscardRule):1325:1327 -> b
     187:189:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):254 -> b
-    190:190:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():500:500 -> b
+    190:190:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():502:502 -> b
     190:190:void evaluateCheckDiscardRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardCheckDiscardRule):1327 -> b
     190:190:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):254 -> b
     191:191:void evaluateCheckDiscardRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardCheckDiscardRule):1327:1327 -> b
@@ -99338,7 +99553,7 @@
     55:55:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
     55:55:void lambda$tryAndKeepMethodOnClass$1(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):637 -> a
     56:57:void lambda$tryAndKeepMethodOnClass$1(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):645:646 -> a
-com.android.tools.r8.shaking.RuntimeTypeCheckInfo -> com.android.tools.r8.internal.ZR:
+com.android.tools.r8.shaking.RuntimeTypeCheckInfo -> com.android.tools.r8.internal.iS:
     java.util.Set exceptionGuardTypes -> c
     java.util.Set instanceOfTypes -> a
     java.util.Set checkCastTypes -> b
@@ -99350,7 +99565,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.YR:
+com.android.tools.r8.shaking.RuntimeTypeCheckInfo$Builder -> com.android.tools.r8.internal.hS:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     java.util.Set instanceOfTypes -> c
     java.util.Set checkCastTypes -> d
@@ -99386,7 +99601,7 @@
     21:21:com.android.tools.r8.shaking.ScopedDexMethodSet getParent():75:75 -> a
     22:22:void setParent(com.android.tools.r8.shaking.ScopedDexMethodSet):79:79 -> a
     1:1:com.android.tools.r8.shaking.ScopedDexMethodSet newNestedScope():36:36 -> b
-com.android.tools.r8.shaking.SingleTargetLookupCache -> com.android.tools.r8.internal.dT:
+com.android.tools.r8.shaking.SingleTargetLookupCache -> com.android.tools.r8.internal.mT:
     java.util.Map cache -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():16:16 -> <clinit>
@@ -99399,7 +99614,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.aX:
+com.android.tools.r8.shaking.TreePruner -> com.android.tools.r8.internal.jX:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set prunedTypes -> d
     java.util.Set methodsToKeepForConfigurationDebugging -> e
@@ -99488,12 +99703,12 @@
     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.ZW:
+com.android.tools.r8.shaking.TreePruner$1 -> com.android.tools.r8.internal.iX:
     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.bX:
+com.android.tools.r8.shaking.TreePrunerConfiguration -> com.android.tools.r8.internal.kX:
     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.a3:
     int $r8$clinit -> r
@@ -99505,7 +99720,7 @@
     1:1:void <init>(com.android.tools.r8.shaking.UnusedArgumentRule$1):12:12 -> <init>
     2:2:void <init>():16:16 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> d
-com.android.tools.r8.shaking.UnusedItemsPrinter -> com.android.tools.r8.internal.fY:
+com.android.tools.r8.shaking.UnusedItemsPrinter -> com.android.tools.r8.internal.oY:
     com.android.tools.r8.shaking.UnusedItemsPrinter DONT_PRINT -> e
     com.android.tools.r8.shaking.UnusedItemsPrinter$Members currentMembers -> c
     java.util.List classes -> d
@@ -99590,8 +99805,8 @@
     5:8:void visited():61:64 -> b
     9:9:void registerUnusedMethod(com.android.tools.r8.graph.DexEncodedMethod):68:68 -> b
     10:10:void registerUnusedField(com.android.tools.r8.graph.DexEncodedField):72:72 -> b
-com.android.tools.r8.shaking.UnusedItemsPrinter$1 -> com.android.tools.r8.internal.cY:
-com.android.tools.r8.shaking.UnusedItemsPrinter$Members -> com.android.tools.r8.internal.dY:
+com.android.tools.r8.shaking.UnusedItemsPrinter$1 -> com.android.tools.r8.internal.lY:
+com.android.tools.r8.shaking.UnusedItemsPrinter$Members -> com.android.tools.r8.internal.mY:
     java.util.List methods -> b
     java.util.List fields -> a
     1:3:void <init>():18:20 -> <init>
@@ -99599,7 +99814,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.eY:
+com.android.tools.r8.shaking.UnusedItemsPrinter$NopPrinter -> com.android.tools.r8.internal.nY:
     1:1:void <init>():139:139 -> <init>
     void finished() -> a
     void registerUnusedClass(com.android.tools.r8.graph.DexProgramClass) -> a
@@ -99607,7 +99822,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.VY:
+com.android.tools.r8.shaking.VerticalClassMerger -> com.android.tools.r8.internal.eZ:
     com.android.tools.r8.shaking.MainDexInfo mainDexInfo -> r
     com.android.tools.r8.shaking.AppInfoWithLiveness appInfo -> b
     java.util.List synthesizedBridges -> q
@@ -99767,8 +99982,8 @@
     1:1:com.android.tools.r8.graph.AppView access$300(com.android.tools.r8.shaking.VerticalClassMerger):117:117 -> k
     1:1:java.util.concurrent.ExecutorService access$800(com.android.tools.r8.shaking.VerticalClassMerger):117:117 -> l
     1:1:com.android.tools.r8.utils.Timing access$900(com.android.tools.r8.shaking.VerticalClassMerger):117:117 -> m
-com.android.tools.r8.shaking.VerticalClassMerger$1 -> com.android.tools.r8.internal.LY:
-com.android.tools.r8.shaking.VerticalClassMerger$AbortReason$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.MY:
+com.android.tools.r8.shaking.VerticalClassMerger$1 -> com.android.tools.r8.internal.UY:
+com.android.tools.r8.shaking.VerticalClassMerger$AbortReason$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.VY:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     boolean com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.$assertionsDisabled -> a
@@ -99819,7 +100034,7 @@
     82:82:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):141 -> a
     83:83:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):146:146 -> a
     83:83:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):141 -> a
-com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger -> com.android.tools.r8.internal.NY:
+com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger -> com.android.tools.r8.internal.WY:
     com.android.tools.r8.graph.DexProgramClass target -> b
     java.util.List synthesizedBridges -> d
     com.android.tools.r8.graph.DexProgramClass source -> a
@@ -99996,7 +100211,7 @@
     337:337:boolean lambda$restoreDebuggingState$11(com.android.tools.r8.graph.DexEncodedMethod):1360:1360 -> c
     338:338:com.android.tools.r8.graph.GraphLens$MethodLookupResult lambda$redirectSuperCallsInTarget$14(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription):1429:1429 -> c
     1:2:void lambda$restoreDebuggingState$9(com.android.tools.r8.graph.DexEncodedMethod):1350:1351 -> d
-com.android.tools.r8.shaking.VerticalClassMerger$CollisionDetector -> com.android.tools.r8.internal.OY:
+com.android.tools.r8.shaking.VerticalClassMerger$CollisionDetector -> com.android.tools.r8.internal.XY:
     java.util.Map seenPositions -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap sourceProtoCache -> c
     java.util.Collection invokes -> f
@@ -100016,7 +100231,7 @@
     21:21:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap lambda$fillSeenPositions$0(com.android.tools.r8.graph.DexString):1831:1831 -> 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):1850:1881 -> a
     1:22:boolean mayCollide():1797:1818 -> b
-com.android.tools.r8.shaking.VerticalClassMerger$IllegalAccessDetector -> com.android.tools.r8.internal.PY:
+com.android.tools.r8.shaking.VerticalClassMerger$IllegalAccessDetector -> com.android.tools.r8.internal.YY:
     com.android.tools.r8.graph.AppView appView -> f
     1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):2026:2027 -> <init>
     1:2:boolean checkMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.OptionalBool):2048:2049 -> a
@@ -100051,7 +100266,7 @@
     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):2032 -> i
     4:11:boolean checkFieldReference(com.android.tools.r8.graph.DexField):2033:2040 -> i
-com.android.tools.r8.shaking.VerticalClassMerger$InvokeSpecialToDefaultLibraryMethodUseRegistry -> com.android.tools.r8.internal.QY:
+com.android.tools.r8.shaking.VerticalClassMerger$InvokeSpecialToDefaultLibraryMethodUseRegistry -> com.android.tools.r8.internal.ZY:
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():2158:2158 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):2163:2164 -> <init>
@@ -100067,7 +100282,7 @@
     void registerTypeReference(com.android.tools.r8.graph.DexType) -> f
     void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod) -> g
     void registerStaticFieldWrite(com.android.tools.r8.graph.DexField) -> g
-com.android.tools.r8.shaking.VerticalClassMerger$OverloadedMethodSignaturesRetriever -> com.android.tools.r8.internal.RY:
+com.android.tools.r8.shaking.VerticalClassMerger$OverloadedMethodSignaturesRetriever -> com.android.tools.r8.internal.aZ:
     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
@@ -100078,7 +100293,7 @@
     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:51:boolean protoMayReferenceMergedSourceOrTarget(com.android.tools.r8.graph.DexProto):666:680 -> a
     52:59:boolean typeMayReferenceMergedSourceOrTarget(com.android.tools.r8.graph.DexType):686:693 -> a
-com.android.tools.r8.shaking.VerticalClassMerger$SingleTypeMapperGraphLens -> com.android.tools.r8.internal.SY:
+com.android.tools.r8.shaking.VerticalClassMerger$SingleTypeMapperGraphLens -> com.android.tools.r8.internal.bZ:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.shaking.VerticalClassMerger this$0 -> h
     com.android.tools.r8.graph.DexProgramClass target -> g
@@ -100098,7 +100313,7 @@
     2:2:com.android.tools.r8.graph.RewrittenPrototypeDescription lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod):1998:1998 -> d
     boolean isContextFreeForMethods() -> f
     1:1:com.android.tools.r8.graph.DexMethod internalGetPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):1958:1958 -> f
-com.android.tools.r8.shaking.VerticalClassMerger$SynthesizedBridgeCode -> com.android.tools.r8.internal.TY:
+com.android.tools.r8.shaking.VerticalClassMerger$SynthesizedBridgeCode -> com.android.tools.r8.internal.cZ:
     com.android.tools.r8.ir.code.Invoke$Type type -> g
     boolean $assertionsDisabled -> i
     com.android.tools.r8.graph.DexMethod invocationTarget -> f
@@ -100118,11 +100333,11 @@
     2307:2307:void lambda$getRegistryCallback$0(com.android.tools.r8.graph.UseRegistry):2279:2279 -> a
     2296:2296:void lambda$getRegistryCallback$0(com.android.tools.r8.graph.UseRegistry):2279:2279 -> a
     2297:2297:void lambda$getRegistryCallback$0(com.android.tools.r8.graph.UseRegistry):2271:2271 -> a
-    1:2:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():2253:2254 -> r0
-    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 -> r0
-    3:3:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():2254 -> r0
-    4:11:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():2255:2262 -> r0
-com.android.tools.r8.shaking.VerticalClassMerger$VerticalClassMergerTreeFixer -> com.android.tools.r8.internal.UY:
+    1:2:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():2253:2254 -> s0
+    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 -> s0
+    3:3:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():2254 -> s0
+    4:11:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():2255:2262 -> s0
+com.android.tools.r8.shaking.VerticalClassMerger$VerticalClassMergerTreeFixer -> com.android.tools.r8.internal.dZ:
     com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder lensBuilder -> g
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.AppView appView -> f
@@ -100144,7 +100359,7 @@
     9:14:com.android.tools.r8.graph.DexEncodedMethod recordMethodChange(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1765:1770 -> a
     1:11:com.android.tools.r8.shaking.VerticalClassMergerGraphLens fixupTypeReferences():1719:1729 -> b
     12:13:com.android.tools.r8.graph.DexType mapClassType(com.android.tools.r8.graph.DexType):1736:1737 -> b
-com.android.tools.r8.shaking.VerticalClassMergerGraphLens -> com.android.tools.r8.internal.ZY:
+com.android.tools.r8.shaking.VerticalClassMergerGraphLens -> com.android.tools.r8.internal.iZ:
     com.android.tools.r8.graph.AppView appView -> n
     java.util.Map originalMethodSignaturesForBridges -> r
     java.util.Map contextualVirtualToDirectMethodMaps -> p
@@ -100168,8 +100383,8 @@
     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.WY:
-com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder -> com.android.tools.r8.internal.XY:
+com.android.tools.r8.shaking.VerticalClassMergerGraphLens$1 -> com.android.tools.r8.internal.fZ:
+com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder -> com.android.tools.r8.internal.gZ:
     java.util.Map methodMap -> c
     com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneRepresentativeMap newMethodSignatures -> f
     boolean $assertionsDisabled -> i
@@ -100218,9 +100433,9 @@
     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.YY:
+com.android.tools.r8.shaking.VerticalClassMergerGraphLens$GraphLensLookupResultProvider -> com.android.tools.r8.internal.hZ:
     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.AZ:
+com.android.tools.r8.shaking.WhyAreYouKeepingConsumer -> com.android.tools.r8.internal.JZ:
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():43:43 -> <clinit>
     1:1:void <init>(com.android.tools.r8.experimental.graphinfo.GraphConsumer):58:58 -> <init>
@@ -100265,7 +100480,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.yZ:
+com.android.tools.r8.shaking.WhyAreYouKeepingConsumer$Formatter -> com.android.tools.r8.internal.HZ:
     java.io.PrintStream output -> a
     int indentation -> b
     1:1:void <init>(java.io.PrintStream):257:257 -> <init>
@@ -100275,7 +100490,7 @@
     1:2:void indent():268:269 -> b
     3:5:void addReason(java.lang.String):274:276 -> b
     1:3:void startItem(java.lang.String):262:264 -> c
-com.android.tools.r8.shaking.WhyAreYouKeepingConsumer$GraphPath -> com.android.tools.r8.internal.zZ:
+com.android.tools.r8.shaking.WhyAreYouKeepingConsumer$GraphPath -> com.android.tools.r8.internal.IZ:
     com.android.tools.r8.experimental.graphinfo.GraphNode node -> a
     com.android.tools.r8.shaking.WhyAreYouKeepingConsumer$GraphPath path -> b
     boolean $assertionsDisabled -> c
@@ -100402,7 +100617,7 @@
     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.IR:
+com.android.tools.r8.synthesis.Rewritable -> com.android.tools.r8.internal.SR:
     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:
@@ -100437,7 +100652,7 @@
     27:27:com.android.tools.r8.synthesis.SynthesizingContext rewrite(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):116 -> a
     28:30:com.android.tools.r8.synthesis.SynthesizingContext rewrite(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):118:120 -> a
     31:31:void registerPrefixRewriting(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):128:128 -> a
-    32:32:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():436:436 -> a
+    32:32:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():438:438 -> a
     32:32: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)"]}
     33:53:void registerPrefixRewriting(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):131:151 -> a
@@ -100466,50 +100681,52 @@
     328:328:java.lang.String toString():158:158 -> toString
     329:329:java.lang.String toString():158:158 -> toString
 com.android.tools.r8.synthesis.SyntheticClassBuilder -> com.android.tools.r8.synthesis.e:
-    com.android.tools.r8.graph.GenericSignature$ClassSignature signature -> q
-    java.util.List methods -> p
-    java.util.List virtualMethods -> o
-    boolean useSortedMethodBacking -> k
-    com.android.tools.r8.ProgramResource$Kind originKind -> g
-    boolean $assertionsDisabled -> r
+    com.android.tools.r8.graph.GenericSignature$ClassSignature signature -> r
+    java.util.List methods -> q
+    java.util.List virtualMethods -> p
+    com.android.tools.r8.ProgramResource$Kind originKind -> h
+    com.android.tools.r8.graph.DexType superType -> i
+    java.util.List directMethods -> o
+    boolean useSortedMethodBacking -> l
+    boolean $assertionsDisabled -> s
     com.android.tools.r8.graph.DexItemFactory factory -> a
     com.android.tools.r8.origin.Origin origin -> d
     com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind syntheticKind -> c
     boolean isAbstract -> e
-    boolean isInterface -> f
+    boolean isFinal -> f
     com.android.tools.r8.graph.DexType type -> b
-    com.android.tools.r8.graph.DexString sourceFile -> j
-    com.android.tools.r8.graph.DexType superType -> h
-    java.util.List directMethods -> n
-    java.util.List instanceFields -> m
-    java.util.List staticFields -> l
-    com.android.tools.r8.graph.DexTypeList interfaces -> i
+    boolean isInterface -> g
+    com.android.tools.r8.graph.DexString sourceFile -> k
+    java.util.List instanceFields -> n
+    java.util.List staticFields -> m
+    com.android.tools.r8.graph.DexTypeList interfaces -> j
     1:1:void <clinit>():31:31 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexItemFactory):58:58 -> <init>
-    2:25:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexItemFactory):40:63 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexItemFactory):59:59 -> <init>
+    2:26:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexItemFactory):40:64 -> <init>
     long lambda$build$0(long,com.android.tools.r8.graph.DexProgramClass) -> a
-    1:2:com.android.tools.r8.synthesis.SyntheticClassBuilder setSuperType(com.android.tools.r8.graph.DexType):102:103 -> a
-    3:4:com.android.tools.r8.synthesis.SyntheticClassBuilder setOriginKind(com.android.tools.r8.ProgramResource$Kind):107:108 -> a
-    5:6:com.android.tools.r8.synthesis.SyntheticClassBuilder setSourceFile(com.android.tools.r8.graph.DexString):112:113 -> a
-    7:8:com.android.tools.r8.synthesis.SyntheticClassBuilder setGenericSignature(com.android.tools.r8.graph.GenericSignature$ClassSignature):117:118 -> a
-    9:11:com.android.tools.r8.synthesis.SyntheticClassBuilder setInstanceFields(java.util.List):128:130 -> a
-    12:14:com.android.tools.r8.synthesis.SyntheticClassBuilder setDirectMethods(java.lang.Iterable):134:136 -> a
-    15:18:com.android.tools.r8.synthesis.SyntheticClassBuilder addMethod(java.util.function.Consumer):146:149 -> a
-    19:62:com.android.tools.r8.graph.DexClass build():158:201 -> a
-    63:88:com.android.tools.r8.graph.DexClass build():183:208 -> a
+    1:2:com.android.tools.r8.synthesis.SyntheticClassBuilder setSuperType(com.android.tools.r8.graph.DexType):109:110 -> a
+    3:4:com.android.tools.r8.synthesis.SyntheticClassBuilder setOriginKind(com.android.tools.r8.ProgramResource$Kind):114:115 -> a
+    5:6:com.android.tools.r8.synthesis.SyntheticClassBuilder setSourceFile(com.android.tools.r8.graph.DexString):119:120 -> a
+    7:8:com.android.tools.r8.synthesis.SyntheticClassBuilder setGenericSignature(com.android.tools.r8.graph.GenericSignature$ClassSignature):124:125 -> a
+    9:11:com.android.tools.r8.synthesis.SyntheticClassBuilder setInstanceFields(java.util.List):135:137 -> a
+    12:14:com.android.tools.r8.synthesis.SyntheticClassBuilder setDirectMethods(java.lang.Iterable):141:143 -> a
+    15:18:com.android.tools.r8.synthesis.SyntheticClassBuilder addMethod(java.util.function.Consumer):153:156 -> a
+    19:63:com.android.tools.r8.graph.DexClass build():165:209 -> a
+    64:89:com.android.tools.r8.graph.DexClass build():191:216 -> a
     com.android.tools.r8.graph.ClassKind getClassKind() -> b
-    1:4:com.android.tools.r8.synthesis.SyntheticClassBuilder setInterfaces(java.util.List):84:87 -> b
-    5:7:com.android.tools.r8.synthesis.SyntheticClassBuilder setVirtualMethods(java.lang.Iterable):140:142 -> b
-    1:1:com.android.tools.r8.graph.DexItemFactory getFactory():71:71 -> c
-    2:4:com.android.tools.r8.synthesis.SyntheticClassBuilder setStaticFields(java.util.List):122:124 -> c
-    1:1:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind getSyntheticKind():79:79 -> d
-    1:1:com.android.tools.r8.graph.DexType getType():75:75 -> e
+    1:4:com.android.tools.r8.synthesis.SyntheticClassBuilder setInterfaces(java.util.List):85:88 -> b
+    5:7:com.android.tools.r8.synthesis.SyntheticClassBuilder setVirtualMethods(java.lang.Iterable):147:149 -> b
+    1:1:com.android.tools.r8.graph.DexItemFactory getFactory():72:72 -> c
+    2:4:com.android.tools.r8.synthesis.SyntheticClassBuilder setStaticFields(java.util.List):129:131 -> c
+    1:1:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind getSyntheticKind():80:80 -> d
+    1:1:com.android.tools.r8.graph.DexType getType():76:76 -> e
     com.android.tools.r8.synthesis.SyntheticClassBuilder self() -> f
-    1:2:com.android.tools.r8.synthesis.SyntheticClassBuilder setAbstract():91:92 -> g
-    1:2:com.android.tools.r8.synthesis.SyntheticClassBuilder setAbstract():91:92 -> h
-    1:2:com.android.tools.r8.synthesis.SyntheticClassBuilder setInterface():96 -> h
-    3:4:com.android.tools.r8.synthesis.SyntheticClassBuilder setInterface():97:98 -> h
-    1:2:com.android.tools.r8.synthesis.SyntheticClassBuilder setUseSortedMethodBacking(boolean):153:154 -> i
+    1:3:com.android.tools.r8.synthesis.SyntheticClassBuilder setAbstract():92:94 -> g
+    1:3:com.android.tools.r8.synthesis.SyntheticClassBuilder setAbstract():92:94 -> h
+    1:3:com.android.tools.r8.synthesis.SyntheticClassBuilder setInterface():103 -> h
+    4:5:com.android.tools.r8.synthesis.SyntheticClassBuilder setInterface():104:105 -> h
+    1:2:com.android.tools.r8.synthesis.SyntheticClassBuilder setUseSortedMethodBacking(boolean):160:161 -> i
+    1:2:com.android.tools.r8.synthesis.SyntheticClassBuilder unsetFinal():98:99 -> j
 com.android.tools.r8.synthesis.SyntheticClassDefinition -> com.android.tools.r8.synthesis.f:
     com.android.tools.r8.graph.DexClass clazz -> d
     1:2:void <init>(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexClass):23:24 -> <init>
@@ -100592,7 +100809,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.UV:
+com.android.tools.r8.synthesis.SyntheticClasspathDefinition -> com.android.tools.r8.internal.dW:
 com.android.tools.r8.synthesis.SyntheticDefinition -> com.android.tools.r8.synthesis.k:
     com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind kind -> a
     boolean $assertionsDisabled -> c
@@ -100645,7 +100862,7 @@
     boolean isProgramDefinition() -> i
     boolean isValid() -> j
     com.android.tools.r8.synthesis.SyntheticReference toReference() -> k
-com.android.tools.r8.synthesis.SyntheticDefinitionsProvider -> com.android.tools.r8.internal.VV:
+com.android.tools.r8.synthesis.SyntheticDefinitionsProvider -> com.android.tools.r8.internal.eW:
     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
@@ -100686,7 +100903,7 @@
     125:132: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
     133:133:boolean verifyNoNestedSynthetics(com.android.tools.r8.graph.DexItemFactory):314:314 -> a
     134:134:void lambda$verifyNoNestedSynthetics$5(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.synthesis.SyntheticReference):316:316 -> a
-    135:135:boolean com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind.allowSyntheticContext():98:98 -> a
+    135:135:boolean com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind.allowSyntheticContext():99:99 -> a
     135:135:void lambda$verifyNoNestedSynthetics$5(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.synthesis.SyntheticReference):316 -> a
     136:139:void lambda$verifyNoNestedSynthetics$5(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.synthesis.SyntheticReference):320:323 -> a
     140:140:boolean isNotSyntheticType(com.android.tools.r8.graph.DexType):309:309 -> a
@@ -100730,12 +100947,12 @@
     812:812:void addSyntheticMarker(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):535:535 -> a
     813:813: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
     813:813:void addSyntheticMarker(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):535 -> a
-    814:814:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():471:471 -> a
+    814:814:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> a
     814:814: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
     814:814:void addSyntheticMarker(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):535 -> a
     815:820: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
     815:820:void addSyntheticMarker(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):535 -> a
-    821:826: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):392:397 -> a
+    821:826: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
     821:826: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
     821:826:void addSyntheticMarker(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):535 -> a
     827:840:com.android.tools.r8.graph.DexAnnotationSet com.android.tools.r8.graph.DexAnnotationSet.getWithAddedOrReplaced(com.android.tools.r8.graph.DexAnnotation):183:196 -> a
@@ -100801,7 +101018,7 @@
     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):736:736 -> 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
@@ -100851,7 +101068,7 @@
     2:3:com.android.tools.r8.synthesis.SyntheticDefinition getRepresentative():838:839 -> b
     1:1:boolean hasRepresentative():843:843 -> c
     1:13:void selectDeterministicRepresentative():859:871 -> d
-    14:14:java.lang.Object com.android.tools.r8.utils.ListUtils.removeLast(java.util.List):233:233 -> d
+    14:14:java.lang.Object com.android.tools.r8.utils.ListUtils.removeLast(java.util.List):241:241 -> d
     14:14:void selectDeterministicRepresentative():871 -> d
     15:16:void setRepresentative(com.android.tools.r8.synthesis.SyntheticDefinition):876:877 -> d
     15:16:void selectDeterministicRepresentative():872 -> d
@@ -100868,7 +101085,7 @@
     1788:1788:java.lang.String toString():889:889 -> toString
     1789:1789:java.lang.String toString():889:889 -> toString
     1778:1778:java.lang.String toString():889:889 -> toString
-com.android.tools.r8.synthesis.SyntheticFinalization$Result -> com.android.tools.r8.internal.WV:
+com.android.tools.r8.synthesis.SyntheticFinalization$Result -> com.android.tools.r8.internal.fW:
     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
@@ -100882,234 +101099,235 @@
     int nextSyntheticId -> a
     com.android.tools.r8.synthesis.CommittedSyntheticsCollection committed -> b
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():52:52 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.synthesis.CommittedItems):112:112 -> <init>
-    2:2:void <init>(int,com.android.tools.r8.synthesis.CommittedSyntheticsCollection):115:115 -> <init>
-    3:23:void <init>(int,com.android.tools.r8.synthesis.CommittedSyntheticsCollection):97:117 -> <init>
+    1:1:void <clinit>():53:53 -> <clinit>
+    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():101:101 -> a
-    2:6:void collectSyntheticInputs(com.android.tools.r8.graph.AppView):122:126 -> 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):126 -> a
-    8:15:void collectSyntheticInputs(com.android.tools.r8.graph.AppView):128:135 -> a
-    16:18:void collectSyntheticInputs(com.android.tools.r8.graph.AppView):134:136 -> a
-    19:19:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():500:500 -> a
-    19:19:void collectSyntheticInputs(com.android.tools.r8.graph.AppView):138 -> a
-    20:20:void collectSyntheticInputs(com.android.tools.r8.graph.AppView):138:138 -> 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):142 -> a
-    22:22:void collectSyntheticInputs(com.android.tools.r8.graph.AppView):142:142 -> a
-    23:37:void collectSyntheticInputs(com.android.tools.r8.graph.AppView):139:153 -> a
-    38:56:void collectSyntheticInputs(com.android.tools.r8.graph.AppView):152:170 -> a
-    57:59:void lambda$collectSyntheticInputs$0(com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder,com.android.tools.r8.synthesis.SyntheticMarker,com.android.tools.r8.graph.ProgramMethod):149:149 -> 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:56:void collectSyntheticInputs(com.android.tools.r8.graph.AppView):153:171 -> a
+    57:59: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
     60:60:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder.addNonLegacyMethod(com.android.tools.r8.synthesis.SyntheticMethodDefinition):65:65 -> a
-    60:60:void lambda$collectSyntheticInputs$0(com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder,com.android.tools.r8.synthesis.SyntheticMarker,com.android.tools.r8.graph.ProgramMethod):149 -> a
-    61:66:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,java.util.function.Function):180:185 -> a
+    60:60: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
+    61:66:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,java.util.function.Function):181:186 -> a
     67:67:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> a
-    67:67:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,java.util.function.Function):185 -> a
-    68:76:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,java.util.function.Function):185:193 -> a
-    77:77:boolean isEligibleForClassMerging(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):233:233 -> a
-    78:78:boolean isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):264:264 -> a
-    78:78:boolean isEligibleForClassMerging(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):233 -> a
-    79:79:boolean isSyntheticClass(com.android.tools.r8.graph.DexType):260:260 -> a
-    79:79:boolean isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):264 -> a
-    79:79:boolean isEligibleForClassMerging(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):233 -> a
-    80:81:boolean isEligibleForClassMerging(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):233:234 -> a
-    82:82:boolean isNonLegacySynthetic(com.android.tools.r8.graph.DexProgramClass):225:225 -> a
-    82:82:boolean isSyntheticLambda(com.android.tools.r8.graph.DexProgramClass):238 -> a
-    82:82:boolean isEligibleForClassMerging(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):234 -> a
-    83:92:boolean isSyntheticLambda(com.android.tools.r8.graph.DexProgramClass):241:250 -> a
-    83:92:boolean isEligibleForClassMerging(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):234 -> a
-    93:93:boolean isSubjectToKeepRules(com.android.tools.r8.graph.DexProgramClass):255:255 -> a
-    94:94:boolean isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):264:264 -> a
-    94:94:boolean isSubjectToKeepRules(com.android.tools.r8.graph.DexProgramClass):255 -> a
-    95:95:boolean isSyntheticClass(com.android.tools.r8.graph.DexType):260:260 -> a
-    95:95:boolean isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):264 -> a
-    95:95:boolean isSubjectToKeepRules(com.android.tools.r8.graph.DexProgramClass):255 -> a
-    96:96:boolean isSubjectToKeepRules(com.android.tools.r8.graph.DexProgramClass):255:255 -> a
-    97:97:boolean isSyntheticInput(com.android.tools.r8.graph.DexProgramClass):272:272 -> a
-    97:97:boolean isSubjectToKeepRules(com.android.tools.r8.graph.DexProgramClass):256 -> a
+    67:67:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,java.util.function.Function):186 -> a
+    68:76:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,java.util.function.Function):186:194 -> a
+    77:77:boolean isEligibleForClassMerging(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):234:234 -> a
+    78:78:boolean isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):265:265 -> a
+    78:78:boolean isEligibleForClassMerging(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):234 -> a
+    79:79:boolean isSyntheticClass(com.android.tools.r8.graph.DexType):261:261 -> a
+    79:79:boolean isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):265 -> a
+    79:79:boolean isEligibleForClassMerging(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):234 -> a
+    80:81:boolean isEligibleForClassMerging(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):234:235 -> a
+    82:82:boolean isNonLegacySynthetic(com.android.tools.r8.graph.DexProgramClass):226:226 -> a
+    82:82:boolean isSyntheticLambda(com.android.tools.r8.graph.DexProgramClass):239 -> a
+    82:82:boolean isEligibleForClassMerging(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):235 -> a
+    83:92:boolean isSyntheticLambda(com.android.tools.r8.graph.DexProgramClass):242:251 -> a
+    83:92:boolean isEligibleForClassMerging(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):235 -> a
+    93:93:boolean isSubjectToKeepRules(com.android.tools.r8.graph.DexProgramClass):256:256 -> a
+    94:94:boolean isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):265:265 -> a
+    94:94:boolean isSubjectToKeepRules(com.android.tools.r8.graph.DexProgramClass):256 -> a
+    95:95:boolean isSyntheticClass(com.android.tools.r8.graph.DexType):261:261 -> a
+    95:95:boolean isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):265 -> a
+    95:95:boolean isSubjectToKeepRules(com.android.tools.r8.graph.DexProgramClass):256 -> a
+    96:96:boolean isSubjectToKeepRules(com.android.tools.r8.graph.DexProgramClass):256:256 -> a
+    97:97:boolean isSyntheticInput(com.android.tools.r8.graph.DexProgramClass):273:273 -> a
+    97:97:boolean isSubjectToKeepRules(com.android.tools.r8.graph.DexProgramClass):257 -> a
     98:98:boolean com.android.tools.r8.synthesis.CommittedSyntheticsCollection.containsSyntheticInput(com.android.tools.r8.graph.DexType):197:197 -> a
-    98:98:boolean isSyntheticInput(com.android.tools.r8.graph.DexProgramClass):272 -> a
-    98:98:boolean isSubjectToKeepRules(com.android.tools.r8.graph.DexProgramClass):256 -> a
-    99:99:boolean isSyntheticOfKind(com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind):268:268 -> a
-    100:111:com.android.tools.r8.FeatureSplit getContextualFeatureSplit(com.android.tools.r8.graph.DexType,com.android.tools.r8.features.ClassToFeatureSplitMap):277:288 -> a
-    112:115:boolean verifyAllHaveSameFeature(java.util.List,java.util.function.Function):294:297 -> a
-    112:115:com.android.tools.r8.FeatureSplit getContextualFeatureSplit(com.android.tools.r8.graph.DexType,com.android.tools.r8.features.ClassToFeatureSplitMap):288 -> a
-    116:116:com.android.tools.r8.FeatureSplit getContextualFeatureSplit(com.android.tools.r8.graph.DexType,com.android.tools.r8.features.ClassToFeatureSplitMap):289:289 -> a
-    117:122:void forEachSynthesizingContext(com.android.tools.r8.graph.DexType,java.util.function.Consumer):303:308 -> a
-    123:126:java.util.Collection getSynthesizingContextTypes(com.android.tools.r8.graph.DexType):317:320 -> a
-    127:127:void lambda$getSynthesizingContextTypes$2(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.synthesis.SynthesizingContext):319:319 -> a
-    128:128:java.util.Set getSynthesizingContextReferences(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):326:326 -> a
-    129:129:boolean isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):264:264 -> a
-    129:129:java.util.Set getSynthesizingContextReferences(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):326 -> a
-    130:130:boolean isSyntheticClass(com.android.tools.r8.graph.DexType):260:260 -> a
-    130:130:boolean isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):264 -> a
-    130:130:java.util.Set getSynthesizingContextReferences(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):326 -> a
-    131:132:java.util.Set getSynthesizingContextReferences(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):326:327 -> a
-    133:133:boolean isSyntheticMethodThatShouldNotBeDoubleProcessed(com.android.tools.r8.graph.ProgramMethod):339:339 -> a
-    134:135:boolean isSyntheticMethodThatShouldNotBeDoubleProcessed(com.android.tools.r8.graph.ProgramMethod):338:339 -> a
+    98:98:boolean isSyntheticInput(com.android.tools.r8.graph.DexProgramClass):273 -> a
+    98:98:boolean isSubjectToKeepRules(com.android.tools.r8.graph.DexProgramClass):257 -> a
+    99:99:boolean isSyntheticOfKind(com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind):269:269 -> a
+    100:111:com.android.tools.r8.FeatureSplit getContextualFeatureSplit(com.android.tools.r8.graph.DexType,com.android.tools.r8.features.ClassToFeatureSplitMap):278:289 -> a
+    112:115:boolean verifyAllHaveSameFeature(java.util.List,java.util.function.Function):295:298 -> a
+    112:115:com.android.tools.r8.FeatureSplit getContextualFeatureSplit(com.android.tools.r8.graph.DexType,com.android.tools.r8.features.ClassToFeatureSplitMap):289 -> a
+    116:116:com.android.tools.r8.FeatureSplit getContextualFeatureSplit(com.android.tools.r8.graph.DexType,com.android.tools.r8.features.ClassToFeatureSplitMap):290:290 -> a
+    117:122:void forEachSynthesizingContext(com.android.tools.r8.graph.DexType,java.util.function.Consumer):304:309 -> a
+    123:126:java.util.Collection getSynthesizingContextTypes(com.android.tools.r8.graph.DexType):318:321 -> a
+    127:127:void lambda$getSynthesizingContextTypes$2(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.synthesis.SynthesizingContext):320:320 -> a
+    128:128:java.util.Set getSynthesizingContextReferences(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):327:327 -> a
+    129:129:boolean isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):265:265 -> a
+    129:129:java.util.Set getSynthesizingContextReferences(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):327 -> a
+    130:130:boolean isSyntheticClass(com.android.tools.r8.graph.DexType):261:261 -> a
+    130:130:boolean isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):265 -> a
+    130:130:java.util.Set getSynthesizingContextReferences(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):327 -> a
+    131:132:java.util.Set getSynthesizingContextReferences(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):327:328 -> a
+    133:133:boolean isSyntheticMethodThatShouldNotBeDoubleProcessed(com.android.tools.r8.graph.ProgramMethod):340:340 -> a
+    134:135:boolean isSyntheticMethodThatShouldNotBeDoubleProcessed(com.android.tools.r8.graph.ProgramMethod):339:340 -> a
     136:136:java.lang.Object com.android.tools.r8.com.google.common.collect.ImmutableMap.getOrDefault(java.lang.Object,java.lang.Object):713:713 -> a
-    136:136:boolean isSyntheticMethodThatShouldNotBeDoubleProcessed(com.android.tools.r8.graph.ProgramMethod):339 -> a
+    136:136:boolean isSyntheticMethodThatShouldNotBeDoubleProcessed(com.android.tools.r8.graph.ProgramMethod):340 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    137:145:boolean isSyntheticMethodThatShouldNotBeDoubleProcessed(com.android.tools.r8.graph.ProgramMethod):339:347 -> a
-    146:149:boolean verifySyntheticLambdaProperty(com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate,java.util.function.Predicate):358:361 -> a
+    137:145:boolean isSyntheticMethodThatShouldNotBeDoubleProcessed(com.android.tools.r8.graph.ProgramMethod):340:348 -> a
+    146:149:boolean verifySyntheticLambdaProperty(com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate,java.util.function.Predicate):359:362 -> a
     150:150:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):418:418 -> a
-    150:150:boolean verifySyntheticLambdaProperty(com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate,java.util.function.Predicate):361 -> a
-    151:151:boolean verifySyntheticLambdaProperty(com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate,java.util.function.Predicate):363:363 -> a
+    150:150:boolean verifySyntheticLambdaProperty(com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate,java.util.function.Predicate):362 -> a
+    151:151:boolean verifySyntheticLambdaProperty(com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate,java.util.function.Predicate):364:364 -> a
     152:152: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
-    152:152:boolean verifySyntheticLambdaProperty(com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate,java.util.function.Predicate):363 -> a
-    153:155:boolean verifySyntheticLambdaProperty(com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate,java.util.function.Predicate):364:366 -> a
-    156:156:boolean lambda$verifySyntheticLambdaProperty$3(com.android.tools.r8.synthesis.SyntheticReference):363:363 -> a
-    157:166:com.android.tools.r8.synthesis.SynthesizingContext getSynthesizingContext(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.features.ClassToFeatureSplitMap):380:389 -> a
+    152:152:boolean verifySyntheticLambdaProperty(com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate,java.util.function.Predicate):364 -> a
+    153:155:boolean verifySyntheticLambdaProperty(com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate,java.util.function.Predicate):365:367 -> a
+    156:156:boolean lambda$verifySyntheticLambdaProperty$3(com.android.tools.r8.synthesis.SyntheticReference):364:364 -> a
+    157:166:com.android.tools.r8.synthesis.SynthesizingContext getSynthesizingContext(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.features.ClassToFeatureSplitMap):381:390 -> a
     167:168:java.lang.Object com.android.tools.r8.utils.IterableUtils.min(java.lang.Iterable,java.util.Comparator):101:102 -> a
-    167:168:com.android.tools.r8.synthesis.SynthesizingContext getSynthesizingContext(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.features.ClassToFeatureSplitMap):389 -> a
-    169:176:com.android.tools.r8.synthesis.SynthesizingContext getSynthesizingContext(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.features.ClassToFeatureSplitMap):389:396 -> a
+    167:168:com.android.tools.r8.synthesis.SynthesizingContext getSynthesizingContext(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.features.ClassToFeatureSplitMap):390 -> a
+    169:176:com.android.tools.r8.synthesis.SynthesizingContext getSynthesizingContext(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.features.ClassToFeatureSplitMap):390:397 -> a
     177:177: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
-    177:177:com.android.tools.r8.synthesis.SynthesizingContext getSynthesizingContext(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.features.ClassToFeatureSplitMap):396 -> a
-    178:178:com.android.tools.r8.synthesis.SynthesizingContext getSynthesizingContext(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.features.ClassToFeatureSplitMap):397:397 -> a
-    179:179:int lambda$getSynthesizingContext$4(com.android.tools.r8.synthesis.SyntheticReference,com.android.tools.r8.synthesis.SyntheticReference):392:392 -> a
-    180:181:void lambda$internalEnsureDexProgramClass$5(java.util.function.Consumer,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):430:431 -> a
-    182:186: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):447:451 -> a
-    187:187: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):462:462 -> a
-    188:188:com.android.tools.r8.synthesis.SynthesizingContext getSynthesizingContext(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView):374:374 -> a
-    188:188: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):462 -> a
-    189:189:com.android.tools.r8.synthesis.SynthesizingContext getSynthesizingContext(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView):373:373 -> a
-    189:189: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):462 -> a
-    190:190: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):465:465 -> a
-    191:193: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):464:466 -> a
-    194:196: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):475:477 -> a
-    197:201: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):482:486 -> a
-    202:202:boolean isSyntheticClass(com.android.tools.r8.graph.DexType):260:260 -> a
-    202:202: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):487 -> a
-    203:205: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):487:489 -> a
-    206:207:com.android.tools.r8.synthesis.SynthesizingContext internalGetOuterContext(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):495:496 -> a
-    208:208:com.android.tools.r8.synthesis.SynthesizingContext getSynthesizingContext(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView):374:374 -> a
-    208:208:com.android.tools.r8.synthesis.SynthesizingContext internalGetOuterContext(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):496 -> a
-    209:209:com.android.tools.r8.synthesis.SynthesizingContext getSynthesizingContext(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView):373:373 -> a
-    209:209:com.android.tools.r8.synthesis.SynthesizingContext internalGetOuterContext(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):496 -> a
-    210:210:com.android.tools.r8.synthesis.SynthesizingContext internalGetOuterContext(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):497:497 -> a
-    211:214: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):511:514 -> a
-    215:215: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):533:533 -> a
-    216:216: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):547:547 -> a
-    216:216: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):525 -> a
-    217:223: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):546:552 -> a
-    217:223: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):525 -> a
-    224:224: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):547:547 -> a
-    225:231: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):546:552 -> a
-    232:232:void errorOnInvalidSyntheticEnsure(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.AppView):557:557 -> a
-    233:233:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> a
-    233:233:void errorOnInvalidSyntheticEnsure(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.AppView):559 -> a
-    234:234:void errorOnInvalidSyntheticEnsure(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.AppView):559:559 -> a
-    235:235:void errorOnInvalidSyntheticEnsure(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.AppView):558:558 -> a
-    236:236:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():500:500 -> a
-    236:236:void errorOnInvalidSyntheticEnsure(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.AppView):561 -> a
+    177:177:com.android.tools.r8.synthesis.SynthesizingContext getSynthesizingContext(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.features.ClassToFeatureSplitMap):397 -> a
+    178:178:com.android.tools.r8.synthesis.SynthesizingContext getSynthesizingContext(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.features.ClassToFeatureSplitMap):398:398 -> a
+    179:179:int lambda$getSynthesizingContext$4(com.android.tools.r8.synthesis.SyntheticReference,com.android.tools.r8.synthesis.SyntheticReference):393:393 -> a
+    180:187: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
+    188:189:void lambda$internalEnsureDexProgramClass$5(java.util.function.Consumer,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):450:451 -> a
+    190:194: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
+    195:195: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
+    196:196:com.android.tools.r8.synthesis.SynthesizingContext getSynthesizingContext(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView):375:375 -> a
+    196:196: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
+    197:197:com.android.tools.r8.synthesis.SynthesizingContext getSynthesizingContext(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView):374:374 -> a
+    197:197: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
+    198:198: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
+    199:201: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
+    202:204: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:497 -> a
+    205:209: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:506 -> a
+    210:210:boolean isSyntheticClass(com.android.tools.r8.graph.DexType):261:261 -> a
+    210:210: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
+    211:213: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
+    214:215:com.android.tools.r8.synthesis.SynthesizingContext internalGetOuterContext(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):515:516 -> a
+    216:216:com.android.tools.r8.synthesis.SynthesizingContext getSynthesizingContext(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView):375:375 -> a
+    216:216:com.android.tools.r8.synthesis.SynthesizingContext internalGetOuterContext(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):516 -> a
+    217:217:com.android.tools.r8.synthesis.SynthesizingContext getSynthesizingContext(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView):374:374 -> a
+    217:217:com.android.tools.r8.synthesis.SynthesizingContext internalGetOuterContext(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):516 -> a
+    218:218:com.android.tools.r8.synthesis.SynthesizingContext internalGetOuterContext(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):517:517 -> a
+    219:222: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:534 -> a
+    223:223: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):553:553 -> a
+    224:224: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
+    224:224: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):545 -> a
+    225:231: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:572 -> a
+    225:231: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):545 -> a
+    232:232: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
+    233:239: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:572 -> a
+    240:240:void errorOnInvalidSyntheticEnsure(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.AppView):577:577 -> a
+    241:241:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> a
+    241:241:void errorOnInvalidSyntheticEnsure(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.AppView):579 -> a
+    242:242:void errorOnInvalidSyntheticEnsure(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.AppView):579:579 -> a
+    243:243:void errorOnInvalidSyntheticEnsure(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.AppView):578:578 -> a
+    244:244:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():502:502 -> a
+    244:244:void errorOnInvalidSyntheticEnsure(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.AppView):581 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    237:237: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":800,"2":801,"3":802}}
-    800:800:void errorOnInvalidSyntheticEnsure(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.AppView):561:561 -> a
-    801:801:void errorOnInvalidSyntheticEnsure(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.AppView):561:561 -> a
-    802:802:void errorOnInvalidSyntheticEnsure(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.AppView):561:561 -> a
-    798:799:void errorOnInvalidSyntheticEnsure(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.AppView):561:562 -> a
-    803:804: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):579:580 -> a
-    805:805:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> a
-    805:805: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):582 -> a
-    806:806: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):585:585 -> a
-    807:818: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):583:594 -> a
-    819:821: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):602:604 -> a
-    822:824: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):616:618 -> a
-    825:840: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):632:647 -> a
-    841:852: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):637:648 -> a
-    853:853:void lambda$ensureFixedClasspathClassMethod$7(java.util.function.Consumer,com.android.tools.r8.synthesis.SyntheticMethodBuilder):645:645 -> a
-    854:869: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):659:674 -> a
-    870:872: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):685:687 -> a
-    873:873: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):705:705 -> a
-    874:874:com.android.tools.r8.synthesis.SynthesizingContext getSynthesizingContext(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView):374:374 -> a
-    874:874: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):708 -> a
-    875:875:com.android.tools.r8.synthesis.SynthesizingContext getSynthesizingContext(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView):373:373 -> a
-    875:875: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):708 -> a
-    876:876: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):711:711 -> a
-    877:886: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):710:719 -> a
-    887:887:void lambda$createMethod$8(com.android.tools.r8.synthesis.SyntheticMethodBuilder):716:716 -> a
-    888:888:void addPendingDefinition(com.android.tools.r8.synthesis.SyntheticDefinition):724:724 -> a
-    889:889:com.android.tools.r8.synthesis.CommittedItems commit(com.android.tools.r8.graph.DexApplication):730:730 -> a
-    890:890:com.android.tools.r8.synthesis.CommittedItems commitPrunedItems(com.android.tools.r8.graph.PrunedItems):734:734 -> a
-    890:890:com.android.tools.r8.synthesis.CommittedItems commit(com.android.tools.r8.graph.DexApplication):730 -> a
-    891:891:com.android.tools.r8.synthesis.CommittedItems commitPrunedItems(com.android.tools.r8.graph.PrunedItems):734:734 -> a
-    892:894:com.android.tools.r8.synthesis.CommittedItems commitRewrittenWithLens(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):739:741 -> a
-    895:895:com.android.tools.r8.synthesis.CommittedItems commitRewrittenWithLens(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):740:740 -> a
-    896:898: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):749:751 -> a
-    899:899:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder com.android.tools.r8.synthesis.CommittedSyntheticsCollection.builder():166:166 -> a
-    899:899: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):751 -> a
-    900:912: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):755:767 -> a
-    913:918: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):766:771 -> a
-    919:919:boolean com.android.tools.r8.graph.DexApplication$Builder.isDirect():0:0 -> a
-    919:919: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
-    920:921: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):772:773 -> a
-    922:922:com.android.tools.r8.graph.DexClass com.android.tools.r8.synthesis.SyntheticClassDefinition.getHolder():29:29 -> a
-    922:922:com.android.tools.r8.graph.DexClasspathClass com.android.tools.r8.synthesis.SyntheticClasspathClassDefinition.getHolder():16 -> a
-    922:922: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):773 -> a
+    245:245: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":828,"2":829,"3":830}}
+    828:828:void errorOnInvalidSyntheticEnsure(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.AppView):581:581 -> a
+    829:829:void errorOnInvalidSyntheticEnsure(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.AppView):581:581 -> a
+    830:830:void errorOnInvalidSyntheticEnsure(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.AppView):581:581 -> a
+    826:827:void errorOnInvalidSyntheticEnsure(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.AppView):581:582 -> a
+    831:832: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
+    833:833:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> a
+    833:833: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
+    834:834: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
+    835:846: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:614 -> a
+    847:849: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
+    850:852: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:638 -> a
+    853:868: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
+    869:880: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:668 -> a
+    881:881:void lambda$ensureFixedClasspathClassMethod$7(java.util.function.Consumer,com.android.tools.r8.synthesis.SyntheticMethodBuilder):665:665 -> a
+    882:897: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:694 -> a
+    898:900: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
+    901:901: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
+    902:902:com.android.tools.r8.synthesis.SynthesizingContext getSynthesizingContext(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView):375:375 -> a
+    902:902: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
+    903:903:com.android.tools.r8.synthesis.SynthesizingContext getSynthesizingContext(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView):374:374 -> a
+    903:903: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
+    904:904: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
+    905:914: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
+    915:915:void lambda$createMethod$8(com.android.tools.r8.synthesis.SyntheticMethodBuilder):736:736 -> a
+    916:916:void addPendingDefinition(com.android.tools.r8.synthesis.SyntheticDefinition):744:744 -> a
+    917:917:com.android.tools.r8.synthesis.CommittedItems commit(com.android.tools.r8.graph.DexApplication):750:750 -> a
+    918:918:com.android.tools.r8.synthesis.CommittedItems commitPrunedItems(com.android.tools.r8.graph.PrunedItems):754:754 -> a
+    918:918:com.android.tools.r8.synthesis.CommittedItems commit(com.android.tools.r8.graph.DexApplication):750 -> a
+    919:919:com.android.tools.r8.synthesis.CommittedItems commitPrunedItems(com.android.tools.r8.graph.PrunedItems):754:754 -> a
+    920:922:com.android.tools.r8.synthesis.CommittedItems commitRewrittenWithLens(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):759:761 -> a
+    923:923:com.android.tools.r8.synthesis.CommittedItems commitRewrittenWithLens(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):760:760 -> a
+    924:926: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
+    927:927:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder com.android.tools.r8.synthesis.CommittedSyntheticsCollection.builder():166:166 -> a
+    927:927: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
+    928:940: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
+    941:946: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
+    947:947:boolean com.android.tools.r8.graph.DexApplication$Builder.isDirect():0:0 -> a
+    947:947: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
+    948:949: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
+    950:950:com.android.tools.r8.graph.DexClass com.android.tools.r8.synthesis.SyntheticClassDefinition.getHolder():29:29 -> a
+    950:950:com.android.tools.r8.graph.DexClasspathClass com.android.tools.r8.synthesis.SyntheticClasspathClassDefinition.getHolder():16 -> a
+    950:950: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)"]}
-    923:923:com.android.tools.r8.graph.DexClasspathClass com.android.tools.r8.synthesis.SyntheticClasspathClassDefinition.getHolder():16:16 -> a
-    923:923: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):773 -> a
+    951:951:com.android.tools.r8.graph.DexClasspathClass com.android.tools.r8.synthesis.SyntheticClasspathClassDefinition.getHolder():16:16 -> a
+    951:951: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)"]}
-    924:935: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):773:784 -> a
-    936:936:void writeAttributeIfIntermediateSyntheticClass(com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):790:790 -> a
-    937:937:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():471:471 -> a
-    937:937:void writeAttributeIfIntermediateSyntheticClass(com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):790 -> a
+    952:963: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
+    964:964: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
+    965:965:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> a
+    965:965: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)"]}
-    938:945:void writeAttributeIfIntermediateSyntheticClass(com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):793:800 -> a
-    946:946: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
-    946:946:void writeAttributeIfIntermediateSyntheticClass(com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):801 -> a
-    1:2:com.android.tools.r8.synthesis.CommittedItems createInitialSyntheticItems(com.android.tools.r8.graph.DexApplication):106:107 -> b
-    3:3:java.util.Collection getPendingSyntheticClasses():205:205 -> b
-    4:4:boolean isSyntheticInput(com.android.tools.r8.graph.DexProgramClass):272:272 -> b
+    966:973: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
+    974:974: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
+    974:974: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: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):197:197 -> b
-    5:5:boolean isSyntheticInput(com.android.tools.r8.graph.DexProgramClass):272 -> 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):313:313 -> b
-    7:7:void lambda$getSynthesizingContexts$1(com.android.tools.r8.graph.DexType,java.util.function.Consumer):313:313 -> b
-    8:21: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):410:423 -> b
-    22:26: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):421:425 -> b
-    27:27:boolean isSyntheticClass(com.android.tools.r8.graph.DexType):260:260 -> b
-    27:27: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):425 -> b
-    28:38: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):425:435 -> b
-    39:50: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):427:438 -> b
-    51:51: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):696:696 -> b
-    52:54:com.android.tools.r8.synthesis.SyntheticFinalization$Result computeFinalSynthetics(com.android.tools.r8.graph.AppView):808:810 -> b
-    1:1:boolean hasPendingSyntheticClasses():201:201 -> c
-    2:2:boolean isCommittedSynthetic(com.android.tools.r8.graph.DexType):209:209 -> c
+    6:6:java.util.List getSynthesizingContexts(com.android.tools.r8.graph.DexType):314:314 -> b
+    7:7:void lambda$getSynthesizingContexts$1(com.android.tools.r8.graph.DexType,java.util.function.Consumer):314:314 -> b
+    8:21: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 -> b
+    22:26: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:445 -> b
+    27:27:boolean isSyntheticClass(com.android.tools.r8.graph.DexType):261:261 -> b
+    27:27: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 -> b
+    28:38: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 -> b
+    39:50: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:458 -> b
+    51:51: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
+    52:54:com.android.tools.r8.synthesis.SyntheticFinalization$Result computeFinalSynthetics(com.android.tools.r8.graph.AppView):828:830 -> 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):209 -> 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)"]}
-    1:1:boolean isFinalized():197:197 -> d
-    2:2:boolean isNonLegacyCommittedSynthetic(com.android.tools.r8.graph.DexType):213:213 -> d
-    2:2:boolean isNonLegacySynthetic(com.android.tools.r8.graph.DexType):229 -> d
-    3:3:boolean isNonLegacyPendingSynthetic(com.android.tools.r8.graph.DexType):221:221 -> d
-    3:3:boolean isNonLegacySynthetic(com.android.tools.r8.graph.DexType):229 -> d
-    1:1:boolean isPendingSynthetic(com.android.tools.r8.graph.DexType):217:217 -> e
+    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:
     java.util.concurrent.ConcurrentHashMap nonLegacyDefinitions -> a
     boolean $assertionsDisabled -> b
-    1:1:void <clinit>():60:60 -> <clinit>
-    1:4:void <init>():60:63 -> <init>
-    5:5:void <init>(com.android.tools.r8.synthesis.SyntheticItems$1):60:60 -> <init>
-    1:1:java.util.concurrent.ConcurrentHashMap access$100(com.android.tools.r8.synthesis.SyntheticItems$PendingSynthetics):60:60 -> a
-    2:2:boolean containsType(com.android.tools.r8.graph.DexType):71:71 -> a
-    3:4:boolean containsTypeOfKind(com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind):75:76 -> a
-    5:5:boolean verifyNotRewritten(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):80:80 -> a
+    1:1:void <clinit>():61:61 -> <clinit>
+    1:4:void <init>():61:64 -> <init>
+    5:5:void <init>(com.android.tools.r8.synthesis.SyntheticItems$1):61:61 -> <init>
+    1:1:java.util.concurrent.ConcurrentHashMap access$100(com.android.tools.r8.synthesis.SyntheticItems$PendingSynthetics):61:61 -> a
+    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):648:649 -> a
-    6:7:boolean verifyNotRewritten(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):80 -> 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):650 -> a
-    8:8:boolean verifyNotRewritten(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):80 -> 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):650:652 -> a
-    9:11:boolean verifyNotRewritten(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):80 -> a
-    12:12:boolean verifyNotRewritten(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):80:80 -> a
-    13:19:java.util.Collection getAllProgramClasses():85:91 -> a
-    1:1:boolean isEmpty():67:67 -> b
-com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle -> com.android.tools.r8.internal.aW:
+    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.jW:
     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.SyntheticNaming$SyntheticKind kind -> a
@@ -101141,7 +101359,7 @@
     47:48:com.android.tools.r8.synthesis.SyntheticMarker internalStripMarkerFromClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):137:138 -> a
     47:48:com.android.tools.r8.synthesis.SyntheticMarker stripMarkerFromClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):103 -> a
     49:51:com.android.tools.r8.synthesis.SyntheticMarker stripMarkerFromClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):104:106 -> a
-    52:52:boolean com.android.tools.r8.graph.DexAnnotation.hasSynthesizedClassAnnotation(com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):404:404 -> a
+    52:52:boolean com.android.tools.r8.graph.DexAnnotation.hasSynthesizedClassAnnotation(com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):405:405 -> a
     52:52:com.android.tools.r8.synthesis.SyntheticMarker stripMarkerFromClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):105 -> a
     53:53:com.android.tools.r8.synthesis.SyntheticMarker stripMarkerFromClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):104:104 -> a
     54:54:com.android.tools.r8.synthesis.SynthesizingContext getContext():176:176 -> a
@@ -101157,7 +101375,7 @@
     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):111:112 -> a
+    4:5:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind.fromId(int):112:113 -> 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
     1:3:com.android.tools.r8.org.objectweb.asm.ByteVector write(com.android.tools.r8.org.objectweb.asm.ClassWriter,byte[],int,int,int):72:74 -> b
@@ -101213,7 +101431,7 @@
     1:1:com.android.tools.r8.synthesis.SyntheticMethodBuilder setApiLevelForDefinition(com.android.tools.r8.androidapi.ComputedApiLevel):115:115 -> b
     2:2:com.android.tools.r8.synthesis.SyntheticMethodBuilder disableAndroidApiLevelCheck():125:125 -> b
     1:1:com.android.tools.r8.synthesis.SyntheticMethodBuilder setName(java.lang.String):63:63 -> c
-com.android.tools.r8.synthesis.SyntheticMethodBuilder$SyntheticCodeGenerator -> com.android.tools.r8.internal.dW:
+com.android.tools.r8.synthesis.SyntheticMethodBuilder$SyntheticCodeGenerator -> com.android.tools.r8.internal.mW:
     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.graph.ProgramMethod method -> d
@@ -101254,7 +101472,7 @@
     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):207:207 -> a
+    17:17:boolean com.android.tools.r8.synthesis.SyntheticNaming.verifyNotInternalSynthetic(com.android.tools.r8.graph.DexType):208:208 -> 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
@@ -101265,47 +101483,46 @@
     boolean $assertionsDisabled -> a
     int $r8$clinit -> b
     1:1:void <clinit>():15:15 -> <clinit>
-    1:4:java.lang.String getPrefixForExternalSyntheticType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType):148:151 -> a
-    5:10:java.lang.String getPrefixForExternalSyntheticType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType):150:155 -> a
-    11:11:java.lang.String getPrefixForExternalSyntheticType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType):153:153 -> a
-    12:13: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):160:161 -> 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):188:188 -> a
-    14:14: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):161 -> a
-    15:19: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):166:170 -> a
-    20:20: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):188:188 -> a
-    20:20: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):167 -> a
-    21:23: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):177:179 -> a
-    24:24: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):197:197 -> a
-    24:24: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):178 -> a
-    25:25:java.lang.String createDescriptor(java.lang.String,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.lang.String,java.lang.String):202:202 -> a
-    26:26:boolean verifyNotInternalSynthetic(com.android.tools.r8.references.ClassReference):211:211 -> a
-    27:27:boolean verifyNotInternalSynthetic(java.lang.String):215:215 -> a
-    28:31:java.lang.String getPhaseSeparator(com.android.tools.r8.synthesis.SyntheticNaming$Phase):227:230 -> a
-    32:32:com.android.tools.r8.references.ClassReference makeSyntheticReferenceForTest(com.android.tools.r8.references.ClassReference,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.lang.String):236:236 -> a
-    33:33:com.android.tools.r8.references.ClassReference makeSyntheticReferenceForTest(com.android.tools.r8.references.ClassReference,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.lang.String):235:235 -> a
-    34:41:boolean isSynthetic(com.android.tools.r8.references.ClassReference,com.android.tools.r8.synthesis.SyntheticNaming$Phase,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind):245:252 -> a
-    42:46:boolean checkMatchFrom(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.lang.String,int,java.lang.String,boolean):261:265 -> a
-    42:46:boolean isSynthetic(com.android.tools.r8.references.ClassReference,com.android.tools.r8.synthesis.SyntheticNaming$Phase,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind):252 -> a
+    1:4:java.lang.String getPrefixForExternalSyntheticType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType):149:152 -> a
+    5:10:java.lang.String getPrefixForExternalSyntheticType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType):151:156 -> a
+    11:11:java.lang.String getPrefixForExternalSyntheticType(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType):154:154 -> a
+    12:13: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):161:162 -> 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):189:189 -> a
+    14:14: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 -> a
+    15:19: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):167:171 -> a
+    20:20: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):189:189 -> a
+    20:20: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 -> a
+    21:23: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):178:180 -> a
+    24:24: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):198:198 -> a
+    24:24: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 -> a
+    25:25:java.lang.String createDescriptor(java.lang.String,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.lang.String,java.lang.String):203:203 -> a
+    26:26:boolean verifyNotInternalSynthetic(com.android.tools.r8.references.ClassReference):212:212 -> a
+    27:27:boolean verifyNotInternalSynthetic(java.lang.String):216:216 -> a
+    28:31:java.lang.String getPhaseSeparator(com.android.tools.r8.synthesis.SyntheticNaming$Phase):228:231 -> a
+    32:32: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
+    33:33:com.android.tools.r8.references.ClassReference makeSyntheticReferenceForTest(com.android.tools.r8.references.ClassReference,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.lang.String):236:236 -> a
+    34:41:boolean isSynthetic(com.android.tools.r8.references.ClassReference,com.android.tools.r8.synthesis.SyntheticNaming$Phase,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind):246:253 -> a
+    42:46:boolean checkMatchFrom(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.lang.String,int,java.lang.String,boolean):262:266 -> a
+    42:46:boolean isSynthetic(com.android.tools.r8.references.ClassReference,com.android.tools.r8.synthesis.SyntheticNaming$Phase,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind):253 -> a
     47:47: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":58,"2":59,"3":60}}
-    58:58:boolean checkMatchFrom(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.lang.String,int,java.lang.String,boolean):266:266 -> a
-    58:58:boolean isSynthetic(com.android.tools.r8.references.ClassReference,com.android.tools.r8.synthesis.SyntheticNaming$Phase,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind):252 -> a
-    59:59:boolean checkMatchFrom(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.lang.String,int,java.lang.String,boolean):266:266 -> a
-    59:59:boolean isSynthetic(com.android.tools.r8.references.ClassReference,com.android.tools.r8.synthesis.SyntheticNaming$Phase,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind):252 -> a
-    60:60:boolean checkMatchFrom(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.lang.String,int,java.lang.String,boolean):266:266 -> a
-    60:60:boolean isSynthetic(com.android.tools.r8.references.ClassReference,com.android.tools.r8.synthesis.SyntheticNaming$Phase,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind):252 -> a
-    48:49:boolean checkMatchFrom(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.lang.String,int,java.lang.String,boolean):266:267 -> a
-    48:49:boolean isSynthetic(com.android.tools.r8.references.ClassReference,com.android.tools.r8.synthesis.SyntheticNaming$Phase,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind):252 -> a
-    50:57:boolean isInt(java.lang.String):271:278 -> a
-    50:57:boolean checkMatchFrom(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.lang.String,int,java.lang.String,boolean):267 -> a
-    50:57:boolean isSynthetic(com.android.tools.r8.references.ClassReference,com.android.tools.r8.synthesis.SyntheticNaming$Phase,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind):252 -> a
+    58:58:boolean checkMatchFrom(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.lang.String,int,java.lang.String,boolean):267:267 -> a
+    58:58:boolean isSynthetic(com.android.tools.r8.references.ClassReference,com.android.tools.r8.synthesis.SyntheticNaming$Phase,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind):253 -> a
+    59:59:boolean checkMatchFrom(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.lang.String,int,java.lang.String,boolean):267:267 -> a
+    59:59:boolean isSynthetic(com.android.tools.r8.references.ClassReference,com.android.tools.r8.synthesis.SyntheticNaming$Phase,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind):253 -> a
+    60:60:boolean checkMatchFrom(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.lang.String,int,java.lang.String,boolean):267:267 -> a
+    60:60:boolean isSynthetic(com.android.tools.r8.references.ClassReference,com.android.tools.r8.synthesis.SyntheticNaming$Phase,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind):253 -> a
+    48:49:boolean checkMatchFrom(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.lang.String,int,java.lang.String,boolean):267:268 -> a
+    48:49:boolean isSynthetic(com.android.tools.r8.references.ClassReference,com.android.tools.r8.synthesis.SyntheticNaming$Phase,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind):253 -> a
+    50:57:boolean isInt(java.lang.String):272:279 -> a
+    50:57:boolean checkMatchFrom(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.lang.String,int,java.lang.String,boolean):268 -> a
+    50:57:boolean isSynthetic(com.android.tools.r8.references.ClassReference,com.android.tools.r8.synthesis.SyntheticNaming$Phase,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind):253 -> a
 com.android.tools.r8.synthesis.SyntheticNaming$Phase -> com.android.tools.r8.synthesis.y$a:
     com.android.tools.r8.synthesis.SyntheticNaming$Phase INTERNAL -> b
     com.android.tools.r8.synthesis.SyntheticNaming$Phase EXTERNAL -> c
-    1:2:void <clinit>():222:223 -> <clinit>
-    1:1:void <init>(java.lang.String,int):221:221 -> <init>
+    1:2:void <clinit>():223:224 -> <clinit>
+    1:1:void <init>(java.lang.String,int):222:222 -> <init>
 com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind -> com.android.tools.r8.synthesis.y$b:
-    boolean $assertionsDisabled -> N
     com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind TO_STRING_IF_NOT_NULL -> 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
@@ -101320,11 +101537,13 @@
     com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind API_MODEL_OUTLINE -> L
     boolean mayOverridesNonProgramType -> f
     com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind THROW_ICCE -> B
+    com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind[] $VALUES -> N
     com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind ENUM_UNBOXING_LOCAL_UTILITY_CLASS -> g
     com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind OUTLINE -> F
     boolean isSingleSyntheticMethod -> d
     com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind TWR_CLOSE_RESOURCE -> D
     com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind THROW_CCE_IF_NOT_NULL -> z
+    boolean $assertionsDisabled -> O
     com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind STATIC_INTERFACE_CALL -> x
     com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind HORIZONTAL_INIT_TYPE_ARGUMENT_1 -> r
     com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind LAMBDA -> p
@@ -101336,118 +101555,118 @@
     com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind EMULATED_INTERFACE_MARKER_CLASS -> I
     com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind ENUM_UNBOXING_SHARED_UTILITY_CLASS -> h
     com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind WRAPPER -> n
+    com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind API_MODEL_STUB -> M
     com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind RETARGET_CLASS -> l
     boolean isFixedSuffixSynthetic -> e
     com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind THROW_NSME -> C
     com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind THROW_IAE -> A
     com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind API_CONVERSION -> G
-    com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind[] $VALUES -> M
     java.lang.String descriptor -> b
     com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind SERVICE_LOADER -> E
     1:3:void <clinit>():26:28 -> <clinit>
-    4:4:void <init>(java.lang.String,int,java.lang.String,int,boolean,boolean):81:81 -> <clinit>
+    4:4:void <init>(java.lang.String,int,java.lang.String,int,boolean,boolean):82:82 -> <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):81:81 -> <clinit>
+    7:7:void <init>(java.lang.String,int,java.lang.String,int,boolean,boolean):82:82 -> <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):81:81 -> <clinit>
+    11:11:void <init>(java.lang.String,int,java.lang.String,int,boolean,boolean):82:82 -> <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):81:81 -> <clinit>
+    14:14:void <init>(java.lang.String,int,java.lang.String,int,boolean,boolean):82:82 -> <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):81:81 -> <clinit>
+    17:17:void <init>(java.lang.String,int,java.lang.String,int,boolean,boolean):82:82 -> <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):81:81 -> <clinit>
+    20:20:void <init>(java.lang.String,int,java.lang.String,int,boolean,boolean):82:82 -> <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):81:81 -> <clinit>
+    23:23:void <init>(java.lang.String,int,java.lang.String,int,boolean,boolean):82:82 -> <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):81:81 -> <clinit>
+    26:26:void <init>(java.lang.String,int,java.lang.String,int,boolean,boolean):82:82 -> <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):73:73 -> <clinit>
+    29:29:void <init>(java.lang.String,int,java.lang.String,int,boolean):74:74 -> <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):81:81 -> <clinit>
+    32:32:void <init>(java.lang.String,int,java.lang.String,int,boolean,boolean):82:82 -> <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):81:81 -> <clinit>
+    35:35:void <init>(java.lang.String,int,java.lang.String,int,boolean,boolean):82:82 -> <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):81:81 -> <clinit>
+    38:38:void <init>(java.lang.String,int,java.lang.String,int,boolean,boolean):82:82 -> <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):81:81 -> <clinit>
+    41:41:void <init>(java.lang.String,int,java.lang.String,int,boolean,boolean):82:82 -> <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):73:73 -> <clinit>
+    45:45:void <init>(java.lang.String,int,java.lang.String,int,boolean):74:74 -> <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):73:73 -> <clinit>
+    48:48:void <init>(java.lang.String,int,java.lang.String,int,boolean):74:74 -> <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):73:73 -> <clinit>
+    51:51:void <init>(java.lang.String,int,java.lang.String,int,boolean):74:74 -> <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):73:73 -> <clinit>
+    54:54:void <init>(java.lang.String,int,java.lang.String,int,boolean):74:74 -> <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):73:73 -> <clinit>
+    57:57:void <init>(java.lang.String,int,java.lang.String,int,boolean):74:74 -> <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):73:73 -> <clinit>
+    60:60:void <init>(java.lang.String,int,java.lang.String,int,boolean):74:74 -> <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):73:73 -> <clinit>
+    63:63:void <init>(java.lang.String,int,java.lang.String,int,boolean):74:74 -> <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):73:73 -> <clinit>
+    66:66:void <init>(java.lang.String,int,java.lang.String,int,boolean):74:74 -> <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):73:73 -> <clinit>
+    69:69:void <init>(java.lang.String,int,java.lang.String,int,boolean):74:74 -> <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):73:73 -> <clinit>
+    72:72:void <init>(java.lang.String,int,java.lang.String,int,boolean):74:74 -> <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):73:73 -> <clinit>
+    75:75:void <init>(java.lang.String,int,java.lang.String,int,boolean):74:74 -> <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):73:73 -> <clinit>
+    78:78:void <init>(java.lang.String,int,java.lang.String,int,boolean):74:74 -> <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):73:73 -> <clinit>
+    81:81:void <init>(java.lang.String,int,java.lang.String,int,boolean):74:74 -> <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):73:73 -> <clinit>
+    84:84:void <init>(java.lang.String,int,java.lang.String,int,boolean):74:74 -> <clinit>
     84:84:void <clinit>():56 -> <clinit>
     85:87:void <clinit>():56:58 -> <clinit>
-    88:88:void <init>(java.lang.String,int,java.lang.String,int,boolean):73:73 -> <clinit>
+    88:88:void <init>(java.lang.String,int,java.lang.String,int,boolean):74:74 -> <clinit>
     88:88:void <clinit>():58 -> <clinit>
     89:90:void <clinit>():58:59 -> <clinit>
-    91:91:void <init>(java.lang.String,int,java.lang.String,int,boolean,boolean):81:81 -> <clinit>
+    91:91:void <init>(java.lang.String,int,java.lang.String,int,boolean,boolean):82:82 -> <clinit>
     91:91:void <clinit>():59 -> <clinit>
-    92:93:void <clinit>():59:60 -> <clinit>
-    94:94:void <clinit>():26:26 -> <clinit>
-    95:98:boolean verifyNoOverlappingIds():120:123 -> <clinit>
-    95:98:void <clinit>():63 -> <clinit>
-    1:1:void <init>(java.lang.String,int,java.lang.String,int,boolean,boolean):81:81 -> <init>
-    2:7:void <init>(java.lang.String,int,java.lang.String,int,boolean,boolean,boolean):89:94 -> <init>
+    92:94:void <clinit>():59:61 -> <clinit>
+    95:95:void <clinit>():26:26 -> <clinit>
+    96:99:boolean verifyNoOverlappingIds():121:124 -> <clinit>
+    96:99:void <clinit>():64 -> <clinit>
+    1:1:void <init>(java.lang.String,int,java.lang.String,int,boolean,boolean):82:82 -> <init>
+    2:7:void <init>(java.lang.String,int,java.lang.String,int,boolean,boolean,boolean):90:95 -> <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:
-    boolean $assertionsDisabled -> s
+    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 -> j
-    3:4:boolean com.android.tools.r8.synthesis.SyntheticMarker.isDefinitelyNotSyntheticProgramClass(com.android.tools.r8.graph.DexProgramClass):143:144 -> j
-    3:4:com.android.tools.r8.graph.DexProgramClass build():36 -> j
-    5:5:com.android.tools.r8.graph.DexProgramClass build():36:36 -> j
+    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:
     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
@@ -101490,7 +101709,7 @@
     8:8:com.android.tools.r8.synthesis.SyntheticReference internalRewrite(com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):19 -> a
     9:15:com.android.tools.r8.synthesis.SyntheticProgramClassReference internalRewrite(com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):44:50 -> a
     9:15:com.android.tools.r8.synthesis.SyntheticReference internalRewrite(com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):19 -> a
-com.android.tools.r8.synthesis.SyntheticProgramDefinition -> com.android.tools.r8.internal.eW:
+com.android.tools.r8.synthesis.SyntheticProgramDefinition -> com.android.tools.r8.internal.nW:
     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:
@@ -101929,21 +102148,21 @@
     com.android.tools.r8.DiagnosticsHandler diagnostics -> b
     com.android.tools.r8.graph.AppView appView -> a
     java.util.function.Predicate targetPredicate -> c
-    1:8:void <init>(java.util.Set,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.DiagnosticsHandler):62:69 -> <init>
-    9:9:void <init>(java.util.Set,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.DiagnosticsHandler):64:64 -> <init>
-    10:10:void <init>(java.util.Set,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.DiagnosticsHandler):63:63 -> <init>
-    11:11:void <init>(java.util.Set,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.DiagnosticsHandler):62:62 -> <init>
-    12:15:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.DiagnosticsHandler,java.util.function.Predicate):77:80 -> <init>
-    1:1:boolean lambda$new$0(java.util.Set,com.android.tools.r8.graph.DexType):71:71 -> a
-    2:9:void run(com.android.tools.r8.tracereferences.TraceReferencesConsumer):84:91 -> a
-    10:10:void com.android.tools.r8.graph.DexProgramClass.forEachProgramField(java.util.function.Consumer):199:199 -> a
-    10:10:void run(com.android.tools.r8.tracereferences.TraceReferencesConsumer):91 -> a
-    11:17:void run(com.android.tools.r8.tracereferences.TraceReferencesConsumer):92:98 -> a
-    18:18:void lambda$run$1(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.ProgramField):91:91 -> a
-    19:19:void lambda$run$2(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.ProgramMethod):94:94 -> a
-    20:20:void com.android.tools.r8.tracereferences.Tracer$UseCollector.traceCode(com.android.tools.r8.graph.ProgramMethod):253:253 -> a
-    20:20:void com.android.tools.r8.tracereferences.Tracer$UseCollector.access$1200(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.ProgramMethod):103 -> a
-    20:20:void lambda$run$2(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.ProgramMethod):95 -> a
+    1:8:void <init>(java.util.Set,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.DiagnosticsHandler):61:68 -> <init>
+    9:9:void <init>(java.util.Set,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.DiagnosticsHandler):63:63 -> <init>
+    10:10:void <init>(java.util.Set,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.DiagnosticsHandler):62:62 -> <init>
+    11:11:void <init>(java.util.Set,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.DiagnosticsHandler):61:61 -> <init>
+    12:15:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.DiagnosticsHandler,java.util.function.Predicate):76:79 -> <init>
+    1:1:boolean lambda$new$0(java.util.Set,com.android.tools.r8.graph.DexType):70:70 -> a
+    2:11:void run(com.android.tools.r8.tracereferences.TraceReferencesConsumer):83:92 -> a
+    12:12:void com.android.tools.r8.graph.DexProgramClass.forEachProgramField(java.util.function.Consumer):199:199 -> a
+    12:12:void run(com.android.tools.r8.tracereferences.TraceReferencesConsumer):92 -> a
+    13:19:void run(com.android.tools.r8.tracereferences.TraceReferencesConsumer):93:99 -> a
+    20:20:void lambda$run$1(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.ProgramField):92:92 -> a
+    21:21:void lambda$run$2(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.ProgramMethod):95:95 -> a
+    22:22:void com.android.tools.r8.tracereferences.Tracer$UseCollector.traceCode(com.android.tools.r8.graph.ProgramMethod):254:254 -> 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):104 -> a
+    22:22:void lambda$run$2(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.ProgramMethod):96 -> a
 com.android.tools.r8.tracereferences.Tracer$UseCollector -> com.android.tools.r8.tracereferences.l:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.tracereferences.TraceReferencesConsumer consumer -> c
@@ -101954,163 +102173,163 @@
     boolean $assertionsDisabled -> i
     java.util.Set missingClasses -> f
     java.util.function.Predicate targetPredicate -> e
-    1:1:void <clinit>():103:103 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.tracereferences.TraceReferencesConsumer,com.android.tools.r8.DiagnosticsHandler,java.util.function.Predicate):119:119 -> <init>
-    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):111:124 -> <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):103:103 -> a
-    2:2:com.android.tools.r8.graph.AppView access$100(com.android.tools.r8.tracereferences.Tracer$UseCollector):103:103 -> a
-    3:3:void access$1000(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.tracereferences.internal.TracedFieldImpl):103:103 -> a
-    4:5:void collectMissingField(com.android.tools.r8.tracereferences.internal.TracedFieldImpl):214:215 -> a
-    4:5:void access$1000(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.tracereferences.internal.TracedFieldImpl):103 -> a
-    6:7:void collectMissing(com.android.tools.r8.tracereferences.TraceReferencesConsumer$TracedReference,java.util.Set):203:204 -> a
-    6:7:void collectMissingField(com.android.tools.r8.tracereferences.internal.TracedFieldImpl):215 -> a
-    6:7:void access$1000(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.tracereferences.internal.TracedFieldImpl):103 -> a
-    8:8:void access$1100(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.ProgramMethod):103:103 -> a
-    9:10:void registerMethod(com.android.tools.r8.graph.ProgramMethod):229:230 -> a
-    9:10:void access$1100(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.ProgramMethod):103 -> a
-    11:12:void addTypes(com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.diagnostic.DefinitionContext):152:153 -> a
-    11:12:void registerMethod(com.android.tools.r8.graph.ProgramMethod):230 -> a
-    11:12:void access$1100(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.ProgramMethod):103 -> a
-    13:26:void registerMethod(com.android.tools.r8.graph.ProgramMethod):231:244 -> a
-    13:26:void access$1100(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.ProgramMethod):103 -> a
+    1:1:void <clinit>():104:104 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.tracereferences.TraceReferencesConsumer,com.android.tools.r8.DiagnosticsHandler,java.util.function.Predicate):120:120 -> <init>
+    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):112:125 -> <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):104:104 -> a
+    2:2:com.android.tools.r8.graph.AppView access$100(com.android.tools.r8.tracereferences.Tracer$UseCollector):104:104 -> a
+    3:3:void access$1000(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.tracereferences.internal.TracedFieldImpl):104:104 -> a
+    4:5:void collectMissingField(com.android.tools.r8.tracereferences.internal.TracedFieldImpl):215:216 -> a
+    4:5:void access$1000(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.tracereferences.internal.TracedFieldImpl):104 -> a
+    6:7:void collectMissing(com.android.tools.r8.tracereferences.TraceReferencesConsumer$TracedReference,java.util.Set):204:205 -> a
+    6:7:void collectMissingField(com.android.tools.r8.tracereferences.internal.TracedFieldImpl):216 -> a
+    6:7:void access$1000(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.tracereferences.internal.TracedFieldImpl):104 -> a
+    8:8:void access$1100(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.ProgramMethod):104:104 -> a
+    9:10:void registerMethod(com.android.tools.r8.graph.ProgramMethod):230:231 -> a
+    9:10:void access$1100(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.ProgramMethod):104 -> a
+    11:12:void addTypes(com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.diagnostic.DefinitionContext):153:154 -> a
+    11:12:void registerMethod(com.android.tools.r8.graph.ProgramMethod):231 -> a
+    11:12:void access$1100(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.ProgramMethod):104 -> a
+    13:26:void registerMethod(com.android.tools.r8.graph.ProgramMethod):232:245 -> a
+    13:26:void access$1100(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.ProgramMethod):104 -> a
     27:27:boolean com.android.tools.r8.graph.Definition.isProgramMethod():0:0 -> a
-    27:27:void registerMethod(com.android.tools.r8.graph.ProgramMethod):246 -> a
-    27:27:void access$1100(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.ProgramMethod):103 -> a
-    28:28:void registerMethod(com.android.tools.r8.graph.ProgramMethod):247:247 -> a
-    28:28:void access$1100(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.ProgramMethod):103 -> a
-    29:29:boolean isTargetType(com.android.tools.r8.graph.DexType):136:136 -> a
-    29:29:void registerMethod(com.android.tools.r8.graph.ProgramMethod):247 -> a
-    29:29:void access$1100(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.ProgramMethod):103 -> a
-    30:30:void registerMethod(com.android.tools.r8.graph.ProgramMethod):248:248 -> a
-    30:30:void access$1100(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.ProgramMethod):103 -> a
-    31:31:void access$1300(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.ProgramField):103:103 -> a
-    32:33:void registerField(com.android.tools.r8.graph.ProgramField):224:225 -> a
-    32:33:void access$1300(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.ProgramField):103 -> 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):103:103 -> 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):103:103 -> a
-    36:37:void addTypes(com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.diagnostic.DefinitionContext):152:153 -> 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):103 -> a
-    38:38:void access$800(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.tracereferences.internal.TracedMethodImpl):103:103 -> a
-    39:40:void collectMissingMethod(com.android.tools.r8.tracereferences.internal.TracedMethodImpl):219:220 -> a
-    39:40:void access$800(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.tracereferences.internal.TracedMethodImpl):103 -> a
-    41:42:void collectMissing(com.android.tools.r8.tracereferences.TraceReferencesConsumer$TracedReference,java.util.Set):203:204 -> a
-    41:42:void collectMissingMethod(com.android.tools.r8.tracereferences.internal.TracedMethodImpl):220 -> a
-    41:42:void access$800(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.tracereferences.internal.TracedMethodImpl):103 -> 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):103:103 -> a
-    44:44:com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfo():128:128 -> a
-    45:45:boolean isTargetType(com.android.tools.r8.graph.DexType):136:136 -> a
-    45:45:boolean access$500(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.DexType):103 -> a
+    27:27:void registerMethod(com.android.tools.r8.graph.ProgramMethod):247 -> a
+    27:27:void access$1100(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.ProgramMethod):104 -> a
+    28:28:void registerMethod(com.android.tools.r8.graph.ProgramMethod):248:248 -> a
+    28:28:void access$1100(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.ProgramMethod):104 -> a
+    29:29:boolean isTargetType(com.android.tools.r8.graph.DexType):137:137 -> a
+    29:29:void registerMethod(com.android.tools.r8.graph.ProgramMethod):248 -> a
+    29:29:void access$1100(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.ProgramMethod):104 -> a
+    30:30:void registerMethod(com.android.tools.r8.graph.ProgramMethod):249:249 -> a
+    30:30:void access$1100(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.ProgramMethod):104 -> a
+    31:31:void access$1300(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.ProgramField):104:104 -> a
+    32:33:void registerField(com.android.tools.r8.graph.ProgramField):225:226 -> a
+    32:33:void access$1300(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.ProgramField):104 -> 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):104:104 -> 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):104:104 -> a
+    36:37:void addTypes(com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.diagnostic.DefinitionContext):153:154 -> 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):104 -> a
+    38:38:void access$800(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.tracereferences.internal.TracedMethodImpl):104:104 -> a
+    39:40:void collectMissingMethod(com.android.tools.r8.tracereferences.internal.TracedMethodImpl):220:221 -> a
+    39:40:void access$800(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.tracereferences.internal.TracedMethodImpl):104 -> a
+    41:42:void collectMissing(com.android.tools.r8.tracereferences.TraceReferencesConsumer$TracedReference,java.util.Set):204:205 -> a
+    41:42:void collectMissingMethod(com.android.tools.r8.tracereferences.internal.TracedMethodImpl):221 -> a
+    41:42:void access$800(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.tracereferences.internal.TracedMethodImpl):104 -> 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):104:104 -> a
+    44:44:com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfo():129:129 -> a
+    45:45:boolean isTargetType(com.android.tools.r8.graph.DexType):137:137 -> a
+    45:45:boolean access$500(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.DexType):104 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    46:53:void addType(com.android.tools.r8.graph.DexType,com.android.tools.r8.diagnostic.DefinitionContext):140:147 -> a
-    54:59:void addClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.diagnostic.DefinitionContext):158:163 -> a
-    54:59:void addType(com.android.tools.r8.graph.DexType,com.android.tools.r8.diagnostic.DefinitionContext):148 -> a
+    46:53:void addType(com.android.tools.r8.graph.DexType,com.android.tools.r8.diagnostic.DefinitionContext):141:148 -> a
+    54:59:void addClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.diagnostic.DefinitionContext):159:164 -> a
+    54:59:void addType(com.android.tools.r8.graph.DexType,com.android.tools.r8.diagnostic.DefinitionContext):149 -> a
     60:60:void com.android.tools.r8.tracereferences.internal.TracedClassImpl.<init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.diagnostic.DefinitionContext):17:17 -> a
-    60:60:void addClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.diagnostic.DefinitionContext):163 -> a
-    60:60:void addType(com.android.tools.r8.graph.DexType,com.android.tools.r8.diagnostic.DefinitionContext):148 -> a
-    61:62:void collectMissingClass(com.android.tools.r8.tracereferences.internal.TracedClassImpl):209:210 -> a
-    61:62:void addClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.diagnostic.DefinitionContext):164 -> a
-    61:62:void addType(com.android.tools.r8.graph.DexType,com.android.tools.r8.diagnostic.DefinitionContext):148 -> a
-    63:64:void collectMissing(com.android.tools.r8.tracereferences.TraceReferencesConsumer$TracedReference,java.util.Set):203:204 -> a
-    63:64:void collectMissingClass(com.android.tools.r8.tracereferences.internal.TracedClassImpl):210 -> a
-    63:64:void addClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.diagnostic.DefinitionContext):164 -> a
-    63:64:void addType(com.android.tools.r8.graph.DexType,com.android.tools.r8.diagnostic.DefinitionContext):148 -> a
-    65:65:void addClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.diagnostic.DefinitionContext):165:165 -> a
-    65:65:void addType(com.android.tools.r8.graph.DexType,com.android.tools.r8.diagnostic.DefinitionContext):148 -> a
-    66:66:void addClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.diagnostic.DefinitionContext):170:170 -> a
-    67:67:boolean isTargetType(com.android.tools.r8.graph.DexType):136:136 -> a
-    67:67:void addClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.diagnostic.DefinitionContext):170 -> a
-    68:72:void addClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.diagnostic.DefinitionContext):171:175 -> a
-    73:73:void addClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.diagnostic.DefinitionContext):174:174 -> a
-    74:74:void addSuperMethodFromTarget(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.diagnostic.DefinitionContext):182:182 -> a
+    60:60:void addClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.diagnostic.DefinitionContext):164 -> a
+    60:60:void addType(com.android.tools.r8.graph.DexType,com.android.tools.r8.diagnostic.DefinitionContext):149 -> a
+    61:62:void collectMissingClass(com.android.tools.r8.tracereferences.internal.TracedClassImpl):210:211 -> a
+    61:62:void addClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.diagnostic.DefinitionContext):165 -> a
+    61:62:void addType(com.android.tools.r8.graph.DexType,com.android.tools.r8.diagnostic.DefinitionContext):149 -> a
+    63:64:void collectMissing(com.android.tools.r8.tracereferences.TraceReferencesConsumer$TracedReference,java.util.Set):204:205 -> a
+    63:64:void collectMissingClass(com.android.tools.r8.tracereferences.internal.TracedClassImpl):211 -> a
+    63:64:void addClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.diagnostic.DefinitionContext):165 -> a
+    63:64:void addType(com.android.tools.r8.graph.DexType,com.android.tools.r8.diagnostic.DefinitionContext):149 -> a
+    65:65:void addClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.diagnostic.DefinitionContext):166:166 -> a
+    65:65:void addType(com.android.tools.r8.graph.DexType,com.android.tools.r8.diagnostic.DefinitionContext):149 -> a
+    66:66:void addClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.diagnostic.DefinitionContext):171:171 -> a
+    67:67:boolean isTargetType(com.android.tools.r8.graph.DexType):137:137 -> a
+    67:67:void addClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.diagnostic.DefinitionContext):171 -> a
+    68:72:void addClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.diagnostic.DefinitionContext):172:176 -> a
+    73:73:void addClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.diagnostic.DefinitionContext):175:175 -> a
+    74:74:void addSuperMethodFromTarget(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.diagnostic.DefinitionContext):183:183 -> a
     75:75:boolean com.android.tools.r8.graph.Definition.isProgramMethod():0:0 -> a
-    75:75:void addSuperMethodFromTarget(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.diagnostic.DefinitionContext):182 -> a
-    76:77:void addSuperMethodFromTarget(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.diagnostic.DefinitionContext):182:183 -> a
-    78:78:boolean isTargetType(com.android.tools.r8.graph.DexType):136:136 -> a
-    78:78:void addSuperMethodFromTarget(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.diagnostic.DefinitionContext):183 -> a
-    79:88:void addSuperMethodFromTarget(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.diagnostic.DefinitionContext):183:192 -> a
-    89:89:boolean isTargetType(com.android.tools.r8.graph.DexType):136:136 -> a
-    89:89:void addSuperMethodFromTarget(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.diagnostic.DefinitionContext):192 -> a
-    90:93:void addSuperMethodFromTarget(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.diagnostic.DefinitionContext):193:196 -> a
-    94:94:void addSuperMethodFromTarget(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.diagnostic.DefinitionContext):195:195 -> a
-    95:97:void registerSuperType(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.diagnostic.DefinitionContext):258:260 -> a
-    98:100: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):263:265 -> a
+    75:75:void addSuperMethodFromTarget(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.diagnostic.DefinitionContext):183 -> a
+    76:77:void addSuperMethodFromTarget(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.diagnostic.DefinitionContext):183:184 -> a
+    78:78:boolean isTargetType(com.android.tools.r8.graph.DexType):137:137 -> a
+    78:78:void addSuperMethodFromTarget(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.diagnostic.DefinitionContext):184 -> a
+    79:88:void addSuperMethodFromTarget(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.diagnostic.DefinitionContext):184:193 -> a
+    89:89:boolean isTargetType(com.android.tools.r8.graph.DexType):137:137 -> a
+    89:89:void addSuperMethodFromTarget(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.diagnostic.DefinitionContext):193 -> a
+    90:93:void addSuperMethodFromTarget(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.diagnostic.DefinitionContext):194:197 -> a
+    94:94:void addSuperMethodFromTarget(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.diagnostic.DefinitionContext):196:196 -> a
+    95:97:void registerSuperType(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.diagnostic.DefinitionContext):259:261 -> a
+    98:100: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):264:266 -> a
     101:101:boolean com.android.tools.r8.graph.Definition.isProgramMethod():0:0 -> a
-    101:101: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):267 -> a
-    102:102: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):268:268 -> a
-    103:103:boolean isTargetType(com.android.tools.r8.graph.DexType):136:136 -> a
-    103:103: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):268 -> a
-    104:104: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):269:269 -> a
-    1:1:com.android.tools.r8.graph.DexItemFactory access$300(com.android.tools.r8.tracereferences.Tracer$UseCollector):103:103 -> b
-    2:2:com.android.tools.r8.graph.GraphLens graphLens():132:132 -> b
-    1:1:com.android.tools.r8.DiagnosticsHandler access$600(com.android.tools.r8.tracereferences.Tracer$UseCollector):103:103 -> c
-    1:1:com.android.tools.r8.tracereferences.TraceReferencesConsumer access$700(com.android.tools.r8.tracereferences.Tracer$UseCollector):103:103 -> d
+    101:101: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):268 -> a
+    102:102: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):269:269 -> a
+    103:103:boolean isTargetType(com.android.tools.r8.graph.DexType):137:137 -> a
+    103:103: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):269 -> a
+    104:104: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:270 -> a
+    1:1:com.android.tools.r8.graph.DexItemFactory access$300(com.android.tools.r8.tracereferences.Tracer$UseCollector):104:104 -> b
+    2:2:com.android.tools.r8.graph.GraphLens graphLens():133:133 -> b
+    1:1:com.android.tools.r8.DiagnosticsHandler access$600(com.android.tools.r8.tracereferences.Tracer$UseCollector):104:104 -> c
+    1:1:com.android.tools.r8.tracereferences.TraceReferencesConsumer access$700(com.android.tools.r8.tracereferences.Tracer$UseCollector):104:104 -> d
 com.android.tools.r8.tracereferences.Tracer$UseCollector$MethodUseCollector -> com.android.tools.r8.tracereferences.k:
     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>():274:274 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.ProgramMethod):278:280 -> <init>
-    1:6:void registerInvokeDirect(com.android.tools.r8.graph.DexMethod):287:292 -> a
-    7:7:void registerInvokeDirect(com.android.tools.r8.graph.DexMethod):291:291 -> a
-    8:19:void handleInvokeWithDynamicDispatch(com.android.tools.r8.graph.GraphLens$MethodLookupResult):336:347 -> a
-    20:20:void handleInvokeWithDynamicDispatch(com.android.tools.r8.graph.GraphLens$MethodLookupResult):343:343 -> a
-    21:31:void handleRewrittenMethodResolution(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodResolutionResult):352:362 -> a
-    32:32:void handleRewrittenMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClassAndMethod):368:368 -> a
-    33:33:void handleRewrittenMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClassAndMethod):367:367 -> a
-    34:37:void handleRewrittenMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):373:373 -> a
-    40:53:void handleRewrittenMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):376:389 -> a
-    54:60:void handleRewrittenMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):387:393 -> a
+    1:1:void <clinit>():275:275 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.ProgramMethod):279:281 -> <init>
+    1:6:void registerInvokeDirect(com.android.tools.r8.graph.DexMethod):288:293 -> a
+    7:7:void registerInvokeDirect(com.android.tools.r8.graph.DexMethod):292:292 -> a
+    8:19:void handleInvokeWithDynamicDispatch(com.android.tools.r8.graph.GraphLens$MethodLookupResult):337:348 -> a
+    20:20:void handleInvokeWithDynamicDispatch(com.android.tools.r8.graph.GraphLens$MethodLookupResult):344:344 -> a
+    21:31:void handleRewrittenMethodResolution(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodResolutionResult):353:363 -> a
+    32:32:void handleRewrittenMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClassAndMethod):369:369 -> a
+    33:33:void handleRewrittenMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClassAndMethod):368:368 -> a
+    34:37:void handleRewrittenMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):374:374 -> a
+    40:53:void handleRewrittenMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):377:390 -> a
+    54:60:void handleRewrittenMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):388:394 -> a
     61:61:void com.android.tools.r8.tracereferences.internal.TracedMethodImpl.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.diagnostic.DefinitionContext):17:17 -> a
-    61:61:void handleRewrittenMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):393 -> a
-    62:63:void handleRewrittenMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):394:395 -> a
-    64:64:void registerInstanceFieldRead(com.android.tools.r8.graph.DexField):410:410 -> a
-    65:83:void registerCallSite(com.android.tools.r8.graph.DexCallSite):469:487 -> a
-    1:1:void registerInvokeInterface(com.android.tools.r8.graph.DexMethod):297:297 -> b
+    61:61:void handleRewrittenMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):394 -> a
+    62:63:void handleRewrittenMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):395:396 -> a
+    64:64:void registerInstanceFieldRead(com.android.tools.r8.graph.DexField):411:411 -> a
+    65:83:void registerCallSite(com.android.tools.r8.graph.DexCallSite):470:488 -> a
+    1:1:void registerInvokeInterface(com.android.tools.r8.graph.DexMethod):298:298 -> 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:void registerInvokeInterface(com.android.tools.r8.graph.DexMethod):297 -> b
-    3:4:void registerInvokeInterface(com.android.tools.r8.graph.DexMethod):298:299 -> b
-    5:5:void lambda$handleRewrittenMethodResolution$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):358:358 -> b
-    6:6:void registerInitClass(com.android.tools.r8.graph.DexType):403:403 -> b
+    2:2:void registerInvokeInterface(com.android.tools.r8.graph.DexMethod):298 -> b
+    3:4:void registerInvokeInterface(com.android.tools.r8.graph.DexMethod):299:300 -> b
+    5:5:void lambda$handleRewrittenMethodResolution$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):359:359 -> b
+    6:6:void registerInitClass(com.android.tools.r8.graph.DexType):404:404 -> b
     7:7:void registerInitClass(com.android.tools.r8.graph.DexType):0:0 -> b
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":413,"2":414,"3":415}}
-    413:413:void registerInitClass(com.android.tools.r8.graph.DexType):403:403 -> b
-    414:414:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> b
-    414:414:void registerInitClass(com.android.tools.r8.graph.DexType):403 -> b
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":414,"2":415,"3":416}}
+    414:414:void registerInitClass(com.android.tools.r8.graph.DexType):404:404 -> b
     415:415:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> b
-    415:415:void registerInitClass(com.android.tools.r8.graph.DexType):403 -> b
-    411:412:void registerInitClass(com.android.tools.r8.graph.DexType):404:405 -> b
-    1:1:void registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):415:415 -> c
-    1:1:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):304:304 -> d
+    415:415:void registerInitClass(com.android.tools.r8.graph.DexType):404 -> b
+    416:416:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> b
+    416:416:void registerInitClass(com.android.tools.r8.graph.DexType):404 -> b
+    412:413:void registerInitClass(com.android.tools.r8.graph.DexType):405:406 -> b
+    1:1:void registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):416:416 -> c
+    1:1:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):305:305 -> 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:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):304 -> d
-    3:6:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):305:308 -> d
-    7:7:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):307:307 -> d
-    1:1:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):420:420 -> e
-    1:1:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):313:313 -> f
+    2:2:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):305 -> d
+    3:6:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):306:309 -> d
+    7:7:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):308:308 -> d
+    1:1:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):421:421 -> e
+    1:1:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):314:314 -> 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:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):313 -> f
-    3:14:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):314:325 -> f
-    15:15:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):323:323 -> f
-    16:16:void registerTypeReference(com.android.tools.r8.graph.DexType):462:462 -> f
+    2:2:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):314 -> f
+    3:14:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):315:326 -> f
+    15:15:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):324:324 -> f
+    16:16:void registerTypeReference(com.android.tools.r8.graph.DexType):463:463 -> f
     17:17:void registerTypeReference(com.android.tools.r8.graph.DexType):0:0 -> f
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":480,"2":481,"3":482}}
-    480:480:void registerTypeReference(com.android.tools.r8.graph.DexType):462:462 -> f
-    481:481:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> f
-    481:481:void registerTypeReference(com.android.tools.r8.graph.DexType):462 -> f
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":481,"2":482,"3":483}}
+    481:481:void registerTypeReference(com.android.tools.r8.graph.DexType):463:463 -> f
     482:482:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> f
-    482:482:void registerTypeReference(com.android.tools.r8.graph.DexType):462 -> f
-    479:479:void registerTypeReference(com.android.tools.r8.graph.DexType):462:462 -> f
-    1:1:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):330:330 -> g
+    482:482:void registerTypeReference(com.android.tools.r8.graph.DexType):463 -> f
+    483:483:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> f
+    483:483:void registerTypeReference(com.android.tools.r8.graph.DexType):463 -> f
+    480:480:void registerTypeReference(com.android.tools.r8.graph.DexType):463:463 -> f
+    1:1:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):331:331 -> 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:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):330 -> g
-    3:4:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):331:332 -> g
-    5:5:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):425:425 -> g
-    1:2:void handleFieldAccess(com.android.tools.r8.graph.DexField):429:430 -> i
-    1:15:void handleRewrittenFieldReference(com.android.tools.r8.graph.DexField):434:448 -> j
-    16:22:void handleRewrittenFieldReference(com.android.tools.r8.graph.DexField):446:452 -> j
+    2:2:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):331 -> g
+    3:4:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):332:333 -> g
+    5:5:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):426:426 -> g
+    1:2:void handleFieldAccess(com.android.tools.r8.graph.DexField):430:431 -> i
+    1:15:void handleRewrittenFieldReference(com.android.tools.r8.graph.DexField):435:449 -> j
+    16:22:void handleRewrittenFieldReference(com.android.tools.r8.graph.DexField):447:453 -> j
     23:23:void com.android.tools.r8.tracereferences.internal.TracedFieldImpl.<init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.diagnostic.DefinitionContext):17:17 -> j
-    23:23:void handleRewrittenFieldReference(com.android.tools.r8.graph.DexField):452 -> j
-    24:25:void handleRewrittenFieldReference(com.android.tools.r8.graph.DexField):453:454 -> j
+    23:23:void handleRewrittenFieldReference(com.android.tools.r8.graph.DexField):453 -> j
+    24:25:void handleRewrittenFieldReference(com.android.tools.r8.graph.DexField):454:455 -> j
 com.android.tools.r8.tracereferences.internal.AccessFlagsImpl -> com.android.tools.r8.internal.q1:
     com.android.tools.r8.graph.AccessFlags accessFlags -> a
     1:2:void <init>(com.android.tools.r8.graph.AccessFlags):13:14 -> <init>
@@ -102118,15 +102337,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.r9:
+com.android.tools.r8.tracereferences.internal.ClassAccessFlagsImpl -> com.android.tools.r8.internal.t9:
     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.ti:
     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.wC:
+com.android.tools.r8.tracereferences.internal.MethodAccessFlagsImpl -> com.android.tools.r8.internal.BC:
     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.OW:
+com.android.tools.r8.tracereferences.internal.TraceReferencesResult -> com.android.tools.r8.internal.XW:
     java.util.Map fields -> b
     java.util.Map methods -> c
     java.util.Set keepPackageNames -> d
@@ -102136,7 +102355,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.NW:
+com.android.tools.r8.tracereferences.internal.TraceReferencesResult$Builder -> com.android.tools.r8.internal.WW:
     java.util.Map fields -> b
     java.util.Map methods -> c
     java.util.Set keepPackageNames -> d
@@ -102149,22 +102368,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.QW:
+com.android.tools.r8.tracereferences.internal.TracedClassImpl -> com.android.tools.r8.internal.ZW:
     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.RW:
+com.android.tools.r8.tracereferences.internal.TracedFieldImpl -> com.android.tools.r8.internal.aX:
     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.SW:
+com.android.tools.r8.tracereferences.internal.TracedMethodImpl -> com.android.tools.r8.internal.bX:
     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.TW:
+com.android.tools.r8.tracereferences.internal.TracedReferenceBase -> com.android.tools.r8.internal.cX:
     com.android.tools.r8.diagnostic.DefinitionContext referencedFrom -> b
     boolean $assertionsDisabled -> e
     java.lang.Object accessFlags -> c
@@ -102703,7 +102922,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.u2:
+com.android.tools.r8.utils.ArchiveBuilder -> com.android.tools.r8.internal.x2:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.origin.Origin origin -> b
     java.util.zip.ZipOutputStream stream -> c
@@ -102751,7 +102970,7 @@
     1:2:java.util.zip.ZipOutputStream getStream():94:95 -> c
     1:7:java.util.zip.ZipOutputStream getStreamRaw():81:87 -> d
     1:2:void open():46:47 -> e
-com.android.tools.r8.utils.ArchiveBuilder$DelayedData -> com.android.tools.r8.internal.t2:
+com.android.tools.r8.utils.ArchiveBuilder$DelayedData -> com.android.tools.r8.internal.w2:
     com.android.tools.r8.ByteDataView content -> c
     java.lang.String name -> b
     boolean isDirectory -> d
@@ -102839,7 +103058,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.c3:
+com.android.tools.r8.utils.ArrayUtils -> com.android.tools.r8.internal.f3:
     boolean $assertionsDisabled -> a
     int $r8$clinit -> b
     1:1:void <clinit>():14:14 -> <clinit>
@@ -102853,43 +103072,43 @@
     56:57:java.lang.Object[] appendSingleElement(java.lang.Object[],java.lang.Object):170:171 -> a
     1:1:java.lang.Object last(java.lang.Object[]):95:95 -> b
     2:3:boolean contains(java.lang.Object[],java.lang.Object):139:140 -> b
-com.android.tools.r8.utils.AsmUtils -> com.android.tools.r8.internal.i3:
+com.android.tools.r8.utils.AsmUtils -> com.android.tools.r8.internal.l3:
     boolean isDeprecated(int) -> a
-com.android.tools.r8.utils.AssertionConfigurationWithDefault -> com.android.tools.r8.internal.k3:
+com.android.tools.r8.utils.AssertionConfigurationWithDefault -> com.android.tools.r8.internal.n3:
     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.l3:
+com.android.tools.r8.utils.AssertionUtils -> com.android.tools.r8.internal.o3:
     boolean $assertionsDisabled -> a
     int $r8$clinit -> b
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:boolean assertNotNull(java.lang.Object):12:12 -> a
     2:2:boolean forTesting(com.android.tools.r8.utils.InternalOptions,java.util.function.Supplier):17:17 -> a
-com.android.tools.r8.utils.BiForEachable -> com.android.tools.r8.internal.u4:
-com.android.tools.r8.utils.BiMapContainer -> com.android.tools.r8.internal.w4:
+com.android.tools.r8.utils.BiForEachable -> com.android.tools.r8.internal.x4:
+com.android.tools.r8.utils.BiMapContainer -> com.android.tools.r8.internal.z4:
     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.x4:
+com.android.tools.r8.utils.BiPredicateUtils -> com.android.tools.r8.internal.A4:
     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.S4:
+com.android.tools.r8.utils.BitSetUtils -> com.android.tools.r8.internal.V4:
     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.T4:
+com.android.tools.r8.utils.BitUtils -> com.android.tools.r8.internal.W4:
     boolean isBitInMaskSet(int,int) -> a
     boolean isBitSet(int,int) -> b
-com.android.tools.r8.utils.BooleanBox -> com.android.tools.r8.internal.X4:
+com.android.tools.r8.utils.BooleanBox -> com.android.tools.r8.internal.a5:
     boolean value -> a
     boolean assigned -> b
     1:1:void <init>():14:14 -> <init>
@@ -102906,7 +103125,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.h5:
+com.android.tools.r8.utils.BooleanLatticeElement -> com.android.tools.r8.internal.k5:
     1:1:void <init>():27:27 -> <init>
     boolean isFalse() -> a
     1:1:boolean isPossiblyFalse():52:52 -> b
@@ -102914,13 +103133,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.p5:
+com.android.tools.r8.utils.BooleanUtils -> com.android.tools.r8.internal.s5:
     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.E5:
+com.android.tools.r8.utils.Box -> com.android.tools.r8.internal.H5:
     java.lang.Object value -> a
     1:1:void <init>():15:15 -> <init>
     2:3:void <init>(java.lang.Object):17:18 -> <init>
@@ -102932,7 +103151,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.v7:
+com.android.tools.r8.utils.CfLineToMethodMapper -> com.android.tools.r8.internal.x7:
     java.util.Map sourceMethodMapping -> a
     com.android.tools.r8.utils.AndroidApp inputApp -> b
     boolean $assertionsDisabled -> c
@@ -102943,8 +103162,8 @@
     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.s7:
-com.android.tools.r8.utils.CfLineToMethodMapper$ClassVisitor -> com.android.tools.r8.internal.t7:
+com.android.tools.r8.utils.CfLineToMethodMapper$1 -> com.android.tools.r8.internal.u7:
+com.android.tools.r8.utils.CfLineToMethodMapper$ClassVisitor -> com.android.tools.r8.internal.v7:
     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>
@@ -102962,13 +103181,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.u7:
+com.android.tools.r8.utils.CfLineToMethodMapper$MethodLineVisitor -> com.android.tools.r8.internal.w7:
     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.K8:
+com.android.tools.r8.utils.CfgPrinter -> com.android.tools.r8.internal.M8:
     java.util.Stack opened -> b
     java.lang.StringBuilder builder -> a
     int nextUnusedValue -> c
@@ -102991,14 +103210,14 @@
     6:6:com.android.tools.r8.utils.CfgPrinter sp():65:65 -> c
     1:2:com.android.tools.r8.utils.CfgPrinter print(java.lang.String):49:50 -> d
     1:1:java.lang.String toString():82:82 -> toString
-com.android.tools.r8.utils.ChainableStringConsumer -> com.android.tools.r8.internal.M8:
+com.android.tools.r8.utils.ChainableStringConsumer -> com.android.tools.r8.internal.O8:
     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.L8:
+com.android.tools.r8.utils.ChainableStringConsumer$1 -> com.android.tools.r8.internal.N8:
     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.ba:
+com.android.tools.r8.utils.ClassMap -> com.android.tools.r8.internal.da:
     java.util.Map classes -> a
     java.util.concurrent.atomic.AtomicReference classProvider -> b
     boolean $assertionsDisabled -> c
@@ -103021,8 +103240,8 @@
     com.android.tools.r8.graph.ClassKind getClassKind() -> c
     1:1:boolean isFullyLoaded():240:240 -> d
     1:1:java.lang.String toString():80:80 -> toString
-com.android.tools.r8.utils.ClassMap$1 -> com.android.tools.r8.internal.Z9:
-com.android.tools.r8.utils.ClassMap$ConcurrentClassLoader -> com.android.tools.r8.internal.aa:
+com.android.tools.r8.utils.ClassMap$1 -> com.android.tools.r8.internal.ba:
+com.android.tools.r8.utils.ClassMap$ConcurrentClassLoader -> com.android.tools.r8.internal.ca:
     com.android.tools.r8.graph.DexType type -> d
     boolean ready -> f
     boolean $assertionsDisabled -> g
@@ -103047,7 +103266,7 @@
     343:343:void lambda$get$0(com.android.tools.r8.graph.DexClass):278 -> a
     344:344: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.za:
+com.android.tools.r8.utils.ClassProvider -> com.android.tools.r8.internal.Ba:
     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
@@ -103059,8 +103278,8 @@
     4:4:com.android.tools.r8.utils.ClassProvider forPreloadedClasses(com.android.tools.r8.graph.ClassKind,java.util.Collection):67 -> a
     5:8:com.android.tools.r8.utils.ClassProvider forPreloadedClasses(com.android.tools.r8.graph.ClassKind,java.util.Collection):68:71 -> a
     1:1:com.android.tools.r8.graph.ClassKind getClassKind():35:35 -> b
-com.android.tools.r8.utils.ClassProvider$1 -> com.android.tools.r8.internal.ua:
-com.android.tools.r8.utils.ClassProvider$ClassFileResourceReader -> com.android.tools.r8.internal.va:
+com.android.tools.r8.utils.ClassProvider$1 -> com.android.tools.r8.internal.wa:
+com.android.tools.r8.utils.ClassProvider$ClassFileResourceReader -> com.android.tools.r8.internal.xa:
     com.android.tools.r8.graph.JarApplicationReader reader -> d
     com.android.tools.r8.graph.ClassKind classKind -> b
     com.android.tools.r8.ClassFileResourceProvider provider -> c
@@ -103085,14 +103304,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.wa:
+com.android.tools.r8.utils.ClassProvider$CombinedClassProvider -> com.android.tools.r8.internal.ya:
     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.xa:
+com.android.tools.r8.utils.ClassProvider$FilteringClassProvider -> com.android.tools.r8.internal.za:
     java.util.Set filteredOut -> c
     com.android.tools.r8.utils.ClassProvider provider -> b
     boolean $assertionsDisabled -> d
@@ -103110,7 +103329,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.ya:
+com.android.tools.r8.utils.ClassProvider$PreloadedClassProvider -> com.android.tools.r8.internal.Aa:
     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>
@@ -103122,7 +103341,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.Ca:
+com.android.tools.r8.utils.ClassReferenceUtils -> com.android.tools.r8.internal.Ea:
     int $r8$clinit -> b
     java.util.Comparator COMPARATOR -> a
     1:2:void <clinit>():16:17 -> <clinit>
@@ -103136,7 +103355,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.Za:
+com.android.tools.r8.utils.ClasspathClassCollection -> com.android.tools.r8.internal.bb:
     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
@@ -103167,7 +103386,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.Pb:
+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:3: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:449 -> a
     2:3: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
@@ -103177,21 +103396,21 @@
     4: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.Zb:
+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.ac:
+com.android.tools.r8.utils.CompareResult$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.cc:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     boolean com.android.tools.r8.utils.CompareResult.isEqual() -> a
     1:1:com.android.tools.r8.utils.CompareResult com.android.tools.r8.utils.CompareResult.compare(java.lang.Object,java.lang.Object,java.util.Comparator):33:33 -> a
     int getComparisonResult(int) -> b
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.utils.ConsumerUtils -> com.android.tools.r8.internal.pd:
+com.android.tools.r8.utils.ConsumerUtils -> com.android.tools.r8.internal.rd:
     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
@@ -103201,9 +103420,9 @@
     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.me:
+com.android.tools.r8.utils.DequeUtils -> com.android.tools.r8.internal.oe:
     1:2:java.util.Deque newArrayDeque(java.lang.Object):13:14 -> a
-com.android.tools.r8.utils.DescriptorUtils -> com.android.tools.r8.internal.oe:
+com.android.tools.r8.utils.DescriptorUtils -> com.android.tools.r8.internal.qe:
     java.util.Map typeNameToLetterMap -> a
     boolean $assertionsDisabled -> b
     int $r8$clinit -> c
@@ -103363,13 +103582,13 @@
     6:10:boolean isDescriptor(java.lang.String):245 -> x
     1:6:boolean isValidJavaType(java.lang.String):123:128 -> y
     1:2:java.lang.String javaTypeToDescriptor(java.lang.String):67:68 -> z
-com.android.tools.r8.utils.DescriptorUtils$ModuleAndDescriptor -> com.android.tools.r8.internal.ne:
+com.android.tools.r8.utils.DescriptorUtils$ModuleAndDescriptor -> com.android.tools.r8.internal.pe:
     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.ig:
+com.android.tools.r8.utils.DexUtils -> com.android.tools.r8.internal.hg:
     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}}
@@ -103377,7 +103596,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.kg:
+com.android.tools.r8.utils.DexVersion -> com.android.tools.r8.internal.jg:
     com.android.tools.r8.utils.DexVersion[] $VALUES -> h
     int dexVersion -> b
     com.android.tools.r8.utils.DexVersion V35 -> d
@@ -103404,7 +103623,7 @@
     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.jg:
+com.android.tools.r8.utils.DexVersion$1 -> com.android.tools.r8.internal.ig:
     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.ng:
@@ -103775,7 +103994,7 @@
     1:1:void <clinit>():18:18 -> <clinit>
     1:1:void <init>(int[],java.util.List,com.android.tools.r8.utils.Int2StructuralItemArrayMap$1):18:18 -> <init>
     2:5:void <init>(int[],java.util.List):24:27 -> <init>
-    com.android.tools.r8.utils.structural.StructuralItem self() -> K
+    com.android.tools.r8.utils.structural.StructuralItem self() -> L
     1:1:int[] lambda$specify$0(com.android.tools.r8.utils.Int2StructuralItemArrayMap):42:42 -> a
     2:2:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):42:42 -> a
     3:4:void forEach(java.util.function.BiConsumer):55:56 -> a
@@ -103857,513 +104076,515 @@
     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.Es:
-    boolean enableEnumSwitchMapRemoval -> P
+    boolean enableEnumValueOptimization -> P
     boolean printTimes -> i
-    int callGraphLikelySpuriousCallEdgeThreshold -> K
+    boolean enableCfByteCodePassThrough -> b0
     com.android.tools.r8.features.FeatureSplitConfiguration featureSplitConfiguration -> f
     com.android.tools.r8.experimental.startup.StartupConfiguration startupConfiguration -> g
-    com.android.tools.r8.utils.InternalOptions$TestingOptions testing -> N0
-    boolean invalidDebugInfoFatal -> X
+    boolean useSmaliSyntax -> X
     boolean enableFieldBitAccessAnalysis -> q
     java.util.Map warningInvalidParameterAnnotations -> U0
-    com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions callSiteOptimizationOptions -> F0
+    com.android.tools.r8.dex.Marker marker -> e0
+    com.android.tools.r8.utils.AssertionConfigurationWithDefault assertionsConfiguration -> C0
     com.android.tools.r8.SourceFileProvider sourceFileProvider -> k1
     boolean enableInitializedClassesAnalysis -> y
     com.android.tools.r8.MapIdProvider mapIdProvider -> j1
     com.android.tools.r8.cf.CfVersion EXPERIMENTAL_CF_VERSION -> q1
-    com.android.tools.r8.utils.InternalOptions$OutlineOptions outline -> Q
+    boolean enableInheritanceClassInDexDistributor -> R0
     boolean $assertionsDisabled -> s1
     java.util.List outputInspections -> h
-    java.util.Set extensiveLoggingFilter -> e0
-    com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryConfiguration desugaredLibraryConfiguration -> c1
-    boolean debug -> E0
+    boolean skipIR -> E0
+    int callGraphLikelySpuriousCallEdgeThreshold -> L
     boolean forceAnnotateSynthetics -> I
+    com.android.tools.r8.utils.InternalOptions$LineNumberOptimization lineNumberOptimization -> S0
     boolean printMemory -> j
-    boolean forceProguardCompatibility -> A0
-    com.android.tools.r8.utils.InternalOptions$DesugarState desugarState -> o0
+    boolean reportMissingClassesInInnerClassAttributes -> A0
+    boolean enableEnumSwitchMapRemoval -> Q
     boolean enableVerticalClassMerging -> r
-    boolean reportMissingClassesInInnerClassAttributes -> z0
-    boolean enableTreeShaking -> v0
-    boolean invalidDebugInfoStrict -> Y
+    boolean reportMissingClassesInEnclosingMethodAttribute -> z0
+    com.android.tools.r8.utils.InternalOptions$InlinerOptions inlinerOptions -> I0
+    boolean enableMainDexListCheck -> v0
+    boolean invalidDebugInfoFatal -> Y
     boolean enableSideEffectAnalysis -> z
-    java.util.List methodsFilter -> g0
     boolean cfToCfDesugar -> H
-    boolean enableLoadStoreOptimization -> n0
-    boolean retainCompileTimeAnnotations -> j0
+    boolean intermediate -> j0
+    boolean enableStringSwitchConversion -> N
     com.android.tools.r8.experimental.graphinfo.GraphConsumer keptGraphConsumer -> f1
     java.lang.String dumpInputToDirectory -> l
-    boolean hasMarker -> c0
-    com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions horizontalClassMergerOptions -> I0
+    boolean enableRedundantConstNumberOptimization -> V
+    com.android.tools.r8.utils.InternalOptions$TestingOptions testing -> O0
     boolean enableClassInlining -> w
     com.android.tools.r8.StringConsumer mainDexListConsumer -> X0
     java.util.Map missingEnclosingMembers -> T0
-    java.util.List mainDexKeepRules -> O0
-    com.android.tools.r8.dex.Marker marker -> d0
+    com.android.tools.r8.utils.OffOrAuto tryWithResourcesDesugaring -> s0
+    com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions apiModelTestingOptions -> M0
     boolean skipReadingDexCode -> W0
     com.android.tools.r8.StringConsumer proguardSeedsConsumer -> a1
-    com.android.tools.r8.utils.AssertionConfigurationWithDefault assertionsConfiguration -> B0
     com.android.tools.r8.cf.CfVersion SUPPORTED_CF_VERSION -> p1
-    boolean enablePcBasedMappingFile -> S0
     com.android.tools.r8.StringConsumer desugaredLibraryKeepRuleConsumer -> e1
     boolean enableTreeShakingOfLibraryMethodOverrides -> E
-    int threadCount -> V
-    com.android.tools.r8.DumpOptions dumpOptions -> b0
-    com.android.tools.r8.utils.InternalOptions$KotlinOptimizationOptions kotlinOptimizationOptions -> K0
     com.android.tools.r8.ProgramConsumer programConsumer -> d
-    int minimumStringSwitchSize -> N
-    boolean enableEnumValueOptimization -> O
+    boolean debug -> F0
     boolean libraryInterfacesMayHaveStaticInitialization -> p
     java.lang.String dumpInputToFile -> k
-    com.android.tools.r8.utils.InternalOptions$LineNumberOptimization lineNumberOptimization -> R0
-    boolean useSmaliSyntax -> W
+    com.android.tools.r8.utils.InternalOptions$DesugarState desugarState -> p0
+    boolean forceProguardCompatibility -> B0
     boolean enableClassStaticizer -> x
-    com.android.tools.r8.utils.InternalOptions$ClassInlinerOptions classInlinerOptions -> G0
     com.android.tools.r8.graph.DexItemFactory itemFactory -> a
-    com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions protoShrinking -> J0
+    com.android.tools.r8.utils.InternalOptions$OutlineOptions outline -> R
     java.util.Set reportedMissingForDesugaring -> l1
-    com.android.tools.r8.utils.InternalOptions$InlinerOptions inlinerOptions -> H0
-    boolean enableMinification -> w0
-    boolean processCovariantReturnTypeAnnotations -> s0
+    com.android.tools.r8.utils.AndroidApiLevel minApiLevel -> i0
+    boolean enableTreeShaking -> w0
+    com.android.tools.r8.utils.InternalOptions$DesugarSpecificOptions desugarSpecificOptions -> N0
     java.util.function.BiPredicate dexClassChecksumFilter -> G
     boolean encodeChecksums -> F
-    boolean ignoreBootClasspathEnumsForMaindexTracing -> k0
+    int threadCount -> W
+    boolean enableLoadStoreOptimization -> o0
+    java.util.List methodsFilter -> h0
+    boolean retainCompileTimeAnnotations -> k0
     com.android.tools.r8.DataResourceConsumer dataResourceConsumer -> e
     boolean passthroughDexCode -> m
+    boolean hasMarker -> d0
+    int minimumStringSwitchSize -> O
     com.android.tools.r8.experimental.graphinfo.GraphConsumer mainDexKeptGraphConsumer -> g1
-    boolean enableSwitchRewriting -> L
     boolean enableEnumUnboxing -> u
+    com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions horizontalClassMergerOptions -> J0
     com.android.tools.r8.StringConsumer proguardMapConsumer -> Y0
     com.android.tools.r8.utils.Reporter reporter -> c
-    boolean enableUninstantiatedTypeOptimizationForInterfaces -> T
+    boolean enableRedundantFieldLoadElimination -> T
     com.android.tools.r8.StringConsumer configurationConsumer -> b1
-    com.android.tools.r8.utils.OffOrAuto tryWithResourcesDesugaring -> r0
-    com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions apiModelTestingOptions -> L0
-    boolean minimalMainDex -> P0
+    com.android.tools.r8.utils.OffOrAuto interfaceMethodDesugaring -> r0
+    java.util.List mainDexKeepRules -> P0
+    java.util.Set extensiveInterfaceMethodMinifierLoggingFilter -> g0
     java.util.Set neverMergePrefixes -> o
+    com.android.tools.r8.utils.InternalOptions$KotlinOptimizationOptions kotlinOptimizationOptions -> L0
+    com.android.tools.r8.DumpOptions dumpOptions -> c0
     boolean enableNameReflectionOptimization -> C
     com.android.tools.r8.utils.Box reportedExperimentClassFileVersion -> o1
-    boolean enableStringSwitchConversion -> M
+    boolean enableSwitchRewriting -> M
     boolean enableNeverMergePrefixes -> n
-    boolean configurationDebugging -> C0
     boolean relocatorCompilation -> d1
-    boolean enableRedundantConstNumberOptimization -> U
+    boolean enableUninstantiatedTypeOptimizationForInterfaces -> U
     boolean enableSimpleInliningConstraints -> v
-    boolean ignoreMissingClasses -> x0
-    boolean lookupLibraryBeforeProgram -> t0
-    com.android.tools.r8.utils.InternalOptions$DesugarSpecificOptions desugarSpecificOptions -> M0
-    com.android.tools.r8.utils.AndroidApiLevel minApiLevel -> h0
-    boolean enableNestReduction -> p0
-    java.util.List logArgumentsFilter -> m0
-    boolean pruneNonVissibleAnnotationClasses -> l0
+    com.android.tools.r8.utils.InternalOptions$ClassInlinerOptions classInlinerOptions -> H0
+    boolean enableMinification -> x0
+    com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions protoShrinking -> K0
+    boolean processCovariantReturnTypeAnnotations -> t0
+    boolean ignoreBootClasspathEnumsForMaindexTracing -> l0
     boolean enableStringConcatenationOptimization -> D
+    com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification desugaredLibrarySpecification -> c1
     boolean readDebugSetFileEvent -> J
-    boolean enableCfByteCodePassThrough -> a0
+    boolean ignoreMainDexMissingClasses -> a0
     com.android.tools.r8.StringConsumer usageInformationConsumer -> Z0
-    boolean enableInitializedClassesInInstanceMethodsAnalysis -> R
     boolean enableUnusedInterfaceRemoval -> s
     java.util.Map warningInvalidDebugInfo -> V0
-    com.android.tools.r8.utils.OffOrAuto interfaceMethodDesugaring -> q0
+    com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions callSiteOptimizationOptions -> G0
     int SUPPORTED_DEX_VERSION -> r1
-    boolean ignoreMainDexMissingClasses -> Z
-    java.util.Set extensiveInterfaceMethodMinifierLoggingFilter -> f0
-    boolean enableInheritanceClassInDexDistributor -> Q0
+    boolean invalidDebugInfoStrict -> Z
+    java.util.Set extensiveLoggingFilter -> f0
+    boolean minimalMainDex -> Q0
     java.util.function.Consumer syntheticProguardRulesConsumer -> i1
     boolean enableDeterminismAnalysis -> A
-    boolean skipIR -> D0
+    boolean configurationDebugging -> D0
     com.android.tools.r8.shaking.ProguardConfiguration proguardConfiguration -> b
+    boolean disableL8AnnotationRemoval -> K
     com.android.tools.r8.DesugarGraphConsumer desugarGraphConsumer -> h1
-    boolean reportMissingClassesInEnclosingMethodAttribute -> y0
-    boolean enableRedundantFieldLoadElimination -> S
+    boolean ignoreMissingClasses -> y0
+    boolean enableInitializedClassesInInstanceMethodsAnalysis -> S
     boolean enableDevirtualization -> t
-    boolean enableMainDexListCheck -> u0
+    boolean lookupLibraryBeforeProgram -> u0
+    java.util.List logArgumentsFilter -> n0
     java.util.Set invalidLibraryClasses -> n1
+    boolean enableNestReduction -> q0
     java.util.concurrent.atomic.AtomicBoolean reportedErrorReadingKotlinMetadataReflectively -> m1
+    boolean pruneNonVissibleAnnotationClasses -> m0
     boolean enableServiceLoaderRewriting -> B
-    boolean intermediate -> i0
     1:32:void <clinit>():106:137 -> <clinit>
     1:1:void <init>():168:168 -> <init>
-    2:917:void <init>():159:1074 -> <init>
-    918:922:void <init>():169:173 -> <init>
-    923:923:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):177:177 -> <init>
-    924:1839:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):159:1074 -> <init>
-    1840:1847:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):178:185 -> <init>
-    1848:1848:void <init>(com.android.tools.r8.CompilationMode,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):190:190 -> <init>
-    1849:2764:void <init>(com.android.tools.r8.CompilationMode,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):159:1074 -> <init>
-    2765:2785:void <init>(com.android.tools.r8.CompilationMode,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):191:211 -> <init>
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():471:471 -> A
-    1:1:boolean canHaveZipFileWithMissingCloseableBug():2291 -> A
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():567:567 -> A
-    2:2:boolean canHaveZipFileWithMissingCloseableBug():2291 -> A
-    3:3:boolean canHaveZipFileWithMissingCloseableBug():2291:2291 -> A
-    1:1:boolean isKeepRuntimeVisibleParameterAnnotationsEnabled():661:661 -> A0
-    1:1:boolean canInitCauseAfterAssertionErrorObjectConstructor():1940:1940 -> B
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():567:567 -> B
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1775 -> B
-    2:2:boolean canInitCauseAfterAssertionErrorObjectConstructor():1940 -> B
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1775:1775 -> B
-    3:3:boolean canInitCauseAfterAssertionErrorObjectConstructor():1940 -> B
-    1:3:boolean isMinifying():590:590 -> B0
-    5:5:boolean isMinifying():592:592 -> B0
-    1:1:boolean canLeaveStaticInterfaceMethodInvokes():1846:1846 -> C
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():567:567 -> C
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1775 -> C
-    2:2:boolean canLeaveStaticInterfaceMethodInvokes():1846 -> C
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1775:1775 -> C
-    3:3:boolean canLeaveStaticInterfaceMethodInvokes():1846 -> C
-    1:1:boolean isOptimizing():576:576 -> C0
-    1:1:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():567:567 -> D
-    1:1:boolean canParseNumbersWithPlusPrefix():2307 -> D
-    2:2:boolean canParseNumbersWithPlusPrefix():2307:2307 -> D
-    1:1:boolean isRelease():580:580 -> D0
-    1:1:boolean canUseAssertionErrorTwoArgumentConstructor():1921:1921 -> E
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():567:567 -> E
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1775 -> E
-    2:2:boolean canUseAssertionErrorTwoArgumentConstructor():1921 -> E
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1775:1775 -> E
-    3:3:boolean canUseAssertionErrorTwoArgumentConstructor():1921 -> E
-    1:1:boolean isRepackagingEnabled():617:617 -> E0
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():471:471 -> F
-    1:1:boolean canUseConstantMethodHandle():1822 -> F
-    2:2:boolean canUseConstantMethodHandle():1822:1822 -> F
-    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():567:567 -> F
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1775 -> F
-    3:3:boolean canUseConstantMethodHandle():1822 -> F
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1775:1775 -> F
-    4:4:boolean canUseConstantMethodHandle():1822 -> F
-    1:3:boolean isShrinking():584:584 -> F0
-    5:5:boolean isShrinking():586:586 -> F0
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():471:471 -> G
-    1:1:boolean canUseConstantMethodType():1826 -> G
-    2:2:boolean canUseConstantMethodType():1826:1826 -> G
-    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():567:567 -> G
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1775 -> G
-    3:3:boolean canUseConstantMethodType():1826 -> G
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1775:1775 -> G
-    4:4:boolean canUseConstantMethodType():1826 -> G
-    1:1:boolean isStringSwitchConversionEnabled():1896:1896 -> G0
-    1:1:boolean canUseDefaultAndStaticInterfaceMethods():1834:1834 -> H
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():567:567 -> H
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1775 -> H
-    2:2:boolean canUseDefaultAndStaticInterfaceMethods():1834 -> H
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1775:1775 -> H
-    3:3:boolean canUseDefaultAndStaticInterfaceMethods():1834 -> H
-    1:6:void keepDebugRelatedInformation():216:221 -> H0
-    1:1:boolean canUseDexPcAsDebugInformation():1876:1876 -> I
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():567:567 -> I
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1775 -> I
-    2:2:boolean canUseDexPcAsDebugInformation():1878 -> I
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1775:1775 -> I
-    3:3:boolean canUseDexPcAsDebugInformation():1878 -> I
-    1:2:boolean keepInnerClassStructure():689:690 -> I0
-    1:2:boolean canUseFilledNewArrayOfObjects():1952:1953 -> J
-    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():567:567 -> J
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1775 -> J
-    3:3:boolean canUseFilledNewArrayOfObjects():1953 -> J
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1775:1775 -> J
-    4:4:boolean canUseFilledNewArrayOfObjects():1953 -> J
-    1:1:com.android.tools.r8.utils.InternalOptions$KotlinOptimizationOptions kotlinOptimizationOptions():764:764 -> J0
-    1:1:boolean canUseInputStackMaps():694:694 -> K
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():471:471 -> K
-    2:2:boolean canUseInputStackMaps():694 -> K
-    1:1:boolean parseSignatureAttribute():626:626 -> K0
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isKeepAttributesSignatureEnabled():631:631 -> K0
-    2:2:boolean parseSignatureAttribute():626 -> K0
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():471:471 -> L
-    1:1:boolean canUseInvokeCustom():1830 -> L
-    2:2:boolean canUseInvokeCustom():1830:1830 -> L
-    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():567:567 -> L
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1775 -> L
-    3:3:boolean canUseInvokeCustom():1830 -> L
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1775:1775 -> L
-    4:4:boolean canUseInvokeCustom():1830 -> L
-    1:32:boolean printWarnings():1094:1125 -> L0
-    33:72:boolean printWarnings():1121:1160 -> L0
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():471:471 -> M
-    1:1:boolean canUseInvokePolymorphic():1818 -> M
-    2:2:boolean canUseInvokePolymorphic():1818:1818 -> M
-    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():567:567 -> M
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1775 -> M
-    3:3:boolean canUseInvokePolymorphic():1818 -> M
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1775:1775 -> M
-    4:4:boolean canUseInvokePolymorphic():1818 -> M
-    1:1:com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions protoShrinking():760:760 -> M0
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():471:471 -> N
-    1:1:boolean canUseInvokePolymorphicOnVarHandle():1814 -> N
-    2:2:boolean canUseInvokePolymorphicOnVarHandle():1814:1814 -> N
-    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():567:567 -> N
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1775 -> N
-    3:3:boolean canUseInvokePolymorphicOnVarHandle():1814 -> N
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1775:1775 -> N
-    4:4:boolean canUseInvokePolymorphicOnVarHandle():1814 -> N
-    1:1:com.android.tools.r8.cf.CfVersion requiredCfVersionForConstClassInstructions():1809:1809 -> N0
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():471:471 -> N0
-    2:2:com.android.tools.r8.cf.CfVersion requiredCfVersionForConstClassInstructions():1809 -> N0
-    3:4:com.android.tools.r8.cf.CfVersion requiredCfVersionForConstClassInstructions():1809:1810 -> N0
-    1:1:boolean canUseJavaUtilObjects():1905:1905 -> O
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():567:567 -> O
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1775 -> O
-    2:2:boolean canUseJavaUtilObjects():1905 -> O
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1775:1775 -> O
-    3:3:boolean canUseJavaUtilObjects():1905 -> O
-    1:1:boolean shouldBackportMethods():444:444 -> O0
-    1:1:boolean canUseJavaUtilObjectsIsNull():1909:1909 -> P
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():567:567 -> P
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1775 -> P
-    2:2:boolean canUseJavaUtilObjectsIsNull():1909 -> P
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1775:1775 -> P
-    3:3:boolean canUseJavaUtilObjectsIsNull():1909 -> P
-    1:1:boolean shouldDesugarRecords():517:517 -> P0
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.canUseRecords():1842:1842 -> P0
-    2:2:boolean shouldDesugarRecords():517 -> P0
-    1:1:boolean canUseJavaUtilObjectsRequireNonNull():1913:1913 -> Q
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():567:567 -> Q
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1775 -> Q
-    2:2:boolean canUseJavaUtilObjectsRequireNonNull():1913 -> Q
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1775:1775 -> Q
-    3:3:boolean canUseJavaUtilObjectsRequireNonNull():1913 -> Q
-    1:1:boolean shouldKeepStackMapTable():448:448 -> Q0
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isRelocatorCompilation():440:440 -> Q0
-    2:2:boolean shouldKeepStackMapTable():448 -> Q0
-    3:4:boolean shouldKeepStackMapTable():448:449 -> Q0
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.isRelocatorCompilation():440:440 -> Q0
-    5:5:boolean shouldKeepStackMapTable():450 -> Q0
-    6:6:boolean shouldKeepStackMapTable():451:451 -> Q0
-    1:2:boolean canUseMultidex():1900:1901 -> R
-    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():567:567 -> R
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1775 -> R
-    3:3:boolean canUseMultidex():1901 -> R
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1775:1775 -> R
-    4:4:boolean canUseMultidex():1901 -> R
-    1:1:boolean shouldRerunEnqueuer():455:455 -> R0
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():471:471 -> S
-    1:1:boolean canUseNotInstruction():1988 -> S
-    2:2:boolean canUseNotInstruction():1988:1988 -> S
-    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():567:567 -> S
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1775 -> S
-    3:3:boolean canUseNotInstruction():1988 -> S
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1775:1775 -> S
-    4:4:boolean canUseNotInstruction():1988 -> S
-    1:18:void signalFinishedToConsumers():491:508 -> S0
-    1:1:boolean canUsePrivateInterfaceMethods():1872:1872 -> T
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():567:567 -> T
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1775 -> T
-    2:2:boolean canUsePrivateInterfaceMethods():1872 -> T
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1775:1775 -> T
-    3:3:boolean canUsePrivateInterfaceMethods():1872 -> T
-    1:2:void warningReadingKotlinMetadataReflective():1019:1020 -> T0
-    1:1:boolean canUseSameArrayAndResultRegisterInArrayGetWide():1961:1961 -> U
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():567:567 -> U
-    2:2:boolean canUseSameArrayAndResultRegisterInArrayGetWide():1962 -> U
-    3:3:boolean canUseSameArrayAndResultRegisterInArrayGetWide():1962:1962 -> U
-    1:1:com.android.tools.r8.utils.InternalOptions$ClassInlinerOptions classInlinerOptions():748:748 -> V
-    1:1:com.android.tools.r8.utils.InternalOptions$DesugarSpecificOptions desugarSpecificOptions():772:772 -> W
-    1:1:com.android.tools.r8.graph.DexItemFactory dexItemFactory():144:144 -> X
-    1:3:void disableAllOptimizations():234:236 -> Y
-    1:14:void disableGlobalOptimizations():240:253 -> Z
-    15:15:void com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions.disableApiCallerIdentification():1543:1543 -> Z
-    15:15:void disableGlobalOptimizations():253 -> Z
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    2:916:void <init>():159:1073 -> <init>
+    917:921:void <init>():169:173 -> <init>
+    922:922:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):177:177 -> <init>
+    923:1837:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):159:1073 -> <init>
+    1838:1845:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):178:185 -> <init>
+    1846:1846:void <init>(com.android.tools.r8.CompilationMode,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):190:190 -> <init>
+    1847:2761:void <init>(com.android.tools.r8.CompilationMode,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):159:1073 -> <init>
+    2762:2782: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():569:569 -> A
+    1:1:boolean canHaveTracingPastInstructionsStreamBug():2172 -> A
+    2:2:boolean canHaveTracingPastInstructionsStreamBug():2172:2172 -> A
+    1:1:boolean isKeepRuntimeVisibleAnnotationsEnabled():658:658 -> A0
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> B
+    1:1:boolean canHaveZipFileWithMissingCloseableBug():2297 -> B
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> B
+    2:2:boolean canHaveZipFileWithMissingCloseableBug():2297 -> B
+    3:3:boolean canHaveZipFileWithMissingCloseableBug():2297:2297 -> B
+    1:1:boolean isKeepRuntimeVisibleParameterAnnotationsEnabled():663:663 -> B0
+    1:1:boolean canInitCauseAfterAssertionErrorObjectConstructor():1946:1946 -> C
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> C
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1774 -> C
+    2:2:boolean canInitCauseAfterAssertionErrorObjectConstructor():1946 -> C
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1774:1774 -> C
+    3:3:boolean canInitCauseAfterAssertionErrorObjectConstructor():1946 -> C
+    1:3:boolean isMinifying():592:592 -> C0
+    5:5:boolean isMinifying():594:594 -> C0
+    1:1:boolean canLeaveStaticInterfaceMethodInvokes():1845:1845 -> D
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> D
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1774 -> D
+    2:2:boolean canLeaveStaticInterfaceMethodInvokes():1845 -> D
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1774:1774 -> D
+    3:3:boolean canLeaveStaticInterfaceMethodInvokes():1845 -> D
+    1:1:boolean isOptimizing():578:578 -> D0
+    1:1:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> E
+    1:1:boolean canParseNumbersWithPlusPrefix():2313 -> E
+    2:2:boolean canParseNumbersWithPlusPrefix():2313:2313 -> E
+    1:1:boolean isRelease():582:582 -> E0
+    1:1:boolean canUseAssertionErrorTwoArgumentConstructor():1927:1927 -> F
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> F
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1774 -> F
+    2:2:boolean canUseAssertionErrorTwoArgumentConstructor():1927 -> F
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1774:1774 -> F
+    3:3:boolean canUseAssertionErrorTwoArgumentConstructor():1927 -> F
+    1:1:boolean isRepackagingEnabled():619:619 -> F0
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> G
+    1:1:boolean canUseConstantMethodHandle():1821 -> G
+    2:2:boolean canUseConstantMethodHandle():1821:1821 -> G
+    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> G
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1774 -> G
+    3:3:boolean canUseConstantMethodHandle():1821 -> G
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1774:1774 -> G
+    4:4:boolean canUseConstantMethodHandle():1821 -> G
+    1:3:boolean isShrinking():586:586 -> G0
+    5:5:boolean isShrinking():588:588 -> G0
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> H
+    1:1:boolean canUseConstantMethodType():1825 -> H
+    2:2:boolean canUseConstantMethodType():1825:1825 -> H
+    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> H
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1774 -> H
+    3:3:boolean canUseConstantMethodType():1825 -> H
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1774:1774 -> H
+    4:4:boolean canUseConstantMethodType():1825 -> H
+    1:1:boolean isStringSwitchConversionEnabled():1902:1902 -> H0
+    1:1:boolean canUseDefaultAndStaticInterfaceMethods():1833:1833 -> I
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> I
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1774 -> I
+    2:2:boolean canUseDefaultAndStaticInterfaceMethods():1833 -> I
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1774:1774 -> I
+    3:3:boolean canUseDefaultAndStaticInterfaceMethods():1833 -> I
+    1:6:void keepDebugRelatedInformation():216:221 -> I0
+    1:1:boolean canUseDexPcAsDebugInformation():1882:1882 -> J
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> J
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1774 -> J
+    2:2:boolean canUseDexPcAsDebugInformation():1883 -> J
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1774:1774 -> J
+    3:3:boolean canUseDexPcAsDebugInformation():1883 -> J
+    4:4:boolean canUseDexPcAsDebugInformation():1884:1884 -> J
+    1:2:boolean keepInnerClassStructure():691:692 -> J0
+    1:2:boolean canUseFilledNewArrayOfObjects():1958:1959 -> K
+    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> K
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1774 -> K
+    3:3:boolean canUseFilledNewArrayOfObjects():1959 -> K
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1774:1774 -> K
+    4:4:boolean canUseFilledNewArrayOfObjects():1959 -> K
+    1:1:com.android.tools.r8.utils.InternalOptions$KotlinOptimizationOptions kotlinOptimizationOptions():763:763 -> K0
+    1:1:boolean canUseInputStackMaps():696:696 -> L
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> L
+    2:2:boolean canUseInputStackMaps():696 -> L
+    1:1:boolean parseSignatureAttribute():628:628 -> L0
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isKeepAttributesSignatureEnabled():633:633 -> L0
+    2:2:boolean parseSignatureAttribute():628 -> L0
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> M
+    1:1:boolean canUseInvokeCustom():1829 -> M
+    2:2:boolean canUseInvokeCustom():1829:1829 -> M
+    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> M
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1774 -> M
+    3:3:boolean canUseInvokeCustom():1829 -> M
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1774:1774 -> M
+    4:4:boolean canUseInvokeCustom():1829 -> M
+    1:32:boolean printWarnings():1093:1124 -> M0
+    33:72:boolean printWarnings():1120:1159 -> M0
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> N
+    1:1:boolean canUseInvokePolymorphic():1817 -> N
+    2:2:boolean canUseInvokePolymorphic():1817:1817 -> N
+    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> N
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1774 -> N
+    3:3:boolean canUseInvokePolymorphic():1817 -> N
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1774:1774 -> N
+    4:4:boolean canUseInvokePolymorphic():1817 -> N
+    1:1:com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions protoShrinking():759:759 -> N0
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> O
+    1:1:boolean canUseInvokePolymorphicOnVarHandle():1813 -> O
+    2:2:boolean canUseInvokePolymorphicOnVarHandle():1813:1813 -> O
+    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> O
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1774 -> O
+    3:3:boolean canUseInvokePolymorphicOnVarHandle():1813 -> O
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1774:1774 -> O
+    4:4:boolean canUseInvokePolymorphicOnVarHandle():1813 -> O
+    1:1:com.android.tools.r8.cf.CfVersion requiredCfVersionForConstClassInstructions():1808:1808 -> O0
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> O0
+    2:2:com.android.tools.r8.cf.CfVersion requiredCfVersionForConstClassInstructions():1808 -> O0
+    3:4:com.android.tools.r8.cf.CfVersion requiredCfVersionForConstClassInstructions():1808:1809 -> O0
+    1:1:boolean canUseJavaUtilObjects():1911:1911 -> P
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> P
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1774 -> P
+    2:2:boolean canUseJavaUtilObjects():1911 -> P
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1774:1774 -> P
+    3:3:boolean canUseJavaUtilObjects():1911 -> P
+    1:1:boolean shouldBackportMethods():446:446 -> P0
+    1:1:boolean canUseJavaUtilObjectsIsNull():1915:1915 -> Q
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> Q
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1774 -> Q
+    2:2:boolean canUseJavaUtilObjectsIsNull():1915 -> Q
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1774:1774 -> Q
+    3:3:boolean canUseJavaUtilObjectsIsNull():1915 -> Q
+    1:1:boolean shouldDesugarRecords():519:519 -> Q0
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.canUseRecords():1841:1841 -> Q0
+    2:2:boolean shouldDesugarRecords():519 -> Q0
+    1:1:boolean canUseJavaUtilObjectsRequireNonNull():1919:1919 -> R
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> R
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1774 -> R
+    2:2:boolean canUseJavaUtilObjectsRequireNonNull():1919 -> R
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1774:1774 -> R
+    3:3:boolean canUseJavaUtilObjectsRequireNonNull():1919 -> R
+    1:1:boolean shouldKeepStackMapTable():450:450 -> R0
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isRelocatorCompilation():442:442 -> R0
+    2:2:boolean shouldKeepStackMapTable():450 -> R0
+    3:4:boolean shouldKeepStackMapTable():450:451 -> R0
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.isRelocatorCompilation():442:442 -> R0
+    5:5:boolean shouldKeepStackMapTable():452 -> R0
+    6:6:boolean shouldKeepStackMapTable():453:453 -> R0
+    1:2:boolean canUseMultidex():1906:1907 -> S
+    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> S
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1774 -> S
+    3:3:boolean canUseMultidex():1907 -> S
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1774:1774 -> S
+    4:4:boolean canUseMultidex():1907 -> S
+    1:1:boolean shouldRerunEnqueuer():457:457 -> S0
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> T
+    1:1:boolean canUseNotInstruction():1994 -> T
+    2:2:boolean canUseNotInstruction():1994:1994 -> T
+    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> T
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1774 -> T
+    3:3:boolean canUseNotInstruction():1994 -> T
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1774:1774 -> T
+    4:4:boolean canUseNotInstruction():1994 -> T
+    1:18:void signalFinishedToConsumers():493:510 -> T0
+    1:1:boolean canUsePrivateInterfaceMethods():1871:1871 -> U
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> U
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1774 -> U
+    2:2:boolean canUsePrivateInterfaceMethods():1871 -> U
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1774:1774 -> U
+    3:3:boolean canUsePrivateInterfaceMethods():1871 -> U
+    1:2:void warningReadingKotlinMetadataReflective():1018:1019 -> U0
+    1:1:boolean canUseSameArrayAndResultRegisterInArrayGetWide():1967:1967 -> V
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> V
+    2:2:boolean canUseSameArrayAndResultRegisterInArrayGetWide():1968 -> V
+    3:3:boolean canUseSameArrayAndResultRegisterInArrayGetWide():1968:1968 -> V
+    1:1:com.android.tools.r8.utils.InternalOptions$ClassInlinerOptions classInlinerOptions():747:747 -> W
+    1:1:com.android.tools.r8.utils.InternalOptions$DesugarSpecificOptions desugarSpecificOptions():771:771 -> X
+    1:1:com.android.tools.r8.graph.DexItemFactory dexItemFactory():144:144 -> Y
+    1:3:void disableAllOptimizations():234:236 -> Z
     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):360:361 -> a
-    4:5:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):365:366 -> a
-    6:12:com.android.tools.r8.dex.Marker com.android.tools.r8.utils.InternalOptions.createMarker(com.android.tools.r8.dex.Marker$Tool):373:379 -> a
-    6:12:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):368 -> a
-    13:13:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():471:471 -> a
-    13:13:com.android.tools.r8.dex.Marker com.android.tools.r8.utils.InternalOptions.createMarker(com.android.tools.r8.dex.Marker$Tool):380 -> a
-    13:13:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):368 -> a
-    14:19:com.android.tools.r8.dex.Marker com.android.tools.r8.utils.InternalOptions.createMarker(com.android.tools.r8.dex.Marker$Tool):380:385 -> a
-    14:19:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):368 -> a
-    20:20:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():567:567 -> a
-    20:20:com.android.tools.r8.dex.Marker com.android.tools.r8.utils.InternalOptions.createMarker(com.android.tools.r8.dex.Marker$Tool):386 -> a
-    20:20:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):368 -> a
-    21:30:com.android.tools.r8.dex.Marker com.android.tools.r8.utils.InternalOptions.createMarker(com.android.tools.r8.dex.Marker$Tool):386:395 -> a
-    21:30:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):368 -> a
-    31:40:void setDumpInputFlags(com.android.tools.r8.utils.DumpInputFlags,boolean):402:411 -> a
-    41:42:void setMinApiLevel(com.android.tools.r8.utils.AndroidApiLevel):571:572 -> a
-    43:52:boolean isClassMergingExtensionRequired(com.android.tools.r8.shaking.Enqueuer$Mode):669:678 -> a
-    53:54:boolean com.android.tools.r8.utils.InternalOptions.isSystemPropertyForDevelopmentSet(java.lang.String):805:806 -> a
+    2:3:void setMarker(com.android.tools.r8.dex.Marker):362:363 -> a
+    4:5:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):367:368 -> a
+    6:12:com.android.tools.r8.dex.Marker com.android.tools.r8.utils.InternalOptions.createMarker(com.android.tools.r8.dex.Marker$Tool):375:381 -> a
+    6:12:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):370 -> a
+    13:13:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> a
+    13:13:com.android.tools.r8.dex.Marker com.android.tools.r8.utils.InternalOptions.createMarker(com.android.tools.r8.dex.Marker$Tool):382 -> a
+    13:13:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):370 -> a
+    14:19:com.android.tools.r8.dex.Marker com.android.tools.r8.utils.InternalOptions.createMarker(com.android.tools.r8.dex.Marker$Tool):382:387 -> a
+    14:19:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):370 -> a
+    20:20:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> a
+    20:20:com.android.tools.r8.dex.Marker com.android.tools.r8.utils.InternalOptions.createMarker(com.android.tools.r8.dex.Marker$Tool):388 -> a
+    20:20:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):370 -> a
+    21:30:com.android.tools.r8.dex.Marker com.android.tools.r8.utils.InternalOptions.createMarker(com.android.tools.r8.dex.Marker$Tool):388:397 -> a
+    21:30:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):370 -> a
+    31:40:void setDumpInputFlags(com.android.tools.r8.utils.DumpInputFlags,boolean):404:413 -> a
+    41:42:void setMinApiLevel(com.android.tools.r8.utils.AndroidApiLevel):573:574 -> a
+    43:52:boolean isClassMergingExtensionRequired(com.android.tools.r8.shaking.Enqueuer$Mode):671:680 -> a
+    53:54:boolean com.android.tools.r8.utils.InternalOptions.isSystemPropertyForDevelopmentSet(java.lang.String):804:805 -> a
     53:54:boolean access$000(java.lang.String):106 -> a
-    55:58:int com.android.tools.r8.utils.InternalOptions.parseSystemPropertyForDevelopmentOrDefault(java.lang.String,int):813:816 -> a
+    55:58:int com.android.tools.r8.utils.InternalOptions.parseSystemPropertyForDevelopmentOrDefault(java.lang.String,int):812:815 -> a
     55:58:int access$100(java.lang.String,int):106 -> a
-    59:61:java.lang.RuntimeException errorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):948:950 -> a
+    59:61:java.lang.RuntimeException errorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):947:949 -> a
     62:62:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():761:761 -> a
-    62:62:java.lang.RuntimeException errorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):950 -> a
+    62:62:java.lang.RuntimeException errorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):949 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    63:63:java.lang.RuntimeException errorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):950:950 -> a
-    64:64:java.lang.RuntimeException errorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):948:948 -> a
-    65:71: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):992:998 -> a
-    72:72: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):993:993 -> a
-    73:74:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1005:1006 -> a
+    63:63:java.lang.RuntimeException errorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):949:949 -> a
+    64:64:java.lang.RuntimeException errorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):947:947 -> a
+    65:71: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):991:997 -> a
+    72:72: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):992:992 -> a
+    73:74:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1004:1005 -> a
     75:75:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():761:761 -> a
-    75:75:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1008 -> a
+    75:75:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1007 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    76:82:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1008:1014 -> a
-    83:83:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1006:1006 -> a
-    84:92:void warningInvalidLibrarySuperclassForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.utils.collections.DexClassAndMethodSet):1034:1042 -> 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,com.android.tools.r8.utils.collections.DexClassAndMethodSet):1041:1041 -> a
-    94:94:void warningInvalidLibrarySuperclassForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.utils.collections.DexClassAndMethodSet):1035:1035 -> a
-    95:95:com.android.tools.r8.references.MethodReference lambda$warningInvalidLibrarySuperclassForDesugar$1(com.android.tools.r8.graph.DexClassAndMethod):1043:1043 -> a
-    96:99:void warningMissingEnclosingMember(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,com.android.tools.r8.cf.CfVersion):1048:1051 -> a
-    100:104:void warningInvalidParameterAnnotations(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.origin.Origin,int,int):1056:1060 -> a
-    105:111:void warningInvalidDebugInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):1065:1071 -> a
-    112:112:void warningInvalidDebugInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):1066:1066 -> a
-    113:113:java.util.List lambda$warningInvalidDebugInfo$4(com.android.tools.r8.origin.Origin):1070:1070 -> a
-    114:119:boolean methodMatchesFilter(com.android.tools.r8.graph.DexEncodedMethod):1174:1179 -> a
-    120:120:boolean canUseConstClassInstructions(com.android.tools.r8.cf.CfVersion):1804:1804 -> a
-    121:121:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():471:471 -> a
-    121:121:boolean canUseConstClassInstructions(com.android.tools.r8.cf.CfVersion):1804 -> a
-    122:123:boolean canUseConstClassInstructions(com.android.tools.r8.cf.CfVersion):1804:1805 -> a
-    1:1:void disableNameReflectionOptimization():1771:1771 -> a0
+    76:82:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1007:1013 -> a
+    83:83:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1005:1005 -> a
+    84:92:void warningInvalidLibrarySuperclassForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.utils.collections.DexClassAndMethodSet):1033:1041 -> 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,com.android.tools.r8.utils.collections.DexClassAndMethodSet):1040:1040 -> a
+    94:94:void warningInvalidLibrarySuperclassForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.utils.collections.DexClassAndMethodSet):1034:1034 -> a
+    95:95:com.android.tools.r8.references.MethodReference lambda$warningInvalidLibrarySuperclassForDesugar$1(com.android.tools.r8.graph.DexClassAndMethod):1042:1042 -> a
+    96:99:void warningMissingEnclosingMember(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,com.android.tools.r8.cf.CfVersion):1047:1050 -> a
+    100:104:void warningInvalidParameterAnnotations(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.origin.Origin,int,int):1055:1059 -> a
+    105:111:void warningInvalidDebugInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):1064:1070 -> a
+    112:112:void warningInvalidDebugInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):1065:1065 -> a
+    113:113:java.util.List lambda$warningInvalidDebugInfo$4(com.android.tools.r8.origin.Origin):1069:1069 -> a
+    114:119:boolean methodMatchesFilter(com.android.tools.r8.graph.DexEncodedMethod):1173:1178 -> a
+    120:120:boolean canUseConstClassInstructions(com.android.tools.r8.cf.CfVersion):1803:1803 -> a
+    121:121:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> a
+    121:121:boolean canUseConstClassInstructions(com.android.tools.r8.cf.CfVersion):1803 -> a
+    122:123:boolean canUseConstClassInstructions(com.android.tools.r8.cf.CfVersion):1803:1804 -> a
+    1:14:void disableGlobalOptimizations():240:253 -> a0
+    15:15:void com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions.disableApiCallerIdentification():1542:1542 -> a0
+    15:15:void disableGlobalOptimizations():253 -> a0
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:1:com.android.tools.r8.utils.Box access$300(com.android.tools.r8.utils.InternalOptions):106:106 -> b
-    2:2:com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions apiModelingOptions():768:768 -> b
-    3:36:java.lang.String messageErrorIncompleteNest(com.android.tools.r8.ir.desugar.nest.Nest):954:987 -> b
-    37:37:java.util.List lambda$warningInvalidParameterAnnotations$3(com.android.tools.r8.origin.Origin):1059:1059 -> b
-    38:43:com.android.tools.r8.cf.CfVersion classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):1925:1930 -> b
-    1:1:boolean enableBackportedMethodRewriting():1858:1858 -> b0
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():567:567 -> b0
-    2:2:boolean enableBackportedMethodRewriting():1858 -> b0
-    3:3:boolean enableBackportedMethodRewriting():1858:1858 -> b0
-    1:1:boolean assertionsEnabled():915:915 -> c
-    2:2:java.util.List lambda$warningMissingEnclosingMember$2(com.android.tools.r8.origin.Origin):1050:1050 -> c
-    1:6:void enableProtoShrinking():225:230 -> c0
-    1:1:com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions callSiteOptimizationOptions():744:744 -> d
-    2:11:void warningExperimentalClassFileVersion(com.android.tools.r8.origin.Origin):1077:1086 -> d
-    12:18:void warningExperimentalClassFileVersion(com.android.tools.r8.origin.Origin):1082:1088 -> d
-    1:5:boolean enableTryWithResourcesDesugaring():1862:1866 -> d0
-    6:6:boolean com.android.tools.r8.utils.InternalOptions.canUseTwrCloseResourceMethod():1850:1850 -> d0
-    6:6:boolean enableTryWithResourcesDesugaring():1866 -> d0
-    7:7:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():567:567 -> d0
-    7:7:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1775 -> d0
-    7:7:boolean com.android.tools.r8.utils.InternalOptions.canUseTwrCloseResourceMethod():1850 -> d0
-    7:7:boolean enableTryWithResourcesDesugaring():1866 -> d0
-    8:8:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1775:1775 -> d0
-    8:8:boolean com.android.tools.r8.utils.InternalOptions.canUseTwrCloseResourceMethod():1850 -> d0
-    8:8:boolean enableTryWithResourcesDesugaring():1866 -> d0
-    9:9:boolean enableTryWithResourcesDesugaring():1868:1868 -> d0
-    1:1:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():567:567 -> e
-    1:1:boolean canHaveArtCheckCastVerifierBug():2238 -> e
-    2:2:boolean canHaveArtCheckCastVerifierBug():2238:2238 -> e
-    1:9:java.util.Set getExtensiveInterfaceMethodMinifierLoggingFilter():793:801 -> e0
-    1:1:boolean canHaveArtInstanceOfVerifierBug():2193:2193 -> f
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():567:567 -> f
-    2:2:boolean canHaveArtInstanceOfVerifierBug():2194 -> f
-    3:3:boolean canHaveArtInstanceOfVerifierBug():2194:2194 -> f
-    1:9:java.util.Set getExtensiveLoggingFilter():780:788 -> f0
-    1:1:boolean canHaveArtStringNewInitBug():2118:2118 -> g
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():567:567 -> g
-    2:2:boolean canHaveArtStringNewInitBug():2118 -> g
-    3:3:boolean canHaveArtStringNewInitBug():2118:2118 -> g
-    1:1:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():420:420 -> g0
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexIndexed():463:463 -> g0
-    2:2:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():421 -> g0
-    3:3:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():422:422 -> g0
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():467:467 -> g0
-    4:4:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():423 -> g0
-    5:5:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():424:424 -> g0
-    6:6:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():471:471 -> g0
-    6:6:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():425 -> g0
-    7:9:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():426:428 -> g0
-    1:1:boolean canHaveBoundsCheckEliminationBug():1979:1979 -> h
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():567:567 -> h
-    2:2:boolean canHaveBoundsCheckEliminationBug():1979 -> h
-    3:3:boolean canHaveBoundsCheckEliminationBug():1979:1979 -> h
-    1:1:com.android.tools.r8.utils.AndroidApiLevel getMinApiLevel():567:567 -> h0
-    1:1:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():567:567 -> i
-    1:1:boolean canHaveCmpIfFloatBug():2071 -> i
-    2:2:boolean canHaveCmpIfFloatBug():2071:2071 -> i
-    1:1:com.android.tools.r8.shaking.ProguardConfiguration getProguardConfiguration():152:152 -> i0
-    1:1:boolean canHaveCmpLongBug():2043:2043 -> j
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():567:567 -> j
-    2:2:boolean canHaveCmpLongBug():2043 -> j
-    3:3:boolean canHaveCmpLongBug():2043:2043 -> j
-    1:1:boolean hasConsumer():416:416 -> j0
-    1:1:boolean canHaveDalvikAbstractMethodOnNonAbstractClassVerificationBug():2270:2270 -> k
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():567:567 -> k
-    2:2:boolean canHaveDalvikAbstractMethodOnNonAbstractClassVerificationBug():2270 -> k
-    3:3:boolean canHaveDalvikAbstractMethodOnNonAbstractClassVerificationBug():2270:2270 -> k
-    1:1:boolean hasMethodsFilter():1169:1169 -> k0
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():471:471 -> l
-    1:1:boolean canHaveDalvikCatchHandlerVerificationBug():2262 -> l
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():567:567 -> l
-    2:2:boolean canHaveDalvikCatchHandlerVerificationBug():2262 -> l
-    3:3:boolean canHaveDalvikCatchHandlerVerificationBug():2262:2262 -> l
-    1:1:boolean hasProguardConfiguration():148:148 -> l0
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():471:471 -> m
-    1:1:boolean canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():2284 -> m
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():567:567 -> m
-    2:2:boolean canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():2284 -> m
-    3:3:boolean canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():2284:2284 -> m
-    1:1:boolean hasUsageInformationConsumer():872:872 -> m0
-    1:1:boolean canHaveDex2OatInliningIssue():2110:2110 -> n
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():567:567 -> n
-    2:2:boolean canHaveDex2OatInliningIssue():2110 -> n
-    3:3:boolean canHaveDex2OatInliningIssue():2110:2110 -> n
-    1:1:com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions horizontalClassMergerOptions():756:756 -> n0
-    1:1:boolean canHaveDex2OatLinkedListBug():2102:2102 -> o
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():567:567 -> o
-    2:2:boolean canHaveDex2OatLinkedListBug():2102 -> o
-    3:3:boolean canHaveDex2OatLinkedListBug():2102:2102 -> o
-    1:1:com.android.tools.r8.utils.InternalOptions$InlinerOptions inlinerOptions():752:752 -> o0
-    1:1:boolean canHaveExceptionTargetingLoopHeaderBug():2151:2151 -> p
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():567:567 -> p
-    2:2:boolean canHaveExceptionTargetingLoopHeaderBug():2151 -> p
-    3:3:boolean canHaveExceptionTargetingLoopHeaderBug():2151:2151 -> p
-    1:1:boolean isDesugaredLibraryCompilation():436:436 -> p0
-    1:1:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():567:567 -> q
-    1:1:boolean canHaveExceptionTypeBug():2230 -> q
-    2:2:boolean canHaveExceptionTypeBug():2230:2230 -> q
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():471:471 -> q0
-    1:1:boolean isDesugaring():475 -> q0
-    2:2:boolean isDesugaring():475:475 -> q0
-    1:1:boolean canHaveForwardingInitInliningBug():2139:2139 -> r
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():567:567 -> r
-    2:2:boolean canHaveForwardingInitInliningBug():2139 -> r
-    3:3:boolean canHaveForwardingInitInliningBug():2139:2139 -> r
-    1:1:boolean isGeneratingClassFiles():471:471 -> r0
-    1:1:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():567:567 -> s
-    1:1:boolean canHaveLongToIntBug():2217 -> s
-    2:2:boolean canHaveLongToIntBug():2217:2217 -> s
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexIndexed():463:463 -> s0
-    1:1:boolean isGeneratingDex():459 -> s0
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():467:467 -> s0
-    2:2:boolean isGeneratingDex():459 -> s0
-    1:1:boolean canHaveMul2AddrBug():2093:2093 -> t
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():567:567 -> t
-    2:2:boolean canHaveMul2AddrBug():2093 -> t
-    3:3:boolean canHaveMul2AddrBug():2093:2093 -> t
-    1:6:boolean isInterfaceMethodDesugaringEnabled():1883:1888 -> t0
-    1:1:boolean canHaveNumberConversionRegisterAllocationBug():2126:2126 -> u
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():567:567 -> u
-    2:2:boolean canHaveNumberConversionRegisterAllocationBug():2126 -> u
-    3:3:boolean canHaveNumberConversionRegisterAllocationBug():2126:2126 -> u
-    1:1:boolean isKeepAttributesSignatureEnabled():631:631 -> u0
-    1:1:boolean canHaveOverlappingLongRegisterBug():2010:2010 -> v
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():567:567 -> v
-    2:2:boolean canHaveOverlappingLongRegisterBug():2010 -> v
-    3:3:boolean canHaveOverlappingLongRegisterBug():2010:2010 -> v
-    1:1:boolean isKeepEnclosingMethodAttributeEnabled():636:636 -> v0
-    1:1:boolean canHaveSwitchMaxIntBug():2299:2299 -> w
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():567:567 -> w
-    2:2:boolean canHaveSwitchMaxIntBug():2299 -> w
-    3:3:boolean canHaveSwitchMaxIntBug():2299:2299 -> w
-    1:1:boolean isKeepInnerClassesAttributeEnabled():641:641 -> w0
-    1:1:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():567:567 -> x
-    1:1:boolean canHaveThisJitCodeDebuggingBug():2004 -> x
-    2:2:boolean canHaveThisJitCodeDebuggingBug():2004:2004 -> x
-    1:1:boolean isKeepRuntimeInvisibleAnnotationsEnabled():646:646 -> x0
-    1:1:boolean canHaveThisTypeVerifierBug():1995:1995 -> y
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():567:567 -> y
-    2:2:boolean canHaveThisTypeVerifierBug():1995 -> y
-    3:3:boolean canHaveThisTypeVerifierBug():1995:1995 -> y
-    1:1:boolean isKeepRuntimeInvisibleParameterAnnotationsEnabled():651:651 -> y0
-    1:1:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():567:567 -> z
-    1:1:boolean canHaveTracingPastInstructionsStreamBug():2166 -> z
-    2:2:boolean canHaveTracingPastInstructionsStreamBug():2166:2166 -> z
-    1:1:boolean isKeepRuntimeVisibleAnnotationsEnabled():656:656 -> z0
+    2:35:java.lang.String messageErrorIncompleteNest(com.android.tools.r8.ir.desugar.nest.Nest):953:986 -> b
+    36:36:java.util.List lambda$warningInvalidParameterAnnotations$3(com.android.tools.r8.origin.Origin):1058:1058 -> b
+    37:37:boolean allowDiscardingResidualDebugInfo():1878:1878 -> b
+    38:43:com.android.tools.r8.cf.CfVersion classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):1931:1936 -> b
+    1:1:void disableNameReflectionOptimization():1770:1770 -> b0
+    1:1:com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions apiModelingOptions():767:767 -> c
+    2:2:java.util.List lambda$warningMissingEnclosingMember$2(com.android.tools.r8.origin.Origin):1049:1049 -> c
+    1:1:boolean enableBackportedMethodRewriting():1857:1857 -> c0
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> c0
+    2:2:boolean enableBackportedMethodRewriting():1857 -> c0
+    3:3:boolean enableBackportedMethodRewriting():1857:1857 -> c0
+    1:1:boolean assertionsEnabled():914:914 -> d
+    2:11:void warningExperimentalClassFileVersion(com.android.tools.r8.origin.Origin):1076:1085 -> d
+    12:18:void warningExperimentalClassFileVersion(com.android.tools.r8.origin.Origin):1081:1087 -> d
+    1:6:void enableProtoShrinking():225:230 -> d0
+    1:1:com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions callSiteOptimizationOptions():743:743 -> e
+    1:5:boolean enableTryWithResourcesDesugaring():1861:1865 -> e0
+    6:6:boolean com.android.tools.r8.utils.InternalOptions.canUseTwrCloseResourceMethod():1849:1849 -> e0
+    6:6:boolean enableTryWithResourcesDesugaring():1865 -> e0
+    7:7:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> e0
+    7:7:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1774 -> e0
+    7:7:boolean com.android.tools.r8.utils.InternalOptions.canUseTwrCloseResourceMethod():1849 -> e0
+    7:7:boolean enableTryWithResourcesDesugaring():1865 -> e0
+    8:8:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1774:1774 -> e0
+    8:8:boolean com.android.tools.r8.utils.InternalOptions.canUseTwrCloseResourceMethod():1849 -> e0
+    8:8:boolean enableTryWithResourcesDesugaring():1865 -> e0
+    9:9:boolean enableTryWithResourcesDesugaring():1867:1867 -> e0
+    1:1:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> f
+    1:1:boolean canHaveArtCheckCastVerifierBug():2244 -> f
+    2:2:boolean canHaveArtCheckCastVerifierBug():2244:2244 -> f
+    1:9:java.util.Set getExtensiveInterfaceMethodMinifierLoggingFilter():792:800 -> f0
+    1:1:boolean canHaveArtInstanceOfVerifierBug():2199:2199 -> g
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> g
+    2:2:boolean canHaveArtInstanceOfVerifierBug():2200 -> g
+    3:3:boolean canHaveArtInstanceOfVerifierBug():2200:2200 -> g
+    1:9:java.util.Set getExtensiveLoggingFilter():779:787 -> g0
+    1:1:boolean canHaveArtStringNewInitBug():2124:2124 -> h
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> h
+    2:2:boolean canHaveArtStringNewInitBug():2124 -> h
+    3:3:boolean canHaveArtStringNewInitBug():2124:2124 -> h
+    1:1:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():422:422 -> h0
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexIndexed():465:465 -> h0
+    2:2:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():423 -> h0
+    3:3:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():424:424 -> h0
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():469:469 -> h0
+    4:4:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():425 -> h0
+    5:5:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():426:426 -> h0
+    6:6:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> h0
+    6:6:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():427 -> h0
+    7:9:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():428:430 -> h0
+    1:1:boolean canHaveBoundsCheckEliminationBug():1985:1985 -> i
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> i
+    2:2:boolean canHaveBoundsCheckEliminationBug():1985 -> i
+    3:3:boolean canHaveBoundsCheckEliminationBug():1985:1985 -> i
+    1:1:com.android.tools.r8.utils.AndroidApiLevel getMinApiLevel():569:569 -> i0
+    1:1:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> j
+    1:1:boolean canHaveCmpIfFloatBug():2077 -> j
+    2:2:boolean canHaveCmpIfFloatBug():2077:2077 -> j
+    1:1:com.android.tools.r8.shaking.ProguardConfiguration getProguardConfiguration():152:152 -> j0
+    1:1:boolean canHaveCmpLongBug():2049:2049 -> k
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> k
+    2:2:boolean canHaveCmpLongBug():2049 -> k
+    3:3:boolean canHaveCmpLongBug():2049:2049 -> k
+    1:1:boolean hasConsumer():418:418 -> k0
+    1:1:boolean canHaveDalvikAbstractMethodOnNonAbstractClassVerificationBug():2276:2276 -> l
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> l
+    2:2:boolean canHaveDalvikAbstractMethodOnNonAbstractClassVerificationBug():2276 -> l
+    3:3:boolean canHaveDalvikAbstractMethodOnNonAbstractClassVerificationBug():2276:2276 -> l
+    1:1:boolean hasMethodsFilter():1168:1168 -> l0
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> m
+    1:1:boolean canHaveDalvikCatchHandlerVerificationBug():2268 -> m
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> m
+    2:2:boolean canHaveDalvikCatchHandlerVerificationBug():2268 -> m
+    3:3:boolean canHaveDalvikCatchHandlerVerificationBug():2268:2268 -> m
+    1:1:boolean hasProguardConfiguration():148:148 -> m0
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> n
+    1:1:boolean canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():2290 -> n
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> n
+    2:2:boolean canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():2290 -> n
+    3:3:boolean canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():2290:2290 -> n
+    1:1:boolean hasUsageInformationConsumer():871:871 -> n0
+    1:1:boolean canHaveDex2OatInliningIssue():2116:2116 -> o
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> o
+    2:2:boolean canHaveDex2OatInliningIssue():2116 -> o
+    3:3:boolean canHaveDex2OatInliningIssue():2116:2116 -> o
+    1:1:com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions horizontalClassMergerOptions():755:755 -> o0
+    1:1:boolean canHaveDex2OatLinkedListBug():2108:2108 -> p
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> p
+    2:2:boolean canHaveDex2OatLinkedListBug():2108 -> p
+    3:3:boolean canHaveDex2OatLinkedListBug():2108:2108 -> p
+    1:1:com.android.tools.r8.utils.InternalOptions$InlinerOptions inlinerOptions():751:751 -> p0
+    1:1:boolean canHaveExceptionTargetingLoopHeaderBug():2157:2157 -> q
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> q
+    2:2:boolean canHaveExceptionTargetingLoopHeaderBug():2157 -> q
+    3:3:boolean canHaveExceptionTargetingLoopHeaderBug():2157:2157 -> q
+    1:1:boolean isDesugaredLibraryCompilation():438:438 -> q0
+    1:1:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> r
+    1:1:boolean canHaveExceptionTypeBug():2236 -> r
+    2:2:boolean canHaveExceptionTypeBug():2236:2236 -> r
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> r0
+    1:1:boolean isDesugaring():477 -> r0
+    2:2:boolean isDesugaring():477:477 -> r0
+    1:1:boolean canHaveForwardingInitInliningBug():2145:2145 -> s
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> s
+    2:2:boolean canHaveForwardingInitInliningBug():2145 -> s
+    3:3:boolean canHaveForwardingInitInliningBug():2145:2145 -> s
+    1:1:boolean isGeneratingClassFiles():473:473 -> s0
+    1:1:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> t
+    1:1:boolean canHaveLongToIntBug():2223 -> t
+    2:2:boolean canHaveLongToIntBug():2223:2223 -> t
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexIndexed():465:465 -> t0
+    1:1:boolean isGeneratingDex():461 -> t0
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():469:469 -> t0
+    2:2:boolean isGeneratingDex():461 -> t0
+    1:1:boolean canHaveMul2AddrBug():2099:2099 -> u
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> u
+    2:2:boolean canHaveMul2AddrBug():2099 -> u
+    3:3:boolean canHaveMul2AddrBug():2099:2099 -> u
+    1:6:boolean isInterfaceMethodDesugaringEnabled():1889:1894 -> u0
+    1:1:boolean canHaveNumberConversionRegisterAllocationBug():2132:2132 -> v
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> v
+    2:2:boolean canHaveNumberConversionRegisterAllocationBug():2132 -> v
+    3:3:boolean canHaveNumberConversionRegisterAllocationBug():2132:2132 -> v
+    1:1:boolean isKeepAttributesSignatureEnabled():633:633 -> v0
+    1:1:boolean canHaveOverlappingLongRegisterBug():2016:2016 -> w
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> w
+    2:2:boolean canHaveOverlappingLongRegisterBug():2016 -> w
+    3:3:boolean canHaveOverlappingLongRegisterBug():2016:2016 -> w
+    1:1:boolean isKeepEnclosingMethodAttributeEnabled():638:638 -> w0
+    1:1:boolean canHaveSwitchMaxIntBug():2305:2305 -> x
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> x
+    2:2:boolean canHaveSwitchMaxIntBug():2305 -> x
+    3:3:boolean canHaveSwitchMaxIntBug():2305:2305 -> x
+    1:1:boolean isKeepInnerClassesAttributeEnabled():643:643 -> x0
+    1:1:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> y
+    1:1:boolean canHaveThisJitCodeDebuggingBug():2010 -> y
+    2:2:boolean canHaveThisJitCodeDebuggingBug():2010:2010 -> y
+    1:1:boolean isKeepRuntimeInvisibleAnnotationsEnabled():648:648 -> y0
+    1:1:boolean canHaveThisTypeVerifierBug():2001:2001 -> z
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> z
+    2:2:boolean canHaveThisTypeVerifierBug():2001 -> z
+    3:3:boolean canHaveThisTypeVerifierBug():2001:2001 -> z
+    1:1:boolean isKeepRuntimeInvisibleParameterAnnotationsEnabled():653:653 -> z0
 com.android.tools.r8.utils.InternalOptions$1 -> com.android.tools.r8.internal.Cs:
     int[] $SwitchMap$com$android$tools$r8$utils$OffOrAuto -> a
-    1:1:void <clinit>():1862:1862 -> <clinit>
+    1:1:void <clinit>():1861:1861 -> <clinit>
 com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions -> com.android.tools.r8.internal.Es$a:
     java.util.Map methodApiMapping -> a
     java.util.Map fieldApiMapping -> b
@@ -104373,50 +104594,50 @@
     boolean checkAllApiReferencesAreSet -> f
     boolean enableStubbingOfClasses -> g
     boolean enableOutliningOfMethods -> h
-    1:12:void <init>():1478:1489 -> <init>
-    1:11:void visitMockedApiLevelsForReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer):1493:1503 -> a
-    12:12:void lambda$visitMockedApiLevelsForReferences$0(java.util.Set,com.android.tools.r8.references.MethodReference):1499:1499 -> a
-    13:13:void lambda$visitMockedApiLevelsForReferences$1(java.util.Set,com.android.tools.r8.references.FieldReference):1502:1502 -> a
-    14:14:void lambda$visitMockedApiLevelsForReferences$2(java.util.function.Consumer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.references.ClassReference):1505:1505 -> a
+    1:12:void <init>():1477:1488 -> <init>
+    1:11:void visitMockedApiLevelsForReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer):1492:1502 -> a
+    12:12:void lambda$visitMockedApiLevelsForReferences$0(java.util.Set,com.android.tools.r8.references.MethodReference):1498:1498 -> a
+    13:13:void lambda$visitMockedApiLevelsForReferences$1(java.util.Set,com.android.tools.r8.references.FieldReference):1501:1501 -> a
+    14:14:void lambda$visitMockedApiLevelsForReferences$2(java.util.function.Consumer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.references.ClassReference):1504:1504 -> a
 com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions$1 -> com.android.tools.r8.internal.Ds:
     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):1506:1506 -> <init>
-    1:1:com.android.tools.r8.utils.AndroidApiLevel getApiLevel():1514:1514 -> a
-    2:2:void visitMethodsWithApiLevels(java.util.function.BiConsumer):1520:1520 -> 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):1522:1523 -> 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):1533:1534 -> a
-    1:1:void visitFieldsWithApiLevels(java.util.function.BiConsumer):1531:1531 -> b
-    1:1:com.android.tools.r8.graph.DexType getType():1509:1509 -> getType
+    1:1:void <init>(com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.references.ClassReference):1505:1505 -> <init>
+    1:1:com.android.tools.r8.utils.AndroidApiLevel getApiLevel():1513:1513 -> a
+    2:2:void visitMethodsWithApiLevels(java.util.function.BiConsumer):1519:1519 -> 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):1521:1522 -> 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):1532:1533 -> a
+    1:1:void visitFieldsWithApiLevels(java.util.function.BiConsumer):1530:1530 -> b
+    1:1:com.android.tools.r8.graph.DexType getType():1508:1508 -> getType
 com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions -> com.android.tools.r8.internal.Es$b:
     com.android.tools.r8.utils.InternalOptions this$0 -> b
     boolean enabled -> a
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():1256:1256 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.utils.InternalOptions):1256:1258 -> <init>
-    1:1:void disableOptimization():1267:1267 -> a
-    2:2:com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions setEnabled(boolean):1287:1287 -> a
-    3:3:void com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions.disableOptimization():1267:1267 -> a
-    3:3:com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions setEnabled(boolean):1289 -> a
-    1:4:boolean isEnabled():1279:1282 -> b
+    1:1:void <clinit>():1255:1255 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.utils.InternalOptions):1255:1257 -> <init>
+    1:1:void disableOptimization():1266:1266 -> a
+    2:2:com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions setEnabled(boolean):1286:1286 -> a
+    3:3:void com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions.disableOptimization():1266:1266 -> a
+    3:3:com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions setEnabled(boolean):1288 -> a
+    1:4:boolean isEnabled():1278:1281 -> b
 com.android.tools.r8.utils.InternalOptions$ClassInlinerOptions -> com.android.tools.r8.internal.Es$c:
     com.android.tools.r8.utils.InternalOptions this$0 -> b
     boolean $assertionsDisabled -> c
     int classInliningInstructionAllowance -> a
-    1:1:void <clinit>():1295:1295 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.utils.InternalOptions):1295:1297 -> <init>
-    1:4:int getClassInliningInstructionAllowance():1300:1303 -> a
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():471:471 -> a
-    5:5:int getClassInliningInstructionAllowance():1303 -> a
+    1:1:void <clinit>():1294:1294 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.utils.InternalOptions):1294:1296 -> <init>
+    1:4:int getClassInliningInstructionAllowance():1299:1302 -> a
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> a
+    5:5:int getClassInliningInstructionAllowance():1302 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    6:6:int getClassInliningInstructionAllowance():1306:1306 -> a
+    6:6:int getClassInliningInstructionAllowance():1305:1305 -> a
 com.android.tools.r8.utils.InternalOptions$DesugarSpecificOptions -> com.android.tools.r8.internal.Es$d:
     boolean sortMethodsOnCfOutput -> a
     boolean allowAllDesugaredInput -> b
     boolean noCfMarkerForDesugaredCode -> c
     boolean lambdaClassFieldsFinal -> d
-    1:15:void <init>():1239:1253 -> <init>
+    1:15:void <init>():1238:1252 -> <init>
 com.android.tools.r8.utils.InternalOptions$DesugarState -> com.android.tools.r8.internal.Es$e:
     com.android.tools.r8.utils.InternalOptions$DesugarState OFF -> b
     com.android.tools.r8.utils.InternalOptions$DesugarState ON -> c
@@ -104433,22 +104654,22 @@
     boolean enableClassInitializerDeadlockDetection -> b
     boolean enableInterfaceMerging -> c
     boolean enableInterfaceMergingInInitial -> d
-    1:1:void <clinit>():1376:1376 -> <clinit>
-    1:14:void <init>(com.android.tools.r8.utils.InternalOptions):1376:1389 -> <init>
-    1:1:void disable():1392:1392 -> a
-    2:2:void enableIf(boolean):1404:1404 -> a
-    3:9:boolean isEnabled(com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):1424:1430 -> a
-    1:1:void disableSyntheticMerging():1396:1396 -> b
-    2:8:boolean isInterfaceMergingEnabled(com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):1443:1449 -> b
-    1:1:void enable():1400:1400 -> c
+    1:1:void <clinit>():1375:1375 -> <clinit>
+    1:14:void <init>(com.android.tools.r8.utils.InternalOptions):1375:1388 -> <init>
+    1:1:void disable():1391:1391 -> a
+    2:2:void enableIf(boolean):1403:1403 -> a
+    3:9:boolean isEnabled(com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):1423:1429 -> a
+    1:1:void disableSyntheticMerging():1395:1395 -> b
+    2:8:boolean isInterfaceMergingEnabled(com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):1442:1448 -> b
+    1:1:void enable():1399:1399 -> c
     int getMaxClassGroupSize() -> d
-    1:1:boolean isClassInitializerDeadlockDetectionEnabled():1420:1420 -> e
-    1:1:boolean isRestrictedToSynthetics():1454:1454 -> f
-    1:1:boolean isSyntheticMergingEnabled():1439:1439 -> g
-    1:1:void setEnableClassInitializerDeadlockDetection():1458:1458 -> h
-    1:1:void setEnableInterfaceMerging():1462:1462 -> i
-    1:1:void setEnableInterfaceMergingInInitial():1466:1466 -> j
-    1:1:void setRestrictToSynthetics():1474:1474 -> k
+    1:1:boolean isClassInitializerDeadlockDetectionEnabled():1419:1419 -> e
+    1:1:boolean isRestrictedToSynthetics():1453:1453 -> f
+    1:1:boolean isSyntheticMergingEnabled():1438:1438 -> g
+    1:1:void setEnableClassInitializerDeadlockDetection():1457:1457 -> h
+    1:1:void setEnableInterfaceMerging():1461:1461 -> i
+    1:1:void setEnableInterfaceMergingInInitial():1465:1465 -> j
+    1:1:void setRestrictToSynthetics():1473:1473 -> k
 com.android.tools.r8.utils.InternalOptions$InlinerOptions -> com.android.tools.r8.internal.Es$g:
     boolean $assertionsDisabled -> m
     boolean enableInliningOfInvokesWithClassInitializationSideEffects -> i
@@ -104463,26 +104684,26 @@
     com.android.tools.r8.utils.InternalOptions this$0 -> l
     boolean applyInliningToInlinee -> g
     boolean enableInlining -> a
-    1:1:void <clinit>():1311:1311 -> <clinit>
-    1:35:void <init>(com.android.tools.r8.utils.InternalOptions):1311:1345 -> <init>
-    1:5:int getDoubleInliningInstructionLimit():1363:1367 -> a
-    6:6:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():471:471 -> a
-    6:6:int getDoubleInliningInstructionLimit():1367 -> a
+    1:1:void <clinit>():1310:1310 -> <clinit>
+    1:35:void <init>(com.android.tools.r8.utils.InternalOptions):1310:1344 -> <init>
+    1:5:int getDoubleInliningInstructionLimit():1362:1366 -> a
+    6:6:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> a
+    6:6:int getDoubleInliningInstructionLimit():1366 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    7:7:int getDoubleInliningInstructionLimit():1371:1371 -> a
-    1:5:int getSimpleInliningInstructionLimit():1349:1353 -> b
-    6:6:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():471:471 -> b
-    6:6:int getSimpleInliningInstructionLimit():1353 -> b
+    7:7:int getDoubleInliningInstructionLimit():1370:1370 -> a
+    1:5:int getSimpleInliningInstructionLimit():1348:1352 -> b
+    6:6:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> b
+    6:6:int getSimpleInliningInstructionLimit():1352 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    7:7:int getSimpleInliningInstructionLimit():1357:1357 -> b
+    7:7:int getSimpleInliningInstructionLimit():1356:1356 -> b
 com.android.tools.r8.utils.InternalOptions$InvalidParameterAnnotationInfo -> com.android.tools.r8.internal.Fs:
     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):829:832 -> <init>
+    1:4:void <init>(com.android.tools.r8.graph.DexMethod,int,int):828:831 -> <init>
 com.android.tools.r8.utils.InternalOptions$KotlinOptimizationOptions -> com.android.tools.r8.internal.Gs:
     boolean disableKotlinSpecificOptimizations -> a
-    1:3:void <init>():1232:1234 -> <init>
+    1:3:void <init>():1231:1233 -> <init>
 com.android.tools.r8.utils.InternalOptions$LineNumberOptimization -> com.android.tools.r8.internal.Es$h:
     com.android.tools.r8.utils.InternalOptions$LineNumberOptimization OFF -> b
     com.android.tools.r8.utils.InternalOptions$LineNumberOptimization ON -> c
@@ -104493,26 +104714,26 @@
     boolean enabled -> a
     int minSize -> b
     int maxSize -> c
-    1:5:void <init>():1224:1228 -> <init>
+    1:5:void <init>():1223:1227 -> <init>
 com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode -> com.android.tools.r8.internal.Es$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>():1194:1201 -> <clinit>
-    1:1:void <init>(java.lang.String,int):1192:1192 -> <init>
-    1:1:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isNone():1204:1204 -> a
-    1:1:boolean isSome():1220 -> a
+    1:8:void <clinit>():1193:1200 -> <clinit>
+    1:1:void <init>(java.lang.String,int):1191:1191 -> <init>
+    1:1:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isNone():1203:1203 -> a
+    1:1:boolean isSome():1219 -> a
 com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions -> com.android.tools.r8.internal.Es$k:
     boolean enableEnumLiteProtoShrinking -> e
     boolean enableGeneratedExtensionRegistryShrinking -> a
     boolean enableGeneratedMessageLiteShrinking -> b
     boolean enableGeneratedMessageLiteBuilderShrinking -> c
     boolean traverseOneOfAndRepeatedProtoFields -> d
-    1:7:void <init>():1547:1553 -> <init>
-    1:1:boolean enableRemoveProtoEnumSwitchMap():1567:1567 -> a
-    1:1:boolean isEnumLiteProtoShrinkingEnabled():1578:1578 -> b
-    1:1:boolean isProtoShrinkingEnabled():1571:1571 -> c
+    1:7:void <init>():1546:1552 -> <init>
+    1:1:boolean enableRemoveProtoEnumSwitchMap():1566:1566 -> a
+    1:1:boolean isEnumLiteProtoShrinkingEnabled():1577:1577 -> b
+    1:1:boolean isProtoShrinkingEnabled():1570:1570 -> c
 com.android.tools.r8.utils.InternalOptions$TestingOptions -> com.android.tools.r8.internal.Es$l:
     boolean allowCheckDiscardedErrors -> m
     boolean testEnableTestAssertions -> d0
@@ -104587,23 +104808,23 @@
     boolean invertConditionals -> B
     boolean allowNonAbstractClassesWithAbstractMethods -> i0
     boolean readInputStackMaps -> k0
-    1:177:void <init>():1582:1758 -> <init>
+    1:177:void <init>():1581:1757 -> <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):1585:1585 -> a
+    1:1:void allowExperimentClassFileVersion(com.android.tools.r8.utils.InternalOptions):1584:1584 -> a
 com.android.tools.r8.utils.InternalOptions$TestingOptions$MinifierTestingOptions -> com.android.tools.r8.internal.Es$l$a:
     java.util.Comparator interfaceMethodOrdering -> a
-    1:3:void <init>():1729:1731 -> <init>
-    1:2:java.util.Comparator getInterfaceMethodOrderingOrDefault(java.util.Comparator):1735:1736 -> 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):1737:1737 -> a
+    1:3:void <init>():1728:1730 -> <init>
+    1:2:java.util.Comparator getInterfaceMethodOrderingOrDefault(java.util.Comparator):1734:1735 -> 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):1736:1736 -> a
 com.android.tools.r8.utils.InternalOptions$TestingOptions$ProguardIfRuleEvaluationData -> com.android.tools.r8.internal.Es$l$b:
     int numberOfProguardIfRuleMemberEvaluations -> b
     int numberOfProguardIfRuleClassEvaluations -> a
-    1:4:void <init>():1747:1750 -> <init>
+    1:4:void <init>():1746:1749 -> <init>
 com.android.tools.r8.utils.InternalOptions$TypeVersionPair -> com.android.tools.r8.internal.Hs:
     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):841:843 -> <init>
+    1:3:void <init>(com.android.tools.r8.cf.CfVersion,com.android.tools.r8.graph.DexType):840:842 -> <init>
 com.android.tools.r8.utils.InternalOutputMode -> com.android.tools.r8.internal.Is:
     com.android.tools.r8.utils.InternalOutputMode ClassFile -> d
     com.android.tools.r8.utils.InternalOutputMode DexIndexed -> b
@@ -104691,12 +104912,12 @@
     17:21:void putUleb128(com.android.tools.r8.dex.DexOutputBuffer,int):48:52 -> b
     1:1:int sizeAsSleb128(int):110:110 -> c
     1:1:int sizeAsUleb128(int):57:57 -> d
-com.android.tools.r8.utils.LensUtils -> com.android.tools.r8.internal.Cz:
+com.android.tools.r8.utils.LensUtils -> com.android.tools.r8.internal.Hz:
     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.Dz:
+com.android.tools.r8.utils.LibraryClassCollection -> com.android.tools.r8.internal.Iz:
     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
@@ -104711,151 +104932,152 @@
     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.dA:
+com.android.tools.r8.utils.LineNumberOptimizer -> com.android.tools.r8.internal.iA:
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():84:84 -> <clinit>
+    1:1:void <clinit>():86:86 -> <clinit>
     1:1:com.android.tools.r8.errors.Unreachable com.android.tools.r8.errors.Unreachable.raise(java.lang.Object[]):16:16 -> a
-    1:1:void lambda$getMappedRangesForPosition$11(java.lang.Object):650 -> a
-    2:2:com.android.tools.r8.ir.code.Position access$1200(com.android.tools.r8.graph.DexDebugPositionState):84:84 -> a
-    3:3:com.android.tools.r8.ir.code.Position access$1300(com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):84:84 -> a
-    4:4:void access$1600(int,int,com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):84:84 -> a
-    5:12: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):330:337 -> a
-    13:13:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):264:264 -> a
-    13:13:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):337 -> a
-    14:14:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexType):260:260 -> a
-    14:14:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):264 -> a
-    14:14:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):337 -> a
-    15:48:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):340:373 -> a
-    49:49:com.android.tools.r8.naming.mappinginformation.CompilerSynthesizedMappingInformation$Builder com.android.tools.r8.naming.mappinginformation.CompilerSynthesizedMappingInformation.builder():31:31 -> a
-    49:49:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):373 -> a
-    50:50: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):373:373 -> a
-    51:51:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):372:372 -> a
-    52:54:void com.android.tools.r8.utils.LineNumberOptimizer.addClassToClassNaming(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,java.util.function.Supplier):738:740 -> a
-    52:54: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):377 -> a
-    55:55: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):381:381 -> a
-    56:74:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):380:398 -> a
-    75:75:boolean com.android.tools.r8.utils.LineNumberOptimizer.verifyMethodsAreKeptDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,java.util.List):659:659 -> a
-    75:75:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):398 -> a
-    76:76:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():471:471 -> a
-    76:76:boolean com.android.tools.r8.utils.LineNumberOptimizer.verifyMethodsAreKeptDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,java.util.List):659 -> a
-    76:76:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):398 -> a
-    77:92:boolean com.android.tools.r8.utils.LineNumberOptimizer.verifyMethodsAreKeptDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,java.util.List):659:674 -> a
-    77:92: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):398 -> a
-    93:93:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():607:607 -> a
-    93:93: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
-    93:93:boolean com.android.tools.r8.utils.LineNumberOptimizer.verifyMethodsAreKeptDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,java.util.List):674 -> a
-    93:93: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):398 -> a
-    94:94: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
-    94:94:boolean com.android.tools.r8.utils.LineNumberOptimizer.verifyMethodsAreKeptDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,java.util.List):674 -> a
-    94:94:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):398 -> a
-    95:111:boolean com.android.tools.r8.utils.LineNumberOptimizer.verifyMethodsAreKeptDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,java.util.List):678:694 -> a
-    95:111: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):398 -> a
-    112:134:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):402:424 -> a
-    135:140: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):964:969 -> a
-    135:140: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):426 -> a
-    141:141:void com.android.tools.r8.utils.Pair.<init>():20:20 -> a
-    141:141: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):969 -> a
-    141:141: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):426 -> a
-    142:145: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):971:974 -> a
-    142:145: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):426 -> a
-    146:146:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):316:316 -> a
-    146:146: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):974 -> a
-    146: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):426 -> a
-    147:175: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):974:1002 -> a
-    147:175: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):426 -> a
-    176:184: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):999:1007 -> a
-    176:184: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):426 -> a
-    185:185: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):430:430 -> a
-    186:196: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):826:836 -> a
-    186:196: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):429 -> a
-    197:197:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):316:316 -> a
-    197:197: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):836 -> a
-    197:197: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):429 -> a
-    198:207: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):836:845 -> a
-    198:207: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):429 -> a
-    208:208:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):316:316 -> a
-    208:208: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):845 -> a
-    208:208: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):429 -> a
-    209:298: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):845:934 -> a
-    209:298:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):429 -> a
-    299:302:boolean com.android.tools.r8.utils.LineNumberOptimizer.verifyIdentityMapping(com.android.tools.r8.graph.DexDebugInfo,com.android.tools.r8.graph.DexDebugInfo):1013:1016 -> a
-    299:302: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):935 -> a
-    299:302:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):429 -> a
-    303:303: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):937:937 -> a
-    303:303:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):429 -> a
-    304:306: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):432:434 -> a
-    307:332: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):1023:1048 -> a
-    307:332: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):435 -> a
-    333:333: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):1041:1041 -> a
-    333:333: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):435 -> a
-    334:341: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):437:444 -> a
-    342:342:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):316:316 -> a
-    342: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):444 -> a
+    1:1:void lambda$getMappedRangesForPosition$11(java.lang.Object):674 -> a
+    2:2:com.android.tools.r8.ir.code.Position access$1200(com.android.tools.r8.graph.DexDebugPositionState):86:86 -> a
+    3:3:com.android.tools.r8.ir.code.Position access$1300(com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):86:86 -> a
+    4:4:void access$1600(int,int,com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):86:86 -> a
+    5:15: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):334:344 -> a
+    16: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):356:363 -> a
+    24:24:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):265:265 -> 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):363 -> a
+    25:25:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexType):261:261 -> a
+    25:25:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):265 -> a
+    25:25: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):363 -> a
+    26:56: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):366:396 -> a
+    57:57:com.android.tools.r8.naming.mappinginformation.CompilerSynthesizedMappingInformation$Builder com.android.tools.r8.naming.mappinginformation.CompilerSynthesizedMappingInformation.builder():31:31 -> a
+    57:57: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):396 -> a
+    58:58: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):396:396 -> a
+    59:59: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):395:395 -> a
+    60:62:void com.android.tools.r8.utils.LineNumberOptimizer.addClassToClassNaming(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,java.util.function.Supplier):762:764 -> a
+    60:62: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):400 -> a
+    63:63: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):404:404 -> a
+    64:82:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.OriginalSourceFiles):403:421 -> a
+    83:83:boolean com.android.tools.r8.utils.LineNumberOptimizer.verifyMethodsAreKeptDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,java.util.List):683:683 -> a
+    83:83:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.OriginalSourceFiles):421 -> a
+    84:84:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> a
+    84:84:boolean com.android.tools.r8.utils.LineNumberOptimizer.verifyMethodsAreKeptDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,java.util.List):683 -> a
+    84:84:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.OriginalSourceFiles):421 -> a
+    85:100:boolean com.android.tools.r8.utils.LineNumberOptimizer.verifyMethodsAreKeptDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,java.util.List):683:698 -> a
+    85:100: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):421 -> a
+    101:101:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():609:609 -> a
+    101:101: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
+    101:101:boolean com.android.tools.r8.utils.LineNumberOptimizer.verifyMethodsAreKeptDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,java.util.List):698 -> a
+    101:101:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.OriginalSourceFiles):421 -> a
+    102:102: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
+    102:102:boolean com.android.tools.r8.utils.LineNumberOptimizer.verifyMethodsAreKeptDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,java.util.List):698 -> a
+    102:102: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):421 -> a
+    103:119:boolean com.android.tools.r8.utils.LineNumberOptimizer.verifyMethodsAreKeptDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,java.util.List):702:718 -> a
+    103:119: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):421 -> a
+    120:140: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):425:445 -> a
+    141:146: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):989:994 -> a
+    141: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):447 -> a
+    147:147:void com.android.tools.r8.utils.Pair.<init>():20:20 -> a
+    147:147: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):994 -> a
+    147: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):447 -> a
+    148:151: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):996:999 -> a
+    148:151: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):447 -> a
+    152:152:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):316:316 -> a
+    152:152: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):999 -> a
+    152:152: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):447 -> a
+    153:181: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):999:1027 -> a
+    153:181: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):447 -> a
+    182:190: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):1024:1032 -> a
+    182:190: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):447 -> a
+    191:191: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):451:451 -> a
+    192:202: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):850:860 -> a
+    192:202: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):450 -> a
+    203:203:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):316:316 -> a
+    203:203: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):860 -> a
+    203: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):450 -> a
+    204:213: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):860:869 -> a
+    204:213: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):450 -> a
+    214:214:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):316:316 -> a
+    214:214: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):869 -> a
+    214:214: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):450 -> a
+    215:305: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):869:959 -> a
+    215:305: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):450 -> a
+    306:309:boolean com.android.tools.r8.utils.LineNumberOptimizer.verifyIdentityMapping(com.android.tools.r8.graph.DexDebugInfo,com.android.tools.r8.graph.DexDebugInfo):1038:1041 -> a
+    306:309: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):960 -> a
+    306:309:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.OriginalSourceFiles):450 -> a
+    310:310: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):962:962 -> a
+    310:310:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.OriginalSourceFiles):450 -> a
+    311:313: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):453:455 -> a
+    314:339: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):1048:1073 -> a
+    314:339: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):456 -> a
+    340:340: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):1066:1066 -> a
+    340:340: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):456 -> a
+    341: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):458:465 -> a
+    349:349:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):316:316 -> a
+    349: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):465 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    343:351: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):445:453 -> a
-    352:352:com.android.tools.r8.naming.mappinginformation.CompilerSynthesizedMappingInformation$Builder com.android.tools.r8.naming.mappinginformation.CompilerSynthesizedMappingInformation.builder():31:31 -> a
-    352: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):453 -> a
-    353:386:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):453:486 -> a
-    387:394:com.android.tools.r8.graph.DexMethod com.android.tools.r8.utils.LineNumberOptimizer.getOutlineMethod(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):608:615 -> a
-    387: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):486 -> a
-    395:398: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):488:491 -> a
-    399:399:com.android.tools.r8.naming.mappinginformation.OutlineMappingInformation com.android.tools.r8.naming.mappinginformation.OutlineMappingInformation$Builder.build():56:56 -> a
-    399:399: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):491 -> a
-    400: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):491:556 -> a
-    466:504: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):548:586 -> a
-    505:524: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):585:604 -> a
-    525:526: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):351:352 -> a
-    527:527: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):350:350 -> a
-    528:528:void lambda$run$4(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange,com.android.tools.r8.naming.mappinginformation.MappingInformation):474:474 -> a
-    529:529: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):482:482 -> a
-    530:530: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):483:483 -> a
-    531:545: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):568:582 -> a
-    546:546: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):574:574 -> a
-    547:547:com.android.tools.r8.utils.LineNumberOptimizer$OutlineFixupBuilder lambda$run$10(com.android.tools.r8.graph.DexMethod):586:586 -> a
-    548:548: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):630:630 -> a
-    549:561: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):628:640 -> a
-    562:569: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):637:644 -> a
-    570:570:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$Builder com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation.builder():109:109 -> a
-    570:570: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):644 -> a
-    571:574: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):644:647 -> a
-    575:575: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):646:646 -> a
-    576:576: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):645:645 -> a
-    577:577:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RemoveInnerFramesAction com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RemoveInnerFramesAction.create(int):269:269 -> a
-    577:577: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):648 -> a
-    578:579: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):648:649 -> a
-    580:589: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):643:652 -> a
-    590:603:int getMethodStartLine(com.android.tools.r8.graph.DexEncodedMethod):700:713 -> a
-    604:604:void sortMethods(java.util.List):722:722 -> a
-    605:606:int lambda$sortMethods$12(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):724:725 -> a
-    607:607:int com.android.tools.r8.graph.DexEncodedMethod.slowCompare(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1261:1261 -> a
-    607:607:int lambda$sortMethods$12(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):728 -> a
-    608:608: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):750:750 -> a
-    609:616: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):752:759 -> a
-    617:623:java.util.IdentityHashMap groupMethodsByRenamedName(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass):766:772 -> a
-    624:624:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):316:316 -> a
-    624:624:java.util.IdentityHashMap groupMethodsByRenamedName(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass):773 -> a
+    350:358: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):466:474 -> a
+    359:359:com.android.tools.r8.naming.mappinginformation.CompilerSynthesizedMappingInformation$Builder com.android.tools.r8.naming.mappinginformation.CompilerSynthesizedMappingInformation.builder():31:31 -> a
+    359:359: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):474 -> a
+    360:370: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):474:484 -> a
+    371:399: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):482:510 -> a
+    400:407:com.android.tools.r8.graph.DexMethod com.android.tools.r8.utils.LineNumberOptimizer.getOutlineMethod(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):632:639 -> a
+    400:407:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.OriginalSourceFiles):510 -> a
+    408:411: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):512:515 -> a
+    412:412:com.android.tools.r8.naming.mappinginformation.OutlineMappingInformation com.android.tools.r8.naming.mappinginformation.OutlineMappingInformation$Builder.build():56:56 -> a
+    412:412: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):515 -> a
+    413:478: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):515:580 -> a
+    479:517: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:610 -> a
+    518:537: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):609:628 -> a
+    538:539: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):377:378 -> a
+    540:540: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):376:376 -> a
+    541:541:void lambda$run$4(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange,com.android.tools.r8.naming.mappinginformation.MappingInformation):498:498 -> a
+    542:542: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):506:506 -> a
+    543:543: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):507:507 -> a
+    544:558: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):592:606 -> a
+    559:559: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):598:598 -> a
+    560:560:com.android.tools.r8.utils.LineNumberOptimizer$OutlineFixupBuilder lambda$run$10(com.android.tools.r8.graph.DexMethod):610:610 -> a
+    561:561: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):654:654 -> a
+    562:574: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):652:664 -> a
+    575:582: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):661:668 -> a
+    583:583:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$Builder com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation.builder():109:109 -> a
+    583:583: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):668 -> a
+    584:587: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):668:671 -> a
+    588:588: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):670:670 -> a
+    589:589: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):669:669 -> a
+    590:590:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RemoveInnerFramesAction com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RemoveInnerFramesAction.create(int):269:269 -> a
+    590:590: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):672 -> a
+    591:592: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):672:673 -> a
+    593:602: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):667:676 -> a
+    603:603:void sortMethods(java.util.List):746:746 -> a
+    604:605:int lambda$sortMethods$12(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):748:749 -> a
+    606:606:int com.android.tools.r8.graph.DexEncodedMethod.slowCompare(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1261:1261 -> a
+    606:606:int lambda$sortMethods$12(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):752 -> a
+    607:607: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):774:774 -> a
+    608:615: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):776:783 -> a
+    616:622:java.util.IdentityHashMap groupMethodsByRenamedName(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass):790:796 -> a
+    623:623:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):316:316 -> a
+    623:623:java.util.IdentityHashMap groupMethodsByRenamedName(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass):797 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    625:632:boolean com.android.tools.r8.utils.LineNumberOptimizer.doesContainPositions(com.android.tools.r8.graph.DexEncodedMethod):785:792 -> a
-    625:632:java.util.IdentityHashMap groupMethodsByRenamedName(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass):774 -> a
-    633:636:java.util.IdentityHashMap groupMethodsByRenamedName(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass):775:778 -> a
-    637:637:java.util.List lambda$groupMethodsByRenamedName$14(com.android.tools.r8.graph.DexString):777:777 -> a
-    638:643:boolean doesContainPositions(com.android.tools.r8.graph.DexCode):798:803 -> a
-    644:646:boolean doesContainPositions(com.android.tools.r8.graph.CfCode):811:813 -> a
+    624:628:java.util.IdentityHashMap groupMethodsByRenamedName(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass):798:802 -> a
+    629:629:java.util.List lambda$groupMethodsByRenamedName$14(com.android.tools.r8.graph.DexString):801:801 -> a
+    630:637:boolean doesContainPositions(com.android.tools.r8.graph.DexEncodedMethod):809:816 -> a
+    638:643:boolean doesContainPositions(com.android.tools.r8.graph.DexCode):822:827 -> a
+    644:646:boolean doesContainPositions(com.android.tools.r8.graph.CfCode):835:837 -> 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):361 -> b
-    2:2:com.android.tools.r8.utils.LineNumberOptimizer$OutlineFixupBuilder lambda$run$7(com.android.tools.r8.graph.DexMethod):489:489 -> b
-    3:19:com.android.tools.r8.ir.code.Position getPositionFromPositionState(com.android.tools.r8.graph.DexDebugPositionState):943:959 -> b
-    20:31:com.android.tools.r8.ir.code.Position remapAndAdd(com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):1055:1066 -> b
-    32:32:com.android.tools.r8.ir.code.Position remapAndAdd(com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):1058:1058 -> b
-    33:47:void remapAndAddForPc(int,int,com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):1076:1090 -> b
-    48:48:void remapAndAddForPc(int,int,com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):1080:1080 -> b
+    1:1:void lambda$run$1(java.lang.Object):388 -> b
+    2:2:com.android.tools.r8.utils.LineNumberOptimizer$OutlineFixupBuilder lambda$run$7(com.android.tools.r8.graph.DexMethod):513:513 -> b
+    3:16:int getMethodStartLine(com.android.tools.r8.graph.DexEncodedMethod):724:737 -> b
+    17:33:com.android.tools.r8.ir.code.Position getPositionFromPositionState(com.android.tools.r8.graph.DexDebugPositionState):968:984 -> b
+    34:45:com.android.tools.r8.ir.code.Position remapAndAdd(com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):1080:1091 -> b
+    46:46:com.android.tools.r8.ir.code.Position remapAndAdd(com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):1083:1083 -> b
+    47:61:void remapAndAddForPc(int,int,com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):1101:1115 -> b
+    62:62:void remapAndAddForPc(int,int,com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):1105:1105 -> b
     1:1:com.android.tools.r8.errors.Unreachable com.android.tools.r8.errors.Unreachable.raise(java.lang.Object[]):16:16 -> c
-    1:1:void lambda$run$2(java.lang.Object):373 -> c
+    1:1:void lambda$run$2(java.lang.Object):396 -> c
     1:1:com.android.tools.r8.errors.Unreachable com.android.tools.r8.errors.Unreachable.raise(java.lang.Object[]):16:16 -> d
-    1:1:void lambda$run$3(java.lang.Object):474 -> d
+    1:1:void lambda$run$3(java.lang.Object):498 -> 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):558 -> e
-com.android.tools.r8.utils.LineNumberOptimizer$1 -> com.android.tools.r8.internal.Uz:
+    1:1:void lambda$run$8(java.lang.Object):582 -> e
+com.android.tools.r8.utils.LineNumberOptimizer$1 -> com.android.tools.r8.internal.Zz:
     java.util.List val$processedEvents -> o
     boolean $assertionsDisabled -> p
     int emittedPc -> j
@@ -104863,32 +105085,32 @@
     com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper val$positionRemapper -> l
     com.android.tools.r8.utils.Box val$inlinedOriginalPosition -> n
     java.util.List val$mappedPositions -> m
-    1:1:void <clinit>():845:845 -> <clinit>
-    1:4:void <init>(int,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List,com.android.tools.r8.utils.Box,java.util.List):845:848 -> <init>
-    1:10:void visit(com.android.tools.r8.graph.DexDebugEvent$Default):861:870 -> a
-    11:11:void visit(com.android.tools.r8.graph.DexDebugEvent$SetFile):879:879 -> a
-    12:12:void visit(com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd):884:884 -> a
-    13:13:void visit(com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin):889:889 -> a
-    14:15:void visit(com.android.tools.r8.graph.DexDebugEvent$StartLocal):896:897 -> a
-    16:17:void visit(com.android.tools.r8.graph.DexDebugEvent$EndLocal):902:903 -> a
-    18:19:void visit(com.android.tools.r8.graph.DexDebugEvent$RestartLocal):908:909 -> a
-    1:3:void flushPc():852:854 -> j
-com.android.tools.r8.utils.LineNumberOptimizer$2 -> com.android.tools.r8.internal.Vz:
+    1:1:void <clinit>():869:869 -> <clinit>
+    1:4:void <init>(int,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List,com.android.tools.r8.utils.Box,java.util.List):869:872 -> <init>
+    1:10:void visit(com.android.tools.r8.graph.DexDebugEvent$Default):885:894 -> a
+    11:11:void visit(com.android.tools.r8.graph.DexDebugEvent$SetFile):903:903 -> a
+    12:12:void visit(com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd):908:908 -> a
+    13:13:void visit(com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin):913:913 -> a
+    14:15:void visit(com.android.tools.r8.graph.DexDebugEvent$StartLocal):920:921 -> a
+    16:17:void visit(com.android.tools.r8.graph.DexDebugEvent$EndLocal):926:927 -> a
+    18:19:void visit(com.android.tools.r8.graph.DexDebugEvent$RestartLocal):932:933 -> a
+    1:3:void flushPc():876:878 -> j
+com.android.tools.r8.utils.LineNumberOptimizer$2 -> com.android.tools.r8.internal.aA:
     boolean $assertionsDisabled -> m
     com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper val$positionRemapper -> k
     com.android.tools.r8.utils.Pair val$lastPosition -> j
     java.util.List val$mappedPositions -> l
-    1:1:void <clinit>():974:974 -> <clinit>
-    1:1:void <init>(int,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.Pair,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):974:974 -> <init>
-    1:7:void visit(com.android.tools.r8.graph.DexDebugEvent$Default):977:983 -> a
-    8:17:void visit(com.android.tools.r8.graph.DexDebugEvent$Default):980:989 -> a
-com.android.tools.r8.utils.LineNumberOptimizer$IdentityPositionRemapper -> com.android.tools.r8.internal.Wz:
+    1:1:void <clinit>():999:999 -> <clinit>
+    1:1:void <init>(int,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.Pair,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):999:999 -> <init>
+    1:7:void visit(com.android.tools.r8.graph.DexDebugEvent$Default):1002:1008 -> a
+    8:17:void visit(com.android.tools.r8.graph.DexDebugEvent$Default):1005:1014 -> a
+com.android.tools.r8.utils.LineNumberOptimizer$IdentityPositionRemapper -> com.android.tools.r8.internal.bA:
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():94:94 -> <clinit>
-    1:1:void <init>():94:94 -> <init>
-    2:2:void <init>(com.android.tools.r8.utils.LineNumberOptimizer$1):94:94 -> <init>
-    1:2:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):99:100 -> a
-com.android.tools.r8.utils.LineNumberOptimizer$KotlinInlineFunctionPositionRemapper -> com.android.tools.r8.internal.Xz:
+    1:1:void <clinit>():96:96 -> <clinit>
+    1:1:void <init>():96:96 -> <init>
+    2:2:void <init>(com.android.tools.r8.utils.LineNumberOptimizer$1):96:96 -> <init>
+    1:2:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):101:102 -> a
+com.android.tools.r8.utils.LineNumberOptimizer$KotlinInlineFunctionPositionRemapper -> com.android.tools.r8.internal.cA:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result parsedData -> g
     java.util.Map parsedKotlinSourceDebugExtensions -> c
@@ -104897,25 +105119,25 @@
     boolean $assertionsDisabled -> h
     com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper baseRemapper -> e
     com.android.tools.r8.graph.DexEncodedMethod currentMethod -> f
-    1:1:void <clinit>():140:140 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.utils.CfLineToMethodMapper,com.android.tools.r8.utils.LineNumberOptimizer$1):140:140 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.utils.CfLineToMethodMapper):155:155 -> <init>
-    3:18:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.utils.CfLineToMethodMapper):144:159 -> <init>
-    1:1:com.android.tools.r8.graph.DexEncodedMethod access$202(com.android.tools.r8.utils.LineNumberOptimizer$KotlinInlineFunctionPositionRemapper,com.android.tools.r8.graph.DexEncodedMethod):140:140 -> a
-    2:4:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):164:166 -> a
-    5:17:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result com.android.tools.r8.utils.LineNumberOptimizer$KotlinInlineFunctionPositionRemapper.getAndParseSourceDebugExtension(com.android.tools.r8.graph.DexType):227:239 -> a
-    5:17:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):166 -> a
-    18:18:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result com.android.tools.r8.utils.LineNumberOptimizer$KotlinInlineFunctionPositionRemapper.getAndParseSourceDebugExtension(com.android.tools.r8.graph.DexType):231:231 -> a
-    18:18:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):166 -> a
-    19:35:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):168:184 -> a
+    1:1:void <clinit>():142:142 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.utils.CfLineToMethodMapper,com.android.tools.r8.utils.LineNumberOptimizer$1):142:142 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.utils.CfLineToMethodMapper):157:157 -> <init>
+    3:18:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.utils.CfLineToMethodMapper):146:161 -> <init>
+    1:1:com.android.tools.r8.graph.DexEncodedMethod access$202(com.android.tools.r8.utils.LineNumberOptimizer$KotlinInlineFunctionPositionRemapper,com.android.tools.r8.graph.DexEncodedMethod):142:142 -> a
+    2:4:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):166:168 -> a
+    5:17:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result com.android.tools.r8.utils.LineNumberOptimizer$KotlinInlineFunctionPositionRemapper.getAndParseSourceDebugExtension(com.android.tools.r8.graph.DexType):229:241 -> a
+    5:17:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):168 -> a
+    18:18:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result com.android.tools.r8.utils.LineNumberOptimizer$KotlinInlineFunctionPositionRemapper.getAndParseSourceDebugExtension(com.android.tools.r8.graph.DexType):233:233 -> a
+    18:18:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):168 -> a
+    19:35:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):170:186 -> a
     36:38:java.lang.String com.android.tools.r8.utils.CfLineToMethodMapper.getName(java.lang.String):74:76 -> a
-    36:38:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):185 -> a
+    36:38:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):187 -> a
     39:41:java.lang.String com.android.tools.r8.utils.CfLineToMethodMapper.getDescriptor(java.lang.String):80:82 -> a
-    39:41:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):186 -> a
-    42:52:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):187:197 -> a
-    53:75:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):194:216 -> a
-    76:88:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):211:223 -> a
-com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition -> com.android.tools.r8.internal.Yz:
+    39:41:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):188 -> a
+    42:52:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):189:199 -> a
+    53:75:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):196:218 -> a
+    76:88:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):213:225 -> a
+com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition -> com.android.tools.r8.internal.dA:
     boolean isOutline -> e
     com.android.tools.r8.graph.DexMethod outlineCallee -> f
     int obfuscatedLine -> d
@@ -104923,48 +105145,48 @@
     com.android.tools.r8.ir.code.Position caller -> c
     com.android.tools.r8.graph.DexMethod method -> a
     com.android.tools.r8.utils.Int2StructuralItemArrayMap outlinePositions -> g
-    1:1:void <init>(com.android.tools.r8.graph.DexMethod,int,com.android.tools.r8.ir.code.Position,int,boolean,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.Int2StructuralItemArrayMap,com.android.tools.r8.utils.LineNumberOptimizer$1):294:294 -> <init>
-    2:9:void <init>(com.android.tools.r8.graph.DexMethod,int,com.android.tools.r8.ir.code.Position,int,boolean,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.Int2StructuralItemArrayMap):311:318 -> <init>
-    1:1:int access$300(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):294:294 -> a
-    2:2:boolean isOutlineCaller():322:322 -> a
-    1:1:int access$400(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):294:294 -> b
-    1:1:com.android.tools.r8.graph.DexMethod access$500(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):294:294 -> c
-    1:1:com.android.tools.r8.ir.code.Position access$600(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):294:294 -> d
-    1:1:com.android.tools.r8.graph.DexMethod access$700(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):294:294 -> e
-    1:1:com.android.tools.r8.utils.Int2StructuralItemArrayMap access$800(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):294:294 -> f
-    1:1:boolean access$900(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):294:294 -> g
-com.android.tools.r8.utils.LineNumberOptimizer$OptimizingPositionRemapper -> com.android.tools.r8.internal.Zz:
+    1:1:void <init>(com.android.tools.r8.graph.DexMethod,int,com.android.tools.r8.ir.code.Position,int,boolean,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.Int2StructuralItemArrayMap,com.android.tools.r8.utils.LineNumberOptimizer$1):296:296 -> <init>
+    2:9:void <init>(com.android.tools.r8.graph.DexMethod,int,com.android.tools.r8.ir.code.Position,int,boolean,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.Int2StructuralItemArrayMap):313:320 -> <init>
+    1:1:int access$300(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):296:296 -> a
+    2:2:boolean isOutlineCaller():324:324 -> a
+    1:1:int access$400(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):296:296 -> b
+    1:1:com.android.tools.r8.graph.DexMethod access$500(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):296:296 -> c
+    1:1:com.android.tools.r8.ir.code.Position access$600(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):296:296 -> d
+    1:1:com.android.tools.r8.graph.DexMethod access$700(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):296:296 -> e
+    1:1:com.android.tools.r8.utils.Int2StructuralItemArrayMap access$800(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):296:296 -> f
+    1:1:boolean access$900(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):296:296 -> g
+com.android.tools.r8.utils.LineNumberOptimizer$OptimizingPositionRemapper -> com.android.tools.r8.internal.eA:
     boolean $assertionsDisabled -> e
     int nextOptimizedLineNumber -> d
     com.android.tools.r8.graph.DexMethod previousMethod -> b
     int previousSourceLine -> c
     int maxLineDelta -> a
-    1:1:void <clinit>():104:104 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.utils.InternalOptions):110:110 -> <init>
-    2:10:void <init>(com.android.tools.r8.utils.InternalOptions):106:114 -> <init>
-    1:18:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):119:136 -> a
-com.android.tools.r8.utils.LineNumberOptimizer$OutlineFixupBuilder -> com.android.tools.r8.internal.aA:
+    1:1:void <clinit>():106:106 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.utils.InternalOptions):112:112 -> <init>
+    2:10:void <init>(com.android.tools.r8.utils.InternalOptions):108:116 -> <init>
+    1:18:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):121:138 -> a
+com.android.tools.r8.utils.LineNumberOptimizer$OutlineFixupBuilder -> com.android.tools.r8.internal.fA:
     java.util.List mappedOutlineCalleePositions -> b
     java.util.List mappedOutlinePositions -> a
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():1094:1094 -> <clinit>
-    1:6:void <init>():1094:1099 -> <init>
-    7:7:void <init>(com.android.tools.r8.utils.LineNumberOptimizer$1):1094:1094 -> <init>
+    1:1:void <clinit>():1119:1119 -> <clinit>
+    1:6:void <init>():1119:1124 -> <init>
+    7:7:void <init>(com.android.tools.r8.utils.LineNumberOptimizer$1):1119:1119 -> <init>
     1:1:com.android.tools.r8.errors.Unreachable com.android.tools.r8.errors.Unreachable.raise(java.lang.Object[]):16:16 -> a
-    1:1:void lambda$fixup$1(java.lang.Object):1130 -> a
-    2:2:void setMappedPositionsOutline(java.util.List):1103:1103 -> a
-    3:3:void addMappedRangeForOutlineCallee(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap):1108:1108 -> a
-    4:12:void fixup():1112:1120 -> a
+    1:1:void lambda$fixup$1(java.lang.Object):1155 -> a
+    2:2:void setMappedPositionsOutline(java.util.List):1128:1128 -> a
+    3:3:void addMappedRangeForOutlineCallee(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap):1133:1133 -> a
+    4:12:void fixup():1137:1145 -> a
     13:13:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap.<init>():176:176 -> a
-    13:13:void fixup():1120 -> a
-    14:23:void fixup():1121:1130 -> a
-    24:24:void fixup():1129:1129 -> a
-    25:26:void fixup():1113:1114 -> a
-    27:27:void lambda$fixup$0(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntSortedMap,java.lang.Integer,java.lang.Integer):1124:1124 -> a
-    28:30:int com.android.tools.r8.utils.LineNumberOptimizer$OutlineFixupBuilder.getMinifiedLinePosition(int,java.util.List):1136:1138 -> a
-    28:30:void lambda$fixup$0(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntSortedMap,java.lang.Integer,java.lang.Integer):1124 -> a
-    31:31:void lambda$fixup$0(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntSortedMap,java.lang.Integer,java.lang.Integer):1126:1126 -> a
-com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter -> com.android.tools.r8.internal.bA:
+    13:13:void fixup():1145 -> a
+    14:23:void fixup():1146:1155 -> a
+    24:24:void fixup():1154:1154 -> a
+    25:26:void fixup():1138:1139 -> a
+    27:27:void lambda$fixup$0(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntSortedMap,java.lang.Integer,java.lang.Integer):1149:1149 -> a
+    28:30:int com.android.tools.r8.utils.LineNumberOptimizer$OutlineFixupBuilder.getMinifiedLinePosition(int,java.util.List):1161:1163 -> a
+    28:30:void lambda$fixup$0(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntSortedMap,java.lang.Integer,java.lang.Integer):1149 -> a
+    31:31:void lambda$fixup$0(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntSortedMap,java.lang.Integer,java.lang.Integer):1151:1151 -> a
+com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter -> com.android.tools.r8.internal.gA:
     java.util.List processedEvents -> f
     int previousPc -> d
     boolean $assertionsDisabled -> g
@@ -104972,45 +105194,46 @@
     com.android.tools.r8.graph.DexMethod method -> c
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> a
     com.android.tools.r8.ir.code.Position previousPosition -> e
-    1:1:void <clinit>():250:250 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,java.util.List,com.android.tools.r8.utils.LineNumberOptimizer$1):250:250 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,java.util.List):259:259 -> <init>
-    3:13:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,java.util.List):252:262 -> <init>
-    1:2:void com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter.emitAdvancePc(int):266:267 -> a
-    1:2:void access$1100(com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter,int):250 -> a
+    1:1:void <clinit>():252:252 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,java.util.List,com.android.tools.r8.utils.LineNumberOptimizer$1):252:252 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,java.util.List):261:261 -> <init>
+    3:13:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,java.util.List):254:264 -> <init>
+    1:2:void com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter.emitAdvancePc(int):268:269 -> a
+    1:2:void access$1100(com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter,int):252 -> 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):271:284 -> a
-    3:16:void access$1400(com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter,int,com.android.tools.r8.ir.code.Position):250 -> a
+    3:16:void com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter.emitPositionEvents(int,com.android.tools.r8.ir.code.Position):273:286 -> a
+    3:16:void access$1400(com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter,int,com.android.tools.r8.ir.code.Position):252 -> 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():288:289 -> a
-    17:18:int access$1500(com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter):250 -> a
+    17:18:int com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter.getStartLine():290:291 -> a
+    17:18:int access$1500(com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter):252 -> 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.cA:
+com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper -> com.android.tools.r8.internal.hA:
     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.pA:
+com.android.tools.r8.utils.ListUtils -> com.android.tools.r8.internal.uA:
     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.List,java.util.function.Predicate):58:59 -> a
+    4:5:java.util.List filter(java.util.Collection,java.util.function.Predicate):58:59 -> a
     6:7:void lambda$filter$1(java.util.function.Predicate,java.util.ArrayList,java.lang.Object):61:62 -> a
     8:8:java.lang.Object first(java.util.List):69:69 -> a
-    9:11:java.util.List map(java.util.Collection,java.util.function.Function):108:110 -> a
-    12:12:java.lang.Object lambda$mapOrElse$2(java.util.function.Function,int,java.lang.Object):131:131 -> a
-    13:13:java.util.List mapOrElse(java.util.List,java.util.function.Function,java.util.List):131:131 -> a
-    14:29:java.util.List mapOrElse(java.util.List,com.android.tools.r8.utils.IntObjToObjFunction,java.util.List):141:156 -> a
-    30:30:java.lang.Object lambda$filterOrElse$3(java.util.function.Predicate,java.lang.Object):176:176 -> a
-    31:32:java.util.ArrayList newArrayList(com.android.tools.r8.utils.ForEachable):193:194 -> a
-    33:34:java.util.LinkedList newLinkedList(java.lang.Object):213:214 -> a
-    35:36:java.lang.Object fold(java.util.Collection,java.lang.Object,java.util.function.BiFunction):247:248 -> a
-    37:38:void forEachWithIndex(java.util.List,com.android.tools.r8.utils.ListUtils$ReferenceAndIntConsumer):254:255 -> a
-    39:39:void destructiveSort(java.util.List,java.util.Comparator):264:264 -> a
+    9:11:java.util.List map(java.lang.Object[],java.util.function.Function):100:102 -> a
+    12:14:java.util.List map(java.util.Collection,java.util.function.Function):116:118 -> a
+    15:15:java.lang.Object lambda$mapOrElse$2(java.util.function.Function,int,java.lang.Object):139:139 -> a
+    16:16:java.util.List mapOrElse(java.util.List,java.util.function.Function,java.util.List):139:139 -> a
+    17:32:java.util.List mapOrElse(java.util.List,com.android.tools.r8.utils.IntObjToObjFunction,java.util.List):149:164 -> a
+    33:33:java.util.List filterOrElse(java.util.List,java.util.function.Predicate):184:184 -> a
+    34:34:java.lang.Object lambda$filterOrElse$3(java.util.function.Predicate,java.lang.Object):184:184 -> a
+    35:36:java.util.ArrayList newArrayList(com.android.tools.r8.utils.ForEachable):201:202 -> a
+    37:38:java.util.LinkedList newLinkedList(java.lang.Object):221:222 -> a
+    39:40:java.lang.Object fold(java.util.Collection,java.lang.Object,java.util.function.BiFunction):255:256 -> a
+    41:42:void forEachWithIndex(java.util.List,com.android.tools.r8.utils.ListUtils$ReferenceAndIntConsumer):262:263 -> a
+    43:43:void destructiveSort(java.util.List,java.util.Comparator):272:272 -> a
     1:15:java.util.List flatMapSameType(java.util.List,java.util.function.Function,java.util.List):31:45 -> b
-    16:16:java.lang.Object last(java.util.List):87:87 -> b
-    17:17:java.util.List filterOrElse(java.util.List,java.util.function.Predicate):176:176 -> b
-    18:20:com.android.tools.r8.com.google.common.collect.ImmutableList newImmutableList(com.android.tools.r8.utils.ForEachable):207:209 -> 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.oA:
-com.android.tools.r8.utils.LongInterval -> com.android.tools.r8.internal.eB:
+    16:17:int firstIndexMatching(java.util.List,java.util.function.Predicate):78:79 -> b
+    18:18:java.lang.Object last(java.util.List):87:87 -> b
+    19:21:com.android.tools.r8.com.google.common.collect.ImmutableList newImmutableList(com.android.tools.r8.utils.ForEachable):215:217 -> b
+    1:2:int lastIndexMatching(java.util.List,java.util.function.Predicate):91:92 -> c
+com.android.tools.r8.utils.ListUtils$ReferenceAndIntConsumer -> com.android.tools.r8.internal.tA:
+com.android.tools.r8.utils.LongInterval -> com.android.tools.r8.internal.jB:
     long max -> b
     long min -> a
     boolean $assertionsDisabled -> c
@@ -105031,7 +105254,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.xB:
+com.android.tools.r8.utils.MainDexListParser -> com.android.tools.r8.internal.CB:
     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}}
@@ -105067,7 +105290,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.zB:
+com.android.tools.r8.utils.MapIdTemplateProvider -> com.android.tools.r8.internal.EB:
     java.util.Map HANDLERS -> c
     java.lang.String template -> a
     java.lang.String cachedValue -> b
@@ -105092,7 +105315,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.AB:
+com.android.tools.r8.utils.MapUtils -> com.android.tools.r8.internal.FB:
     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
@@ -105107,7 +105330,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.NC:
+com.android.tools.r8.utils.MethodJavaSignatureEquivalence -> com.android.tools.r8.internal.SC:
     com.android.tools.r8.utils.MethodJavaSignatureEquivalence INSTANCE_IGNORE_NAME -> c
     com.android.tools.r8.utils.MethodJavaSignatureEquivalence INSTANCE -> b
     boolean ignoreName -> a
@@ -105121,7 +105344,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.bD:
+com.android.tools.r8.utils.MethodReferenceUtils -> com.android.tools.r8.internal.gD:
     int $r8$clinit -> b
     java.util.Comparator COMPARATOR -> a
     1:1:void <clinit>():24:24 -> <clinit>
@@ -105161,7 +105384,7 @@
     27:27:int com.android.tools.r8.utils.CompareResult.getComparisonResult():21:21 -> b
     27:27:int lambda$static$0(com.android.tools.r8.references.MethodReference,com.android.tools.r8.references.MethodReference):52 -> b
     28:28: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.dD:
+com.android.tools.r8.utils.MethodSignatureEquivalence -> com.android.tools.r8.internal.iD:
     com.android.tools.r8.utils.MethodSignatureEquivalence INSTANCE -> a
     1:1:void <clinit>():16:16 -> <clinit>
     1:1:void <init>(boolean):23:23 -> <init>
@@ -105172,13 +105395,13 @@
     4:4:int com.android.tools.r8.utils.MethodSignatureEquivalence.doHash(com.android.tools.r8.graph.DexMethod):48:48 -> a
     4:4:int doHash(java.lang.Object):14 -> a
     5:5:com.android.tools.r8.utils.MethodSignatureEquivalence get():28:28 -> a
-com.android.tools.r8.utils.NumberUtils -> com.android.tools.r8.internal.UF:
+com.android.tools.r8.utils.NumberUtils -> com.android.tools.r8.internal.ZF:
     boolean is16Bit(long) -> a
     boolean is32Bit(long) -> b
-com.android.tools.r8.utils.ObjectUtils -> com.android.tools.r8.internal.oI:
+com.android.tools.r8.utils.ObjectUtils -> com.android.tools.r8.internal.tI:
     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.tI:
+com.android.tools.r8.utils.OffOrAuto -> com.android.tools.r8.internal.yI:
     com.android.tools.r8.utils.OffOrAuto Auto -> c
     com.android.tools.r8.utils.OffOrAuto Off -> b
     com.android.tools.r8.utils.OffOrAuto[] $VALUES -> d
@@ -105200,7 +105423,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.II:
+com.android.tools.r8.utils.OptionalBool -> com.android.tools.r8.internal.NI:
     com.android.tools.r8.utils.OptionalBool UNKNOWN -> c
     com.android.tools.r8.utils.OptionalBool TRUE -> a
     com.android.tools.r8.utils.OptionalBool FALSE -> b
@@ -105209,22 +105432,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.FI:
+com.android.tools.r8.utils.OptionalBool$1 -> com.android.tools.r8.internal.KI:
     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.GI:
+com.android.tools.r8.utils.OptionalBool$2 -> com.android.tools.r8.internal.LI:
     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.HI:
+com.android.tools.r8.utils.OptionalBool$3 -> com.android.tools.r8.internal.MI:
     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.LI:
+com.android.tools.r8.utils.OptionsParsing -> com.android.tools.r8.internal.QI:
     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
@@ -105238,14 +105461,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.KI:
+com.android.tools.r8.utils.OptionsParsing$ParseContext -> com.android.tools.r8.internal.PI:
     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.QI:
+com.android.tools.r8.utils.OriginWithPosition -> com.android.tools.r8.internal.VI:
     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>
@@ -105253,7 +105476,26 @@
     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.Pair -> com.android.tools.r8.internal.nJ:
+com.android.tools.r8.utils.OriginalSourceFiles -> com.android.tools.r8.internal.ZI:
+    com.android.tools.r8.utils.OriginalSourceFiles UNREACHABLE -> a
+    com.android.tools.r8.utils.OriginalSourceFiles FROM_CLASSES -> b
+    1:9:void <clinit>():15:23 -> <clinit>
+    1:1:void <init>():13:13 -> <init>
+    com.android.tools.r8.graph.DexString getOriginalSourceFile(com.android.tools.r8.graph.DexProgramClass) -> a
+    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.WI:
+    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.XI:
+    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.YI:
+    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.wJ:
 # {"id":"sourceFile","fileName":"Pair.java"}
     java.lang.Object second -> b
     java.lang.Object first -> a
@@ -105271,7 +105513,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.WJ:
+com.android.tools.r8.utils.PredicateSet -> com.android.tools.r8.internal.fK:
     java.util.List predicates -> b
     java.util.Set elements -> a
     1:4:void <init>():14:17 -> <init>
@@ -105280,13 +105522,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.XJ:
+com.android.tools.r8.utils.PredicateUtils -> com.android.tools.r8.internal.gK:
     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.lK:
+com.android.tools.r8.utils.PreloadedClassFileProvider -> com.android.tools.r8.internal.uK:
     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>
@@ -105305,8 +105547,8 @@
     1:6:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):48:53 -> getProgramResource
     7:7:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):52:52 -> getProgramResource
     1:1:java.lang.String toString():64:64 -> toString
-com.android.tools.r8.utils.PreloadedClassFileProvider$1 -> com.android.tools.r8.internal.kK:
-com.android.tools.r8.utils.PreloadedClassFileProvider$Builder -> com.android.tools.r8.internal.lK$a:
+com.android.tools.r8.utils.PreloadedClassFileProvider$1 -> com.android.tools.r8.internal.tK:
+com.android.tools.r8.utils.PreloadedClassFileProvider$Builder -> com.android.tools.r8.internal.uK$a:
     java.util.Map content -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():74:74 -> <clinit>
@@ -105315,11 +105557,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.mK:
+com.android.tools.r8.utils.PreloadedClassFileProvider$ClassDescriptorOrigin -> com.android.tools.r8.internal.vK:
     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.GK:
+com.android.tools.r8.utils.ProgramClassCollection -> com.android.tools.r8.internal.PK:
     com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver conflictResolver -> d
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():18:18 -> <clinit>
@@ -105361,7 +105603,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.QK:
+com.android.tools.r8.utils.ProgramMethodEquivalence -> com.android.tools.r8.internal.ZK:
     com.android.tools.r8.utils.ProgramMethodEquivalence INSTANCE -> a
     1:1:void <clinit>():12:12 -> <clinit>
     1:1:void <init>():14:14 -> <init>
@@ -105372,17 +105614,17 @@
     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.SP:
-com.android.tools.r8.utils.ReflectionHelper$1 -> com.android.tools.r8.internal.MP:
-com.android.tools.r8.utils.ReflectionHelper$ReflectiveFieldOperation -> com.android.tools.r8.internal.NP:
+com.android.tools.r8.utils.ReflectionHelper -> com.android.tools.r8.internal.bQ:
+com.android.tools.r8.utils.ReflectionHelper$1 -> com.android.tools.r8.internal.VP:
+com.android.tools.r8.utils.ReflectionHelper$ReflectiveFieldOperation -> com.android.tools.r8.internal.WP:
     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.OP:
+com.android.tools.r8.utils.ReflectionHelper$ReflectiveMethodOperation -> com.android.tools.r8.internal.XP:
     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.PP:
+com.android.tools.r8.utils.ReflectionHelper$ReflectiveOperation -> com.android.tools.r8.internal.YP:
     java.util.function.Consumer modifier -> c
     com.android.tools.r8.utils.ReflectionHelper$ReflectiveOperation nextOperation -> d
     java.lang.Class classForDeclaration -> a
@@ -105390,7 +105632,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.QP:
+com.android.tools.r8.utils.ReflectionHelper$ReflectiveOperationBuilder -> com.android.tools.r8.internal.ZP:
     com.android.tools.r8.utils.ReflectionHelper$ReflectiveOperationSequenceBuilder sequenceBuilder -> d
     boolean $assertionsDisabled -> e
     java.lang.String declaredMember -> a
@@ -105406,7 +105648,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.RP:
+com.android.tools.r8.utils.ReflectionHelper$ReflectiveOperationSequenceBuilder -> com.android.tools.r8.internal.aQ:
     java.util.List reflectiveOperationBuilderList -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():92:92 -> <clinit>
@@ -105416,7 +105658,7 @@
     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.CQ:
+com.android.tools.r8.utils.Reporter -> com.android.tools.r8.internal.LQ:
     java.util.List diagnosticsLevelMapping -> b
     com.android.tools.r8.DiagnosticsHandler clientHandler -> a
     com.android.tools.r8.utils.AbortException abort -> c
@@ -105438,19 +105680,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.zQ:
+com.android.tools.r8.utils.Reporter$1 -> com.android.tools.r8.internal.IQ:
     1:1:void <init>():56:56 -> <init>
-com.android.tools.r8.utils.Reporter$2 -> com.android.tools.r8.internal.AQ:
+com.android.tools.r8.utils.Reporter$2 -> com.android.tools.r8.internal.JQ:
     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.BQ:
+com.android.tools.r8.utils.Reporter$DiagnosticsLevelMapping -> com.android.tools.r8.internal.KQ:
     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.jS:
+com.android.tools.r8.utils.SegmentTree -> com.android.tools.r8.internal.sS:
     java.util.TreeMap internalTree -> a
     boolean allowIntervalOverwrites -> b
     int size -> c
@@ -105463,7 +105705,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.kS:
+com.android.tools.r8.utils.SemanticVersion -> com.android.tools.r8.internal.tS:
     int minor -> b
     int patch -> c
     int major -> a
@@ -105508,7 +105750,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.nS:
+com.android.tools.r8.utils.SetUtils -> com.android.tools.r8.internal.wS:
     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
@@ -105521,14 +105763,14 @@
     3:3:java.util.Set newIdentityHashSet(int):85:85 -> b
     4:6:com.android.tools.r8.com.google.common.collect.ImmutableSet newImmutableSet(com.android.tools.r8.utils.ForEachable):95:97 -> b
     7:13: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.tT:
+com.android.tools.r8.utils.SortingStringConsumer -> com.android.tools.r8.internal.CT:
     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.xT:
+com.android.tools.r8.utils.SourceFileTemplateProvider -> com.android.tools.r8.internal.GT:
     java.util.Map HANDLERS -> c
     java.lang.String template -> a
     java.lang.String cachedValue -> b
@@ -105556,7 +105798,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.zU:
+com.android.tools.r8.utils.StreamUtils -> com.android.tools.r8.internal.IU:
     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
@@ -105570,7 +105812,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.gV:
+com.android.tools.r8.utils.StringUtils -> com.android.tools.r8.internal.pV:
     char[] EMPTY_CHAR_ARRAY -> a
     java.lang.String LINE_SEPARATOR -> c
     java.lang.String[] EMPTY_ARRAY -> b
@@ -105662,10 +105904,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.fV:
+com.android.tools.r8.utils.StringUtils$1 -> com.android.tools.r8.internal.oV:
     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.gV$a:
+com.android.tools.r8.utils.StringUtils$BraceType -> com.android.tools.r8.internal.pV$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
@@ -105675,10 +105917,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.BV:
+com.android.tools.r8.utils.SupplierUtils -> com.android.tools.r8.internal.KV:
     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.MV:
+com.android.tools.r8.utils.SymbolGenerationUtils -> com.android.tools.r8.internal.VV:
     char[] IDENTIFIER_CHARACTERS -> b
     boolean $assertionsDisabled -> e
     java.util.Set PRIMITIVE_TYPE_NAMES -> a
@@ -105691,7 +105933,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.MV$a:
+com.android.tools.r8.utils.SymbolGenerationUtils$MixedCasing -> com.android.tools.r8.internal.VV$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>
@@ -105733,34 +105975,34 @@
     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.mW:
+com.android.tools.r8.utils.ThrowingAction -> com.android.tools.r8.internal.vW:
     void execute() -> a
-com.android.tools.r8.utils.ThrowingBiConsumer -> com.android.tools.r8.internal.nW:
-com.android.tools.r8.utils.ThrowingBiFunction -> com.android.tools.r8.internal.oW:
-com.android.tools.r8.utils.ThrowingCharIterator -> com.android.tools.r8.internal.pW:
+com.android.tools.r8.utils.ThrowingBiConsumer -> com.android.tools.r8.internal.wW:
+com.android.tools.r8.utils.ThrowingBiFunction -> com.android.tools.r8.internal.xW:
+com.android.tools.r8.utils.ThrowingCharIterator -> com.android.tools.r8.internal.yW:
     char nextChar() -> a
-com.android.tools.r8.utils.ThrowingConsumer -> com.android.tools.r8.internal.qW:
-com.android.tools.r8.utils.ThrowingFunction -> com.android.tools.r8.internal.rW:
-com.android.tools.r8.utils.ThrowingIntIterator -> com.android.tools.r8.internal.tW:
+com.android.tools.r8.utils.ThrowingConsumer -> com.android.tools.r8.internal.zW:
+com.android.tools.r8.utils.ThrowingFunction -> com.android.tools.r8.internal.AW:
+com.android.tools.r8.utils.ThrowingIntIterator -> com.android.tools.r8.internal.CW:
     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.uW:
+com.android.tools.r8.utils.ThrowingIntSupplier -> com.android.tools.r8.internal.DW:
     int getAsInt() -> a
-com.android.tools.r8.utils.ThrowingIterator -> com.android.tools.r8.internal.vW:
+com.android.tools.r8.utils.ThrowingIterator -> com.android.tools.r8.internal.EW:
     1:1:void <init>():11:11 -> <init>
     boolean hasNext() -> a
     1:4:java.lang.Object computeNextIfAbsent(com.android.tools.r8.utils.ThrowingSupplier):18:21 -> a
     5:10:java.util.List take(int):25:30 -> a
     11:11:java.util.List take(int):28:28 -> a
     java.lang.Object next() -> b
-com.android.tools.r8.utils.ThrowingReferenceIntConsumer -> com.android.tools.r8.internal.wW:
-com.android.tools.r8.utils.ThrowingReferenceIntFunction -> com.android.tools.r8.internal.xW:
+com.android.tools.r8.utils.ThrowingReferenceIntConsumer -> com.android.tools.r8.internal.FW:
+com.android.tools.r8.utils.ThrowingReferenceIntFunction -> com.android.tools.r8.internal.GW:
     java.lang.Object apply(java.lang.Object,int) -> a
-com.android.tools.r8.utils.ThrowingSupplier -> com.android.tools.r8.internal.yW:
-com.android.tools.r8.utils.Timing -> com.android.tools.r8.internal.GW:
+com.android.tools.r8.utils.ThrowingSupplier -> com.android.tools.r8.internal.HW:
+com.android.tools.r8.utils.Timing -> com.android.tools.r8.internal.PW:
     java.util.Stack stack -> b
     com.android.tools.r8.utils.Timing EMPTY -> d
     boolean $assertionsDisabled -> e
@@ -105824,20 +106066,20 @@
     1:1:boolean access$800(com.android.tools.r8.utils.Timing):26:26 -> c
     2:3:void end():393:394 -> c
     1:6:void report():398:403 -> d
-com.android.tools.r8.utils.Timing$1 -> com.android.tools.r8.internal.AW:
+com.android.tools.r8.utils.Timing$1 -> com.android.tools.r8.internal.JW:
     1:1:void <init>(java.lang.String,boolean):31:31 -> <init>
     void begin(java.lang.String) -> a
     1:1:com.android.tools.r8.utils.Timing$TimingMerger beginMerger(java.lang.String,int):34:34 -> a
     void end() -> c
     void report() -> d
-com.android.tools.r8.utils.Timing$1$1 -> com.android.tools.r8.internal.zW:
+com.android.tools.r8.utils.Timing$1$1 -> com.android.tools.r8.internal.IW:
     1:1:void <init>(com.android.tools.r8.utils.Timing$1,java.lang.String,int,com.android.tools.r8.utils.Timing):34:34 -> <init>
     void add(java.util.Collection) -> a
     void end() -> a
-com.android.tools.r8.utils.Timing$MemInfo -> com.android.tools.r8.internal.BW:
+com.android.tools.r8.utils.Timing$MemInfo -> com.android.tools.r8.internal.KW:
     long used -> a
     1:2:void <init>(long):102:103 -> <init>
-com.android.tools.r8.utils.Timing$Node -> com.android.tools.r8.internal.CW:
+com.android.tools.r8.utils.Timing$Node -> com.android.tools.r8.internal.LW:
     java.util.Map children -> c
     long start_time -> e
     java.lang.String title -> a
@@ -105915,7 +106157,7 @@
     4:4:java.lang.String com.android.tools.r8.utils.Timing.access$300(long):26 -> toString
     4:4:java.lang.String toString():157 -> toString
     5:5:java.lang.String toString():157:157 -> toString
-com.android.tools.r8.utils.Timing$TimingMerger -> com.android.tools.r8.internal.FW:
+com.android.tools.r8.utils.Timing$TimingMerger -> com.android.tools.r8.internal.OW:
     boolean $assertionsDisabled -> e
     com.android.tools.r8.utils.Timing$Node slowest -> d
     int taskCount -> c
@@ -105931,7 +106173,7 @@
     24:24:com.android.tools.r8.utils.Timing$Node lambda$add$0(boolean,java.lang.String):306:306 -> a
     25:26:void end():316:317 -> a
     1:1:int access$900(com.android.tools.r8.utils.Timing$TimingMerger):226:226 -> b
-com.android.tools.r8.utils.Timing$TimingMerger$1 -> com.android.tools.r8.internal.DW:
+com.android.tools.r8.utils.Timing$TimingMerger$1 -> com.android.tools.r8.internal.MW:
     boolean $assertionsDisabled -> k
     int val$numberOfThreads -> i
     com.android.tools.r8.utils.Timing$TimingMerger this$0 -> j
@@ -105968,24 +106210,24 @@
     274:274:java.lang.String toString():271:271 -> toString
     275:275:java.lang.String toString():271:271 -> toString
     272:272:java.lang.String toString():271:271 -> toString
-com.android.tools.r8.utils.Timing$TimingMerger$Item -> com.android.tools.r8.internal.EW:
+com.android.tools.r8.utils.Timing$TimingMerger$Item -> com.android.tools.r8.internal.NW:
     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):280:282 -> <init>
-com.android.tools.r8.utils.TraversalContinuation -> com.android.tools.r8.internal.XW:
+com.android.tools.r8.utils.TraversalContinuation -> com.android.tools.r8.internal.gX:
     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.cX:
+com.android.tools.r8.utils.TriConsumer -> com.android.tools.r8.internal.lX:
     void accept(java.lang.Object,java.lang.Object,java.lang.Object) -> a
-com.android.tools.r8.utils.TriFunction -> com.android.tools.r8.internal.dX:
+com.android.tools.r8.utils.TriFunction -> com.android.tools.r8.internal.mX:
     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.eX:
+com.android.tools.r8.utils.TriPredicate -> com.android.tools.r8.internal.nX:
     boolean test(java.lang.Object,java.lang.Object,java.lang.Object) -> a
-com.android.tools.r8.utils.TypeReferenceUtils -> com.android.tools.r8.internal.xX:
+com.android.tools.r8.utils.TypeReferenceUtils -> com.android.tools.r8.internal.GX:
     boolean $assertionsDisabled -> b
     java.util.Comparator COMPARATOR -> a
     1:3:void <clinit>():19:21 -> <clinit>
@@ -106010,7 +106252,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.GY:
+com.android.tools.r8.utils.VersionProperties -> com.android.tools.r8.internal.PY:
     com.android.tools.r8.utils.VersionProperties INSTANCE -> c
     java.lang.String sha -> a
     java.lang.String releaser -> b
@@ -106040,7 +106282,7 @@
     2:2:java.lang.String getSha():57:57 -> b
     1:1:boolean isEngineering():66:66 -> c
     1:1:java.lang.String toString():62:62 -> toString
-com.android.tools.r8.utils.Visibility -> com.android.tools.r8.internal.wZ:
+com.android.tools.r8.utils.Visibility -> com.android.tools.r8.internal.FZ:
     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
@@ -106058,10 +106300,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.vZ:
+com.android.tools.r8.utils.Visibility$1 -> com.android.tools.r8.internal.EZ:
     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.PZ:
+com.android.tools.r8.utils.WorkList -> com.android.tools.r8.internal.YZ:
     java.util.Deque workingList -> a
     java.util.Set seen -> b
     boolean $assertionsDisabled -> c
@@ -106159,10 +106401,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.WC:
+com.android.tools.r8.utils.classhierarchy.MethodOverridesCollector -> com.android.tools.r8.internal.bD:
     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.UC:
+com.android.tools.r8.utils.classhierarchy.MethodOverridesCollector$InterfaceMethodToClassSiblingPropagator -> com.android.tools.r8.internal.ZC:
     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>
@@ -106177,7 +106419,7 @@
     9:9:void visit(com.android.tools.r8.graph.DexProgramClass):97 -> l
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     10:31:void visit(com.android.tools.r8.graph.DexProgramClass):105:126 -> l
-com.android.tools.r8.utils.classhierarchy.MethodOverridesCollector$TopDownClassHierarchyPropagator -> com.android.tools.r8.internal.VC:
+com.android.tools.r8.utils.classhierarchy.MethodOverridesCollector$TopDownClassHierarchyPropagator -> com.android.tools.r8.internal.aD:
     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>
@@ -106194,12 +106436,12 @@
     6:6:void visit(com.android.tools.r8.graph.DexProgramClass):185 -> l
       # {"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 -> l
-com.android.tools.r8.utils.collections.BidirectionalManyToManyMap -> com.android.tools.r8.internal.z4:
+com.android.tools.r8.utils.collections.BidirectionalManyToManyMap -> com.android.tools.r8.internal.C4:
     java.util.Set getKeys(java.lang.Object) -> a
-com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap -> com.android.tools.r8.internal.A4:
+com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap -> com.android.tools.r8.internal.D4:
     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.B4:
+com.android.tools.r8.utils.collections.BidirectionalManyToOneHashMap -> com.android.tools.r8.internal.E4:
     java.util.Map backing -> b
     java.util.Map inverse -> c
     boolean $assertionsDisabled -> d
@@ -106227,10 +106469,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.C4:
+com.android.tools.r8.utils.collections.BidirectionalManyToOneMap -> com.android.tools.r8.internal.F4:
     void forEachManyToOneMapping(java.util.function.BiConsumer) -> a
     java.util.Map getForwardMap() -> e
-com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeHashMap -> com.android.tools.r8.internal.D4:
+com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeHashMap -> com.android.tools.r8.internal.G4:
     boolean $assertionsDisabled -> f
     java.util.Map representatives -> e
     1:1:void <clinit>():13:13 -> <clinit>
@@ -106259,8 +106501,8 @@
     2:2:java.lang.Object com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeHashMap.removeRepresentativeFor(java.lang.Object):44:44 -> f
     2:2:java.util.Set removeValue(java.lang.Object):108 -> f
     1:1:boolean hasExplicitRepresentativeKey(java.lang.Object):54:54 -> g
-com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap -> com.android.tools.r8.internal.E4:
-com.android.tools.r8.utils.collections.BidirectionalOneToManyHashMap -> com.android.tools.r8.internal.F4:
+com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap -> com.android.tools.r8.internal.H4:
+com.android.tools.r8.utils.collections.BidirectionalOneToManyHashMap -> com.android.tools.r8.internal.I4:
     java.util.Map backing -> b
     java.util.Map inverse -> c
     1:1:void <init>():21:21 -> <init>
@@ -106278,7 +106520,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.G4:
+com.android.tools.r8.utils.collections.BidirectionalOneToManyRepresentativeHashMap -> com.android.tools.r8.internal.J4:
     java.util.Map representatives -> d
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():12:12 -> <clinit>
@@ -106289,7 +106531,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.H4:
+com.android.tools.r8.utils.collections.BidirectionalOneToOneHashMap -> com.android.tools.r8.internal.K4:
     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>
@@ -106325,14 +106567,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.I4:
-com.android.tools.r8.utils.collections.DexClassAndMethodSet -> com.android.tools.r8.internal.uf:
+com.android.tools.r8.utils.collections.BidirectionalOneToOneMap -> com.android.tools.r8.internal.L4:
+com.android.tools.r8.utils.collections.DexClassAndMethodSet -> com.android.tools.r8.internal.tf:
     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.vf:
+com.android.tools.r8.utils.collections.DexClassAndMethodSetBase -> com.android.tools.r8.internal.uf:
     java.util.function.Supplier backingFactory -> c
     java.util.Map backing -> b
     boolean $assertionsDisabled -> d
@@ -106358,7 +106600,7 @@
     1:1:boolean removeIf(java.util.function.Predicate):84:84 -> removeIf
     1:1:int size():88:88 -> size
     1:1:java.util.stream.Stream stream():92:92 -> stream
-com.android.tools.r8.utils.collections.DexMethodSignatureSet -> com.android.tools.r8.internal.cg:
+com.android.tools.r8.utils.collections.DexMethodSignatureSet -> com.android.tools.r8.internal.bg:
     com.android.tools.r8.utils.collections.DexMethodSignatureSet EMPTY -> c
     java.util.Set backing -> b
     1:2:void <clinit>():22:23 -> <clinit>
@@ -106534,7 +106776,7 @@
     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.hB:
+com.android.tools.r8.utils.collections.LongLivedClassSetBuilder -> com.android.tools.r8.internal.mB:
     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>
@@ -106547,7 +106789,7 @@
     84:84:java.util.Set build(com.android.tools.r8.graph.AppView):70:70 -> a
     81:81:java.util.Set build(com.android.tools.r8.graph.AppView):70:70 -> a
     1:1:com.android.tools.r8.utils.collections.LongLivedClassSetBuilder createConcurrentBuilderForIdentitySet(com.android.tools.r8.graph.GraphLens):29:29 -> b
-com.android.tools.r8.utils.collections.LongLivedCollectionBuilder -> com.android.tools.r8.internal.iB:
+com.android.tools.r8.utils.collections.LongLivedCollectionBuilder -> com.android.tools.r8.internal.nB:
     java.util.function.IntFunction factoryForBuilder -> b
     java.lang.Object backing -> d
     boolean $assertionsDisabled -> e
@@ -106559,7 +106801,7 @@
     2:2:boolean com.android.tools.r8.utils.collections.LongLivedCollectionBuilder.isRewrittenWithLens(com.android.tools.r8.graph.GraphLens):35:35 -> a
     2:2:boolean verifyIsRewrittenWithLens(com.android.tools.r8.graph.GraphLens):39 -> a
     3:3:boolean verifyIsRewrittenWithLens(com.android.tools.r8.graph.GraphLens):39:39 -> a
-com.android.tools.r8.utils.collections.LongLivedProgramMethodMapBuilder -> com.android.tools.r8.internal.jB:
+com.android.tools.r8.utils.collections.LongLivedProgramMethodMapBuilder -> com.android.tools.r8.internal.oB:
     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>
@@ -106570,7 +106812,7 @@
     25:28:com.android.tools.r8.utils.collections.ProgramMethodMap build(com.android.tools.r8.graph.AppView,java.util.function.Function):92:95 -> a
     29:34: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
     1:1:com.android.tools.r8.utils.collections.LongLivedProgramMethodMapBuilder createConcurrentBuilderForNonConcurrentMap(com.android.tools.r8.graph.GraphLens):40:40 -> b
-com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder -> com.android.tools.r8.internal.kB:
+com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder -> com.android.tools.r8.internal.pB:
     java.util.function.IntFunction factoryForBuilder -> b
     java.util.Set methods -> d
     boolean $assertionsDisabled -> e
@@ -106609,11 +106851,11 @@
     3:3:boolean verifyIsRewrittenWithLens(com.android.tools.r8.graph.GraphLens):175:175 -> d
     1:4:boolean verifyIsRewrittenWithNewerLens(com.android.tools.r8.graph.GraphLens):180:183 -> e
     5:5:boolean verifyIsRewrittenWithNewerLens(com.android.tools.r8.graph.GraphLens):182:182 -> e
-com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneMap -> com.android.tools.r8.internal.jE:
+com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneMap -> com.android.tools.r8.internal.oE:
     void put(java.lang.Iterable,java.lang.Object) -> a
-com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneRepresentativeMap -> com.android.tools.r8.internal.kE:
-com.android.tools.r8.utils.collections.MutableBidirectionalOneToManyRepresentativeMap -> com.android.tools.r8.internal.lE:
-com.android.tools.r8.utils.collections.ProgramFieldSet -> com.android.tools.r8.internal.NK:
+com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneRepresentativeMap -> com.android.tools.r8.internal.pE:
+com.android.tools.r8.utils.collections.MutableBidirectionalOneToManyRepresentativeMap -> com.android.tools.r8.internal.qE:
+com.android.tools.r8.utils.collections.ProgramFieldSet -> com.android.tools.r8.internal.WK:
     java.util.Map backing -> b
     com.android.tools.r8.utils.collections.ProgramFieldSet EMPTY -> c
     boolean $assertionsDisabled -> d
@@ -106627,7 +106869,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.PK:
+com.android.tools.r8.utils.collections.ProgramMemberMap -> com.android.tools.r8.internal.YK:
     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>
@@ -106644,7 +106886,7 @@
     1:1:java.lang.Object get(com.android.tools.r8.graph.ProgramMember):49:49 -> b
     1:1:java.lang.Object remove(com.android.tools.r8.graph.ProgramMember):66:66 -> c
     com.android.tools.r8.com.google.common.base.Equivalence$Wrapper wrap(com.android.tools.r8.graph.ProgramMember) -> d
-com.android.tools.r8.utils.collections.ProgramMethodMap -> com.android.tools.r8.internal.RK:
+com.android.tools.r8.utils.collections.ProgramMethodMap -> com.android.tools.r8.internal.aL:
     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>
@@ -106656,7 +106898,7 @@
     1:1:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper wrap(com.android.tools.r8.graph.ProgramMember):16:16 -> d
     2:2:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper com.android.tools.r8.utils.collections.ProgramMethodMap.wrap(com.android.tools.r8.graph.ProgramMethod):47:47 -> d
     2:2:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper wrap(com.android.tools.r8.graph.ProgramMember):16 -> d
-com.android.tools.r8.utils.collections.ProgramMethodSet -> com.android.tools.r8.internal.SK:
+com.android.tools.r8.utils.collections.ProgramMethodSet -> com.android.tools.r8.internal.bL:
     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>
@@ -106675,7 +106917,7 @@
     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.qT:
+com.android.tools.r8.utils.collections.SortedProgramMethodSet -> com.android.tools.r8.internal.zT:
     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
@@ -106689,7 +106931,7 @@
     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.bc:
+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
@@ -106704,7 +106946,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.ec:
+com.android.tools.r8.utils.structural.CompareToVisitorBase -> com.android.tools.r8.internal.gc:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():19:19 -> <clinit>
     1:1:void <init>():19:19 -> <init>
@@ -106725,8 +106967,8 @@
     16:16:int visitDexReference(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexReference):79 -> a
     17:21:int visitDexReference(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexReference):80:84 -> a
     22:24:int visit(java.lang.Object,java.lang.Object,com.android.tools.r8.utils.structural.StructuralMapping):97:99 -> a
-com.android.tools.r8.utils.structural.CompareToVisitorBase$1 -> com.android.tools.r8.internal.cc:
-com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification -> com.android.tools.r8.internal.dc:
+com.android.tools.r8.utils.structural.CompareToVisitorBase$1 -> com.android.tools.r8.internal.ec:
+com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification -> com.android.tools.r8.internal.fc:
     com.android.tools.r8.utils.structural.CompareToVisitorBase parent -> a
     java.lang.Object item1 -> b
     boolean $assertionsDisabled -> e
@@ -106796,7 +107038,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.fc:
+com.android.tools.r8.utils.structural.CompareToVisitorWithNamingLens -> com.android.tools.r8.internal.hc:
     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
@@ -106818,30 +107060,30 @@
     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.gc:
+com.android.tools.r8.utils.structural.CompareToVisitorWithStringTable -> com.android.tools.r8.internal.ic:
     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.hc:
+com.android.tools.r8.utils.structural.CompareToVisitorWithTypeEquivalence -> com.android.tools.r8.internal.jc:
     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.ic:
+com.android.tools.r8.utils.structural.CompareToVisitorWithTypeTable -> com.android.tools.r8.internal.kc:
     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.Sd:
+com.android.tools.r8.utils.structural.DefaultCompareToVisitor -> com.android.tools.r8.internal.Ud:
     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.Vd:
+com.android.tools.r8.utils.structural.DefaultHashingVisitor -> com.android.tools.r8.internal.Xd:
     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.Xh:
@@ -106960,7 +107202,7 @@
     6:7:com.android.tools.r8.utils.structural.StructuralSpecification withCustomItemIterator(java.util.function.Function,com.android.tools.r8.utils.structural.StructuralItem$CompareToAccept,com.android.tools.r8.utils.structural.StructuralItem$HashingAccept):86 -> b
     1:3:com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence$ItemSpecification com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence$ItemSpecification.withShortArray(java.util.function.Function):143:145 -> i
     1:3:com.android.tools.r8.utils.structural.StructuralSpecification withShortArray(java.util.function.Function):86 -> i
-com.android.tools.r8.utils.structural.Ordered -> com.android.tools.r8.internal.OI:
+com.android.tools.r8.utils.structural.Ordered -> com.android.tools.r8.internal.TI:
     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
@@ -106972,14 +107214,14 @@
     1:1:com.android.tools.r8.utils.structural.Ordered min(com.android.tools.r8.utils.structural.Ordered,com.android.tools.r8.utils.structural.Ordered):21:21 -> d
     2:2:boolean isGreaterThanOrEqualTo(java.lang.Object):61:61 -> d
     1:1:boolean isLessThanOrEqualTo(java.lang.Object):53:53 -> e
-com.android.tools.r8.utils.structural.Ordered$1 -> com.android.tools.r8.internal.NI:
+com.android.tools.r8.utils.structural.Ordered$1 -> com.android.tools.r8.internal.SI:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():16:16 -> <clinit>
-com.android.tools.r8.utils.structural.RepresentativeMap -> com.android.tools.r8.internal.DQ:
+com.android.tools.r8.utils.structural.RepresentativeMap -> com.android.tools.r8.internal.MQ:
     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.pV:
-com.android.tools.r8.utils.structural.StructuralItem -> com.android.tools.r8.internal.rV:
-    com.android.tools.r8.utils.structural.StructuralItem self() -> K
+com.android.tools.r8.utils.structural.StructuralAcceptor -> com.android.tools.r8.internal.yV:
+com.android.tools.r8.utils.structural.StructuralItem -> com.android.tools.r8.internal.AV:
+    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
     3:4:int com.android.tools.r8.utils.structural.CompareToVisitorWithTypeEquivalence.run(java.lang.Object,java.lang.Object,com.android.tools.r8.utils.structural.RepresentativeMap,com.android.tools.r8.utils.structural.StructuralItem$CompareToAccept):20:21 -> a
@@ -106990,13 +107232,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.qV:
+com.android.tools.r8.utils.structural.StructuralItem$CompareToAccept -> com.android.tools.r8.internal.zV:
     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.rV$a:
+com.android.tools.r8.utils.structural.StructuralItem$HashingAccept -> com.android.tools.r8.internal.AV$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.sV:
+com.android.tools.r8.utils.structural.StructuralMapping -> com.android.tools.r8.internal.BV:
     void apply(com.android.tools.r8.utils.structural.StructuralSpecification) -> a
-com.android.tools.r8.utils.structural.StructuralSpecification -> com.android.tools.r8.internal.tV:
+com.android.tools.r8.utils.structural.StructuralSpecification -> com.android.tools.r8.internal.CV:
     1:1:void <init>():18:18 -> <init>
     boolean lambda$withCustomItem$0(java.lang.Object) -> a
     com.android.tools.r8.utils.structural.StructuralSpecification self() -> a