Update D8 and R8 to 3.0.2-dev

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

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

Test: TARGET_PRODUCT=aosp_arm64 m -j core-oj
Change-Id: I84a81910565b5ee117c6a09157e5ca23cfe2aaa2
diff --git a/r8.jar b/r8.jar
index 2653a9a..29724cf 100644
--- a/r8.jar
+++ b/r8.jar
Binary files differ
diff --git a/r8.jar.map b/r8.jar.map
index 58bcd66..f5c8e06 100644
--- a/r8.jar.map
+++ b/r8.jar.map
@@ -1,7 +1,7 @@
 # compiler: R8
-# compiler_version: 3.0.1-dev
+# compiler_version: 3.0.2-dev
 # compiler_hash: engineering
-# pg_map_id: 81d2328
+# pg_map_id: fddc995
 # common_typos_disable
 com.android.tools.r8.ApiLevelException -> com.android.tools.r8.internal.f1:
     boolean $assertionsDisabled -> c
@@ -126,7 +126,7 @@
     126:126:void lambda$main$2(java.lang.String[]):109:109 -> a
     1:1:void main(java.lang.String[]):109:109 -> main
     1:13:void run(com.android.tools.r8.BackportedMethodListCommand):73:85 -> run
-    14:14:void com.android.tools.r8.utils.ExceptionUtils.withD8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):54:54 -> run
+    14:14:void com.android.tools.r8.utils.ExceptionUtils.withD8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):55:55 -> run
     14:14:void run(com.android.tools.r8.BackportedMethodListCommand):84 -> run
     15:15:void run(com.android.tools.r8.BackportedMethodListCommand):100:100 -> run
     16:16:void run(java.lang.String[]):105:105 -> run
@@ -187,7 +187,7 @@
     1:25:com.android.tools.r8.BackportedMethodListCommand build():308:332 -> build
     26:26:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration getDesugaredLibraryConfiguration(com.android.tools.r8.graph.DexItemFactory):249:249 -> build
     26:26:com.android.tools.r8.BackportedMethodListCommand build():335 -> build
-    27:27:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration.empty():101:101 -> build
+    27:27:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration.empty():100:100 -> build
     27:27:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration getDesugaredLibraryConfiguration(com.android.tools.r8.graph.DexItemFactory):250 -> build
     27:27:com.android.tools.r8.BackportedMethodListCommand build():335 -> build
     28:35:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration getDesugaredLibraryConfiguration(com.android.tools.r8.graph.DexItemFactory):252:259 -> build
@@ -265,10 +265,10 @@
     9:9:void lambda$addClasspathFile$6(java.nio.file.Path):230:230 -> b
     10:10:void lambda$addDexProgramData$9(byte[],com.android.tools.r8.origin.Origin):247:247 -> b
     11:11:void lambda$addMainDexListFiles$10(java.nio.file.Path[]):263:263 -> b
-    12:1095:com.android.tools.r8.utils.AndroidApp$Builder com.android.tools.r8.utils.AndroidApp$Builder.addMainDexListFiles(java.nio.file.Path[]):0:1083 -> b
-    12:1095:void lambda$addMainDexListFiles$10(java.nio.file.Path[]):263 -> b
-    1096:1098:void lambda$addMainDexListFiles$10(java.nio.file.Path[]):265:265 -> b
-    1099:1099:void setIgnoreDexInArchive(boolean):353:353 -> b
+    12:1108:com.android.tools.r8.utils.AndroidApp$Builder com.android.tools.r8.utils.AndroidApp$Builder.addMainDexListFiles(java.nio.file.Path[]):0:1096 -> b
+    12:1108:void lambda$addMainDexListFiles$10(java.nio.file.Path[]):263 -> b
+    1109:1111:void lambda$addMainDexListFiles$10(java.nio.file.Path[]):265:265 -> b
+    1112:1112:void setIgnoreDexInArchive(boolean):353:353 -> b
     1:9:com.android.tools.r8.BaseCommand build():139:147 -> build
     com.android.tools.r8.BaseCommand makeCommand() -> c
     1:1:void lambda$addMainDexClasses$13(java.util.Collection):311:311 -> c
@@ -350,7 +350,7 @@
     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):387:419 -> a
     34:34:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration getDesugaredLibraryConfiguration(com.android.tools.r8.graph.DexItemFactory,boolean):493:493 -> a
-    35:35:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration.empty():101:101 -> a
+    35:35:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration.empty():100:100 -> a
     35:35:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration getDesugaredLibraryConfiguration(com.android.tools.r8.graph.DexItemFactory,boolean):494 -> a
     36:44:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration getDesugaredLibraryConfiguration(com.android.tools.r8.graph.DexItemFactory,boolean):496:504 -> a
     45:45:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration getDesugaredLibraryConfiguration(com.android.tools.r8.graph.DexItemFactory,boolean):497:497 -> a
@@ -414,23 +414,24 @@
     java.lang.Iterable THREAD_COUNT_USAGE_MESSAGE -> b
     java.lang.Iterable ASSERTIONS_USAGE_MESSAGE -> a
     java.lang.String PACKAGE_ASSERTION_POSTFIX -> d
-    1:64:void <clinit>():17:80 -> <clinit>
-    1:1:void <init>():17:17 -> <init>
-    1:12:void parsePositiveIntArgument(java.util.function.Consumer,java.lang.String,java.lang.String,com.android.tools.r8.origin.Origin,java.util.function.Consumer):66:77 -> a
-    13:13:void parsePositiveIntArgument(java.util.function.Consumer,java.lang.String,java.lang.String,com.android.tools.r8.origin.Origin,java.util.function.Consumer):68:68 -> a
-    14:26:void addAssertionTransformation(com.android.tools.r8.BaseCompilerCommand$Builder,com.android.tools.r8.AssertionsConfiguration$AssertionTransformation,java.lang.String):85:97 -> a
-    27:27:com.android.tools.r8.AssertionsConfiguration lambda$addAssertionTransformation$0(com.android.tools.r8.AssertionsConfiguration$AssertionTransformation,com.android.tools.r8.AssertionsConfiguration$Builder):86:86 -> a
-    28:30:com.android.tools.r8.AssertionsConfiguration lambda$addAssertionTransformation$1(com.android.tools.r8.AssertionsConfiguration$AssertionTransformation,java.lang.String,com.android.tools.r8.AssertionsConfiguration$Builder):92:94 -> a
-    31:33:com.android.tools.r8.AssertionsConfiguration lambda$addAssertionTransformation$1(com.android.tools.r8.AssertionsConfiguration$AssertionTransformation,java.lang.String,com.android.tools.r8.AssertionsConfiguration$Builder):93:95 -> a
-    34:68:boolean tryParseAssertionArgument(com.android.tools.r8.BaseCompilerCommand$Builder,java.lang.String,com.android.tools.r8.origin.Origin):113:147 -> a
-    69:84:int tryParseMapDiagnostics(com.android.tools.r8.BaseCompilerCommand$Builder,java.lang.String,java.lang.String[],int,com.android.tools.r8.origin.Origin):176:191 -> a
-    85:94:int tryParseMapDiagnostics(com.android.tools.r8.BaseCompilerCommand$Builder,java.lang.String,java.lang.String[],int,com.android.tools.r8.origin.Origin):187:196 -> a
-    95:95:void addLibraryArgument(com.android.tools.r8.BaseCommand$Builder,com.android.tools.r8.origin.Origin,java.lang.String):224:224 -> a
-    96:107:boolean isJdkHome(java.nio.file.Path):206:217 -> a
-    96:107:void addLibraryArgument(com.android.tools.r8.BaseCommand$Builder,com.android.tools.r8.origin.Origin,java.lang.String):225 -> a
-    108:113:void addLibraryArgument(com.android.tools.r8.BaseCommand$Builder,com.android.tools.r8.origin.Origin,java.lang.String):228:233 -> a
-    1:1:com.android.tools.r8.AssertionsConfiguration lambda$addAssertionTransformation$2(com.android.tools.r8.AssertionsConfiguration$AssertionTransformation,java.lang.String,com.android.tools.r8.AssertionsConfiguration$Builder):98:98 -> b
-    2:11:com.android.tools.r8.DiagnosticsLevel tryParseLevel(com.android.tools.r8.BaseCompilerCommand$Builder,java.lang.String,com.android.tools.r8.origin.Origin):156:165 -> b
+    1:64:void <clinit>():18:81 -> <clinit>
+    1:1:void <init>():18:18 -> <init>
+    1:12:void parsePositiveIntArgument(java.util.function.Consumer,java.lang.String,java.lang.String,com.android.tools.r8.origin.Origin,java.util.function.Consumer):67:78 -> a
+    13:13:void parsePositiveIntArgument(java.util.function.Consumer,java.lang.String,java.lang.String,com.android.tools.r8.origin.Origin,java.util.function.Consumer):69:69 -> a
+    14:26:void addAssertionTransformation(com.android.tools.r8.BaseCompilerCommand$Builder,com.android.tools.r8.AssertionsConfiguration$AssertionTransformation,java.lang.String):86:98 -> a
+    27:27:com.android.tools.r8.AssertionsConfiguration lambda$addAssertionTransformation$0(com.android.tools.r8.AssertionsConfiguration$AssertionTransformation,com.android.tools.r8.AssertionsConfiguration$Builder):87:87 -> a
+    28:30:com.android.tools.r8.AssertionsConfiguration lambda$addAssertionTransformation$1(com.android.tools.r8.AssertionsConfiguration$AssertionTransformation,java.lang.String,com.android.tools.r8.AssertionsConfiguration$Builder):93:95 -> a
+    31:33:com.android.tools.r8.AssertionsConfiguration lambda$addAssertionTransformation$1(com.android.tools.r8.AssertionsConfiguration$AssertionTransformation,java.lang.String,com.android.tools.r8.AssertionsConfiguration$Builder):94:96 -> a
+    34:68:boolean tryParseAssertionArgument(com.android.tools.r8.BaseCompilerCommand$Builder,java.lang.String,com.android.tools.r8.origin.Origin):114:148 -> a
+    69:71:int tryParseMapDiagnostics(com.android.tools.r8.BaseCompilerCommand$Builder,java.lang.String,java.lang.String[],int,com.android.tools.r8.origin.Origin):157:157 -> a
+    72:81:com.android.tools.r8.DiagnosticsLevel tryParseLevel(java.util.function.Consumer,java.lang.String,com.android.tools.r8.origin.Origin):163:172 -> a
+    82:97:int tryParseMapDiagnostics(java.util.function.Consumer,com.android.tools.r8.utils.Reporter,java.lang.String,java.lang.String[],int,com.android.tools.r8.origin.Origin):189:204 -> a
+    98:107:int tryParseMapDiagnostics(java.util.function.Consumer,com.android.tools.r8.utils.Reporter,java.lang.String,java.lang.String[],int,com.android.tools.r8.origin.Origin):200:209 -> a
+    108:108:void addLibraryArgument(com.android.tools.r8.BaseCommand$Builder,com.android.tools.r8.origin.Origin,java.lang.String):237:237 -> a
+    109:120:boolean isJdkHome(java.nio.file.Path):219:230 -> a
+    109:120:void addLibraryArgument(com.android.tools.r8.BaseCommand$Builder,com.android.tools.r8.origin.Origin,java.lang.String):238 -> a
+    121:126:void addLibraryArgument(com.android.tools.r8.BaseCommand$Builder,com.android.tools.r8.origin.Origin,java.lang.String):241:246 -> a
+    1:1:com.android.tools.r8.AssertionsConfiguration lambda$addAssertionTransformation$2(com.android.tools.r8.AssertionsConfiguration$AssertionTransformation,java.lang.String,com.android.tools.r8.AssertionsConfiguration$Builder):99:99 -> b
 com.android.tools.r8.ByteBufferProvider -> com.android.tools.r8.ByteBufferProvider:
     1:1:java.nio.ByteBuffer acquireByteBuffer(int):24:24 -> acquireByteBuffer
 com.android.tools.r8.ByteDataView -> com.android.tools.r8.ByteDataView:
@@ -509,7 +510,7 @@
     4:15:void run(java.lang.String[]):124:135 -> a
     4:15:void lambda$main$2(java.lang.String[]):148 -> a
     16:17:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):153:154 -> a
-    18:18:void com.android.tools.r8.utils.ExceptionUtils.withD8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):54:54 -> a
+    18:18:void com.android.tools.r8.utils.ExceptionUtils.withD8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):55:55 -> a
     18:18:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):154 -> a
     19:24: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):168:173 -> a
     25:27:void lambda$run$4(com.android.tools.r8.graph.analysis.ClassInitializerAssertionEnablingAnalysis,com.android.tools.r8.graph.DexProgramClass):197:199 -> a
@@ -529,24 +530,24 @@
     35:35:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):376:376 -> d
     35:35:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):209 -> d
     36:87:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):209:260 -> d
-    88:88:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():425:425 -> d
+    88:88:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> d
     88:88:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):261 -> d
     89:99:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):264:274 -> d
-    100:100:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():441:441 -> d
+    100:100:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():448:448 -> d
     100:100:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):276 -> d
     101:120:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):276:295 -> d
     121:126:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):294:299 -> d
     127:131:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):296:300 -> d
     132:175:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):283:326 -> d
-    176:176:java.lang.RuntimeException com.android.tools.r8.utils.ExceptionUtils.unwrapExecutionException(java.util.concurrent.ExecutionException):207:207 -> d
+    176:176:java.lang.RuntimeException com.android.tools.r8.utils.ExceptionUtils.unwrapExecutionException(java.util.concurrent.ExecutionException):216:216 -> d
     176:176:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):321 -> d
     177:182:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):321:326 -> d
     1:5:void main(java.lang.String[]):144:148 -> main
     1:5:void run(com.android.tools.r8.D8Command):92:96 -> run
-    6:6:void com.android.tools.r8.utils.ExceptionUtils.withD8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):54:54 -> run
+    6:6:void com.android.tools.r8.utils.ExceptionUtils.withD8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):55:55 -> run
     6:6:void run(com.android.tools.r8.D8Command):95 -> run
     7:10:void run(com.android.tools.r8.D8Command,java.util.concurrent.ExecutorService):114:117 -> run
-    11:11:void com.android.tools.r8.utils.ExceptionUtils.withD8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):54:54 -> run
+    11:11:void com.android.tools.r8.utils.ExceptionUtils.withD8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):55:55 -> run
     11:11:void run(com.android.tools.r8.D8Command,java.util.concurrent.ExecutorService):116 -> run
 com.android.tools.r8.D8$ConvertedCfFiles -> com.android.tools.r8.D8$a:
     java.util.List resources -> a
@@ -556,67 +557,70 @@
     5:5:void accept(int,com.android.tools.r8.ByteDataView,java.util.Set,com.android.tools.r8.DiagnosticsHandler):417:417 -> accept
     1:1:java.util.Collection getProgramResources():424:424 -> getProgramResources
 com.android.tools.r8.D8Command -> com.android.tools.r8.D8Command:
+    com.android.tools.r8.graph.DexItemFactory factory -> B
     java.lang.String synthesizedClassPrefix -> x
-    boolean enableMainDexListCheck -> y
-    boolean minimalMainDex -> z
+    boolean skipDump -> y
+    boolean enableMainDexListCheck -> z
     com.android.tools.r8.DesugarGraphConsumer desugarGraphConsumer -> u
     com.android.tools.r8.StringConsumer desugaredLibraryKeepRuleConsumer -> v
+    boolean minimalMainDex -> A
     java.lang.String USAGE_MESSAGE -> r
     boolean $assertionsDisabled -> s
     com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration libraryConfiguration -> w
     boolean intermediate -> t
-    com.android.tools.r8.graph.DexItemFactory factory -> A
-    1:224:void <clinit>():42:265 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.CompilationMode,com.android.tools.r8.ProgramConsumer,com.android.tools.r8.StringConsumer,int,com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.InternalOptions$DesugarState,boolean,boolean,boolean,java.util.function.BiPredicate,com.android.tools.r8.DesugarGraphConsumer,com.android.tools.r8.StringConsumer,com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration,java.util.List,java.util.List,java.lang.String,boolean,boolean,int,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.D8Command$1):43:43 -> <init>
+    1:235:void <clinit>():42:276 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.CompilationMode,com.android.tools.r8.ProgramConsumer,com.android.tools.r8.StringConsumer,int,com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.InternalOptions$DesugarState,boolean,boolean,boolean,java.util.function.BiPredicate,com.android.tools.r8.DesugarGraphConsumer,com.android.tools.r8.StringConsumer,com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration,java.util.List,java.util.List,java.lang.String,boolean,boolean,boolean,int,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.D8Command$1):43:43 -> <init>
     2:2:void <init>(boolean,boolean,com.android.tools.r8.D8Command$1):43:43 -> <init>
-    3:24:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.CompilationMode,com.android.tools.r8.ProgramConsumer,com.android.tools.r8.StringConsumer,int,com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.InternalOptions$DesugarState,boolean,boolean,boolean,java.util.function.BiPredicate,com.android.tools.r8.DesugarGraphConsumer,com.android.tools.r8.StringConsumer,com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration,java.util.List,java.util.List,java.lang.String,boolean,boolean,int,com.android.tools.r8.graph.DexItemFactory):338:359 -> <init>
-    25:33:void <init>(boolean,boolean):363:371 -> <init>
-    1:1:com.android.tools.r8.D8Command$Builder builder(com.android.tools.r8.utils.AndroidApp):286:286 -> a
-    1:55:com.android.tools.r8.utils.InternalOptions getInternalOptions():376:430 -> b
-    1:1:com.android.tools.r8.D8Command$Builder builder():277:277 -> builder
-    2:2:com.android.tools.r8.D8Command$Builder builder(com.android.tools.r8.DiagnosticsHandler):281:281 -> builder
-    1:1:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin):299:299 -> parse
-    2:2:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.DiagnosticsHandler):313:313 -> parse
+    3:25:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.CompilationMode,com.android.tools.r8.ProgramConsumer,com.android.tools.r8.StringConsumer,int,com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.InternalOptions$DesugarState,boolean,boolean,boolean,java.util.function.BiPredicate,com.android.tools.r8.DesugarGraphConsumer,com.android.tools.r8.StringConsumer,com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration,java.util.List,java.util.List,java.lang.String,boolean,boolean,boolean,int,com.android.tools.r8.graph.DexItemFactory):351:373 -> <init>
+    26:35:void <init>(boolean,boolean):377:386 -> <init>
+    1:1:com.android.tools.r8.D8Command$Builder builder(com.android.tools.r8.utils.AndroidApp):298:298 -> a
+    1:60:com.android.tools.r8.utils.InternalOptions getInternalOptions():391:450 -> b
+    1:1:com.android.tools.r8.D8Command$Builder builder():289:289 -> builder
+    2:2:com.android.tools.r8.D8Command$Builder builder(com.android.tools.r8.DiagnosticsHandler):293:293 -> builder
+    1:1:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin):311:311 -> parse
+    2:2:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.DiagnosticsHandler):325:325 -> parse
 com.android.tools.r8.D8Command$1 -> com.android.tools.r8.D8Command$a:
 com.android.tools.r8.D8Command$Builder -> com.android.tools.r8.D8Command$Builder:
     java.lang.String synthesizedClassPrefix -> x
     boolean enableMainDexListCheck -> y
+    boolean skipDump -> z
     com.android.tools.r8.DesugarGraphConsumer desugarGraphConsumer -> v
     boolean intermediate -> u
     com.android.tools.r8.StringConsumer desugaredLibraryKeepRuleConsumer -> w
     1:1:void <init>(com.android.tools.r8.D8Command$1):68:68 -> <init>
     2:2:void <init>(com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.D8Command$1):68:68 -> <init>
     3:3:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.D8Command$1):68:68 -> <init>
-    4:4:void <init>():78:78 -> <init>
-    5:5:void <init>(com.android.tools.r8.DiagnosticsHandler):82:82 -> <init>
-    6:10:void <init>(com.android.tools.r8.DiagnosticsHandler):70:74 -> <init>
-    11:11:void <init>(com.android.tools.r8.utils.AndroidApp):86:86 -> <init>
-    12:16:void <init>(com.android.tools.r8.utils.AndroidApp):70:74 -> <init>
-    1:1:com.android.tools.r8.D8Command$Builder setSynthesizedClassesPrefix(java.lang.String):177:177 -> a
+    4:4:void <init>():79:79 -> <init>
+    5:5:void <init>(com.android.tools.r8.DiagnosticsHandler):83:83 -> <init>
+    6:12:void <init>(com.android.tools.r8.DiagnosticsHandler):70:76 -> <init>
+    13:13:void <init>(com.android.tools.r8.utils.AndroidApp):87:87 -> <init>
+    14:20:void <init>(com.android.tools.r8.utils.AndroidApp):70:76 -> <init>
+    1:1:com.android.tools.r8.D8Command$Builder setSynthesizedClassesPrefix(java.lang.String):187:187 -> a
     1:1:com.android.tools.r8.BaseCommand$Builder addClasspathFiles(java.util.Collection):67:67 -> addClasspathFiles
     2:2:com.android.tools.r8.BaseCommand$Builder addClasspathFiles(java.nio.file.Path[]):67:67 -> addClasspathFiles
-    3:3:com.android.tools.r8.D8Command$Builder addClasspathFiles(java.nio.file.Path[]):103:103 -> addClasspathFiles
-    4:4:com.android.tools.r8.D8Command$Builder addClasspathFiles(java.util.Collection):111:111 -> addClasspathFiles
+    3:3:com.android.tools.r8.D8Command$Builder addClasspathFiles(java.nio.file.Path[]):104:104 -> addClasspathFiles
+    4:4:com.android.tools.r8.D8Command$Builder addClasspathFiles(java.util.Collection):112:112 -> addClasspathFiles
     1:1:com.android.tools.r8.BaseCommand$Builder addClasspathResourceProvider(com.android.tools.r8.ClassFileResourceProvider):67:67 -> addClasspathResourceProvider
-    2:2:com.android.tools.r8.D8Command$Builder addClasspathResourceProvider(com.android.tools.r8.ClassFileResourceProvider):119:119 -> addClasspathResourceProvider
+    2:2:com.android.tools.r8.D8Command$Builder addClasspathResourceProvider(com.android.tools.r8.ClassFileResourceProvider):120:120 -> addClasspathResourceProvider
     1:1:com.android.tools.r8.BaseCommand$Builder addDexProgramData(byte[],com.android.tools.r8.origin.Origin):67:67 -> addDexProgramData
-    2:2:com.android.tools.r8.D8Command$Builder addDexProgramData(byte[],com.android.tools.r8.origin.Origin):94:94 -> addDexProgramData
+    2:2:com.android.tools.r8.D8Command$Builder addDexProgramData(byte[],com.android.tools.r8.origin.Origin):95:95 -> addDexProgramData
     1:1:com.android.tools.r8.BaseCommand makeCommand():67:67 -> c
-    2:2:void lambda$addDexProgramData$0(byte[],com.android.tools.r8.origin.Origin):94:94 -> c
+    2:2:void lambda$addDexProgramData$0(byte[],com.android.tools.r8.origin.Origin):95:95 -> c
     com.android.tools.r8.BaseCommand$Builder self() -> d
-    1:22:void validate():197:218 -> e
-    23:32:void validate():216:225 -> e
-    1:1:com.android.tools.r8.CompilationMode defaultCompilationMode():173:173 -> f
-    1:1:com.android.tools.r8.DesugarGraphConsumer getDesugarGraphConsumer():153:153 -> getDesugarGraphConsumer
-    1:17:com.android.tools.r8.D8Command makeCommand():230:246 -> m
+    1:22:void validate():207:228 -> e
+    23:32:void validate():226:235 -> e
+    1:1:com.android.tools.r8.CompilationMode defaultCompilationMode():183:183 -> f
+    1:1:com.android.tools.r8.DesugarGraphConsumer getDesugarGraphConsumer():154:154 -> getDesugarGraphConsumer
+    1:17:com.android.tools.r8.D8Command makeCommand():240:256 -> m
     18:18:com.android.tools.r8.utils.InternalOptions$DesugarState com.android.tools.r8.BaseCompilerCommand$Builder.getDesugaringState():469:469 -> m
-    18:18:com.android.tools.r8.D8Command makeCommand():247 -> m
-    19:32:com.android.tools.r8.D8Command makeCommand():247:260 -> m
-    33:33:com.android.tools.r8.D8Command makeCommand():231:231 -> m
-    1:1:com.android.tools.r8.D8Command$Builder setDesugarGraphConsumer(com.android.tools.r8.DesugarGraphConsumer):162:162 -> setDesugarGraphConsumer
-    1:1:com.android.tools.r8.D8Command$Builder setDesugaredLibraryKeepRuleConsumer(com.android.tools.r8.StringConsumer):145:145 -> setDesugaredLibraryKeepRuleConsumer
-    1:1:com.android.tools.r8.D8Command$Builder setIntermediate(boolean):134:134 -> setIntermediate
-    1:1:com.android.tools.r8.D8Command$Builder setProguardInputMapFile(java.nio.file.Path):124:124 -> setProguardInputMapFile
+    18:18:com.android.tools.r8.D8Command makeCommand():257 -> m
+    19:33:com.android.tools.r8.D8Command makeCommand():257:271 -> m
+    34:34:com.android.tools.r8.D8Command makeCommand():241:241 -> m
+    1:1:com.android.tools.r8.D8Command$Builder skipDump():172:172 -> n
+    1:1:com.android.tools.r8.D8Command$Builder setDesugarGraphConsumer(com.android.tools.r8.DesugarGraphConsumer):163:163 -> setDesugarGraphConsumer
+    1:1:com.android.tools.r8.D8Command$Builder setDesugaredLibraryKeepRuleConsumer(com.android.tools.r8.StringConsumer):146:146 -> setDesugaredLibraryKeepRuleConsumer
+    1:1:com.android.tools.r8.D8Command$Builder setIntermediate(boolean):135:135 -> setIntermediate
+    1:1:com.android.tools.r8.D8Command$Builder setProguardInputMapFile(java.nio.file.Path):125:125 -> setProguardInputMapFile
 com.android.tools.r8.D8Command$DefaultD8DiagnosticsHandler -> com.android.tools.r8.D8Command$b:
     1:1:void <init>():45:45 -> <init>
     2:2:void <init>(com.android.tools.r8.D8Command$1):45:45 -> <init>
@@ -740,29 +744,32 @@
     1:1:void <clinit>():31:31 -> <clinit>
     1:2:void <init>(java.util.Map):35:36 -> <init>
     1:2:void run(com.android.tools.r8.D8Command,java.lang.Boolean,java.util.Map):65:66 -> a
-    3:3:void com.android.tools.r8.utils.ExceptionUtils.withD8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):54:54 -> a
+    3:3:void com.android.tools.r8.utils.ExceptionUtils.withD8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):55:55 -> a
     3:3:void run(com.android.tools.r8.D8Command,java.lang.Boolean,java.util.Map):66 -> a
     4:4:void lambda$run$0(com.android.tools.r8.D8Command,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):68:68 -> a
-    5:25:void runInternal(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):77:97 -> a
-    26:26:void runInternal(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):96:96 -> a
-    27:27:void com.android.tools.r8.D8.optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):394:394 -> a
-    27:27:void runInternal(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):99 -> a
-    28:28:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):376:376 -> a
-    28:28:void com.android.tools.r8.D8.optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):394 -> a
-    28:28:void runInternal(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):99 -> a
-    29:29:void com.android.tools.r8.D8.optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):394:394 -> a
-    29:29:void runInternal(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):99 -> a
-    30:49:void runInternal(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):101:120 -> a
-    50:50:java.lang.RuntimeException com.android.tools.r8.utils.ExceptionUtils.unwrapExecutionException(java.util.concurrent.ExecutionException):207:207 -> a
-    50:50:void runInternal(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):115 -> a
-    51:56:void runInternal(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):115:120 -> a
-    57:57:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():580:580 -> a
-    57:57:com.android.tools.r8.graph.DexProgramClass keepFirstProgramClassConflictResolver(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):41 -> a
-    58:58:com.android.tools.r8.graph.DexProgramClass keepFirstProgramClassConflictResolver(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):41:41 -> a
-    59:59:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():580:580 -> a
-    59:59:com.android.tools.r8.graph.DexProgramClass keepFirstProgramClassConflictResolver(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):42 -> a
-    60:77:com.android.tools.r8.graph.DexProgramClass keepFirstProgramClassConflictResolver(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):42:59 -> a
-    78:89:com.android.tools.r8.graph.DexProgramClass keepFirstProgramClassConflictResolver(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):46:57 -> a
+    5:17:void runInternal(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):77:89 -> a
+    18:18: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):127:127 -> a
+    18:18:void runInternal(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):90 -> a
+    19:19:void runInternal(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):97:97 -> a
+    20:20:void runInternal(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):96:96 -> a
+    21:21:void com.android.tools.r8.D8.optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):394:394 -> a
+    21:21:void runInternal(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):99 -> a
+    22:22:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):376:376 -> a
+    22:22:void com.android.tools.r8.D8.optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):394 -> a
+    22:22:void runInternal(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):99 -> a
+    23:23:void com.android.tools.r8.D8.optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):394:394 -> a
+    23:23:void runInternal(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):99 -> a
+    24:43:void runInternal(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):101:120 -> a
+    44:44:java.lang.RuntimeException com.android.tools.r8.utils.ExceptionUtils.unwrapExecutionException(java.util.concurrent.ExecutionException):216:216 -> 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():584:584 -> a
+    51:51:com.android.tools.r8.graph.DexProgramClass keepFirstProgramClassConflictResolver(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):41 -> a
+    52:52:com.android.tools.r8.graph.DexProgramClass keepFirstProgramClassConflictResolver(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):41:41 -> a
+    53:53:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():584:584 -> a
+    53:53:com.android.tools.r8.graph.DexProgramClass keepFirstProgramClassConflictResolver(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):42 -> a
+    54:71:com.android.tools.r8.graph.DexProgramClass keepFirstProgramClassConflictResolver(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):42:59 -> a
+    72:83:com.android.tools.r8.graph.DexProgramClass keepFirstProgramClassConflictResolver(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):46:57 -> a
 com.android.tools.r8.DexFilePerClassFileConsumer -> com.android.tools.r8.DexFilePerClassFileConsumer:
     1:1:void accept(java.lang.String,com.android.tools.r8.ByteDataView,java.util.Set,com.android.tools.r8.DiagnosticsHandler):63:63 -> accept
     2:2:void accept(java.lang.String,byte[],java.util.Set,com.android.tools.r8.DiagnosticsHandler):73:73 -> accept
@@ -903,7 +910,7 @@
     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:76:void run(com.android.tools.r8.D8Command,com.android.tools.r8.utils.FeatureClassMapping,java.lang.String,java.lang.String,java.util.concurrent.ExecutorService):64:130 -> run
     77:79:void run(com.android.tools.r8.D8Command,com.android.tools.r8.utils.FeatureClassMapping,java.lang.String,java.lang.String,java.util.concurrent.ExecutorService):128:130 -> run
-    80:80:java.lang.RuntimeException com.android.tools.r8.utils.ExceptionUtils.unwrapExecutionException(java.util.concurrent.ExecutionException):207:207 -> run
+    80:80:java.lang.RuntimeException com.android.tools.r8.utils.ExceptionUtils.unwrapExecutionException(java.util.concurrent.ExecutionException):216:216 -> run
     80:80:void run(com.android.tools.r8.D8Command,com.android.tools.r8.utils.FeatureClassMapping,java.lang.String,java.lang.String,java.util.concurrent.ExecutorService):126 -> run
     81:85:void run(com.android.tools.r8.D8Command,com.android.tools.r8.utils.FeatureClassMapping,java.lang.String,java.lang.String,java.util.concurrent.ExecutorService):126:130 -> run
     1:3:void runD8ForTesting(com.android.tools.r8.D8Command,boolean):154:156 -> runD8ForTesting
@@ -1070,56 +1077,161 @@
     1:1:com.android.tools.r8.FeatureSplit$Builder setProgramConsumer(com.android.tools.r8.ProgramConsumer):90:90 -> setProgramConsumer
 com.android.tools.r8.GenerateLintFiles -> com.android.tools.r8.g:
     com.android.tools.r8.graph.DexItemFactory factory -> b
-    java.util.Set parallelMethods -> g
-    java.lang.String outputDirectory -> f
+    java.util.Set parallelMethods -> h
+    java.nio.file.Path outputDirectory -> g
+    java.nio.file.Path desugaredLibraryImplementation -> f
     com.android.tools.r8.utils.InternalOptions options -> d
     com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration desugaredLibraryConfiguration -> e
     boolean $assertionsDisabled -> a
     com.android.tools.r8.utils.Reporter reporter -> c
-    1:1:void <clinit>():63:63 -> <clinit>
-    1:1:void <init>(java.lang.String,java.lang.String):76:76 -> <init>
-    2:22:void <init>(java.lang.String,java.lang.String):67:87 -> <init>
-    23:35:void <init>(java.lang.String,java.lang.String):84:96 -> <init>
-    36:42:void <init>(java.lang.String,java.lang.String):95:101 -> <init>
-    43:45:void <init>(java.lang.String,java.lang.String):100:102 -> <init>
-    1:3:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration readDesugaredLibraryConfiguration(java.lang.String):113:115 -> a
-    4:14:void addMethodsToHeaderJar(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.graph.DexClass,java.util.List):131:141 -> a
-    15:22:com.android.tools.r8.graph.CfCode buildEmptyThrowingCfCode(com.android.tools.r8.graph.DexMethod):119:126 -> a
-    15:22:void addMethodsToHeaderJar(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.graph.DexClass,java.util.List):141 -> a
-    23:37:void addMethodsToHeaderJar(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.graph.DexClass,java.util.List):143:157 -> a
-    38:71:void addMethodsToHeaderJar(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.graph.DexClass,java.util.List):155:188 -> a
-    72:72:com.android.tools.r8.GenerateLintFiles$SupportedMethods collectSupportedMethods(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate):209:209 -> a
-    73:74:java.nio.file.Path getAndroidJarPath(com.android.tools.r8.utils.AndroidApiLevel):107:108 -> a
-    73:74:com.android.tools.r8.GenerateLintFiles$SupportedMethods collectSupportedMethods(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate):209 -> a
-    75:132:com.android.tools.r8.GenerateLintFiles$SupportedMethods collectSupportedMethods(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate):209:266 -> a
-    133:133:java.util.List lambda$collectSupportedMethods$0(com.android.tools.r8.graph.DexClass):224:224 -> a
-    134:137:java.nio.file.Path lintFile(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,java.lang.String):277:280 -> a
-    138:138:java.lang.String lintBaseFileName(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel):271:271 -> a
-    138:138:java.nio.file.Path lintFile(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,java.lang.String):283 -> a
-    139:139:java.nio.file.Path lintFile(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,java.lang.String):283:283 -> a
-    140:140:java.nio.file.Path lintFile(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,java.lang.String):280:280 -> a
-    141:166:void writeLintFiles(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.GenerateLintFiles$SupportedMethods):293:318 -> a
-    167:183:void writeLintFiles(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.GenerateLintFiles$SupportedMethods):317:333 -> a
-    184:188: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):298:302 -> a
-    189:297:java.lang.String com.android.tools.r8.graph.DexProto.toDescriptorString():0:108 -> a
-    189:297: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):306 -> a
-    298:298: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):306:306 -> a
-    299:309: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):302:312 -> a
-    310:323:void generateLintFiles(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate,java.util.function.BiPredicate):341:354 -> a
-    324:324:boolean lambda$generateLintFiles$4(java.util.function.BiPredicate,com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.graph.DexEncodedMethod):351:351 -> a
-    325:325:void run(int):369:369 -> a
-    326:326:void run(int):368:368 -> a
-    327:327:boolean lambda$run$5(com.android.tools.r8.utils.AndroidApiLevel):370:370 -> a
-    328:333:boolean lambda$run$6(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.graph.DexEncodedMethod):372:377 -> a
-    334:338:void main(java.lang.String[]):382:386 -> a
-    339:343:void run():359:363 -> a
-    339:343:void main(java.lang.String[]):386 -> a
-    1:1:java.util.List lambda$collectSupportedMethods$1(com.android.tools.r8.graph.DexClass):246:246 -> b
-    1:1:java.util.List lambda$collectSupportedMethods$2(com.android.tools.r8.graph.DexClass):260:260 -> c
-com.android.tools.r8.GenerateLintFiles$SupportedMethods -> com.android.tools.r8.g$a:
+    1:1:void <clinit>():68:68 -> <clinit>
+    1:1:void <init>(java.lang.String,java.lang.String,java.lang.String):84:84 -> <init>
+    2:28:void <init>(java.lang.String,java.lang.String,java.lang.String):72:98 -> <init>
+    29:41:void <init>(java.lang.String,java.lang.String,java.lang.String):95:107 -> <init>
+    42:48:void <init>(java.lang.String,java.lang.String,java.lang.String):106:112 -> <init>
+    49:51:void <init>(java.lang.String,java.lang.String,java.lang.String):111:113 -> <init>
+    52:52:void <init>(java.lang.String,java.lang.String,java.lang.String):90:90 -> <init>
+    1:1: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):0:0 -> a
+    1:1:void lambda$generateClassHTML$10(com.android.tools.r8.GenerateLintFiles$SourceBuilder,com.android.tools.r8.graph.DexEncodedMethod):762 -> a
+    2:476:com.android.tools.r8.GenerateLintFiles$SourceBuilder com.android.tools.r8.GenerateLintFiles$SourceBuilder.addMethod(com.android.tools.r8.graph.DexEncodedMethod):0:474 -> a
+    2:476: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):441 -> a
+    2:476:void lambda$generateClassHTML$10(com.android.tools.r8.GenerateLintFiles$SourceBuilder,com.android.tools.r8.graph.DexEncodedMethod):762 -> a
+    477:479:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration readDesugaredLibraryConfiguration(java.lang.String):124:126 -> a
+    480:490:void addMethodsToHeaderJar(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.graph.DexClass,java.util.List):142:152 -> a
+    491:498:com.android.tools.r8.graph.CfCode buildEmptyThrowingCfCode(com.android.tools.r8.graph.DexMethod):130:137 -> a
+    491:498:void addMethodsToHeaderJar(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.graph.DexClass,java.util.List):152 -> a
+    499:513:void addMethodsToHeaderJar(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.graph.DexClass,java.util.List):154:168 -> a
+    514:547:void addMethodsToHeaderJar(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.graph.DexClass,java.util.List):166:199 -> a
+    548:548:com.android.tools.r8.GenerateLintFiles$SupportedMethods collectSupportedMethods(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate):220:220 -> a
+    549:550:java.nio.file.Path getAndroidJarPath(com.android.tools.r8.utils.AndroidApiLevel):118:119 -> a
+    549:550:com.android.tools.r8.GenerateLintFiles$SupportedMethods collectSupportedMethods(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate):220 -> a
+    551:569:com.android.tools.r8.GenerateLintFiles$SupportedMethods collectSupportedMethods(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate):220:238 -> a
+    570:570:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DirectMappedDexApplication.programDefinitionFor(com.android.tools.r8.graph.DexType):83:83 -> a
+    570:570:com.android.tools.r8.GenerateLintFiles$SupportedMethods collectSupportedMethods(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate):238 -> a
+    571:571:com.android.tools.r8.GenerateLintFiles$SupportedMethods collectSupportedMethods(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate):243:243 -> a
+    572:572:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():488:488 -> a
+    572:572:com.android.tools.r8.GenerateLintFiles$SupportedMethods collectSupportedMethods(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate):244 -> a
+    573:583:com.android.tools.r8.GenerateLintFiles$SupportedMethods collectSupportedMethods(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate):247:257 -> a
+    584:637:com.android.tools.r8.GenerateLintFiles$SupportedMethods collectSupportedMethods(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate):240:293 -> a
+    638:638:java.util.List lambda$collectSupportedMethods$0(com.android.tools.r8.graph.DexClass):251:251 -> a
+    639:641:java.nio.file.Path lintFile(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,java.lang.String):304:306 -> a
+    642:642:java.lang.String lintBaseFileName(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel):298:298 -> a
+    642:642:java.nio.file.Path lintFile(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,java.lang.String):309 -> a
+    643:643:java.nio.file.Path lintFile(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,java.lang.String):309:309 -> a
+    644:644:java.nio.file.Path lintFile(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,java.lang.String):306:306 -> a
+    645:674:void writeLintFiles(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.GenerateLintFiles$SupportedMethods):319:348 -> a
+    675:691:void writeLintFiles(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.GenerateLintFiles$SupportedMethods):347:363 -> a
+    692:700:void lambda$writeLintFiles$3(com.android.tools.r8.GenerateLintFiles$SupportedMethods,java.util.List,com.android.tools.r8.graph.LazyLoadedDexApplication$Builder,com.android.tools.r8.graph.DexClass,java.util.List):324:332 -> a
+    701:809:java.lang.String com.android.tools.r8.graph.DexProto.toDescriptorString():0:108 -> a
+    701:809: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):336 -> a
+    810:810: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):336:336 -> a
+    811:821: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):332:342 -> a
+    822:835:void generateLintFiles(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate,java.util.function.BiPredicate):371:384 -> a
+    836:836:boolean lambda$generateLintFiles$4(java.util.function.BiPredicate,com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.graph.DexEncodedMethod):381:381 -> a
+    837:837:void run(int):399:399 -> a
+    838:838:void run(int):398:398 -> a
+    839:839:boolean lambda$run$5(com.android.tools.r8.utils.AndroidApiLevel):400:400 -> a
+    840:845:boolean lambda$run$6(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.graph.DexEncodedMethod):402:407 -> a
+    846:847:com.android.tools.r8.GenerateLintFiles$SourceBuilder com.android.tools.r8.GenerateLintFiles$SourceBuilder.addField(com.android.tools.r8.graph.DexEncodedField):463:464 -> a
+    846:847: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):441 -> a
+    846:847:void lambda$generateClassHTML$8(com.android.tools.r8.GenerateLintFiles$SourceBuilder,com.android.tools.r8.graph.DexEncodedField):754 -> a
+    848:862:void generateClassHTML(java.io.PrintStream,com.android.tools.r8.graph.DexClass,boolean,java.util.function.Predicate,java.util.function.Predicate):749:763 -> a
+    863:863:boolean lambda$generateClassHTML$7(com.android.tools.r8.graph.DexEncodedField):752:752 -> a
+    864:865:boolean lambda$generateClassHTML$9(com.android.tools.r8.graph.DexEncodedMethod):759:760 -> a
+    866:877:void generateDesugaredLibraryApisDocumetation():767:778 -> a
+    878:878:void lambda$generateDesugaredLibraryApisDocumetation$15(java.io.PrintStream,com.android.tools.r8.graph.DexClass):772:772 -> a
+    879:879:boolean lambda$generateDesugaredLibraryApisDocumetation$16(com.android.tools.r8.GenerateLintFiles$SupportedMethods,com.android.tools.r8.graph.DexClass):776:776 -> a
+    880:880:void lambda$generateDesugaredLibraryApisDocumetation$20(java.io.PrintStream,com.android.tools.r8.GenerateLintFiles$SupportedMethods,com.android.tools.r8.graph.DexClass):780:780 -> a
+    881:881:boolean lambda$generateDesugaredLibraryApisDocumetation$19(com.android.tools.r8.GenerateLintFiles$SupportedMethods,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):785:785 -> a
+    882:883:void main(java.lang.String[]):789:790 -> a
+    884:888:void run():389:393 -> a
+    884:888:void main(java.lang.String[]):790 -> a
+    889:896:void main(java.lang.String[]):793:800 -> 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):273:273 -> 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):287:287 -> c
+    1:1:java.lang.String lambda$generateDesugaredLibraryApisDocumetation$12(com.android.tools.r8.graph.DexClass):771:771 -> d
+    1:1:java.lang.String lambda$generateDesugaredLibraryApisDocumetation$17(com.android.tools.r8.graph.DexClass):777:777 -> e
+com.android.tools.r8.GenerateLintFiles$1 -> com.android.tools.r8.g$a:
+com.android.tools.r8.GenerateLintFiles$HTMLBuilder -> com.android.tools.r8.g$b:
+    java.lang.String indent -> d
+    1:2:void <init>():618:619 -> <init>
+    3:3:void <init>(com.android.tools.r8.GenerateLintFiles$1):618:618 -> <init>
+    1:1:com.android.tools.r8.GenerateLintFiles$HTMLBuilder appendLiCode(java.lang.String):642:642 -> b
+    1:1:void decreaseIndent():627:627 -> c
+    1:1:com.android.tools.r8.GenerateLintFiles$HTMLBuilder end(java.lang.String):653 -> c
+    2:2:com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent.indent(java.lang.String):419:419 -> c
+    2:2:void decreaseIndent():628 -> c
+    2:2:com.android.tools.r8.GenerateLintFiles$HTMLBuilder end(java.lang.String):653 -> c
+    3:3:com.android.tools.r8.GenerateLintFiles$HTMLBuilder end(java.lang.String):654:654 -> c
+    1:1:com.android.tools.r8.GenerateLintFiles$HTMLBuilder start(java.lang.String):647:647 -> d
+    2:2:void increaseIndent():622:622 -> d
+    2:2:com.android.tools.r8.GenerateLintFiles$HTMLBuilder start(java.lang.String):648 -> d
+    3:3:com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent.indent(java.lang.String):419:419 -> d
+    3:3:void increaseIndent():623 -> d
+    3:3:com.android.tools.r8.GenerateLintFiles$HTMLBuilder start(java.lang.String):648 -> d
+com.android.tools.r8.GenerateLintFiles$HTMLSourceBuilder -> com.android.tools.r8.g$c:
+    java.util.Set parallelMethods -> i
+    boolean $assertionsDisabled -> h
+    1:1:void <clinit>():659:659 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.DexClass,boolean,java.util.Set):663:664 -> <init>
+    1:28:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.arguments(com.android.tools.r8.graph.DexEncodedMethod):587:614 -> a
+    1:28:java.lang.String arguments(com.android.tools.r8.graph.DexEncodedMethod):659 -> a
+    1:4:java.lang.String toString():674:677 -> toString
+    5:5:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdCode(java.lang.String):632:632 -> toString
+    5:5:java.lang.String toString():677 -> toString
+    6:6:java.lang.String toString():679:679 -> toString
+    7:7:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdCode(java.lang.String):632:632 -> toString
+    7:7:java.lang.String toString():679 -> toString
+    8:12:java.lang.String toString():680:684 -> toString
+    13:22:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.accessFlags(com.android.tools.r8.graph.FieldAccessFlags):534:543 -> toString
+    13:22:java.lang.String toString():685 -> toString
+    23:28:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.accessFlags(com.android.tools.r8.graph.FieldAccessFlags):542:547 -> toString
+    23:28:java.lang.String toString():685 -> toString
+    29:38:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.accessFlags(com.android.tools.r8.graph.FieldAccessFlags):546:555 -> toString
+    29:38:java.lang.String toString():685 -> toString
+    39:41:java.lang.String toString():685:687 -> toString
+    42:56:java.lang.String toString():684:698 -> toString
+    57:73:java.lang.String toString():694:710 -> toString
+    74:107:java.lang.String toString():704:737 -> toString
+    108:108:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdP(java.lang.String):637:637 -> toString
+    108:108:java.lang.String toString():737 -> toString
+    109:109:java.lang.String toString():738:738 -> toString
+    110:110:java.lang.String com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent.toString():437:437 -> toString
+    110:110:java.lang.String toString():739 -> toString
+com.android.tools.r8.GenerateLintFiles$SourceBuilder -> com.android.tools.r8.g$d:
+    java.lang.String packageName -> g
+    java.lang.String className -> f
+    java.util.List methods -> e
+    java.util.List constructors -> d
+    java.util.List fields -> c
+    boolean $assertionsDisabled -> a
+    boolean newClass -> b
+    1:1:void <clinit>():441:441 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexClass,boolean,com.android.tools.r8.GenerateLintFiles$1):441:441 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexClass,boolean):452:452 -> <init>
+    3:15:void <init>(com.android.tools.r8.graph.DexClass,boolean):445:457 -> <init>
+    1:5:java.lang.String typeInPackage(java.lang.String,java.lang.String):478:482 -> a
+    6:13:java.lang.String typeInPackage(java.lang.String):488:495 -> a
+    14:17:java.lang.String typeInPackage(com.android.tools.r8.graph.DexType):499:502 -> a
+    18:27:java.lang.String accessFlags(com.android.tools.r8.graph.MethodAccessFlags):559:568 -> a
+    28:33:java.lang.String accessFlags(com.android.tools.r8.graph.MethodAccessFlags):567:572 -> a
+    34:46:java.lang.String accessFlags(com.android.tools.r8.graph.MethodAccessFlags):571:583 -> a
+com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent -> com.android.tools.r8.g$e:
+    java.lang.StringBuilder builder -> b
+    java.lang.String NL -> a
+    java.lang.String indent -> c
+    1:1:void <init>():416:416 -> <init>
+    2:4:void <init>():412:414 -> <init>
+    1:3:com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent appendLine(java.lang.String):424:426 -> a
+    1:1:java.lang.String toString():437:437 -> toString
+com.android.tools.r8.GenerateLintFiles$SupportedMethods -> com.android.tools.r8.g$f:
     java.util.Map supportedMethods -> b
     java.util.Set classesWithAllMethodsSupported -> a
-    1:3:void <init>(java.util.Set,java.util.Map):197:199 -> <init>
+    1:3:void <init>(java.util.Set,java.util.Map):208:210 -> <init>
 com.android.tools.r8.GenerateMainDexList -> com.android.tools.r8.GenerateMainDexList:
     com.android.tools.r8.utils.Timing timing -> b
     com.android.tools.r8.utils.InternalOptions options -> c
@@ -1128,7 +1240,7 @@
     1:1:void <init>(com.android.tools.r8.utils.InternalOptions):43:43 -> <init>
     2:6:void <init>(com.android.tools.r8.utils.InternalOptions):40:44 -> <init>
     1:37:java.util.List run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):50:86 -> a
-    38:38:java.lang.RuntimeException com.android.tools.r8.utils.ExceptionUtils.unwrapExecutionException(java.util.concurrent.ExecutionException):207:207 -> a
+    38:38:java.lang.RuntimeException com.android.tools.r8.utils.ExceptionUtils.unwrapExecutionException(java.util.concurrent.ExecutionException):216:216 -> a
     38:38:java.util.List run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):111 -> a
     39:39:java.util.List run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):111:111 -> a
     40:40:java.lang.String lambda$run$0(com.android.tools.r8.graph.DexType):77:77 -> a
@@ -1140,7 +1252,7 @@
     1:13:void main(java.lang.String[]):168:180 -> main
     1:5:java.util.List run(com.android.tools.r8.GenerateMainDexListCommand):129:133 -> run
     6:10:java.util.List run(com.android.tools.r8.GenerateMainDexListCommand,java.util.concurrent.ExecutorService):152:156 -> run
-    11:11:void com.android.tools.r8.utils.ExceptionUtils.withMainDexListHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):64:64 -> run
+    11:11:void com.android.tools.r8.utils.ExceptionUtils.withMainDexListHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):65:65 -> run
     11:11:java.util.List run(com.android.tools.r8.GenerateMainDexListCommand,java.util.concurrent.ExecutorService):155 -> run
     12:12:java.util.List run(com.android.tools.r8.GenerateMainDexListCommand,java.util.concurrent.ExecutorService):164:164 -> run
 com.android.tools.r8.GenerateMainDexListCommand -> com.android.tools.r8.GenerateMainDexListCommand:
@@ -1226,7 +1338,7 @@
     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:4: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:93 -> a
-    5:5:void com.android.tools.r8.utils.ExceptionUtils.withD8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):54:54 -> a
+    5:5:void com.android.tools.r8.utils.ExceptionUtils.withD8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):55:55 -> a
     5:5: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 -> a
     6:13: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):100:107 -> a
     14:14:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):96:96 -> a
@@ -1237,13 +1349,13 @@
     31:31:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):97 -> a
     32:44:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):128:140 -> a
     32:44:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):97 -> a
-    45:45:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():441:441 -> a
+    45:45:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():448:448 -> a
     45:45:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):141 -> a
     45:45:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):97 -> a
     46:54:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):141:149 -> a
     46:54:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):97 -> a
     55:55:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):98:98 -> a
-    56:56:java.lang.RuntimeException com.android.tools.r8.utils.ExceptionUtils.unwrapExecutionException(java.util.concurrent.ExecutionException):207:207 -> a
+    56:56:java.lang.RuntimeException com.android.tools.r8.utils.ExceptionUtils.unwrapExecutionException(java.util.concurrent.ExecutionException):216:216 -> a
     56:56:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):144 -> a
     56:56:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):97 -> a
     57:62:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):144:149 -> a
@@ -1312,12 +1424,12 @@
     7:25:com.android.tools.r8.BaseCommand makeCommand():208 -> c
     26:41:com.android.tools.r8.L8Command makeCommand():302:317 -> c
     26:41:com.android.tools.r8.BaseCommand makeCommand():208 -> c
-    42:53:com.android.tools.r8.L8Command makeCommand():316:327 -> c
-    42:53:com.android.tools.r8.BaseCommand makeCommand():208 -> c
-    54:86:com.android.tools.r8.L8Command makeCommand():326:358 -> c
-    54:86:com.android.tools.r8.BaseCommand makeCommand():208 -> c
-    87:87:com.android.tools.r8.L8Command makeCommand():281:281 -> c
-    87:87:com.android.tools.r8.BaseCommand makeCommand():208 -> c
+    42:54:com.android.tools.r8.L8Command makeCommand():316:328 -> c
+    42:54:com.android.tools.r8.BaseCommand makeCommand():208 -> c
+    55:88:com.android.tools.r8.L8Command makeCommand():327:360 -> c
+    55:88:com.android.tools.r8.BaseCommand makeCommand():208 -> c
+    89:89:com.android.tools.r8.L8Command makeCommand():281:281 -> c
+    89:89:com.android.tools.r8.BaseCommand makeCommand():208 -> c
     com.android.tools.r8.BaseCommand$Builder self() -> d
     1:19:void validate():257:275 -> e
     1:1:com.android.tools.r8.CompilationMode defaultCompilationMode():234:234 -> f
@@ -1328,11 +1440,11 @@
     6:12:void error(com.android.tools.r8.Diagnostic):131:137 -> error
 com.android.tools.r8.L8Command$InMemoryJarContent -> com.android.tools.r8.L8Command$c:
     java.util.List resources -> a
-    1:3:void <init>():363:365 -> <init>
-    1:3:void accept(com.android.tools.r8.ByteDataView,java.lang.String,com.android.tools.r8.DiagnosticsHandler):371:373 -> accept
-    4:4:void accept(com.android.tools.r8.ByteDataView,java.lang.String,com.android.tools.r8.DiagnosticsHandler):372:372 -> accept
-    5:5:void accept(com.android.tools.r8.ByteDataView,java.lang.String,com.android.tools.r8.DiagnosticsHandler):371:371 -> accept
-    1:1:java.util.Collection getProgramResources():378:378 -> getProgramResources
+    1:3:void <init>():365:367 -> <init>
+    1:3:void accept(com.android.tools.r8.ByteDataView,java.lang.String,com.android.tools.r8.DiagnosticsHandler):373:375 -> accept
+    4:4:void accept(com.android.tools.r8.ByteDataView,java.lang.String,com.android.tools.r8.DiagnosticsHandler):374:374 -> accept
+    5:5:void accept(com.android.tools.r8.ByteDataView,java.lang.String,com.android.tools.r8.DiagnosticsHandler):373:373 -> accept
+    1:1:java.util.Collection getProgramResources():380:380 -> getProgramResources
 com.android.tools.r8.L8CommandParser -> com.android.tools.r8.i:
     java.lang.String USAGE_MESSAGE -> g
     java.util.Set OPTIONS_WITH_PARAMETER -> f
@@ -1403,10 +1515,10 @@
     com.android.tools.r8.graph.DexApplication lambda$run$5(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):212:212 -> 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):225:232 -> a
-    10:10:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():425:425 -> a
+    10:10:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> 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):233 -> 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):234:234 -> a
-    12:12:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():441:441 -> a
+    12:12:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():448:448 -> 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):235 -> 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):235:248 -> a
     27:28:java.util.Set filterMissingClasses(java.util.Set,com.android.tools.r8.shaking.ProguardClassFilter):254:255 -> a
@@ -1414,7 +1526,7 @@
     29:29:void lambda$run$6(com.android.tools.r8.graph.AppView,java.util.ArrayList,com.android.tools.r8.graph.DexType):672 -> a
     30:31:void lambda$run$6(com.android.tools.r8.graph.AppView,java.util.ArrayList,com.android.tools.r8.graph.DexType):673:674 -> a
     32:33:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):261:262 -> a
-    34:34:void com.android.tools.r8.utils.ExceptionUtils.withR8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):59:59 -> a
+    34:34:void com.android.tools.r8.utils.ExceptionUtils.withR8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):60:60 -> a
     34:34:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):262 -> a
     35:35:com.android.tools.r8.graph.DirectMappedDexApplication getDirectApp(com.android.tools.r8.graph.AppView):279:279 -> a
     36:87:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):283:334 -> a
@@ -1470,7 +1582,7 @@
     1387:1387:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$15(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):974 -> a
     1388:1396: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
     1397:1402: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
-    1403:1403:boolean com.android.tools.r8.utils.InternalOptions.isClassMergingExtensionRequired():566:566 -> a
+    1403:1403:boolean com.android.tools.r8.utils.InternalOptions.isClassMergingExtensionRequired():573:573 -> a
     1403:1403: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):1021 -> a
     1404:1406:void com.android.tools.r8.shaking.RuntimeTypeCheckInfo$Builder.attach(com.android.tools.r8.shaking.Enqueuer):67:69 -> a
     1404:1406: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
@@ -1499,18 +1611,19 @@
     10:10:void com.android.tools.r8.utils.SelfRetraceTest.test():26 -> b
     10:10:void run(java.lang.String[]):1114 -> b
     11:18:void run(java.lang.String[]):1118:1125 -> b
-    19:19:void com.android.tools.r8.utils.ExceptionUtils.withR8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):59:59 -> b
+    19:19:void com.android.tools.r8.utils.ExceptionUtils.withR8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):60:60 -> b
     19:19:void run(java.lang.String[]):1125 -> b
     20:20:void run(java.lang.String[]):1128:1128 -> b
     1:1:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):275:275 -> c
     1:5:void main(java.lang.String[]):1138:1142 -> main
     1:3:void run(com.android.tools.r8.R8Command):191:193 -> run
     4:7:void run(com.android.tools.r8.R8Command,java.util.concurrent.ExecutorService):207:210 -> run
-    8:8:void com.android.tools.r8.utils.ExceptionUtils.withR8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):59:59 -> run
+    8:8:void com.android.tools.r8.utils.ExceptionUtils.withR8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):60:60 -> run
     8:8:void run(com.android.tools.r8.R8Command,java.util.concurrent.ExecutorService):209 -> run
 com.android.tools.r8.R8Command -> com.android.tools.r8.R8Command:
     java.lang.String synthesizedClassPrefix -> J
     java.util.List mainDexKeepRules -> t
+    boolean skipDump -> K
     com.android.tools.r8.StringConsumer proguardMapConsumer -> z
     boolean enableTreeShaking -> v
     boolean enableMinification -> w
@@ -1528,34 +1641,35 @@
     com.android.tools.r8.StringConsumer proguardUsageConsumer -> A
     com.android.tools.r8.StringConsumer proguardSeedsConsumer -> B
     com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration libraryConfiguration -> H
-    1:589:void <clinit>():63:651 -> <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,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.DesugaredLibraryConfiguration,com.android.tools.r8.features.FeatureSplitConfiguration,java.util.List,java.util.List,java.lang.String,int,com.android.tools.r8.R8Command$1):64:64 -> <init>
+    1:600:void <clinit>():63:662 -> <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,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.DesugaredLibraryConfiguration,com.android.tools.r8.features.FeatureSplitConfiguration,java.util.List,java.util.List,java.lang.String,boolean,int,com.android.tools.r8.R8Command$1):64:64 -> <init>
     2:2:void <init>(boolean,boolean,com.android.tools.r8.R8Command$1):64:64 -> <init>
-    3:35: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,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.DesugaredLibraryConfiguration,com.android.tools.r8.features.FeatureSplitConfiguration,java.util.List,java.util.List,java.lang.String,int):749:781 -> <init>
-    36:53:void <init>(boolean,boolean):785:802 -> <init>
-    1:1:com.android.tools.r8.R8Command$Builder builder(com.android.tools.r8.utils.AndroidApp):683:683 -> a
-    2:2:com.android.tools.r8.R8Command$Builder builder(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.DiagnosticsHandler):688:688 -> a
-    3:5:com.android.tools.r8.StringConsumer wrapStringConsumer(com.android.tools.r8.StringConsumer,boolean,java.nio.file.Path):965:967 -> a
-    1:71:com.android.tools.r8.utils.InternalOptions getInternalOptions():817:887 -> b
-    72:82:com.android.tools.r8.utils.InternalOptions getInternalOptions():884:894 -> b
-    83:93:com.android.tools.r8.utils.InternalOptions getInternalOptions():891:901 -> b
-    94:104:com.android.tools.r8.utils.InternalOptions getInternalOptions():898:908 -> b
-    105:129:com.android.tools.r8.utils.InternalOptions getInternalOptions():905:929 -> b
-    130:130:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():425:425 -> b
-    130:130:com.android.tools.r8.utils.InternalOptions getInternalOptions():934 -> b
-    131:151:com.android.tools.r8.utils.InternalOptions getInternalOptions():935:955 -> b
-    1:1:com.android.tools.r8.R8Command$Builder builder():673:673 -> builder
-    2:2:void com.android.tools.r8.R8Command$Builder.<init>():117:117 -> builder
-    2:2:com.android.tools.r8.R8Command$Builder builder():673 -> builder
-    3:3:com.android.tools.r8.R8Command$Builder builder(com.android.tools.r8.DiagnosticsHandler):678:678 -> builder
-    1:1:boolean getEnableMinification():812:812 -> getEnableMinification
-    1:1:boolean getEnableTreeShaking():807:807 -> getEnableTreeShaking
-    1:1:com.android.tools.r8.R8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin):701:701 -> parse
-    2:2:com.android.tools.r8.R8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.DiagnosticsHandler):715:715 -> parse
+    3:36: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,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.DesugaredLibraryConfiguration,com.android.tools.r8.features.FeatureSplitConfiguration,java.util.List,java.util.List,java.lang.String,boolean,int):762:795 -> <init>
+    37:55:void <init>(boolean,boolean):799:817 -> <init>
+    1:1:com.android.tools.r8.R8Command$Builder builder(com.android.tools.r8.utils.AndroidApp):695:695 -> a
+    2:2:com.android.tools.r8.R8Command$Builder builder(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.DiagnosticsHandler):700:700 -> a
+    3:5:com.android.tools.r8.StringConsumer wrapStringConsumer(com.android.tools.r8.StringConsumer,boolean,java.nio.file.Path):985:987 -> a
+    1:71:com.android.tools.r8.utils.InternalOptions getInternalOptions():832:902 -> b
+    72:82:com.android.tools.r8.utils.InternalOptions getInternalOptions():899:909 -> b
+    83:93:com.android.tools.r8.utils.InternalOptions getInternalOptions():906:916 -> b
+    94:104:com.android.tools.r8.utils.InternalOptions getInternalOptions():913:923 -> b
+    105:129:com.android.tools.r8.utils.InternalOptions getInternalOptions():920:944 -> b
+    130:130:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> b
+    130:130:com.android.tools.r8.utils.InternalOptions getInternalOptions():949 -> b
+    131:156:com.android.tools.r8.utils.InternalOptions getInternalOptions():950:975 -> b
+    1:1:com.android.tools.r8.R8Command$Builder builder():685:685 -> builder
+    2:2:void com.android.tools.r8.R8Command$Builder.<init>():118:118 -> builder
+    2:2:com.android.tools.r8.R8Command$Builder builder():685 -> builder
+    3:3:com.android.tools.r8.R8Command$Builder builder(com.android.tools.r8.DiagnosticsHandler):690:690 -> builder
+    1:1:boolean getEnableMinification():827:827 -> getEnableMinification
+    1:1:boolean getEnableTreeShaking():822:822 -> getEnableTreeShaking
+    1:1:com.android.tools.r8.R8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin):713:713 -> parse
+    2:2:com.android.tools.r8.R8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.DiagnosticsHandler):727:727 -> parse
 com.android.tools.r8.R8Command$1 -> com.android.tools.r8.R8Command$a:
 com.android.tools.r8.R8Command$Builder -> com.android.tools.r8.R8Command$Builder:
-    boolean allowTestProguardOptions -> M
+    boolean skipDump -> M
     com.android.tools.r8.experimental.graphinfo.GraphConsumer keptGraphConsumer -> I
+    boolean allowTestProguardOptions -> N
     java.util.List mainDexRules -> v
     com.android.tools.r8.StringConsumer desugaredLibraryKeepRuleConsumer -> y
     com.android.tools.r8.experimental.graphinfo.GraphConsumer mainDexKeptGraphConsumer -> J
@@ -1576,85 +1690,86 @@
     1:1:void <clinit>():71:71 -> <clinit>
     1:1:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.R8Command$1):72:72 -> <init>
     2:2:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.R8Command$1):72:72 -> <init>
-    3:3:void <init>():117:117 -> <init>
-    4:4:void <init>(com.android.tools.r8.DiagnosticsHandler):121:121 -> <init>
-    5:26:void <init>(com.android.tools.r8.DiagnosticsHandler):92:113 -> <init>
-    27:27:void <init>(com.android.tools.r8.utils.AndroidApp):125:125 -> <init>
-    28:49:void <init>(com.android.tools.r8.utils.AndroidApp):92:113 -> <init>
-    50:50:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.DiagnosticsHandler):129:129 -> <init>
-    51:72:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.DiagnosticsHandler):92:113 -> <init>
-    1:1:com.android.tools.r8.R8Command$Builder setSynthesizedClassesPrefix(java.lang.String):153:153 -> a
-    2:4:void lambda$addMainDexRules$3(java.util.List,com.android.tools.r8.origin.Origin):201:201 -> a
-    5:6:void lambda$addProguardConfigurationFiles$5(java.util.List):219:220 -> a
-    7:7:com.android.tools.r8.InternalProgramOutputPathConsumer createProgramOutputConsumer(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):405:405 -> a
-    8:10:void lambda$makeR8Command$7(com.android.tools.r8.DataResourceProvider$Visitor,com.android.tools.r8.utils.Reporter,com.android.tools.r8.DataResourceProvider):527:529 -> a
-    11:12:void addProguardConfigurationConsumerForTesting(java.util.function.Consumer):594:595 -> a
-    13:15:void lambda$addProguardConfigurationConsumerForTesting$8(java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.shaking.ProguardConfiguration$Builder):598:600 -> a
-    1:1:com.android.tools.r8.R8Command$Builder addFeatureSplit(java.util.function.Function):379:379 -> addFeatureSplit
+    3:3:void <init>():118:118 -> <init>
+    4:4:void <init>(com.android.tools.r8.DiagnosticsHandler):122:122 -> <init>
+    5:27:void <init>(com.android.tools.r8.DiagnosticsHandler):92:114 -> <init>
+    28:28:void <init>(com.android.tools.r8.utils.AndroidApp):126:126 -> <init>
+    29:51:void <init>(com.android.tools.r8.utils.AndroidApp):92:114 -> <init>
+    52:52:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.DiagnosticsHandler):130:130 -> <init>
+    53:75:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.DiagnosticsHandler):92:114 -> <init>
+    1:1:com.android.tools.r8.R8Command$Builder setSynthesizedClassesPrefix(java.lang.String):154:154 -> a
+    2:4:void lambda$addMainDexRules$3(java.util.List,com.android.tools.r8.origin.Origin):202:202 -> a
+    5:6:void lambda$addProguardConfigurationFiles$5(java.util.List):220:221 -> a
+    7:7:com.android.tools.r8.InternalProgramOutputPathConsumer createProgramOutputConsumer(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):415:415 -> a
+    8:10:void lambda$makeR8Command$7(com.android.tools.r8.DataResourceProvider$Visitor,com.android.tools.r8.utils.Reporter,com.android.tools.r8.DataResourceProvider):537:539 -> a
+    11:12:void addProguardConfigurationConsumerForTesting(java.util.function.Consumer):605:606 -> a
+    13:15:void lambda$addProguardConfigurationConsumerForTesting$8(java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.shaking.ProguardConfiguration$Builder):609:611 -> a
+    1:1:com.android.tools.r8.R8Command$Builder addFeatureSplit(java.util.function.Function):389:389 -> addFeatureSplit
     2:2:com.android.tools.r8.FeatureSplit$Builder com.android.tools.r8.FeatureSplit.builder(com.android.tools.r8.DiagnosticsHandler):63:63 -> addFeatureSplit
-    2:2:com.android.tools.r8.R8Command$Builder addFeatureSplit(java.util.function.Function):379 -> addFeatureSplit
-    3:6:com.android.tools.r8.R8Command$Builder addFeatureSplit(java.util.function.Function):379:382 -> addFeatureSplit
-    7:21:com.android.tools.r8.R8Command$Builder addFeatureSplit(java.util.function.Function):381:395 -> addFeatureSplit
-    1:1:com.android.tools.r8.R8Command$Builder addMainDexRules(java.util.List,com.android.tools.r8.origin.Origin):201:201 -> addMainDexRules
-    1:1:com.android.tools.r8.R8Command$Builder addMainDexRulesFiles(java.nio.file.Path[]):181:181 -> addMainDexRulesFiles
-    2:2:com.android.tools.r8.R8Command$Builder addMainDexRulesFiles(java.util.Collection):191:191 -> addMainDexRulesFiles
+    2:2:com.android.tools.r8.R8Command$Builder addFeatureSplit(java.util.function.Function):389 -> addFeatureSplit
+    3:6:com.android.tools.r8.R8Command$Builder addFeatureSplit(java.util.function.Function):389:392 -> addFeatureSplit
+    7:21:com.android.tools.r8.R8Command$Builder addFeatureSplit(java.util.function.Function):391:405 -> addFeatureSplit
+    1:1:com.android.tools.r8.R8Command$Builder addMainDexRules(java.util.List,com.android.tools.r8.origin.Origin):202:202 -> addMainDexRules
+    1:1:com.android.tools.r8.R8Command$Builder addMainDexRulesFiles(java.nio.file.Path[]):182:182 -> addMainDexRulesFiles
+    2:2:com.android.tools.r8.R8Command$Builder addMainDexRulesFiles(java.util.Collection):192:192 -> addMainDexRulesFiles
     1:1:com.android.tools.r8.BaseCommand$Builder addProgramResourceProvider(com.android.tools.r8.ProgramResourceProvider):71:71 -> addProgramResourceProvider
-    2:2:com.android.tools.r8.R8Command$Builder addProgramResourceProvider(com.android.tools.r8.ProgramResourceProvider):366:366 -> addProgramResourceProvider
-    1:1:com.android.tools.r8.R8Command$Builder addProguardConfiguration(java.util.List,com.android.tools.r8.origin.Origin):228:228 -> addProguardConfiguration
-    1:1:com.android.tools.r8.R8Command$Builder addProguardConfigurationFiles(java.nio.file.Path[]):208:208 -> addProguardConfigurationFiles
-    2:2:com.android.tools.r8.R8Command$Builder addProguardConfigurationFiles(java.util.List):218:218 -> addProguardConfigurationFiles
+    2:2:com.android.tools.r8.R8Command$Builder addProgramResourceProvider(com.android.tools.r8.ProgramResourceProvider):376:376 -> addProgramResourceProvider
+    1:1:com.android.tools.r8.R8Command$Builder addProguardConfiguration(java.util.List,com.android.tools.r8.origin.Origin):229:229 -> addProguardConfiguration
+    1:1:com.android.tools.r8.R8Command$Builder addProguardConfigurationFiles(java.nio.file.Path[]):209:209 -> addProguardConfigurationFiles
+    2:2:com.android.tools.r8.R8Command$Builder addProguardConfigurationFiles(java.util.List):219:219 -> addProguardConfigurationFiles
     1:1:java.lang.Boolean lambda$new$0(java.lang.String,java.lang.Long):107:107 -> b
-    2:4:void lambda$addProguardConfiguration$6(java.util.List,com.android.tools.r8.origin.Origin):228:228 -> b
-    5:7:void addSyntheticProguardRulesConsumerForTesting(java.util.function.Consumer):607:609 -> b
+    2:4:void lambda$addProguardConfiguration$6(java.util.List,com.android.tools.r8.origin.Origin):229:229 -> b
+    5:7:void addSyntheticProguardRulesConsumerForTesting(java.util.function.Consumer):618:620 -> b
     1:1:com.android.tools.r8.BaseCommand makeCommand():71:71 -> c
-    2:2:void setDisableVerticalClassMerging(boolean):139:139 -> c
-    3:4:void lambda$addMainDexRulesFiles$1(java.nio.file.Path[]):182:183 -> c
+    2:2:void setDisableVerticalClassMerging(boolean):140:140 -> c
+    3:4:void lambda$addMainDexRulesFiles$1(java.nio.file.Path[]):183:184 -> c
     com.android.tools.r8.BaseCommand$Builder self() -> d
-    1:2:void lambda$addProguardConfigurationFiles$4(java.nio.file.Path[]):209:210 -> d
-    1:21:void validate():410:430 -> e
-    22:47:void validate():428:453 -> e
-    1:1:com.android.tools.r8.CompilationMode defaultCompilationMode():149:149 -> f
-    2:3:void lambda$addMainDexRulesFiles$2(java.util.Collection):192:193 -> f
+    1:2:void lambda$addProguardConfigurationFiles$4(java.nio.file.Path[]):210:211 -> d
+    1:21:void validate():420:440 -> e
+    22:47:void validate():438:463 -> e
+    1:1:com.android.tools.r8.CompilationMode defaultCompilationMode():150:150 -> f
+    2:3:void lambda$addMainDexRulesFiles$2(java.util.Collection):193:194 -> f
     void allowPartiallyImplementedProguardOptions() -> m
-    1:1:void allowTestProguardOptions():620:620 -> n
-    1:1:void internalForceProguardCompatibility():135:135 -> o
-    1:4:com.android.tools.r8.R8Command makeCommand():459:462 -> p
-    5:5:com.android.tools.r8.R8Command makeCommand():460:460 -> p
-    1:22:com.android.tools.r8.R8Command makeR8Command():466:487 -> q
-    23:649:boolean com.android.tools.r8.utils.InternalOptions.shouldEnableKeepRuleSynthesisForRecompilation():0:626 -> q
-    23:649:com.android.tools.r8.R8Command makeR8Command():488 -> q
-    650:711:com.android.tools.r8.R8Command makeR8Command():489:550 -> q
-    712:712:com.android.tools.r8.utils.InternalOptions$DesugarState com.android.tools.r8.BaseCompilerCommand$Builder.getDesugaringState():469:469 -> q
-    712:712:com.android.tools.r8.R8Command makeR8Command():551 -> q
-    713:746:com.android.tools.r8.R8Command makeR8Command():554:587 -> q
-    1:1:com.android.tools.r8.R8Command$Builder setDesugaredLibraryKeepRuleConsumer(com.android.tools.r8.StringConsumer):268:268 -> setDesugaredLibraryKeepRuleConsumer
-    1:1:com.android.tools.r8.R8Command$Builder setDisableMinification(boolean):175:175 -> setDisableMinification
-    1:1:com.android.tools.r8.R8Command$Builder setDisableTreeShaking(boolean):164:164 -> setDisableTreeShaking
-    1:1:com.android.tools.r8.R8Command$Builder setKeptGraphConsumer(com.android.tools.r8.experimental.graphinfo.GraphConsumer):311:311 -> setKeptGraphConsumer
-    1:1:com.android.tools.r8.R8Command$Builder setMainDexKeptGraphConsumer(com.android.tools.r8.experimental.graphinfo.GraphConsumer):319:319 -> setMainDexKeptGraphConsumer
+    1:1:void allowTestProguardOptions():631:631 -> n
+    1:1:void internalForceProguardCompatibility():136:136 -> o
+    1:4:com.android.tools.r8.R8Command makeCommand():469:472 -> p
+    5:5:com.android.tools.r8.R8Command makeCommand():470:470 -> p
+    1:22:com.android.tools.r8.R8Command makeR8Command():476:497 -> q
+    23:656:boolean com.android.tools.r8.utils.InternalOptions.shouldEnableKeepRuleSynthesisForRecompilation():0:633 -> q
+    23:656:com.android.tools.r8.R8Command makeR8Command():498 -> q
+    657:718:com.android.tools.r8.R8Command makeR8Command():499:560 -> q
+    719:719:com.android.tools.r8.utils.InternalOptions$DesugarState com.android.tools.r8.BaseCompilerCommand$Builder.getDesugaringState():469:469 -> q
+    719:719:com.android.tools.r8.R8Command makeR8Command():561 -> q
+    720:754:com.android.tools.r8.R8Command makeR8Command():564:598 -> q
+    1:1:com.android.tools.r8.R8Command$Builder skipDump():278:278 -> r
+    1:1:com.android.tools.r8.R8Command$Builder setDesugaredLibraryKeepRuleConsumer(com.android.tools.r8.StringConsumer):269:269 -> setDesugaredLibraryKeepRuleConsumer
+    1:1:com.android.tools.r8.R8Command$Builder setDisableMinification(boolean):176:176 -> setDisableMinification
+    1:1:com.android.tools.r8.R8Command$Builder setDisableTreeShaking(boolean):165:165 -> setDisableTreeShaking
+    1:1:com.android.tools.r8.R8Command$Builder setKeptGraphConsumer(com.android.tools.r8.experimental.graphinfo.GraphConsumer):321:321 -> setKeptGraphConsumer
+    1:1:com.android.tools.r8.R8Command$Builder setMainDexKeptGraphConsumer(com.android.tools.r8.experimental.graphinfo.GraphConsumer):329:329 -> setMainDexKeptGraphConsumer
     1:1:com.android.tools.r8.BaseCompilerCommand$Builder setOutput(java.nio.file.Path,com.android.tools.r8.OutputMode):71:71 -> setOutput
     2:2:com.android.tools.r8.BaseCompilerCommand$Builder setOutput(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):71:71 -> setOutput
-    3:3:com.android.tools.r8.R8Command$Builder setOutput(java.nio.file.Path,com.android.tools.r8.OutputMode):338:338 -> setOutput
-    4:4:com.android.tools.r8.R8Command$Builder setOutput(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):361:361 -> setOutput
-    1:1:com.android.tools.r8.R8Command$Builder setProguardConfigurationConsumer(com.android.tools.r8.StringConsumer):303:303 -> setProguardConfigurationConsumer
-    1:1:com.android.tools.r8.R8Command$Builder setProguardMapConsumer(com.android.tools.r8.StringConsumer):257:257 -> setProguardMapConsumer
-    1:2:com.android.tools.r8.R8Command$Builder setProguardMapOutputPath(java.nio.file.Path):243:244 -> setProguardMapOutputPath
-    1:1:com.android.tools.r8.R8Command$Builder setProguardSeedsConsumer(com.android.tools.r8.StringConsumer):292:292 -> setProguardSeedsConsumer
-    1:1:com.android.tools.r8.R8Command$Builder setProguardUsageConsumer(com.android.tools.r8.StringConsumer):280:280 -> setProguardUsageConsumer
+    3:3:com.android.tools.r8.R8Command$Builder setOutput(java.nio.file.Path,com.android.tools.r8.OutputMode):348:348 -> setOutput
+    4:4:com.android.tools.r8.R8Command$Builder setOutput(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):371:371 -> setOutput
+    1:1:com.android.tools.r8.R8Command$Builder setProguardConfigurationConsumer(com.android.tools.r8.StringConsumer):313:313 -> setProguardConfigurationConsumer
+    1:1:com.android.tools.r8.R8Command$Builder setProguardMapConsumer(com.android.tools.r8.StringConsumer):258:258 -> setProguardMapConsumer
+    1:2:com.android.tools.r8.R8Command$Builder setProguardMapOutputPath(java.nio.file.Path):244:245 -> setProguardMapOutputPath
+    1:1:com.android.tools.r8.R8Command$Builder setProguardSeedsConsumer(com.android.tools.r8.StringConsumer):302:302 -> setProguardSeedsConsumer
+    1:1:com.android.tools.r8.R8Command$Builder setProguardUsageConsumer(com.android.tools.r8.StringConsumer):290:290 -> setProguardUsageConsumer
 com.android.tools.r8.R8Command$Builder$1 -> com.android.tools.r8.R8Command$Builder$a:
     com.android.tools.r8.ProgramResourceProvider val$programResourceProvider -> a
-    1:1:void <init>(com.android.tools.r8.R8Command$Builder,com.android.tools.r8.ProgramResourceProvider):384:384 -> <init>
-    1:1:java.util.Collection getProgramResources():387:387 -> getProgramResources
+    1:1:void <init>(com.android.tools.r8.R8Command$Builder,com.android.tools.r8.ProgramResourceProvider):394:394 -> <init>
+    1:1:java.util.Collection getProgramResources():397:397 -> getProgramResources
 com.android.tools.r8.R8Command$Builder$2 -> com.android.tools.r8.R8Command$Builder$b:
     com.android.tools.r8.shaking.ProguardConfigurationParser val$parser -> a
     com.android.tools.r8.utils.Reporter val$reporter -> b
-    1:1:void <init>(com.android.tools.r8.R8Command$Builder,com.android.tools.r8.shaking.ProguardConfigurationParser,com.android.tools.r8.utils.Reporter):498:498 -> <init>
-    1:4:void visit(com.android.tools.r8.DataEntryResource):506:509 -> visit
+    1:1:void <init>(com.android.tools.r8.R8Command$Builder,com.android.tools.r8.shaking.ProguardConfigurationParser,com.android.tools.r8.utils.Reporter):508:508 -> <init>
+    1:4:void visit(com.android.tools.r8.DataEntryResource):516:519 -> visit
     5:5:void com.android.tools.r8.shaking.ProguardConfigurationSourceBytes.<init>(java.io.InputStream,com.android.tools.r8.origin.Origin):24:24 -> visit
-    5:5:void visit(com.android.tools.r8.DataEntryResource):509 -> visit
-    6:7:void visit(com.android.tools.r8.DataEntryResource):510:511 -> visit
-    8:16:void visit(com.android.tools.r8.DataEntryResource):507:515 -> visit
-    17:19:void visit(com.android.tools.r8.DataEntryResource):512:512 -> visit
+    5:5:void visit(com.android.tools.r8.DataEntryResource):519 -> visit
+    6:7:void visit(com.android.tools.r8.DataEntryResource):520:521 -> visit
+    8:16:void visit(com.android.tools.r8.DataEntryResource):517:525 -> visit
+    17:19:void visit(com.android.tools.r8.DataEntryResource):522:522 -> visit
 com.android.tools.r8.R8Command$Builder$DefaultR8DiagnosticsHandler -> com.android.tools.r8.R8Command$Builder$c:
     1:1:void <init>():74:74 -> <init>
     2:2:void <init>(com.android.tools.r8.R8Command$1):74:74 -> <init>
@@ -1662,12 +1777,12 @@
     7:14:void error(com.android.tools.r8.Diagnostic):81:88 -> error
 com.android.tools.r8.R8Command$EnsureNonDexProgramResourceProvider -> com.android.tools.r8.R8Command$b:
     com.android.tools.r8.ProgramResourceProvider provider -> a
-    1:2:void <init>(com.android.tools.r8.ProgramResourceProvider):629:630 -> <init>
-    1:1:com.android.tools.r8.DataResourceProvider getDataResourceProvider():647:647 -> getDataResourceProvider
-    1:4:java.util.Collection getProgramResources():635:638 -> getProgramResources
+    1:2:void <init>(com.android.tools.r8.ProgramResourceProvider):640:641 -> <init>
+    1:1:com.android.tools.r8.DataResourceProvider getDataResourceProvider():658:658 -> getDataResourceProvider
+    1:4:java.util.Collection getProgramResources():646:649 -> getProgramResources
 com.android.tools.r8.R8Command$StandardOutConsumer -> com.android.tools.r8.R8Command$c:
-    1:1:void <init>(com.android.tools.r8.StringConsumer):976:976 -> <init>
-    1:2:void accept(java.lang.String,com.android.tools.r8.DiagnosticsHandler):981:982 -> accept
+    1:1:void <init>(com.android.tools.r8.StringConsumer):996:996 -> <init>
+    1:2:void accept(java.lang.String,com.android.tools.r8.DiagnosticsHandler):1001:1002 -> accept
 com.android.tools.r8.R8CommandParser -> com.android.tools.r8.l:
     java.util.Set OPTIONS_WITH_TWO_PARAMETERS -> g
     java.lang.String USAGE_MESSAGE -> h
@@ -1876,14 +1991,14 @@
     1:3:void <init>(com.android.tools.r8.origin.Origin,java.io.Writer,com.android.tools.r8.StringConsumer):190:192 -> <init>
     1:5:void accept(java.lang.String,com.android.tools.r8.DiagnosticsHandler):197:201 -> accept
     1:5:void finished(com.android.tools.r8.DiagnosticsHandler):207:211 -> finished
-com.android.tools.r8.StringResource -> com.android.tools.r8.internal.ez:
+com.android.tools.r8.StringResource -> com.android.tools.r8.internal.gz:
     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.ez$a:
-com.android.tools.r8.StringResource$FileResource -> com.android.tools.r8.internal.ez$b:
+com.android.tools.r8.StringResource$1 -> com.android.tools.r8.internal.gz$a:
+com.android.tools.r8.StringResource$FileResource -> com.android.tools.r8.internal.gz$b:
     java.nio.charset.Charset charset -> c
     java.nio.file.Path file -> b
     com.android.tools.r8.origin.Origin origin -> d
@@ -1893,7 +2008,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.ez$c:
+com.android.tools.r8.StringResource$StringContentResource -> com.android.tools.r8.internal.gz$c:
     com.android.tools.r8.origin.Origin origin -> b
     boolean $assertionsDisabled -> a
     java.lang.String content -> c
@@ -1914,7 +2029,7 @@
     1:1:java.lang.String getPreReleaseString():86:86 -> getPreReleaseString
     1:1:java.lang.String getVersionString():21:21 -> getVersionString
     1:1:boolean isDevelopmentVersion():106:106 -> isDevelopmentVersion
-com.android.tools.r8.algorithms.scc.SCC -> com.android.tools.r8.internal.rx:
+com.android.tools.r8.algorithms.scc.SCC -> com.android.tools.r8.internal.tx:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap discoverTime -> c
     java.util.Set unassignedSet -> d
     java.util.function.Function successors -> h
@@ -2455,7 +2570,7 @@
     1:1:com.android.tools.r8.cf.CfVersion max(com.android.tools.r8.cf.CfVersion):58:58 -> g
     1:1:int hashCode():101:101 -> hashCode
     1:1:java.lang.String toString():106:106 -> toString
-com.android.tools.r8.cf.FixedLocalValue -> com.android.tools.r8.internal.Qa:
+com.android.tools.r8.cf.FixedLocalValue -> com.android.tools.r8.internal.Ra:
     com.android.tools.r8.ir.code.Phi phi -> q
     1:2:void <init>(com.android.tools.r8.ir.code.Phi):21:22 -> <init>
     boolean isConstant() -> L
@@ -2465,7 +2580,7 @@
     2:2:int getRegister(com.android.tools.r8.cf.CfRegisterAllocator):26 -> a
     1:1:com.android.tools.r8.ir.code.Phi getPhi():30:30 -> h0
     1:1:java.lang.String toString():45:45 -> toString
-com.android.tools.r8.cf.LoadStoreHelper -> com.android.tools.r8.internal.Rm:
+com.android.tools.r8.cf.LoadStoreHelper -> com.android.tools.r8.internal.Sm:
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.ir.code.IRCode code -> c
     boolean $assertionsDisabled -> a
@@ -2606,11 +2721,11 @@
     89:91:void com.android.tools.r8.cf.LoadStoreHelper.add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.InstructionListIterator):292:294 -> b
     89:91:void storeOutValue(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):206 -> b
     92:94:void storeOutValue(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):207:209 -> b
-com.android.tools.r8.cf.LoadStoreHelper$PhiMove -> com.android.tools.r8.internal.Qm:
+com.android.tools.r8.cf.LoadStoreHelper$PhiMove -> com.android.tools.r8.internal.Rm:
     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):236:238 -> <init>
-com.android.tools.r8.cf.TypeVerificationHelper -> com.android.tools.r8.internal.NB:
+com.android.tools.r8.cf.TypeVerificationHelper -> com.android.tools.r8.internal.OB:
     boolean computingVerificationTypes -> j
     com.android.tools.r8.ir.code.IRCode code -> g
     com.android.tools.r8.graph.AppView appView -> f
@@ -2653,8 +2768,8 @@
     22:22:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo getTypeInfo(com.android.tools.r8.ir.code.Value):167:167 -> b
     23:23:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo getTypeInfo(com.android.tools.r8.ir.code.Value):165:165 -> b
     24:24:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo getTypeInfo(com.android.tools.r8.ir.code.Value):163:163 -> b
-com.android.tools.r8.cf.TypeVerificationHelper$1 -> com.android.tools.r8.internal.IB:
-com.android.tools.r8.cf.TypeVerificationHelper$InitializedTypeInfo -> com.android.tools.r8.internal.JB:
+com.android.tools.r8.cf.TypeVerificationHelper$1 -> com.android.tools.r8.internal.JB:
+com.android.tools.r8.cf.TypeVerificationHelper$InitializedTypeInfo -> com.android.tools.r8.internal.KB:
     com.android.tools.r8.graph.DexType type -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():41:41 -> <clinit>
@@ -2662,7 +2777,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.KB:
+com.android.tools.r8.cf.TypeVerificationHelper$NewInstanceInfo -> com.android.tools.r8.internal.LB:
     com.android.tools.r8.ir.code.NewInstance newInstance -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():60:60 -> <clinit>
@@ -2672,7 +2787,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.LB:
+com.android.tools.r8.cf.TypeVerificationHelper$ThisInstanceInfo -> com.android.tools.r8.internal.MB:
     com.android.tools.r8.graph.DexType type -> b
     boolean $assertionsDisabled -> a
     com.android.tools.r8.ir.code.Argument thisArgument -> c
@@ -2683,7 +2798,7 @@
     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.MB:
+com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo -> com.android.tools.r8.internal.NB:
     com.android.tools.r8.graph.DexType getDexType() -> a
 com.android.tools.r8.cf.code.CfArithmeticBinop -> com.android.tools.r8.internal.f3:
     com.android.tools.r8.ir.code.NumericType type -> d
@@ -8400,10 +8515,10 @@
 com.android.tools.r8.com.google.common.base.Charsets -> com.android.tools.r8.internal.c5:
     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.O6:
+com.android.tools.r8.com.google.common.base.CommonPattern -> com.android.tools.r8.internal.P6:
     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.Y9:
+com.android.tools.r8.com.google.common.base.Equivalence -> com.android.tools.r8.internal.Z9:
     1:1:void <init>():41:41 -> <init>
     boolean doEquivalent(java.lang.Object,java.lang.Object) -> a
     int doHash(java.lang.Object) -> a
@@ -8411,8 +8526,8 @@
     2:2:int hash(java.lang.Object):113:113 -> b
     1:1:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper wrap(java.lang.Object):162:162 -> c
     1:1:boolean test(java.lang.Object,java.lang.Object):78:78 -> test
-com.android.tools.r8.com.google.common.base.Equivalence$1 -> com.android.tools.r8.internal.X9:
-com.android.tools.r8.com.google.common.base.Equivalence$Wrapper -> com.android.tools.r8.internal.Y9$a:
+com.android.tools.r8.com.google.common.base.Equivalence$1 -> com.android.tools.r8.internal.Y9:
+com.android.tools.r8.com.google.common.base.Equivalence$Wrapper -> com.android.tools.r8.internal.Z9$a:
     com.android.tools.r8.com.google.common.base.Equivalence equivalence -> a
     java.lang.Object reference -> b
     1:1:void <init>(com.android.tools.r8.com.google.common.base.Equivalence,java.lang.Object,com.android.tools.r8.com.google.common.base.Equivalence$1):183:183 -> <init>
@@ -8423,24 +8538,24 @@
     2:115:int com.android.tools.r8.com.google.common.base.Equivalence.hash(java.lang.Object):0:113 -> hashCode
     2:115:int hashCode():229 -> hashCode
     1:1:java.lang.String toString():238:238 -> toString
-com.android.tools.r8.com.google.common.base.Function -> com.android.tools.r8.internal.qb:
-com.android.tools.r8.com.google.common.base.JdkPattern -> com.android.tools.r8.internal.Vg:
+com.android.tools.r8.com.google.common.base.Function -> com.android.tools.r8.internal.rb:
+com.android.tools.r8.com.google.common.base.JdkPattern -> com.android.tools.r8.internal.Wg:
     java.util.regex.Pattern pattern -> a
     1:2:void <init>(java.util.regex.Pattern):29:30 -> <init>
     1:1:com.android.tools.r8.com.google.common.base.CommonMatcher matcher(java.lang.CharSequence):35:35 -> a
     1:4:boolean equals(java.lang.Object):60:63 -> equals
     1:1:int hashCode():55:55 -> hashCode
     1:1:java.lang.String toString():50:50 -> toString
-com.android.tools.r8.com.google.common.base.JdkPattern$JdkMatcher -> com.android.tools.r8.internal.Ug:
+com.android.tools.r8.com.google.common.base.JdkPattern$JdkMatcher -> com.android.tools.r8.internal.Vg:
     java.util.regex.Matcher matcher -> a
     1:1:void com.android.tools.r8.com.google.common.base.CommonMatcher.<init>():25:25 -> <init>
     1:1:void <init>(java.util.regex.Matcher):69 -> <init>
     2:2:void <init>(java.util.regex.Matcher):70:70 -> <init>
-com.android.tools.r8.com.google.common.base.Optional -> com.android.tools.r8.internal.Lr:
+com.android.tools.r8.com.google.common.base.Optional -> com.android.tools.r8.internal.Nr:
     1:1:void <init>():150:150 -> <init>
     java.lang.Object or(java.lang.Object) -> a
     1:1:com.android.tools.r8.com.google.common.base.Optional absent():93:93 -> a
-com.android.tools.r8.com.google.common.base.Platform -> com.android.tools.r8.internal.ys:
+com.android.tools.r8.com.google.common.base.Platform -> com.android.tools.r8.internal.As:
     com.android.tools.r8.com.google.common.base.PatternCompiler patternCompiler -> b
     java.util.logging.Logger logger -> a
     1:2:void <clinit>():35:36 -> <clinit>
@@ -8455,11 +8570,11 @@
     11:11:com.android.tools.r8.com.google.common.base.CommonPattern compilePattern(java.lang.String):66:66 -> a
     12:110:com.android.tools.r8.com.google.common.base.CommonPattern com.android.tools.r8.com.google.common.base.Platform$JdkPatternCompiler.compile(java.lang.String):0:98 -> a
     12:110:com.android.tools.r8.com.google.common.base.CommonPattern compilePattern(java.lang.String):66 -> a
-com.android.tools.r8.com.google.common.base.Platform$1 -> com.android.tools.r8.internal.ws:
-com.android.tools.r8.com.google.common.base.Platform$JdkPatternCompiler -> com.android.tools.r8.internal.xs:
+com.android.tools.r8.com.google.common.base.Platform$1 -> com.android.tools.r8.internal.ys:
+com.android.tools.r8.com.google.common.base.Platform$JdkPatternCompiler -> com.android.tools.r8.internal.zs:
     1:1:void <init>():95:95 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.base.Platform$1):95:95 -> <init>
-com.android.tools.r8.com.google.common.base.Preconditions -> com.android.tools.r8.internal.Fs:
+com.android.tools.r8.com.google.common.base.Preconditions -> com.android.tools.r8.internal.Hs:
     1:1:com.android.tools.r8.com.google.common.base.Predicate com.android.tools.r8.com.google.common.base.Predicates.alwaysFalse():62:62 -> a
     2:2:com.android.tools.r8.com.google.common.base.Predicate com.android.tools.r8.com.google.common.base.Predicates.not(com.android.tools.r8.com.google.common.base.Predicate):88:88 -> a
     3:7:com.android.tools.r8.com.google.common.base.Supplier com.android.tools.r8.com.google.common.base.Suppliers.memoize(com.android.tools.r8.com.google.common.base.Supplier):97:101 -> a
@@ -8508,17 +8623,17 @@
     4:4:void checkState(boolean,java.lang.String,int):509:509 -> b
     5:5:int com.android.tools.r8.com.google.common.base.Preconditions.checkPositionIndex(int,int,java.lang.String):1241:1241 -> b
     5:5:int checkPositionIndex(int,int):1223 -> b
-com.android.tools.r8.com.google.common.base.Predicate -> com.android.tools.r8.internal.Gs:
+com.android.tools.r8.com.google.common.base.Predicate -> com.android.tools.r8.internal.Is:
     1:1:boolean test(java.lang.Object):80:80 -> test
-com.android.tools.r8.com.google.common.base.Predicates$1 -> com.android.tools.r8.internal.Is:
-com.android.tools.r8.com.google.common.base.Predicates$NotPredicate -> com.android.tools.r8.internal.Js:
+com.android.tools.r8.com.google.common.base.Predicates$1 -> com.android.tools.r8.internal.Ks:
+com.android.tools.r8.com.google.common.base.Predicates$NotPredicate -> com.android.tools.r8.internal.Ls:
     com.android.tools.r8.com.google.common.base.Predicate predicate -> a
     1:2:void <init>(com.android.tools.r8.com.google.common.base.Predicate):341:342 -> <init>
     1:1:boolean apply(java.lang.Object):347:347 -> apply
     1:3:boolean equals(java.lang.Object):357:359 -> equals
     1:1:int hashCode():352:352 -> hashCode
     1:1:java.lang.String toString():366:366 -> toString
-com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate -> com.android.tools.r8.internal.Os:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate -> com.android.tools.r8.internal.Qs:
     com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate NOT_NULL -> d
     com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate ALWAYS_FALSE -> b
     com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate IS_NULL -> c
@@ -8526,15 +8641,15 @@
     1:37:void <clinit>():283:319 -> <clinit>
     1:1:void <init>(java.lang.String,int):281:281 -> <init>
     2:2:void <init>(java.lang.String,int,com.android.tools.r8.com.google.common.base.Predicates$1):281:281 -> <init>
-com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$1 -> com.android.tools.r8.internal.Ks:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$1 -> com.android.tools.r8.internal.Ms:
     1:1:void <init>(java.lang.String,int):283:283 -> <init>
-com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$2 -> com.android.tools.r8.internal.Ls:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$2 -> com.android.tools.r8.internal.Ns:
     1:1:void <init>(java.lang.String,int):295:295 -> <init>
-com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$3 -> com.android.tools.r8.internal.Ms:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$3 -> com.android.tools.r8.internal.Os:
     1:1:void <init>(java.lang.String,int):307:307 -> <init>
-com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$4 -> com.android.tools.r8.internal.Ns:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$4 -> com.android.tools.r8.internal.Ps:
     1:1:void <init>(java.lang.String,int):319:319 -> <init>
-com.android.tools.r8.com.google.common.base.Predicates$OrPredicate -> com.android.tools.r8.internal.Ps:
+com.android.tools.r8.com.google.common.base.Predicates$OrPredicate -> com.android.tools.r8.internal.Rs:
     java.util.List components -> a
     1:1:void <init>(java.util.List,com.android.tools.r8.com.google.common.base.Predicates$1):415:415 -> <init>
     2:3:void <init>(java.util.List):418:419 -> <init>
@@ -8545,7 +8660,7 @@
     2:11:java.lang.String com.android.tools.r8.com.google.common.base.Predicates.toStringHelper(java.lang.String,java.lang.Iterable):457:466 -> toString
     2:11:java.lang.String com.android.tools.r8.com.google.common.base.Predicates.access$800(java.lang.String,java.lang.Iterable):43 -> toString
     2:11:java.lang.String toString():450 -> toString
-com.android.tools.r8.com.google.common.base.Splitter -> com.android.tools.r8.internal.wy:
+com.android.tools.r8.com.google.common.base.Splitter -> com.android.tools.r8.internal.yy:
     1:1:void <init>(com.android.tools.r8.com.google.common.base.Splitter$Strategy,boolean,com.android.tools.r8.com.google.common.base.CharMatcher,int):103:103 -> <init>
     1:1:com.android.tools.r8.com.google.common.base.Splitter onPattern(java.lang.String):252:252 -> a
     2:2:com.android.tools.r8.com.google.common.base.Splitter com.android.tools.r8.com.google.common.base.Splitter.on(com.android.tools.r8.com.google.common.base.CommonPattern):214:214 -> a
@@ -8562,24 +8677,24 @@
     11:11:void com.android.tools.r8.com.google.common.base.Splitter.<init>(com.android.tools.r8.com.google.common.base.Splitter$Strategy):100:100 -> 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):218 -> a
     11:11:com.android.tools.r8.com.google.common.base.Splitter onPattern(java.lang.String):252 -> a
-com.android.tools.r8.com.google.common.base.Splitter$3 -> com.android.tools.r8.internal.vy:
+com.android.tools.r8.com.google.common.base.Splitter$3 -> com.android.tools.r8.internal.xy:
     1:1:void <init>(com.android.tools.r8.com.google.common.base.CommonPattern):219:219 -> <init>
-com.android.tools.r8.com.google.common.base.Supplier -> com.android.tools.r8.internal.Cz:
-com.android.tools.r8.com.google.common.base.Suppliers$MemoizingSupplier -> com.android.tools.r8.internal.Dz:
+com.android.tools.r8.com.google.common.base.Supplier -> com.android.tools.r8.internal.Ez:
+com.android.tools.r8.com.google.common.base.Suppliers$MemoizingSupplier -> com.android.tools.r8.internal.Fz:
     com.android.tools.r8.com.google.common.base.Supplier delegate -> a
     java.lang.Object value -> c
     boolean initialized -> b
     1:2:void <init>(com.android.tools.r8.com.google.common.base.Supplier):114:115 -> <init>
     1:11:java.lang.Object get():121:131 -> get
     1:1:java.lang.String toString():136:136 -> toString
-com.android.tools.r8.com.google.common.base.Suppliers$NonSerializableMemoizingSupplier -> com.android.tools.r8.internal.Ez:
+com.android.tools.r8.com.google.common.base.Suppliers$NonSerializableMemoizingSupplier -> com.android.tools.r8.internal.Gz:
     com.android.tools.r8.com.google.common.base.Supplier delegate -> a
     java.lang.Object value -> c
     boolean initialized -> b
     1:2:void <init>(com.android.tools.r8.com.google.common.base.Supplier):150:151 -> <init>
     1:13:java.lang.Object get():157:169 -> get
     1:1:java.lang.String toString():174:174 -> toString
-com.android.tools.r8.com.google.common.base.Throwables -> com.android.tools.r8.internal.lA:
+com.android.tools.r8.com.google.common.base.Throwables -> com.android.tools.r8.internal.nA:
     java.lang.Object jla -> a
     int $r8$clinit -> b
     1:3:java.lang.Object com.android.tools.r8.com.google.common.base.Throwables.getJLA():482:484 -> <clinit>
@@ -9273,7 +9388,7 @@
     2:2:int com.android.tools.r8.com.google.common.base.Objects.hashCode(java.lang.Object[]):76:76 -> hashCode
     2:2:int hashCode():60 -> hashCode
     1:1:java.lang.String toString():65:65 -> toString
-com.android.tools.r8.com.google.common.collect.CollectCollectors -> com.android.tools.r8.internal.E6:
+com.android.tools.r8.com.google.common.collect.CollectCollectors -> com.android.tools.r8.internal.F6:
     java.util.stream.Collector TO_IMMUTABLE_SET -> a
     1:25:void <clinit>():44:68 -> <clinit>
     1:1:void lambda$toImmutableMap$1(java.util.function.Function,java.util.function.Function,com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,java.lang.Object):62:62 -> a
@@ -9283,7 +9398,7 @@
     4:4:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
     4:4:java.util.stream.Collector toImmutableMap(java.util.function.Function,java.util.function.Function):59 -> a
     5:5:java.util.stream.Collector toImmutableMap(java.util.function.Function,java.util.function.Function):60:60 -> a
-com.android.tools.r8.com.google.common.collect.CollectSpliterators$1 -> com.android.tools.r8.internal.F6:
+com.android.tools.r8.com.google.common.collect.CollectSpliterators$1 -> com.android.tools.r8.internal.G6:
     java.util.Spliterator val$fromSpliterator -> a
     java.util.function.Function val$function -> b
     1:1:void <init>(java.util.Spliterator,java.util.function.Function):105:105 -> <init>
@@ -9299,7 +9414,7 @@
     3:3:java.util.Spliterator trySplit():121 -> trySplit
     4:4:java.util.Spliterator com.android.tools.r8.com.google.common.collect.CollectSpliterators.map(java.util.Spliterator,java.util.function.Function):105:105 -> trySplit
     4:4:java.util.Spliterator trySplit():121 -> trySplit
-com.android.tools.r8.com.google.common.collect.CollectSpliterators$1FlatMapSpliterator -> com.android.tools.r8.internal.G6:
+com.android.tools.r8.com.google.common.collect.CollectSpliterators$1FlatMapSpliterator -> com.android.tools.r8.internal.H6:
     long estimatedSize -> d
     java.util.function.Function val$function -> e
     java.util.Spliterator from -> b
@@ -9313,7 +9428,7 @@
     1:6:void forEachRemaining(java.util.function.Consumer):242:247 -> forEachRemaining
     1:9:boolean tryAdvance(java.util.function.Consumer):226:234 -> tryAdvance
     1:16:java.util.Spliterator trySplit():252:267 -> trySplit
-com.android.tools.r8.com.google.common.collect.CollectSpliterators$1Splitr -> com.android.tools.r8.internal.H6:
+com.android.tools.r8.com.google.common.collect.CollectSpliterators$1Splitr -> com.android.tools.r8.internal.I6:
     java.util.function.Predicate val$predicate -> c
     java.lang.Object holder -> a
     java.util.Spliterator val$fromSpliterator -> b
@@ -9329,7 +9444,7 @@
     3:3:java.util.Spliterator trySplit():167 -> trySplit
     4:4:java.util.Spliterator com.android.tools.r8.com.google.common.collect.CollectSpliterators.filter(java.util.Spliterator,java.util.function.Predicate):189:189 -> trySplit
     4:4:java.util.Spliterator trySplit():167 -> trySplit
-com.android.tools.r8.com.google.common.collect.CollectSpliterators$1WithCharacteristics -> com.android.tools.r8.internal.I6:
+com.android.tools.r8.com.google.common.collect.CollectSpliterators$1WithCharacteristics -> com.android.tools.r8.internal.J6:
     java.util.Comparator val$comparator -> c
     java.util.Spliterator delegate -> a
     int val$extraCharacteristics -> b
@@ -9340,7 +9455,7 @@
     1:4:java.util.Comparator getComparator():87:90 -> getComparator
     1:1:boolean tryAdvance(java.util.function.Consumer):60:60 -> tryAdvance
     1:2:java.util.Spliterator trySplit():71:72 -> trySplit
-com.android.tools.r8.com.google.common.collect.Collections2 -> com.android.tools.r8.internal.L6:
+com.android.tools.r8.com.google.common.collect.Collections2 -> com.android.tools.r8.internal.M6:
     java.util.Spliterator com.android.tools.r8.com.google.common.collect.Streams.lambda$concat$0(java.util.Spliterator) -> a
     1:1:void com.android.tools.r8.com.google.common.collect.CollectPreconditions.checkEntryNotNull(java.lang.Object,java.lang.Object):34:34 -> a
     2:2:void com.android.tools.r8.com.google.common.collect.CollectPreconditions.checkEntryNotNull(java.lang.Object,java.lang.Object):32:32 -> a
@@ -9538,14 +9653,14 @@
     4:4:java.util.Set com.android.tools.r8.com.google.common.collect.Sets.newIdentityHashSet():466 -> f
     5:5:java.util.Set com.android.tools.r8.com.google.common.collect.Sets.newIdentityHashSet():466:466 -> f
     1:1:java.util.LinkedHashSet com.android.tools.r8.com.google.common.collect.Sets.newLinkedHashSet():347:347 -> g
-com.android.tools.r8.com.google.common.collect.ComparatorOrdering -> com.android.tools.r8.internal.P6:
+com.android.tools.r8.com.google.common.collect.ComparatorOrdering -> com.android.tools.r8.internal.Q6:
     java.util.Comparator comparator -> a
     1:2:void <init>(java.util.Comparator):31:32 -> <init>
     1:1:int compare(java.lang.Object,java.lang.Object):37:37 -> compare
     1:3:boolean equals(java.lang.Object):45:47 -> equals
     1:1:int hashCode():54:54 -> hashCode
     1:1:java.lang.String toString():59:59 -> toString
-com.android.tools.r8.com.google.common.collect.Count -> com.android.tools.r8.internal.p7:
+com.android.tools.r8.com.google.common.collect.Count -> com.android.tools.r8.internal.q7:
     int value -> a
     1:2:void <init>(int):30:31 -> <init>
     1:1:int get():35:35 -> a
@@ -9556,11 +9671,11 @@
     1:1:boolean equals(java.lang.Object):63:63 -> equals
     1:1:int hashCode():58:58 -> hashCode
     1:1:java.lang.String toString():68:68 -> toString
-com.android.tools.r8.com.google.common.collect.EmptyImmutableListMultimap -> com.android.tools.r8.internal.e9:
+com.android.tools.r8.com.google.common.collect.EmptyImmutableListMultimap -> com.android.tools.r8.internal.f9:
     com.android.tools.r8.com.google.common.collect.EmptyImmutableListMultimap INSTANCE -> g
     1:1:void <clinit>():28:28 -> <clinit>
     1:1:void <init>():31:31 -> <init>
-com.android.tools.r8.com.google.common.collect.FluentIterable -> com.android.tools.r8.internal.db:
+com.android.tools.r8.com.google.common.collect.FluentIterable -> com.android.tools.r8.internal.eb:
     com.android.tools.r8.com.google.common.base.Optional iterableDelegate -> a
     1:2:void <init>():117:118 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.FluentIterable concat(java.lang.Iterable,java.lang.Iterable):190:190 -> a
@@ -9578,18 +9693,18 @@
     3:12:java.lang.String com.android.tools.r8.com.google.common.collect.Iterators.toString(java.util.Iterator):293:302 -> toString
     3:12:java.lang.String com.android.tools.r8.com.google.common.collect.Iterables.toString(java.lang.Iterable):253 -> toString
     3:12:java.lang.String toString():336 -> toString
-com.android.tools.r8.com.google.common.collect.FluentIterable$2 -> com.android.tools.r8.internal.bb:
+com.android.tools.r8.com.google.common.collect.FluentIterable$2 -> com.android.tools.r8.internal.cb:
     java.lang.Iterable[] val$inputs -> b
     1:1:void <init>(java.lang.Iterable[]):261:261 -> <init>
     1:1:java.util.Iterator iterator():264:264 -> iterator
     2:2:java.util.Iterator com.android.tools.r8.com.google.common.collect.Iterators.concat(java.util.Iterator):578:578 -> iterator
     2:2:java.util.Iterator iterator():264 -> iterator
-com.android.tools.r8.com.google.common.collect.FluentIterable$2$1 -> com.android.tools.r8.internal.ab:
+com.android.tools.r8.com.google.common.collect.FluentIterable$2$1 -> com.android.tools.r8.internal.bb:
     com.android.tools.r8.com.google.common.collect.FluentIterable$2 this$0 -> c
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.FluentIterable$2,int):266:266 -> <init>
     1:1:java.util.Iterator com.android.tools.r8.com.google.common.collect.FluentIterable$2$1.get(int):269:269 -> a
     1:1:java.lang.Object get(int):266 -> a
-com.android.tools.r8.com.google.common.collect.FluentIterable$3 -> com.android.tools.r8.internal.cb:
+com.android.tools.r8.com.google.common.collect.FluentIterable$3 -> com.android.tools.r8.internal.db:
     java.lang.Iterable val$inputs -> b
     1:1:void <init>(java.lang.Iterable):294:294 -> <init>
     1:1:java.util.Iterator iterator():297:297 -> iterator
@@ -9599,7 +9714,7 @@
     3:3:java.util.Iterator iterator():297 -> iterator
     4:4:java.util.Iterator com.android.tools.r8.com.google.common.collect.Iterators.concat(java.util.Iterator):578:578 -> iterator
     4:4:java.util.Iterator iterator():297 -> iterator
-com.android.tools.r8.com.google.common.collect.ForwardingCollection -> com.android.tools.r8.internal.ib:
+com.android.tools.r8.com.google.common.collect.ForwardingCollection -> com.android.tools.r8.internal.jb:
     1:1:void com.android.tools.r8.com.google.common.collect.ForwardingObject.<init>():55:55 -> <init>
     1:1:void <init>():55 -> <init>
     java.lang.Object com.android.tools.r8.com.google.common.collect.ForwardingObject.delegate() -> a
@@ -9619,7 +9734,7 @@
     2:2:java.lang.Object[] toArray(java.lang.Object[]):128:128 -> toArray
     1:1:java.lang.String com.android.tools.r8.com.google.common.collect.ForwardingObject.toString():72:72 -> toString
     1:1:java.lang.String com.android.tools.r8.com.google.common.collect.ForwardingObject.toString():0 -> toString
-com.android.tools.r8.com.google.common.collect.ForwardingSortedSet -> com.android.tools.r8.internal.jb:
+com.android.tools.r8.com.google.common.collect.ForwardingSortedSet -> com.android.tools.r8.internal.kb:
     1:1:void com.android.tools.r8.com.google.common.collect.ForwardingSet.<init>():55:55 -> <init>
     1:1:void <init>():62 -> <init>
     java.util.Set com.android.tools.r8.com.google.common.collect.ForwardingSet.delegate() -> c
@@ -9634,7 +9749,7 @@
     1:1:java.lang.Object last():84:84 -> last
     1:1:java.util.SortedSet subSet(java.lang.Object,java.lang.Object):89:89 -> subSet
     1:1:java.util.SortedSet tailSet(java.lang.Object):94:94 -> tailSet
-com.android.tools.r8.com.google.common.collect.HashBiMap -> com.android.tools.r8.internal.Sb:
+com.android.tools.r8.com.google.common.collect.HashBiMap -> com.android.tools.r8.internal.Tb:
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry firstInKeyInsertionOrder -> c
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry lastInKeyInsertionOrder -> d
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry[] hashTableVToK -> b
@@ -9714,19 +9829,19 @@
     1:1:int size():390:390 -> size
     1:1:java.util.Set com.android.tools.r8.com.google.common.collect.HashBiMap.values():469:469 -> values
     1:1:java.util.Collection values():57 -> values
-com.android.tools.r8.com.google.common.collect.HashBiMap$1 -> com.android.tools.r8.internal.Ob:
+com.android.tools.r8.com.google.common.collect.HashBiMap$1 -> com.android.tools.r8.internal.Pb:
     com.android.tools.r8.com.google.common.collect.HashBiMap this$0 -> e
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap):474:474 -> <init>
     1:1:java.util.Map$Entry com.android.tools.r8.com.google.common.collect.HashBiMap$1.output(com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry):477:477 -> a
     1:1:java.lang.Object output(com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry):474 -> a
-com.android.tools.r8.com.google.common.collect.HashBiMap$1$MapEntry -> com.android.tools.r8.internal.Ob$a:
+com.android.tools.r8.com.google.common.collect.HashBiMap$1$MapEntry -> com.android.tools.r8.internal.Pb$a:
     com.android.tools.r8.com.google.common.collect.HashBiMap$1 this$1 -> b
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry delegate -> a
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap$1,com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry):483:484 -> <init>
     1:1:java.lang.Object getKey():489:489 -> getKey
     1:1:java.lang.Object getValue():494:494 -> getValue
     1:17:java.lang.Object setValue(java.lang.Object):499:515 -> setValue
-com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry -> com.android.tools.r8.internal.Pb:
+com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry -> com.android.tools.r8.internal.Qb:
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry nextInKToVBucket -> e
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry nextInVToKBucket -> f
     int valueHash -> d
@@ -9734,7 +9849,7 @@
     int keyHash -> c
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry prevInKeyInsertionOrder -> h
     1:3:void <init>(java.lang.Object,int,java.lang.Object,int):99:101 -> <init>
-com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse -> com.android.tools.r8.internal.Sb$a:
+com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse -> com.android.tools.r8.internal.Tb$a:
     com.android.tools.r8.com.google.common.collect.HashBiMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap):550:550 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap,com.android.tools.r8.com.google.common.collect.HashBiMap$1):550:550 -> <init>
@@ -9775,27 +9890,27 @@
     1:1:java.util.Collection values():550 -> values
     2:2:java.util.Set com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse.values():640:640 -> values
     2:2:java.util.Collection values():550 -> values
-com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$1 -> com.android.tools.r8.internal.Qb:
+com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$1 -> com.android.tools.r8.internal.Rb:
     com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse this$1 -> e
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse):645:645 -> <init>
     1:1:java.util.Map$Entry com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$1.output(com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry):648:648 -> a
     1:1:java.lang.Object output(com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry):645 -> a
-com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$1$InverseEntry -> com.android.tools.r8.internal.Qb$a:
+com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$1$InverseEntry -> com.android.tools.r8.internal.Rb$a:
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry delegate -> a
     com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$1 this$2 -> b
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$1,com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry):654:655 -> <init>
     1:1:java.lang.Object getKey():660:660 -> getKey
     1:1:java.lang.Object getValue():665:665 -> getValue
     1:12:java.lang.Object setValue(java.lang.Object):670:681 -> setValue
-com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$InverseKeySet -> com.android.tools.r8.internal.Sb$a$a:
+com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$InverseKeySet -> com.android.tools.r8.internal.Tb$a$a:
     com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse this$1 -> b
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse):612:613 -> <init>
     1:1:java.util.Iterator iterator():629:629 -> iterator
     1:5:boolean remove(java.lang.Object):618:622 -> remove
-com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$InverseKeySet$1 -> com.android.tools.r8.internal.Rb:
+com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$InverseKeySet$1 -> com.android.tools.r8.internal.Sb:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$InverseKeySet):629:629 -> <init>
     1:1:java.lang.Object output(com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry):632:632 -> a
-com.android.tools.r8.com.google.common.collect.HashBiMap$Itr -> com.android.tools.r8.internal.Sb$b:
+com.android.tools.r8.com.google.common.collect.HashBiMap$Itr -> com.android.tools.r8.internal.Tb$b:
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry next -> a
     com.android.tools.r8.com.google.common.collect.HashBiMap this$0 -> d
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry toRemove -> b
@@ -9811,15 +9926,15 @@
     5:5:void remove():423 -> remove
     6:8:void remove():424:426 -> remove
     9:9:void remove():421:421 -> remove
-com.android.tools.r8.com.google.common.collect.HashBiMap$KeySet -> com.android.tools.r8.internal.Sb$c:
+com.android.tools.r8.com.google.common.collect.HashBiMap$KeySet -> com.android.tools.r8.internal.Tb$c:
     com.android.tools.r8.com.google.common.collect.HashBiMap this$0 -> b
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap):439:440 -> <init>
     1:1:java.util.Iterator iterator():445:445 -> iterator
     1:7:boolean remove(java.lang.Object):455:461 -> remove
-com.android.tools.r8.com.google.common.collect.HashBiMap$KeySet$1 -> com.android.tools.r8.internal.Tb:
+com.android.tools.r8.com.google.common.collect.HashBiMap$KeySet$1 -> com.android.tools.r8.internal.Ub:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap$KeySet):445:445 -> <init>
     1:1:java.lang.Object output(com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry):448:448 -> a
-com.android.tools.r8.com.google.common.collect.HashMultiset -> com.android.tools.r8.internal.Zb:
+com.android.tools.r8.com.google.common.collect.HashMultiset -> com.android.tools.r8.internal.ac:
     1:1:void <init>():70:70 -> <init>
     1:1:boolean com.android.tools.r8.com.google.common.collect.AbstractMultiset.add(java.lang.Object):84:84 -> add
     1:1:boolean add(java.lang.Object):33 -> add
@@ -9838,14 +9953,14 @@
     1:1:boolean remove(java.lang.Object):33 -> remove
     1:1:java.lang.String com.android.tools.r8.com.google.common.collect.AbstractMultiset.toString():248:248 -> toString
     1:1:java.lang.String toString():33 -> toString
-com.android.tools.r8.com.google.common.collect.ImmutableAsList -> com.android.tools.r8.internal.yc:
+com.android.tools.r8.com.google.common.collect.ImmutableAsList -> com.android.tools.r8.internal.zc:
     1:1:void <init>():34:34 -> <init>
     1:1:boolean isPartialView():56:56 -> b
     1:1:boolean contains(java.lang.Object):41:41 -> contains
     com.android.tools.r8.com.google.common.collect.ImmutableCollection delegateCollection() -> i
     1:1:boolean isEmpty():51:51 -> isEmpty
     1:1:int size():46:46 -> size
-com.android.tools.r8.com.google.common.collect.ImmutableBiMap -> com.android.tools.r8.internal.zc:
+com.android.tools.r8.com.google.common.collect.ImmutableBiMap -> com.android.tools.r8.internal.Ac:
     1:1:void <init>():341:341 -> <init>
     1:1:java.lang.Object forcePut(java.lang.Object,java.lang.Object):376:376 -> a
     1:1:com.android.tools.r8.com.google.common.collect.BiMap com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap.inverse():41:41 -> f
@@ -9857,7 +9972,7 @@
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableBiMap of():66:66 -> u
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableBiMap.values():358:358 -> values
     1:1:java.util.Collection values():36 -> values
-com.android.tools.r8.com.google.common.collect.ImmutableBiMap$Builder -> com.android.tools.r8.internal.zc$a:
+com.android.tools.r8.com.google.common.collect.ImmutableBiMap$Builder -> com.android.tools.r8.internal.Ac$a:
     1:1:void <init>():159:159 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap build():153:153 -> a
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableBiMap$Builder com.android.tools.r8.com.google.common.collect.ImmutableBiMap$Builder.put(java.lang.Object,java.lang.Object):172:172 -> a
@@ -9889,9 +10004,9 @@
     482:482:com.android.tools.r8.com.google.common.collect.ImmutableBiMap build():257 -> b
     483:483:com.android.tools.r8.com.google.common.collect.ImmutableBiMap com.android.tools.r8.com.google.common.collect.ImmutableBiMap.of():66:66 -> b
     483:483:com.android.tools.r8.com.google.common.collect.ImmutableBiMap build():255 -> b
-com.android.tools.r8.com.google.common.collect.ImmutableBiMapFauxverideShim -> com.android.tools.r8.internal.Ac:
+com.android.tools.r8.com.google.common.collect.ImmutableBiMapFauxverideShim -> com.android.tools.r8.internal.Bc:
     1:1:void <init>():32:32 -> <init>
-com.android.tools.r8.com.google.common.collect.ImmutableCollection -> com.android.tools.r8.internal.Dc:
+com.android.tools.r8.com.google.common.collect.ImmutableCollection -> com.android.tools.r8.internal.Ec:
     java.lang.Object[] EMPTY_ARRAY -> a
     1:1:void <clinit>():181:181 -> <clinit>
     1:1:void <init>():168:168 -> <init>
@@ -9923,7 +10038,7 @@
     10:15:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.newArray(java.lang.Object[],int):60 -> toArray
     10:15:java.lang.Object[] toArray(java.lang.Object[]):200 -> toArray
     16:19:java.lang.Object[] toArray(java.lang.Object[]):201:204 -> toArray
-com.android.tools.r8.com.google.common.collect.ImmutableCollection$ArrayBasedBuilder -> com.android.tools.r8.internal.Bc:
+com.android.tools.r8.com.google.common.collect.ImmutableCollection$ArrayBasedBuilder -> com.android.tools.r8.internal.Cc:
     java.lang.Object[] contents -> a
     int size -> b
     1:4:void <init>(int):459:462 -> <init>
@@ -9939,19 +10054,19 @@
     1:1:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> b
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection$ArrayBasedBuilder add(java.lang.Object):480 -> b
     2:3:com.android.tools.r8.com.google.common.collect.ImmutableCollection$ArrayBasedBuilder add(java.lang.Object):481:482 -> b
-com.android.tools.r8.com.google.common.collect.ImmutableCollection$Builder -> com.android.tools.r8.internal.Cc:
+com.android.tools.r8.com.google.common.collect.ImmutableCollection$Builder -> com.android.tools.r8.internal.Dc:
     1:1:void <init>():370:370 -> <init>
     com.android.tools.r8.com.google.common.collect.ImmutableCollection$Builder add(java.lang.Object) -> a
     1:1:int expandedCapacity(int,int):361:361 -> a
     2:2:int expandedCapacity(int,int):356:356 -> a
-com.android.tools.r8.com.google.common.collect.ImmutableEntry -> com.android.tools.r8.internal.Fc:
+com.android.tools.r8.com.google.common.collect.ImmutableEntry -> com.android.tools.r8.internal.Gc:
     java.lang.Object value -> b
     java.lang.Object key -> a
     1:3:void <init>(java.lang.Object,java.lang.Object):31:33 -> <init>
     1:1:java.lang.Object getKey():39:39 -> getKey
     1:1:java.lang.Object getValue():45:45 -> getValue
     1:1:java.lang.Object setValue(java.lang.Object):50:50 -> setValue
-com.android.tools.r8.com.google.common.collect.ImmutableEnumMap -> com.android.tools.r8.internal.Gc:
+com.android.tools.r8.com.google.common.collect.ImmutableEnumMap -> com.android.tools.r8.internal.Hc:
     java.util.EnumMap delegate -> e
     1:1:void com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap.<init>():445:445 -> <init>
     1:1:void <init>(java.util.EnumMap):51 -> <init>
@@ -9986,7 +10101,7 @@
     2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator entryIterator():94 -> t
     1:1:java.util.Collection com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap.values():445:445 -> values
     1:1:java.util.Collection com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap.values():0 -> values
-com.android.tools.r8.com.google.common.collect.ImmutableEnumSet -> com.android.tools.r8.internal.Hc:
+com.android.tools.r8.com.google.common.collect.ImmutableEnumSet -> com.android.tools.r8.internal.Ic:
     java.util.EnumSet delegate -> d
     int hashCode -> e
     1:2:void <init>(java.util.EnumSet):58:59 -> <init>
@@ -10007,7 +10122,7 @@
     1:1:int size():84:84 -> size
     1:1:java.util.Spliterator spliterator():74:74 -> spliterator
     1:1:java.lang.String toString():132:132 -> toString
-com.android.tools.r8.com.google.common.collect.ImmutableList -> com.android.tools.r8.internal.Mc:
+com.android.tools.r8.com.google.common.collect.ImmutableList -> com.android.tools.r8.internal.Nc:
     int $r8$clinit -> b
     1:1:void <init>():377:377 -> <init>
     com.android.tools.r8.com.google.common.collect.ImmutableList asList() -> a
@@ -10128,11 +10243,11 @@
     2:2:java.util.Spliterator com.android.tools.r8.com.google.common.collect.CollectSpliterators.indexed(int,int,java.util.function.IntFunction):40:40 -> spliterator
     2:2:java.util.Spliterator spliterator():576 -> spliterator
     1:1:java.util.List subList(int,int):57:57 -> subList
-com.android.tools.r8.com.google.common.collect.ImmutableList$1 -> com.android.tools.r8.internal.Lc:
+com.android.tools.r8.com.google.common.collect.ImmutableList$1 -> com.android.tools.r8.internal.Mc:
     com.android.tools.r8.com.google.common.collect.ImmutableList this$0 -> c
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableList,int,int):393:393 -> <init>
     1:1:java.lang.Object get(int):396:396 -> a
-com.android.tools.r8.com.google.common.collect.ImmutableList$Builder -> com.android.tools.r8.internal.Mc$a:
+com.android.tools.r8.com.google.common.collect.ImmutableList$Builder -> com.android.tools.r8.internal.Nc$a:
     1:1:void <init>():739:739 -> <init>
     2:2:void <init>(int):744:744 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList$Builder com.android.tools.r8.com.google.common.collect.ImmutableList$Builder.add(java.lang.Object):757:757 -> a
@@ -10142,7 +10257,7 @@
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableList$Builder add(java.lang.Object[]):787:787 -> b
     3:3:com.android.tools.r8.com.google.common.collect.ImmutableList$Builder combine(com.android.tools.r8.com.google.common.collect.ImmutableCollection$ArrayBasedBuilder):809:809 -> b
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList$Builder add(java.lang.Object):757:757 -> c
-com.android.tools.r8.com.google.common.collect.ImmutableList$ReverseImmutableList -> com.android.tools.r8.internal.Nc:
+com.android.tools.r8.com.google.common.collect.ImmutableList$ReverseImmutableList -> com.android.tools.r8.internal.Oc:
     com.android.tools.r8.com.google.common.collect.ImmutableList forwardList -> c
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableList):604:605 -> <init>
     1:1:boolean isPartialView():657:657 -> b
@@ -10175,7 +10290,7 @@
     2:2:java.util.ListIterator listIterator(int):601 -> listIterator
     1:1:int size():652:652 -> size
     1:1:java.util.List subList(int,int):601:601 -> subList
-com.android.tools.r8.com.google.common.collect.ImmutableList$SubList -> com.android.tools.r8.internal.Mc$b:
+com.android.tools.r8.com.google.common.collect.ImmutableList$SubList -> com.android.tools.r8.internal.Nc$b:
     com.android.tools.r8.com.google.common.collect.ImmutableList this$0 -> e
     int length -> d
     int offset -> c
@@ -10192,14 +10307,14 @@
     2:2:java.util.ListIterator listIterator(int):457 -> listIterator
     1:1:int size():468:468 -> size
     1:1:java.util.List subList(int,int):457:457 -> subList
-com.android.tools.r8.com.google.common.collect.ImmutableListMultimap -> com.android.tools.r8.internal.Pc:
+com.android.tools.r8.com.google.common.collect.ImmutableListMultimap -> com.android.tools.r8.internal.Qc:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap,int):391:391 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableListMultimap.get(java.lang.Object):405:405 -> get
     1:1:java.util.Collection get(java.lang.Object):52 -> get
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of():81:81 -> get
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableListMultimap.get(java.lang.Object):406 -> get
     2:2:java.util.Collection get(java.lang.Object):52 -> get
-com.android.tools.r8.com.google.common.collect.ImmutableListMultimap$Builder -> com.android.tools.r8.internal.Oc:
+com.android.tools.r8.com.google.common.collect.ImmutableListMultimap$Builder -> com.android.tools.r8.internal.Pc:
     1:1:void <init>():237:237 -> <init>
     1:2:com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Builder com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Builder.put(java.lang.Object,java.lang.Object):168:169 -> a
     1:2:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap$Builder put(java.lang.Object,java.lang.Object):242 -> a
@@ -10235,7 +10350,7 @@
     14:27:com.android.tools.r8.com.google.common.collect.ImmutableMultimap com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Builder.build():296 -> a
     14:27:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap build():328 -> a
     28:28:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap build():328:328 -> a
-com.android.tools.r8.com.google.common.collect.ImmutableMap -> com.android.tools.r8.internal.Rc:
+com.android.tools.r8.com.google.common.collect.ImmutableMap -> com.android.tools.r8.internal.Sc:
     com.android.tools.r8.com.google.common.collect.ImmutableCollection values -> d
     java.util.Map$Entry[] EMPTY_ENTRY_ARRAY -> a
     com.android.tools.r8.com.google.common.collect.ImmutableSet entrySet -> b
@@ -10320,12 +10435,12 @@
     4:13:java.lang.String com.android.tools.r8.com.google.common.collect.Maps.toStringImpl(java.util.Map):3815:3824 -> toString
     4:13:java.lang.String toString():851 -> toString
     1:1:java.util.Collection values():60:60 -> values
-com.android.tools.r8.com.google.common.collect.ImmutableMap$1 -> com.android.tools.r8.internal.Qc:
+com.android.tools.r8.com.google.common.collect.ImmutableMap$1 -> com.android.tools.r8.internal.Rc:
     com.android.tools.r8.com.google.common.collect.UnmodifiableIterator val$entryIterator -> a
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.com.google.common.collect.UnmodifiableIterator):707:707 -> <init>
     1:1:boolean hasNext():710:710 -> hasNext
     1:1:java.lang.Object next():715:715 -> next
-com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder -> com.android.tools.r8.internal.Rc$a:
+com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder -> com.android.tools.r8.internal.Sc$a:
     java.util.Map$Entry[] entries -> b
     int size -> c
     java.util.Comparator valueComparator -> a
@@ -10352,28 +10467,28 @@
     496:496:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
     496:496:com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder combine(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder):329 -> a
     497:499:com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder combine(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder):330:332 -> a
-com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap$1EntrySetImpl -> com.android.tools.r8.internal.Sc:
+com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap$1EntrySetImpl -> com.android.tools.r8.internal.Tc:
     com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap this$0 -> d
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap):463:463 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():471:471 -> c
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap$1EntrySetImpl.iterator():471:471 -> iterator
     1:1:java.util.Iterator iterator():462 -> iterator
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap map():466:466 -> k
-com.android.tools.r8.com.google.common.collect.ImmutableMapEntry -> com.android.tools.r8.internal.Vc:
+com.android.tools.r8.com.google.common.collect.ImmutableMapEntry -> com.android.tools.r8.internal.Wc:
     1:2:void <init>(java.lang.Object,java.lang.Object):48:49 -> <init>
     com.android.tools.r8.com.google.common.collect.ImmutableMapEntry getNextInKeyBucket() -> b
     com.android.tools.r8.com.google.common.collect.ImmutableMapEntry getNextInValueBucket() -> c
     boolean isReusable() -> d
-com.android.tools.r8.com.google.common.collect.ImmutableMapEntry$NonTerminalImmutableBiMapEntry -> com.android.tools.r8.internal.Tc:
+com.android.tools.r8.com.google.common.collect.ImmutableMapEntry$NonTerminalImmutableBiMapEntry -> com.android.tools.r8.internal.Uc:
     com.android.tools.r8.com.google.common.collect.ImmutableMapEntry nextInValueBucket -> d
     1:2:void <init>(java.lang.Object,java.lang.Object,com.android.tools.r8.com.google.common.collect.ImmutableMapEntry,com.android.tools.r8.com.google.common.collect.ImmutableMapEntry):104:105 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMapEntry getNextInValueBucket():111:111 -> c
-com.android.tools.r8.com.google.common.collect.ImmutableMapEntry$NonTerminalImmutableMapEntry -> com.android.tools.r8.internal.Uc:
+com.android.tools.r8.com.google.common.collect.ImmutableMapEntry$NonTerminalImmutableMapEntry -> com.android.tools.r8.internal.Vc:
     com.android.tools.r8.com.google.common.collect.ImmutableMapEntry nextInKeyBucket -> c
     1:2:void <init>(java.lang.Object,java.lang.Object,com.android.tools.r8.com.google.common.collect.ImmutableMapEntry):79:80 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMapEntry getNextInKeyBucket():86:86 -> b
     boolean isReusable() -> d
-com.android.tools.r8.com.google.common.collect.ImmutableMapEntrySet -> com.android.tools.r8.internal.Xc:
+com.android.tools.r8.com.google.common.collect.ImmutableMapEntrySet -> com.android.tools.r8.internal.Yc:
     1:1:void <init>():77:77 -> <init>
     1:1:boolean isPartialView():98:98 -> b
     1:4:boolean contains(java.lang.Object):88:91 -> contains
@@ -10383,7 +10498,7 @@
     1:1:int hashCode():109:109 -> hashCode
     com.android.tools.r8.com.google.common.collect.ImmutableMap map() -> k
     1:1:int size():83:83 -> size
-com.android.tools.r8.com.google.common.collect.ImmutableMapEntrySet$RegularEntrySet -> com.android.tools.r8.internal.Wc:
+com.android.tools.r8.com.google.common.collect.ImmutableMapEntrySet$RegularEntrySet -> com.android.tools.r8.internal.Xc:
     com.android.tools.r8.com.google.common.collect.ImmutableMap map -> d
     java.util.Map$Entry[] entries -> e
     1:3:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap,java.util.Map$Entry[]):43:45 -> <init>
@@ -10398,7 +10513,7 @@
     1:1:java.util.Iterator iterator():39 -> iterator
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap map():50:50 -> k
     1:1:java.util.Spliterator spliterator():60:60 -> spliterator
-com.android.tools.r8.com.google.common.collect.ImmutableMapKeySet -> com.android.tools.r8.internal.Yc:
+com.android.tools.r8.com.google.common.collect.ImmutableMapKeySet -> com.android.tools.r8.internal.Zc:
     com.android.tools.r8.com.google.common.collect.ImmutableMap map -> d
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap):39:40 -> <init>
     1:1:void lambda$forEach$0(java.util.function.Consumer,java.lang.Object,java.lang.Object):71:71 -> a
@@ -10413,7 +10528,7 @@
     1:1:java.util.Iterator iterator():35 -> iterator
     1:1:int size():45:45 -> size
     1:1:java.util.Spliterator spliterator():55:55 -> spliterator
-com.android.tools.r8.com.google.common.collect.ImmutableMapValues -> com.android.tools.r8.internal.bd:
+com.android.tools.r8.com.google.common.collect.ImmutableMapValues -> com.android.tools.r8.internal.cd:
     com.android.tools.r8.com.google.common.collect.ImmutableMap map -> b
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap):40:41 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap access$000(com.android.tools.r8.com.google.common.collect.ImmutableMapValues):37:37 -> a
@@ -10439,19 +10554,19 @@
     1:1:java.util.Iterator iterator():36 -> iterator
     1:1:int size():46:46 -> size
     1:1:java.util.Spliterator spliterator():67:67 -> spliterator
-com.android.tools.r8.com.google.common.collect.ImmutableMapValues$1 -> com.android.tools.r8.internal.Zc:
+com.android.tools.r8.com.google.common.collect.ImmutableMapValues$1 -> com.android.tools.r8.internal.ad:
     com.android.tools.r8.com.google.common.collect.UnmodifiableIterator entryItr -> a
     com.android.tools.r8.com.google.common.collect.ImmutableMapValues this$0 -> b
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMapValues):51:52 -> <init>
     1:1:boolean hasNext():56:56 -> hasNext
     1:1:java.lang.Object next():61:61 -> next
-com.android.tools.r8.com.google.common.collect.ImmutableMapValues$2 -> com.android.tools.r8.internal.ad:
+com.android.tools.r8.com.google.common.collect.ImmutableMapValues$2 -> com.android.tools.r8.internal.bd:
     com.android.tools.r8.com.google.common.collect.ImmutableMapValues this$0 -> d
     com.android.tools.r8.com.google.common.collect.ImmutableList val$entryList -> c
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMapValues,com.android.tools.r8.com.google.common.collect.ImmutableList):83:83 -> <init>
     1:1:java.lang.Object get(int):86:86 -> get
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection delegateCollection():91:91 -> i
-com.android.tools.r8.com.google.common.collect.ImmutableMultimap -> com.android.tools.r8.internal.fd:
+com.android.tools.r8.com.google.common.collect.ImmutableMultimap -> com.android.tools.r8.internal.gd:
     com.android.tools.r8.com.google.common.collect.ImmutableMap map -> e
     int size -> f
     1:3:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap,int):354:356 -> <init>
@@ -10490,13 +10605,13 @@
     1:1:int size():493:493 -> size
     1:1:java.lang.String com.android.tools.r8.com.google.common.collect.AbstractMultimap.toString():274:274 -> toString
     1:1:java.lang.String toString():67 -> toString
-com.android.tools.r8.com.google.common.collect.ImmutableMultimap$1 -> com.android.tools.r8.internal.cd:
+com.android.tools.r8.com.google.common.collect.ImmutableMultimap$1 -> com.android.tools.r8.internal.dd:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMultimap):595:595 -> <init>
-com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Builder -> com.android.tools.r8.internal.dd:
+com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Builder -> com.android.tools.r8.internal.ed:
     com.android.tools.r8.com.google.common.collect.Multimap builderMultimap -> a
     1:1:void <init>():156:156 -> <init>
     2:3:void <init>(com.android.tools.r8.com.google.common.collect.Multimap):159:160 -> <init>
-com.android.tools.r8.com.google.common.collect.ImmutableMultimap$EntryCollection -> com.android.tools.r8.internal.ed:
+com.android.tools.r8.com.google.common.collect.ImmutableMultimap$EntryCollection -> com.android.tools.r8.internal.fd:
     com.android.tools.r8.com.google.common.collect.ImmutableMultimap multimap -> b
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMultimap):539:540 -> <init>
     1:1:boolean isPartialView():550:550 -> b
@@ -10509,7 +10624,7 @@
     1:1:int size():555:555 -> size
     2:2:int com.android.tools.r8.com.google.common.collect.ImmutableMultimap.size():493:493 -> size
     2:2:int size():555 -> size
-com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Itr -> com.android.tools.r8.internal.fd$a:
+com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Itr -> com.android.tools.r8.internal.gd$a:
     java.util.Iterator valueIterator -> c
     java.util.Iterator mapIterator -> a
     java.lang.Object key -> b
@@ -10522,7 +10637,7 @@
     7:7:java.util.Map$Entry com.android.tools.r8.com.google.common.collect.ImmutableMultimap$1.output(java.lang.Object,java.lang.Object):598 -> next
     7:7:java.lang.Object com.android.tools.r8.com.google.common.collect.ImmutableMultimap$1.output(java.lang.Object,java.lang.Object):595 -> next
     7:7:java.lang.Object next():589 -> next
-com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Keys -> com.android.tools.r8.internal.fd$b:
+com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Keys -> com.android.tools.r8.internal.gd$b:
     com.android.tools.r8.com.google.common.collect.ImmutableMultimap this$0 -> e
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMultimap):642:642 -> <init>
     boolean isPartialView() -> b
@@ -10544,7 +10659,7 @@
     1:1:int size():661:661 -> size
     2:2:int com.android.tools.r8.com.google.common.collect.ImmutableMultimap.size():493:493 -> size
     2:2:int size():661 -> size
-com.android.tools.r8.com.google.common.collect.ImmutableMultiset -> com.android.tools.r8.internal.hd:
+com.android.tools.r8.com.google.common.collect.ImmutableMultiset -> com.android.tools.r8.internal.id:
     int $r8$clinit -> b
     com.android.tools.r8.com.google.common.collect.ImmutableSet entrySet -> d
     com.android.tools.r8.com.google.common.collect.ImmutableList asList -> c
@@ -10572,14 +10687,14 @@
     com.android.tools.r8.com.google.common.collect.Multiset$Entry getEntry(int) -> g
     1:1:int hashCode():345:345 -> hashCode
     1:1:java.lang.String toString():350:350 -> toString
-com.android.tools.r8.com.google.common.collect.ImmutableMultiset$1 -> com.android.tools.r8.internal.gd:
+com.android.tools.r8.com.google.common.collect.ImmutableMultiset$1 -> com.android.tools.r8.internal.hd:
     java.util.Iterator val$entryIterator -> c
     java.lang.Object element -> b
     int remaining -> a
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMultiset,java.util.Iterator):240:240 -> <init>
     1:1:boolean hasNext():246:246 -> hasNext
     1:7:java.lang.Object next():251:257 -> next
-com.android.tools.r8.com.google.common.collect.ImmutableMultiset$EntrySet -> com.android.tools.r8.internal.hd$a:
+com.android.tools.r8.com.google.common.collect.ImmutableMultiset$EntrySet -> com.android.tools.r8.internal.id$a:
     com.android.tools.r8.com.google.common.collect.ImmutableMultiset this$0 -> d
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMultiset):373:373 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMultiset,com.android.tools.r8.com.google.common.collect.ImmutableMultiset$1):373:373 -> <init>
@@ -10589,9 +10704,9 @@
     1:1:java.lang.Object get(int):372 -> get
     1:1:int hashCode():404:404 -> hashCode
     1:1:int size():386:386 -> size
-com.android.tools.r8.com.google.common.collect.ImmutableMultisetGwtSerializationDependencies -> com.android.tools.r8.internal.id:
+com.android.tools.r8.com.google.common.collect.ImmutableMultisetGwtSerializationDependencies -> com.android.tools.r8.internal.jd:
     1:1:void <init>():40:40 -> <init>
-com.android.tools.r8.com.google.common.collect.ImmutableSet -> com.android.tools.r8.internal.jd:
+com.android.tools.r8.com.google.common.collect.ImmutableSet -> com.android.tools.r8.internal.kd:
     int $r8$clinit -> b
     com.android.tools.r8.com.google.common.collect.ImmutableList asList -> c
     1:1:void <init>():332:332 -> <init>
@@ -10625,7 +10740,7 @@
     1:1:int hashCode():354:354 -> hashCode
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet of():74:74 -> i
     1:1:java.util.stream.Collector toImmutableSet():65:65 -> j
-com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder -> com.android.tools.r8.internal.jd$a:
+com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder -> com.android.tools.r8.internal.kd$a:
     1:1:void <init>():471:471 -> <init>
     2:2:void <init>(int):475:475 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection$Builder add(java.lang.Object):464:464 -> a
@@ -10634,7 +10749,7 @@
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder addAll(java.lang.Iterable):522:522 -> b
     3:3:com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder combine(com.android.tools.r8.com.google.common.collect.ImmutableCollection$ArrayBasedBuilder):545:545 -> b
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder add(java.lang.Object):490:490 -> c
-com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed -> com.android.tools.r8.internal.ld:
+com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed -> com.android.tools.r8.internal.md:
     1:1:void <init>():376:376 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():381:381 -> c
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList createAsList():400:400 -> e
@@ -10644,13 +10759,13 @@
     1:1:java.util.Spliterator spliterator():386:386 -> spliterator
     2:2:java.util.Spliterator com.android.tools.r8.com.google.common.collect.CollectSpliterators.indexed(int,int,java.util.function.IntFunction):40:40 -> spliterator
     2:2:java.util.Spliterator spliterator():386 -> spliterator
-com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed$1 -> com.android.tools.r8.internal.kd:
+com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed$1 -> com.android.tools.r8.internal.ld:
     com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed this$0 -> c
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed):400:400 -> <init>
     1:1:java.lang.Object get(int):403:403 -> get
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed$1.delegateCollection():408:408 -> i
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection delegateCollection():400 -> i
-com.android.tools.r8.com.google.common.collect.ImmutableSortedAsList -> com.android.tools.r8.internal.md:
+com.android.tools.r8.com.google.common.collect.ImmutableSortedAsList -> com.android.tools.r8.internal.nd:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableSortedSet,com.android.tools.r8.com.google.common.collect.ImmutableList):34:34 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet com.android.tools.r8.com.google.common.collect.ImmutableSortedAsList.delegateCollection():39:39 -> comparator
     1:1:java.util.Comparator comparator():44 -> comparator
@@ -10670,7 +10785,7 @@
     1:1:java.util.Spliterator spliterator():90 -> spliterator
     2:3:java.util.Spliterator spliterator():92:93 -> spliterator
     4:4:java.util.Spliterator spliterator():89:89 -> spliterator
-com.android.tools.r8.com.google.common.collect.ImmutableSortedSet -> com.android.tools.r8.internal.nd:
+com.android.tools.r8.com.google.common.collect.ImmutableSortedSet -> com.android.tools.r8.internal.od:
     com.android.tools.r8.com.google.common.collect.ImmutableSortedSet descendingSet -> e
     java.util.Comparator comparator -> d
     1:2:void <init>(java.util.Comparator):564:565 -> <init>
@@ -10733,7 +10848,7 @@
     4:4:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet com.android.tools.r8.com.google.common.collect.ImmutableSortedSet.tailSet(java.lang.Object,boolean):661:661 -> tailSet
     4:4:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet com.android.tools.r8.com.google.common.collect.ImmutableSortedSet.tailSet(java.lang.Object):652 -> tailSet
     4:4:java.util.SortedSet tailSet(java.lang.Object):63 -> tailSet
-com.android.tools.r8.com.google.common.collect.ImmutableSortedSet$Builder -> com.android.tools.r8.internal.nd$a:
+com.android.tools.r8.com.google.common.collect.ImmutableSortedSet$Builder -> com.android.tools.r8.internal.od$a:
     java.util.Comparator comparator -> c
     1:2:void <init>(java.util.Comparator):462:463 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet build():455:455 -> a
@@ -10755,14 +10870,14 @@
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder add(java.lang.Object):455 -> c
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder.add(java.lang.Object):490:490 -> d
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet$Builder add(java.lang.Object):479 -> d
-com.android.tools.r8.com.google.common.collect.ImmutableSortedSetFauxverideShim -> com.android.tools.r8.internal.od:
+com.android.tools.r8.com.google.common.collect.ImmutableSortedSetFauxverideShim -> com.android.tools.r8.internal.pd:
     1:1:void <init>():39:39 -> <init>
-com.android.tools.r8.com.google.common.collect.Iterables$10 -> com.android.tools.r8.internal.Dg:
+com.android.tools.r8.com.google.common.collect.Iterables$10 -> com.android.tools.r8.internal.Eg:
     1:1:void <init>():1061:1061 -> <init>
     1:1:java.lang.Object apply(java.lang.Object):1061:1061 -> apply
     2:2:java.util.Iterator com.android.tools.r8.com.google.common.collect.Iterables$10.apply(java.lang.Iterable):1064:1064 -> apply
     2:2:java.lang.Object apply(java.lang.Object):1061 -> apply
-com.android.tools.r8.com.google.common.collect.Iterables$4 -> com.android.tools.r8.internal.Eg:
+com.android.tools.r8.com.google.common.collect.Iterables$4 -> com.android.tools.r8.internal.Fg:
     com.android.tools.r8.com.google.common.base.Predicate val$retainIfTrue -> c
     java.lang.Iterable val$unfiltered -> b
     1:1:void <init>(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):575:575 -> <init>
@@ -10788,7 +10903,7 @@
     3:3:java.util.Spliterator spliterator():594 -> spliterator
     4:4:java.util.Spliterator com.android.tools.r8.com.google.common.collect.CollectSpliterators.filter(java.util.Spliterator,java.util.function.Predicate):189:189 -> spliterator
     4:4:java.util.Spliterator spliterator():594 -> spliterator
-com.android.tools.r8.com.google.common.collect.Iterables$5 -> com.android.tools.r8.internal.Fg:
+com.android.tools.r8.com.google.common.collect.Iterables$5 -> com.android.tools.r8.internal.Gg:
     java.lang.Iterable val$fromIterable -> b
     com.android.tools.r8.com.google.common.base.Function val$function -> c
     1:1:void <init>(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Function):722:722 -> <init>
@@ -10798,35 +10913,35 @@
     2:2:void forEach(java.util.function.Consumer):731:731 -> forEach
     1:1:java.util.Iterator iterator():725:725 -> iterator
     1:1:java.util.Spliterator spliterator():736:736 -> spliterator
-com.android.tools.r8.com.google.common.collect.Iterators$1 -> com.android.tools.r8.internal.Ig:
+com.android.tools.r8.com.google.common.collect.Iterators$1 -> com.android.tools.r8.internal.Jg:
     java.util.Iterator val$iterator -> a
     1:1:void <init>(java.util.Iterator):137:137 -> <init>
     1:1:boolean hasNext():140:140 -> hasNext
     1:1:java.lang.Object next():145:145 -> next
-com.android.tools.r8.com.google.common.collect.Iterators$2 -> com.android.tools.r8.internal.Jg:
+com.android.tools.r8.com.google.common.collect.Iterators$2 -> com.android.tools.r8.internal.Kg:
     java.util.Iterator iterator -> a
     java.lang.Iterable val$iterable -> b
     1:2:void <init>(java.lang.Iterable):411:412 -> <init>
     1:1:boolean hasNext():425:425 -> hasNext
     1:7:java.lang.Object next():430:436 -> next
     1:1:void remove():441:441 -> remove
-com.android.tools.r8.com.google.common.collect.Iterators$3 -> com.android.tools.r8.internal.Kg:
+com.android.tools.r8.com.google.common.collect.Iterators$3 -> com.android.tools.r8.internal.Lg:
     java.lang.Object[] val$elements -> b
     int index -> a
     1:2:void <init>(java.lang.Object[]):471:472 -> <init>
     1:1:boolean hasNext():476:476 -> hasNext
     1:6:java.lang.Object next():481:486 -> next
     7:7:java.lang.Object next():482:482 -> next
-com.android.tools.r8.com.google.common.collect.Iterators$5 -> com.android.tools.r8.internal.Lg:
+com.android.tools.r8.com.google.common.collect.Iterators$5 -> com.android.tools.r8.internal.Mg:
     java.util.Iterator val$unfiltered -> c
     com.android.tools.r8.com.google.common.base.Predicate val$retainIfTrue -> d
     1:1:void <init>(java.util.Iterator,com.android.tools.r8.com.google.common.base.Predicate):659:659 -> <init>
     1:7:java.lang.Object computeNext():662:668 -> l
-com.android.tools.r8.com.google.common.collect.Iterators$6 -> com.android.tools.r8.internal.Mg:
+com.android.tools.r8.com.google.common.collect.Iterators$6 -> com.android.tools.r8.internal.Ng:
     com.android.tools.r8.com.google.common.base.Function val$function -> b
     1:1:void <init>(java.util.Iterator,com.android.tools.r8.com.google.common.base.Function):817:817 -> <init>
     1:1:java.lang.Object transform(java.lang.Object):820:820 -> a
-com.android.tools.r8.com.google.common.collect.Iterators$7 -> com.android.tools.r8.internal.Ng:
+com.android.tools.r8.com.google.common.collect.Iterators$7 -> com.android.tools.r8.internal.Og:
     java.util.Iterator val$iterator -> c
     int val$limitSize -> b
     int count -> a
@@ -10835,21 +10950,21 @@
     1:5:java.lang.Object next():962:966 -> next
     6:6:java.lang.Object next():963:963 -> next
     1:1:void remove():971:971 -> remove
-com.android.tools.r8.com.google.common.collect.Iterators$9 -> com.android.tools.r8.internal.Og:
+com.android.tools.r8.com.google.common.collect.Iterators$9 -> com.android.tools.r8.internal.Pg:
     java.lang.Object val$value -> b
     boolean done -> a
     1:1:void <init>(java.lang.Object):1104:1104 -> <init>
     1:1:boolean hasNext():1109:1109 -> hasNext
     1:5:java.lang.Object next():1114:1118 -> next
     6:6:java.lang.Object next():1115:1115 -> next
-com.android.tools.r8.com.google.common.collect.Iterators$ArrayItr -> com.android.tools.r8.internal.Pg:
+com.android.tools.r8.com.google.common.collect.Iterators$ArrayItr -> com.android.tools.r8.internal.Qg:
     java.lang.Object[] array -> d
     com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator EMPTY -> c
     int offset -> e
     1:1:void <clinit>():1058:1058 -> <clinit>
     1:3:void <init>(java.lang.Object[],int,int,int):1065:1067 -> <init>
     1:1:java.lang.Object get(int):1072:1072 -> a
-com.android.tools.r8.com.google.common.collect.Iterators$ConcatenatedIterator -> com.android.tools.r8.internal.Qg:
+com.android.tools.r8.com.google.common.collect.Iterators$ConcatenatedIterator -> com.android.tools.r8.internal.Rg:
     java.util.Deque metaIterators -> d
     java.util.Iterator topMetaIterator -> c
     java.util.Iterator iterator -> b
@@ -10869,17 +10984,17 @@
     2:2:void com.android.tools.r8.com.google.common.collect.CollectPreconditions.checkRemove(boolean):65:65 -> remove
     2:2:void remove():1433 -> remove
     3:4:void remove():1434:1435 -> remove
-com.android.tools.r8.com.google.common.collect.Iterators$EmptyModifiableIterator -> com.android.tools.r8.internal.Rg:
+com.android.tools.r8.com.google.common.collect.Iterators$EmptyModifiableIterator -> com.android.tools.r8.internal.Sg:
     com.android.tools.r8.com.google.common.collect.Iterators$EmptyModifiableIterator INSTANCE -> a
     1:1:void <clinit>():98:98 -> <clinit>
     1:1:void <init>(java.lang.String,int):97:97 -> <init>
     1:1:java.lang.Object next():107:107 -> next
     1:1:void com.android.tools.r8.com.google.common.collect.CollectPreconditions.checkRemove(boolean):65:65 -> remove
     1:1:void remove():112 -> remove
-com.android.tools.r8.com.google.common.collect.ListMultimap -> com.android.tools.r8.internal.Dm:
-com.android.tools.r8.com.google.common.collect.Lists$RandomAccessReverseList -> com.android.tools.r8.internal.Fm:
+com.android.tools.r8.com.google.common.collect.ListMultimap -> com.android.tools.r8.internal.Em:
+com.android.tools.r8.com.google.common.collect.Lists$RandomAccessReverseList -> com.android.tools.r8.internal.Gm:
     1:1:void <init>(java.util.List):991:991 -> <init>
-com.android.tools.r8.com.google.common.collect.Lists$ReverseList -> com.android.tools.r8.internal.Hm:
+com.android.tools.r8.com.google.common.collect.Lists$ReverseList -> com.android.tools.r8.internal.Im:
     java.util.List forwardList -> a
     1:2:void <init>(java.util.List):854:855 -> <init>
     1:1:java.util.List getForwardList():859:859 -> a
@@ -10940,7 +11055,7 @@
     7:7:int com.android.tools.r8.com.google.common.collect.Lists$ReverseList.reversePosition(int):870:870 -> subList
     7:7:java.util.List subList(int,int):912 -> subList
     8:8:java.util.List subList(int,int):912:912 -> subList
-com.android.tools.r8.com.google.common.collect.Lists$ReverseList$1 -> com.android.tools.r8.internal.Gm:
+com.android.tools.r8.com.google.common.collect.Lists$ReverseList$1 -> com.android.tools.r8.internal.Hm:
     com.android.tools.r8.com.google.common.collect.Lists$ReverseList this$0 -> c
     java.util.ListIterator val$forwardIterator -> b
     boolean canRemoveOrSet -> a
@@ -10963,13 +11078,13 @@
     2:2:void remove():975 -> remove
     3:4:void remove():976:977 -> remove
     1:2:void set(java.lang.Object):982:983 -> set
-com.android.tools.r8.com.google.common.collect.Maps$1 -> com.android.tools.r8.internal.Bn:
-com.android.tools.r8.com.google.common.collect.Maps$5 -> com.android.tools.r8.internal.Cn:
+com.android.tools.r8.com.google.common.collect.Maps$1 -> com.android.tools.r8.internal.Cn:
+com.android.tools.r8.com.google.common.collect.Maps$5 -> com.android.tools.r8.internal.Dn:
     java.util.Map$Entry val$entry -> a
     1:1:void <init>(java.util.Map$Entry):1447:1447 -> <init>
     1:1:java.lang.Object getKey():1450:1450 -> getKey
     1:1:java.lang.Object getValue():1455:1455 -> getValue
-com.android.tools.r8.com.google.common.collect.Maps$6 -> com.android.tools.r8.internal.Dn:
+com.android.tools.r8.com.google.common.collect.Maps$6 -> com.android.tools.r8.internal.En:
     java.util.Iterator val$entryIterator -> a
     1:1:void <init>(java.util.Iterator):1462:1462 -> <init>
     1:1:boolean hasNext():1465:1465 -> hasNext
@@ -10982,23 +11097,23 @@
     3:3:java.util.Map$Entry com.android.tools.r8.com.google.common.collect.Maps.unmodifiableEntry(java.util.Map$Entry):1447:1447 -> next
     3:3:java.util.Map$Entry com.android.tools.r8.com.google.common.collect.Maps$6.next():1470 -> next
     3:3:java.lang.Object next():1462 -> next
-com.android.tools.r8.com.google.common.collect.Maps$EntryFunction -> com.android.tools.r8.internal.Gn:
+com.android.tools.r8.com.google.common.collect.Maps$EntryFunction -> com.android.tools.r8.internal.Hn:
     com.android.tools.r8.com.google.common.collect.Maps$EntryFunction VALUE -> b
     com.android.tools.r8.com.google.common.collect.Maps$EntryFunction KEY -> a
     1:8:void <clinit>():93:100 -> <clinit>
     1:1:void <init>(java.lang.String,int):92:92 -> <init>
     2:2:void <init>(java.lang.String,int,com.android.tools.r8.com.google.common.collect.Maps$1):92:92 -> <init>
-com.android.tools.r8.com.google.common.collect.Maps$EntryFunction$1 -> com.android.tools.r8.internal.En:
+com.android.tools.r8.com.google.common.collect.Maps$EntryFunction$1 -> com.android.tools.r8.internal.Fn:
     1:1:void <init>(java.lang.String,int):93:93 -> <init>
     1:1:java.lang.Object apply(java.lang.Object):93:93 -> apply
     2:2:java.lang.Object com.android.tools.r8.com.google.common.collect.Maps$EntryFunction$1.apply(java.util.Map$Entry):97:97 -> apply
     2:2:java.lang.Object apply(java.lang.Object):93 -> apply
-com.android.tools.r8.com.google.common.collect.Maps$EntryFunction$2 -> com.android.tools.r8.internal.Fn:
+com.android.tools.r8.com.google.common.collect.Maps$EntryFunction$2 -> com.android.tools.r8.internal.Gn:
     1:1:void <init>(java.lang.String,int):100:100 -> <init>
     1:1:java.lang.Object apply(java.lang.Object):100:100 -> apply
     2:2:java.lang.Object com.android.tools.r8.com.google.common.collect.Maps$EntryFunction$2.apply(java.util.Map$Entry):104:104 -> apply
     2:2:java.lang.Object apply(java.lang.Object):100 -> apply
-com.android.tools.r8.com.google.common.collect.Maps$EntrySet -> com.android.tools.r8.internal.Hn:
+com.android.tools.r8.com.google.common.collect.Maps$EntrySet -> com.android.tools.r8.internal.In:
     1:1:void <init>():4112:4112 -> <init>
     java.util.Map map() -> a
     1:1:void clear():4122:4122 -> clear
@@ -11017,11 +11132,11 @@
     6:6:boolean retainAll(java.util.Collection):4166 -> retainAll
     7:13:boolean retainAll(java.util.Collection):4167:4173 -> retainAll
     1:1:int size():4117:4117 -> size
-com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap -> com.android.tools.r8.internal.Jn:
+com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap -> com.android.tools.r8.internal.Kn:
     1:1:void <init>():3653:3653 -> <init>
     1:1:java.util.Set entrySet():3666:3666 -> entrySet
     java.util.Iterator entryIterator() -> i
-com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap$1 -> com.android.tools.r8.internal.In:
+com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap$1 -> com.android.tools.r8.internal.Jn:
     com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap):3666:3666 -> <init>
     1:1:java.util.Map map():3669:3669 -> a
@@ -11034,7 +11149,7 @@
     2:2:java.util.Spliterator spliterator():3679 -> spliterator
     3:3:java.util.Spliterator com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap.entrySpliterator():3660:3660 -> spliterator
     3:3:java.util.Spliterator spliterator():3679 -> spliterator
-com.android.tools.r8.com.google.common.collect.Maps$KeySet -> com.android.tools.r8.internal.Kn:
+com.android.tools.r8.com.google.common.collect.Maps$KeySet -> com.android.tools.r8.internal.Ln:
     java.util.Map map -> a
     1:2:void <init>(java.util.Map):3839:3840 -> <init>
     1:1:void lambda$forEach$0(java.util.function.Consumer,java.lang.Object,java.lang.Object):3856:3856 -> a
@@ -11069,7 +11184,7 @@
     1:1:java.util.Map com.android.tools.r8.com.google.common.collect.Maps$KeySet.map():3844:3844 -> size
     1:1:int size():3861 -> size
     2:2:int size():3861:3861 -> size
-com.android.tools.r8.com.google.common.collect.Maps$Values -> com.android.tools.r8.internal.Ln:
+com.android.tools.r8.com.google.common.collect.Maps$Values -> com.android.tools.r8.internal.Mn:
     java.util.Map map -> a
     1:2:void <init>(java.util.Map):4026:4027 -> <init>
     1:1:void lambda$forEach$0(java.util.function.Consumer,java.lang.Object,java.lang.Object):4043:4043 -> a
@@ -11125,7 +11240,7 @@
     1:1:java.util.Map com.android.tools.r8.com.google.common.collect.Maps$Values.map():4031:4031 -> size
     1:1:int size():4093 -> size
     2:2:int size():4093:4093 -> size
-com.android.tools.r8.com.google.common.collect.Maps$ViewCachingAbstractMap -> com.android.tools.r8.internal.Mn:
+com.android.tools.r8.com.google.common.collect.Maps$ViewCachingAbstractMap -> com.android.tools.r8.internal.Nn:
     java.util.Collection values -> b
     java.util.Set entrySet -> a
     1:1:void <init>():3612:3612 -> <init>
@@ -11137,31 +11252,31 @@
     2:2:java.util.Collection com.android.tools.r8.com.google.common.collect.Maps$ViewCachingAbstractMap.createValues():3649:3649 -> values
     2:2:java.util.Collection values():3645 -> values
     3:3:java.util.Collection values():3645:3645 -> values
-com.android.tools.r8.com.google.common.collect.Multimap -> com.android.tools.r8.internal.Yo:
+com.android.tools.r8.com.google.common.collect.Multimap -> com.android.tools.r8.internal.Zo:
     boolean containsEntry(java.lang.Object,java.lang.Object) -> a
     java.util.Collection entries() -> a
     java.util.Map asMap() -> b
     com.android.tools.r8.com.google.common.collect.Multiset keys() -> c
-com.android.tools.r8.com.google.common.collect.MultimapBuilder$2 -> com.android.tools.r8.internal.Zo:
+com.android.tools.r8.com.google.common.collect.MultimapBuilder$2 -> com.android.tools.r8.internal.ap:
     int val$expectedKeys -> a
     1:1:void <init>(int):127:127 -> <init>
-com.android.tools.r8.com.google.common.collect.MultimapBuilder$ArrayListSupplier -> com.android.tools.r8.internal.ap:
+com.android.tools.r8.com.google.common.collect.MultimapBuilder$ArrayListSupplier -> com.android.tools.r8.internal.bp:
     int expectedValuesPerKey -> a
     1:2:void <init>(int):193:194 -> <init>
     1:1:java.util.List com.android.tools.r8.com.google.common.collect.MultimapBuilder$ArrayListSupplier.get():199:199 -> get
     1:1:java.lang.Object get():190 -> get
-com.android.tools.r8.com.google.common.collect.MultimapBuilder$ListMultimapBuilder -> com.android.tools.r8.internal.bp:
+com.android.tools.r8.com.google.common.collect.MultimapBuilder$ListMultimapBuilder -> com.android.tools.r8.internal.cp:
     1:1:void com.android.tools.r8.com.google.common.collect.MultimapBuilder.<init>():77:77 -> <init>
     1:1:void com.android.tools.r8.com.google.common.collect.MultimapBuilder.<init>(com.android.tools.r8.com.google.common.collect.MultimapBuilder$1):71 -> <init>
     1:1:void <init>():438 -> <init>
     com.android.tools.r8.com.google.common.collect.ListMultimap build() -> a
     1:2:com.android.tools.r8.com.google.common.collect.MultimapBuilder$MultimapBuilderWithKeys com.android.tools.r8.com.google.common.collect.MultimapBuilder.linkedHashKeys(int):126:127 -> b
     1:2:com.android.tools.r8.com.google.common.collect.MultimapBuilder$MultimapBuilderWithKeys com.android.tools.r8.com.google.common.collect.MultimapBuilder.linkedHashKeys():113 -> b
-com.android.tools.r8.com.google.common.collect.MultimapBuilder$MultimapBuilderWithKeys -> com.android.tools.r8.internal.dp:
+com.android.tools.r8.com.google.common.collect.MultimapBuilder$MultimapBuilderWithKeys -> com.android.tools.r8.internal.ep:
     1:1:void <init>():282:282 -> <init>
     1:2:com.android.tools.r8.com.google.common.collect.MultimapBuilder$ListMultimapBuilder com.android.tools.r8.com.google.common.collect.MultimapBuilder$MultimapBuilderWithKeys.arrayListValues(int):300:301 -> a
     1:2:com.android.tools.r8.com.google.common.collect.MultimapBuilder$ListMultimapBuilder arrayListValues():290 -> a
-com.android.tools.r8.com.google.common.collect.MultimapBuilder$MultimapBuilderWithKeys$1 -> com.android.tools.r8.internal.cp:
+com.android.tools.r8.com.google.common.collect.MultimapBuilder$MultimapBuilderWithKeys$1 -> com.android.tools.r8.internal.dp:
     com.android.tools.r8.com.google.common.collect.MultimapBuilder$MultimapBuilderWithKeys this$0 -> b
     int val$expectedValuesPerKey -> a
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.MultimapBuilder$MultimapBuilderWithKeys,int):301:301 -> <init>
@@ -11174,12 +11289,12 @@
     5:5:com.android.tools.r8.com.google.common.collect.ListMultimap build():305:305 -> a
     6:6:com.android.tools.r8.com.google.common.collect.ListMultimap com.android.tools.r8.com.google.common.collect.Multimaps.newListMultimap(java.util.Map,com.android.tools.r8.com.google.common.base.Supplier):294:294 -> a
     6:6:com.android.tools.r8.com.google.common.collect.ListMultimap build():304 -> a
-com.android.tools.r8.com.google.common.collect.Multimaps$CustomListMultimap -> com.android.tools.r8.internal.ep:
+com.android.tools.r8.com.google.common.collect.Multimaps$CustomListMultimap -> com.android.tools.r8.internal.fp:
     com.android.tools.r8.com.google.common.base.Supplier factory -> g
     1:2:void <init>(java.util.Map,com.android.tools.r8.com.google.common.base.Supplier):301:302 -> <init>
     1:1:java.util.List com.android.tools.r8.com.google.common.collect.Multimaps$CustomListMultimap.createCollection():307:307 -> j
     1:1:java.util.Collection createCollection():297 -> j
-com.android.tools.r8.com.google.common.collect.Multimaps$Entries -> com.android.tools.r8.internal.fp:
+com.android.tools.r8.com.google.common.collect.Multimaps$Entries -> com.android.tools.r8.internal.gp:
     1:1:void <init>():1793:1793 -> <init>
     1:1:void clear():1821:1821 -> clear
     2:2:com.android.tools.r8.com.google.common.collect.Multimap com.android.tools.r8.com.google.common.collect.AbstractMultimap$Entries.multimap():130:130 -> clear
@@ -11197,7 +11312,7 @@
     2:2:com.android.tools.r8.com.google.common.collect.Multimap com.android.tools.r8.com.google.common.collect.AbstractMultimap$Entries.multimap():130:130 -> size
     2:2:int size():1798 -> size
     3:3:int size():1798:1798 -> size
-com.android.tools.r8.com.google.common.collect.Multimaps$Keys -> com.android.tools.r8.internal.ip:
+com.android.tools.r8.com.google.common.collect.Multimaps$Keys -> com.android.tools.r8.internal.jp:
     com.android.tools.r8.com.google.common.collect.Multimap multimap -> c
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.Multimap):1645:1646 -> <init>
     1:1:void lambda$forEach$0(java.util.function.Consumer,java.util.Map$Entry):1678:1678 -> a
@@ -11219,17 +11334,17 @@
     3:3:java.util.Iterator com.android.tools.r8.com.google.common.collect.Maps.keyIterator(java.util.Iterator):120 -> iterator
     3:3:java.util.Iterator iterator():1744 -> iterator
     1:1:java.util.Spliterator spliterator():1672:1672 -> spliterator
-com.android.tools.r8.com.google.common.collect.Multimaps$Keys$1 -> com.android.tools.r8.internal.hp:
+com.android.tools.r8.com.google.common.collect.Multimaps$Keys$1 -> com.android.tools.r8.internal.ip:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.Multimaps$Keys,java.util.Iterator):1652:1652 -> <init>
     1:1:java.lang.Object transform(java.lang.Object):1652:1652 -> a
     2:2:com.android.tools.r8.com.google.common.collect.Multiset$Entry com.android.tools.r8.com.google.common.collect.Multimaps$Keys$1.transform(java.util.Map$Entry):1655:1655 -> a
     2:2:java.lang.Object transform(java.lang.Object):1652 -> a
-com.android.tools.r8.com.google.common.collect.Multimaps$Keys$1$1 -> com.android.tools.r8.internal.gp:
+com.android.tools.r8.com.google.common.collect.Multimaps$Keys$1$1 -> com.android.tools.r8.internal.hp:
     java.util.Map$Entry val$backingEntry -> a
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.Multimaps$Keys$1,java.util.Map$Entry):1655:1655 -> <init>
     1:1:int getCount():1663:1663 -> a
     1:1:java.lang.Object getElement():1658:1658 -> b
-com.android.tools.r8.com.google.common.collect.Multimaps$Keys$KeysEntrySet -> com.android.tools.r8.internal.ip$a:
+com.android.tools.r8.com.google.common.collect.Multimaps$Keys$KeysEntrySet -> com.android.tools.r8.internal.jp$a:
     com.android.tools.r8.com.google.common.collect.Multimaps$Keys this$0 -> a
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.Multimaps$Keys):1692:1692 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.Multiset multiset():1695:1695 -> a
@@ -11242,7 +11357,7 @@
     1:1:int size():1705:1705 -> size
     2:2:int com.android.tools.r8.com.google.common.collect.Multimaps$Keys.distinctElements():1683:1683 -> size
     2:2:int size():1705 -> size
-com.android.tools.r8.com.google.common.collect.Multiset -> com.android.tools.r8.internal.jp:
+com.android.tools.r8.com.google.common.collect.Multiset -> com.android.tools.r8.internal.kp:
     int remove(java.lang.Object,int) -> a
     boolean setCount(java.lang.Object,int,int) -> a
     1:1:void lambda$forEachEntry$0(java.util.function.ObjIntConsumer,com.android.tools.r8.com.google.common.collect.Multiset$Entry):321:321 -> a
@@ -11258,22 +11373,22 @@
     2:3:void forEach(java.util.function.Consumer):491:492 -> forEach
     java.util.Set elementSet() -> g
     1:1:java.util.Spliterator spliterator():504:504 -> spliterator
-com.android.tools.r8.com.google.common.collect.Multiset$Entry -> com.android.tools.r8.internal.jp$a:
+com.android.tools.r8.com.google.common.collect.Multiset$Entry -> com.android.tools.r8.internal.kp$a:
     int getCount() -> a
     java.lang.Object getElement() -> b
-com.android.tools.r8.com.google.common.collect.Multisets$AbstractEntry -> com.android.tools.r8.internal.kp:
+com.android.tools.r8.com.google.common.collect.Multisets$AbstractEntry -> com.android.tools.r8.internal.lp:
     1:1:void <init>():833:833 -> <init>
     1:4:boolean equals(java.lang.Object):840:843 -> equals
     1:2:int hashCode():854:855 -> hashCode
     1:3:java.lang.String toString():867:869 -> toString
-com.android.tools.r8.com.google.common.collect.Multisets$DecreasingCount -> com.android.tools.r8.internal.lp:
+com.android.tools.r8.com.google.common.collect.Multisets$DecreasingCount -> com.android.tools.r8.internal.mp:
     com.android.tools.r8.com.google.common.collect.Multisets$DecreasingCount INSTANCE -> a
     1:1:void <clinit>():1165:1165 -> <clinit>
     1:1:void <init>():1164:1164 -> <init>
     1:1:int compare(java.lang.Object,java.lang.Object):1164:1164 -> compare
     2:2:int com.android.tools.r8.com.google.common.collect.Multisets$DecreasingCount.compare(com.android.tools.r8.com.google.common.collect.Multiset$Entry,com.android.tools.r8.com.google.common.collect.Multiset$Entry):1168:1168 -> compare
     2:2:int compare(java.lang.Object,java.lang.Object):1164 -> compare
-com.android.tools.r8.com.google.common.collect.Multisets$ElementSet -> com.android.tools.r8.internal.np:
+com.android.tools.r8.com.google.common.collect.Multisets$ElementSet -> com.android.tools.r8.internal.op:
     1:1:void <init>():977:977 -> <init>
     1:1:void clear():982:982 -> clear
     2:2:com.android.tools.r8.com.google.common.collect.Multiset com.android.tools.r8.com.google.common.collect.AbstractMultiset$ElementSet.multiset():174:174 -> clear
@@ -11303,25 +11418,25 @@
     2:2:com.android.tools.r8.com.google.common.collect.Multiset com.android.tools.r8.com.google.common.collect.AbstractMultiset$ElementSet.multiset():174:174 -> size
     2:2:int size():1017 -> size
     3:3:int size():1017:1017 -> size
-com.android.tools.r8.com.google.common.collect.Multisets$ElementSet$1 -> com.android.tools.r8.internal.mp:
+com.android.tools.r8.com.google.common.collect.Multisets$ElementSet$1 -> com.android.tools.r8.internal.np:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.Multisets$ElementSet,java.util.Iterator):1002:1002 -> <init>
     1:1:java.lang.Object transform(java.lang.Object):1002:1002 -> a
     2:2:java.lang.Object com.android.tools.r8.com.google.common.collect.Multisets$ElementSet$1.transform(com.android.tools.r8.com.google.common.collect.Multiset$Entry):1005:1005 -> a
     2:2:java.lang.Object transform(java.lang.Object):1002 -> a
-com.android.tools.r8.com.google.common.collect.Multisets$EntrySet -> com.android.tools.r8.internal.op:
+com.android.tools.r8.com.google.common.collect.Multisets$EntrySet -> com.android.tools.r8.internal.pp:
     1:1:void <init>():1021:1021 -> <init>
     com.android.tools.r8.com.google.common.collect.Multiset multiset() -> a
     1:1:void clear():1061:1061 -> clear
     1:11:boolean contains(java.lang.Object):1026:1036 -> contains
     1:9:boolean remove(java.lang.Object):1045:1053 -> remove
-com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry -> com.android.tools.r8.internal.pp:
+com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry -> com.android.tools.r8.internal.qp:
     java.lang.Object element -> a
     int count -> b
     1:4:void <init>(java.lang.Object,int):258:261 -> <init>
     1:1:int getCount():272:272 -> a
     1:1:java.lang.Object getElement():267:267 -> b
     com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry nextInBucket() -> c
-com.android.tools.r8.com.google.common.collect.NaturalOrdering -> com.android.tools.r8.internal.wp:
+com.android.tools.r8.com.google.common.collect.NaturalOrdering -> com.android.tools.r8.internal.xp:
     com.android.tools.r8.com.google.common.collect.NaturalOrdering INSTANCE -> a
     1:1:void <clinit>():28:28 -> <clinit>
     1:1:void <init>():73:73 -> <init>
@@ -11334,11 +11449,11 @@
     3:3:int compare(java.lang.Object,java.lang.Object):25 -> compare
     4:4:int com.android.tools.r8.com.google.common.collect.NaturalOrdering.compare(java.lang.Comparable,java.lang.Comparable):37:37 -> compare
     4:4:int compare(java.lang.Object,java.lang.Object):25 -> compare
-com.android.tools.r8.com.google.common.collect.Ordering -> com.android.tools.r8.internal.Pr:
+com.android.tools.r8.com.google.common.collect.Ordering -> com.android.tools.r8.internal.Rr:
     1:1:void <init>():390:390 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.Ordering natural():161:161 -> a
     2:2:com.android.tools.r8.com.google.common.collect.Ordering from(java.util.Comparator):181:181 -> a
-com.android.tools.r8.com.google.common.collect.RegularImmutableAsList -> com.android.tools.r8.internal.Aw:
+com.android.tools.r8.com.google.common.collect.RegularImmutableAsList -> com.android.tools.r8.internal.Cw:
     com.android.tools.r8.com.google.common.collect.ImmutableCollection delegate -> c
     com.android.tools.r8.com.google.common.collect.ImmutableList delegateList -> d
     1:3:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableCollection,com.android.tools.r8.com.google.common.collect.ImmutableList):35:37 -> <init>
@@ -11350,7 +11465,7 @@
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList delegateList():50:50 -> 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.Dw:
+com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap -> com.android.tools.r8.internal.Fw:
     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
@@ -11407,8 +11522,8 @@
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableBiMap com.android.tools.r8.com.google.common.collect.ImmutableBiMap.of():66:66 -> t
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse():189 -> t
     3:4:com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse():191:192 -> t
-com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$1 -> com.android.tools.r8.internal.Bw:
-com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse -> com.android.tools.r8.internal.Dw$a:
+com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$1 -> com.android.tools.r8.internal.Dw:
+com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse -> com.android.tools.r8.internal.Fw$a:
     com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap this$0 -> e
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap):195:195 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap,com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$1):195:195 -> <init>
@@ -11432,7 +11547,7 @@
     1:1:int size():199 -> size
     2:2:int size():199:199 -> size
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse():204:204 -> t
-com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet -> com.android.tools.r8.internal.Dw$a$a:
+com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet -> com.android.tools.r8.internal.Fw$a$a:
     com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse this$1 -> d
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse):240:240 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():258:258 -> c
@@ -11443,7 +11558,7 @@
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet.iterator():258:258 -> iterator
     1:1:java.util.Iterator iterator():239 -> iterator
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap map():243:243 -> k
-com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet$1 -> com.android.tools.r8.internal.Cw:
+com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet$1 -> com.android.tools.r8.internal.Ew:
     com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet this$2 -> c
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet):268:268 -> <init>
     1:2:java.util.Map$Entry com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet$1.get(int):271:272 -> get
@@ -11452,7 +11567,7 @@
     3:3:java.util.Map$Entry com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet$1.get(int):272 -> get
     3:3:java.lang.Object get(int):268 -> get
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection delegateCollection():277:277 -> i
-com.android.tools.r8.com.google.common.collect.RegularImmutableList -> com.android.tools.r8.internal.Ew:
+com.android.tools.r8.com.google.common.collect.RegularImmutableList -> com.android.tools.r8.internal.Gw:
     java.lang.Object[] array -> d
     com.android.tools.r8.com.google.common.collect.ImmutableList EMPTY -> c
     1:1:void <clinit>():31:31 -> <clinit>
@@ -11465,7 +11580,7 @@
     1:1:java.util.ListIterator listIterator(int):28 -> listIterator
     1:1:int size():42:42 -> size
     1:1:java.util.Spliterator spliterator():73:73 -> spliterator
-com.android.tools.r8.com.google.common.collect.RegularImmutableMap -> com.android.tools.r8.internal.Hw:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMap -> com.android.tools.r8.internal.Jw:
     java.util.Map$Entry[] entries -> f
     com.android.tools.r8.com.google.common.collect.ImmutableMapEntry[] table -> g
     int mask -> h
@@ -11504,7 +11619,7 @@
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection createValues():229:229 -> l
     boolean isPartialView() -> n
     1:1:int size():159:159 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableMap$KeySet -> com.android.tools.r8.internal.Fw:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMap$KeySet -> com.android.tools.r8.internal.Hw:
     com.android.tools.r8.com.google.common.collect.RegularImmutableMap map -> d
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableMap):181:182 -> <init>
     boolean isPartialView() -> b
@@ -11513,13 +11628,13 @@
     2:2:boolean contains(java.lang.Object):192 -> contains
     1:1:java.lang.Object get(int):187:187 -> get
     1:1:int size():202:202 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableMap$Values -> com.android.tools.r8.internal.Gw:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMap$Values -> com.android.tools.r8.internal.Iw:
     com.android.tools.r8.com.google.common.collect.RegularImmutableMap map -> c
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableMap):236:237 -> <init>
     boolean isPartialView() -> b
     1:1:java.lang.Object get(int):242:242 -> get
     1:1:int size():247:247 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset -> com.android.tools.r8.internal.Jw:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset -> com.android.tools.r8.internal.Lw:
     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
@@ -11541,8 +11656,8 @@
     3:3:com.android.tools.r8.com.google.common.collect.Multiset$Entry getEntry(int):170:170 -> g
     1:1:int hashCode():175:175 -> hashCode
     1:1:int size():135:135 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$1 -> com.android.tools.r8.internal.Iw:
-com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$ElementSet -> com.android.tools.r8.internal.Jw$a:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$1 -> com.android.tools.r8.internal.Kw:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$ElementSet -> com.android.tools.r8.internal.Lw$a:
     com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset this$0 -> d
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset):145:145 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset,com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$1):145:145 -> <init>
@@ -11552,11 +11667,11 @@
     2:2:boolean contains(java.lang.Object):154 -> contains
     1:1:java.lang.Object get(int):149:149 -> get
     1:1:int size():164:164 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$NonTerminalEntry -> com.android.tools.r8.internal.Kw:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$NonTerminalEntry -> com.android.tools.r8.internal.Mw:
     com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry nextInBucket -> c
     1:2:void <init>(java.lang.Object,int,com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry):100:101 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry nextInBucket():106:106 -> c
-com.android.tools.r8.com.google.common.collect.RegularImmutableSet -> com.android.tools.r8.internal.Lw:
+com.android.tools.r8.com.google.common.collect.RegularImmutableSet -> com.android.tools.r8.internal.Nw:
     java.lang.Object[] elements -> e
     int hashCode -> h
     int mask -> g
@@ -11580,7 +11695,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.RegularImmutableSortedSet -> com.android.tools.r8.internal.Mw:
+com.android.tools.r8.com.google.common.collect.RegularImmutableSortedSet -> com.android.tools.r8.internal.Ow:
     com.android.tools.r8.com.google.common.collect.RegularImmutableSortedSet NATURAL_EMPTY_SET -> f
     com.android.tools.r8.com.google.common.collect.ImmutableList elements -> g
     1:1:void <clinit>():44:44 -> <clinit>
@@ -11695,7 +11810,7 @@
     1:2:java.lang.Object lower(java.lang.Object):212:213 -> lower
     1:1:int size():77:77 -> size
     1:1:java.util.Spliterator spliterator():67:67 -> spliterator
-com.android.tools.r8.com.google.common.collect.Sets$1 -> com.android.tools.r8.internal.Cx:
+com.android.tools.r8.com.google.common.collect.Sets$1 -> com.android.tools.r8.internal.Ex:
     java.util.Set val$set1 -> a
     java.util.Set val$set2 -> b
     1:1:void <init>(java.util.Set,java.util.Set):744:744 -> <init>
@@ -11707,13 +11822,13 @@
     1:1:java.util.stream.Stream parallelStream():790:790 -> parallelStream
     1:3:int size():747:749 -> size
     1:1:java.util.stream.Stream stream():785:785 -> stream
-com.android.tools.r8.com.google.common.collect.Sets$1$1 -> com.android.tools.r8.internal.Bx:
+com.android.tools.r8.com.google.common.collect.Sets$1$1 -> com.android.tools.r8.internal.Dx:
     java.util.Iterator itr2 -> d
     java.util.Iterator itr1 -> c
     com.android.tools.r8.com.google.common.collect.Sets$1 this$0 -> e
     1:3:void <init>(com.android.tools.r8.com.google.common.collect.Sets$1):763:765 -> <init>
     1:10:java.lang.Object computeNext():769:778 -> l
-com.android.tools.r8.com.google.common.collect.Sets$2 -> com.android.tools.r8.internal.Ex:
+com.android.tools.r8.com.google.common.collect.Sets$2 -> com.android.tools.r8.internal.Gx:
     java.util.Set val$set1 -> a
     java.util.Set val$set2 -> b
     1:1:void <init>(java.util.Set,java.util.Set):842:842 -> <init>
@@ -11725,12 +11840,12 @@
     1:1:java.util.stream.Stream parallelStream():868:868 -> parallelStream
     1:2:int size():874:875 -> size
     1:1:java.util.stream.Stream stream():863:863 -> stream
-com.android.tools.r8.com.google.common.collect.Sets$2$1 -> com.android.tools.r8.internal.Dx:
+com.android.tools.r8.com.google.common.collect.Sets$2$1 -> com.android.tools.r8.internal.Fx:
     java.util.Iterator itr -> c
     com.android.tools.r8.com.google.common.collect.Sets$2 this$0 -> d
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.Sets$2):845:846 -> <init>
     1:7:java.lang.Object computeNext():850:856 -> l
-com.android.tools.r8.com.google.common.collect.Sets$3 -> com.android.tools.r8.internal.Gx:
+com.android.tools.r8.com.google.common.collect.Sets$3 -> com.android.tools.r8.internal.Ix:
     java.util.Set val$set1 -> a
     java.util.Set val$set2 -> b
     1:1:void <init>(java.util.Set,java.util.Set):914:914 -> <init>
@@ -11743,12 +11858,12 @@
     1:1:java.util.stream.Stream parallelStream():939:939 -> parallelStream
     1:2:int size():945:946 -> size
     1:1:java.util.stream.Stream stream():934:934 -> stream
-com.android.tools.r8.com.google.common.collect.Sets$3$1 -> com.android.tools.r8.internal.Fx:
+com.android.tools.r8.com.google.common.collect.Sets$3$1 -> com.android.tools.r8.internal.Hx:
     java.util.Iterator itr -> c
     com.android.tools.r8.com.google.common.collect.Sets$3 this$0 -> d
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.Sets$3):917:918 -> <init>
     1:7:java.lang.Object computeNext():921:927 -> l
-com.android.tools.r8.com.google.common.collect.Sets$5 -> com.android.tools.r8.internal.Kx:
+com.android.tools.r8.com.google.common.collect.Sets$5 -> com.android.tools.r8.internal.Mx:
     com.android.tools.r8.com.google.common.collect.ImmutableMap val$index -> b
     int val$size -> a
     1:1:void <init>(int,com.android.tools.r8.com.google.common.collect.ImmutableMap):1676:1676 -> <init>
@@ -11756,31 +11871,31 @@
     1:1:java.util.Iterator iterator():1688:1688 -> iterator
     1:1:int size():1755:1755 -> size
     1:1:java.lang.String toString():1760:1760 -> toString
-com.android.tools.r8.com.google.common.collect.Sets$5$1 -> com.android.tools.r8.internal.Jx:
+com.android.tools.r8.com.google.common.collect.Sets$5$1 -> com.android.tools.r8.internal.Lx:
     java.util.BitSet bits -> c
     com.android.tools.r8.com.google.common.collect.Sets$5 this$0 -> d
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.Sets$5):1688:1689 -> <init>
     1:29:java.util.Set com.android.tools.r8.com.google.common.collect.Sets$5$1.computeNext():1693:1721 -> l
     1:29:java.lang.Object computeNext():1688 -> l
-com.android.tools.r8.com.google.common.collect.Sets$5$1$1 -> com.android.tools.r8.internal.Ix:
+com.android.tools.r8.com.google.common.collect.Sets$5$1$1 -> com.android.tools.r8.internal.Kx:
     com.android.tools.r8.com.google.common.collect.Sets$5$1 this$1 -> b
     java.util.BitSet val$copy -> a
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.Sets$5$1,java.util.BitSet):1721:1721 -> <init>
     1:2:boolean contains(java.lang.Object):1724:1725 -> contains
     1:1:java.util.Iterator iterator():1730:1730 -> iterator
     1:1:int size():1746:1746 -> size
-com.android.tools.r8.com.google.common.collect.Sets$5$1$1$1 -> com.android.tools.r8.internal.Hx:
+com.android.tools.r8.com.google.common.collect.Sets$5$1$1$1 -> com.android.tools.r8.internal.Jx:
     com.android.tools.r8.com.google.common.collect.Sets$5$1$1 this$2 -> d
     int i -> c
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.Sets$5$1$1):1730:1731 -> <init>
     1:5:java.lang.Object computeNext():1735:1739 -> l
-com.android.tools.r8.com.google.common.collect.Sets$ImprovedAbstractSet -> com.android.tools.r8.internal.Lx:
+com.android.tools.r8.com.google.common.collect.Sets$ImprovedAbstractSet -> com.android.tools.r8.internal.Nx:
     1:1:void <init>():77:77 -> <init>
     1:1:boolean removeAll(java.util.Collection):80:80 -> removeAll
     1:1:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> retainAll
     1:1:boolean retainAll(java.util.Collection):85 -> retainAll
     2:2:boolean retainAll(java.util.Collection):85:85 -> retainAll
-com.android.tools.r8.com.google.common.collect.Sets$SetView -> com.android.tools.r8.internal.Mx:
+com.android.tools.r8.com.google.common.collect.Sets$SetView -> com.android.tools.r8.internal.Ox:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.Sets$1):599:599 -> <init>
     2:2:void <init>():600:600 -> <init>
     1:1:boolean add(java.lang.Object):640:640 -> add
@@ -11790,7 +11905,7 @@
     1:1:boolean removeAll(java.util.Collection):679:679 -> removeAll
     1:1:boolean removeIf(java.util.function.Predicate):692:692 -> removeIf
     1:1:boolean retainAll(java.util.Collection):705:705 -> retainAll
-com.android.tools.r8.com.google.common.collect.Sets$UnmodifiableNavigableSet -> com.android.tools.r8.internal.Nx:
+com.android.tools.r8.com.google.common.collect.Sets$UnmodifiableNavigableSet -> com.android.tools.r8.internal.Px:
     java.util.SortedSet unmodifiableDelegate -> b
     java.util.NavigableSet delegate -> a
     com.android.tools.r8.com.google.common.collect.Sets$UnmodifiableNavigableSet descendingSet -> c
@@ -11817,7 +11932,7 @@
     1:1:java.util.stream.Stream stream():1847:1847 -> stream
     1:3:java.util.NavigableSet subSet(java.lang.Object,boolean,java.lang.Object,boolean):1910:1910 -> subSet
     1:1:java.util.NavigableSet tailSet(java.lang.Object,boolean):1921:1921 -> tailSet
-com.android.tools.r8.com.google.common.collect.SingletonImmutableBiMap -> com.android.tools.r8.internal.fy:
+com.android.tools.r8.com.google.common.collect.SingletonImmutableBiMap -> com.android.tools.r8.internal.hy:
     java.lang.Object singleValue -> f
     com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse -> g
     java.lang.Object singleKey -> e
@@ -11841,7 +11956,7 @@
     2:85:com.android.tools.r8.com.google.common.collect.ImmutableSet createKeySet():90 -> k
     boolean isPartialView() -> n
     1:3:com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse():100:102 -> t
-com.android.tools.r8.com.google.common.collect.SingletonImmutableList -> com.android.tools.r8.internal.gy:
+com.android.tools.r8.com.google.common.collect.SingletonImmutableList -> com.android.tools.r8.internal.iy:
     java.lang.Object element -> c
     1:2:void <init>(java.lang.Object):37:38 -> <init>
     boolean isPartialView() -> b
@@ -11856,7 +11971,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.hy:
+com.android.tools.r8.com.google.common.collect.SingletonImmutableSet -> com.android.tools.r8.internal.jy:
     java.lang.Object element -> d
     int cachedHashCode -> e
     1:2:void <init>(java.lang.Object):44:45 -> <init>
@@ -11873,28 +11988,28 @@
     1:1:boolean isHashCodeFast():97:97 -> h
     1:3:int hashCode():88:90 -> hashCode
     1:1:java.lang.String toString():102:102 -> toString
-com.android.tools.r8.com.google.common.collect.SortedIterable -> com.android.tools.r8.internal.oy:
-com.android.tools.r8.com.google.common.collect.Streams$1 -> com.android.tools.r8.internal.Qy:
+com.android.tools.r8.com.google.common.collect.SortedIterable -> com.android.tools.r8.internal.qy:
+com.android.tools.r8.com.google.common.collect.Streams$1 -> com.android.tools.r8.internal.Sy:
     java.util.function.BiFunction val$function -> c
     java.util.Iterator val$itrB -> b
     java.util.Iterator val$itrA -> a
     1:1:void <init>(long,int,java.util.Iterator,java.util.Iterator,java.util.function.BiFunction):249:249 -> <init>
     1:2:boolean tryAdvance(java.util.function.Consumer):252:253 -> tryAdvance
-com.android.tools.r8.com.google.common.collect.Streams$1Splitr -> com.android.tools.r8.internal.Ry:
+com.android.tools.r8.com.google.common.collect.Streams$1Splitr -> com.android.tools.r8.internal.Ty:
     com.android.tools.r8.com.google.common.collect.Streams$FunctionWithIndex val$function -> d
     java.lang.Object holder -> c
     1:2:void <init>(java.util.Spliterator,long,com.android.tools.r8.com.google.common.collect.Streams$FunctionWithIndex):369:370 -> <init>
     1:1:void accept(java.lang.Object):375:375 -> accept
     1:6:boolean tryAdvance(java.util.function.Consumer):380:385 -> tryAdvance
-com.android.tools.r8.com.google.common.collect.Streams$2 -> com.android.tools.r8.internal.Sy:
+com.android.tools.r8.com.google.common.collect.Streams$2 -> com.android.tools.r8.internal.Uy:
     java.util.Iterator val$fromIterator -> b
     long index -> a
     com.android.tools.r8.com.google.common.collect.Streams$FunctionWithIndex val$function -> c
     1:2:void <init>(long,int,java.util.Iterator,com.android.tools.r8.com.google.common.collect.Streams$FunctionWithIndex):352:353 -> <init>
     1:2:boolean tryAdvance(java.util.function.Consumer):357:358 -> tryAdvance
-com.android.tools.r8.com.google.common.collect.Streams$FunctionWithIndex -> com.android.tools.r8.internal.Ty:
+com.android.tools.r8.com.google.common.collect.Streams$FunctionWithIndex -> com.android.tools.r8.internal.Vy:
     java.lang.Object apply(java.lang.Object,long) -> a
-com.android.tools.r8.com.google.common.collect.Streams$MapWithIndexSpliterator -> com.android.tools.r8.internal.Uy:
+com.android.tools.r8.com.google.common.collect.Streams$MapWithIndexSpliterator -> com.android.tools.r8.internal.Wy:
     long index -> b
     java.util.Spliterator fromSpliterator -> a
     1:3:void <init>(java.util.Spliterator,long):419:421 -> <init>
@@ -11908,17 +12023,17 @@
     6:6:java.util.Spliterator trySplit():413 -> trySplit
     7:7:com.android.tools.r8.com.google.common.collect.Streams$MapWithIndexSpliterator com.android.tools.r8.com.google.common.collect.Streams$MapWithIndexSpliterator.trySplit():434:434 -> trySplit
     7:7:java.util.Spliterator trySplit():413 -> trySplit
-com.android.tools.r8.com.google.common.collect.TransformedIterator -> com.android.tools.r8.internal.IA:
+com.android.tools.r8.com.google.common.collect.TransformedIterator -> com.android.tools.r8.internal.JA:
     java.util.Iterator backingIterator -> a
     1:2:void <init>(java.util.Iterator):35:36 -> <init>
     java.lang.Object transform(java.lang.Object) -> a
     1:1:boolean hasNext():43:43 -> hasNext
     1:1:java.lang.Object next():48:48 -> next
     1:1:void remove():53:53 -> remove
-com.android.tools.r8.com.google.common.collect.UnmodifiableIterator -> com.android.tools.r8.internal.bC:
+com.android.tools.r8.com.google.common.collect.UnmodifiableIterator -> com.android.tools.r8.internal.cC:
     1:1:void <init>():35:35 -> <init>
     1:1:void remove():46:46 -> remove
-com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator -> com.android.tools.r8.internal.cC:
+com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator -> com.android.tools.r8.internal.dC:
     1:1:void <init>():33:33 -> <init>
     1:1:void add(java.lang.Object):44:44 -> add
     1:1:void set(java.lang.Object):56:56 -> set
@@ -11930,7 +12045,7 @@
     com.android.tools.r8.com.google.common.hash.Hasher putBytes(byte[],int,int) -> a
     1:1:com.android.tools.r8.com.google.common.hash.Hasher putString(java.lang.CharSequence,java.nio.charset.Charset):55:55 -> a
     2:2:com.android.tools.r8.com.google.common.hash.Hasher putBytes(byte[]):60:60 -> a
-com.android.tools.r8.com.google.common.hash.HashCode -> com.android.tools.r8.internal.Wb:
+com.android.tools.r8.com.google.common.hash.HashCode -> com.android.tools.r8.internal.Xb:
     char[] hexDigits -> a
     int $r8$clinit -> b
     1:1:void <clinit>():429:429 -> <clinit>
@@ -11943,7 +12058,7 @@
     1:3:boolean equals(java.lang.Object):380:382 -> equals
     1:8:int hashCode():396:403 -> hashCode
     1:6:java.lang.String toString():421:426 -> toString
-com.android.tools.r8.com.google.common.hash.HashCode$BytesHashCode -> com.android.tools.r8.internal.Ub:
+com.android.tools.r8.com.google.common.hash.HashCode$BytesHashCode -> com.android.tools.r8.internal.Vb:
     byte[] bytes -> c
     1:2:void <init>(byte[]):262:263 -> <init>
     1:1:byte[] asBytes():273:273 -> a
@@ -11951,29 +12066,29 @@
     1:5:int asInt():278:282 -> b
     1:1:int bits():268:268 -> c
     1:1:byte[] getBytesInternal():313:313 -> d
-com.android.tools.r8.com.google.common.hash.HashCode$IntHashCode -> com.android.tools.r8.internal.Vb:
+com.android.tools.r8.com.google.common.hash.HashCode$IntHashCode -> com.android.tools.r8.internal.Wb:
     int hash -> c
     1:2:void <init>(int):125:126 -> <init>
     1:1:byte[] asBytes():136:136 -> a
     2:2:boolean equalsSameBits(com.android.tools.r8.com.google.common.hash.HashCode):168:168 -> a
     1:1:int asInt():146:146 -> b
     int bits() -> c
-com.android.tools.r8.com.google.common.hash.HashFunction -> com.android.tools.r8.internal.Yb:
+com.android.tools.r8.com.google.common.hash.HashFunction -> com.android.tools.r8.internal.Zb:
     com.android.tools.r8.com.google.common.hash.HashCode hashString(java.lang.CharSequence,java.nio.charset.Charset) -> a
     com.android.tools.r8.com.google.common.hash.Hasher newHasher() -> a
-com.android.tools.r8.com.google.common.hash.Hasher -> com.android.tools.r8.internal.ac:
+com.android.tools.r8.com.google.common.hash.Hasher -> com.android.tools.r8.internal.bc:
     com.android.tools.r8.com.google.common.hash.HashCode hash() -> a
     com.android.tools.r8.com.google.common.hash.Hasher putInt(int) -> a
     com.android.tools.r8.com.google.common.hash.Hasher putString(java.lang.CharSequence,java.nio.charset.Charset) -> a
-com.android.tools.r8.com.google.common.hash.Hashing -> com.android.tools.r8.internal.cc:
+com.android.tools.r8.com.google.common.hash.Hashing -> com.android.tools.r8.internal.dc:
     int GOOD_FAST_HASH_SEED -> a
     1:1:void <clinit>():90:90 -> <clinit>
     1:1:com.android.tools.r8.com.google.common.hash.HashFunction murmur3_32():111:111 -> a
     1:1:com.android.tools.r8.com.google.common.hash.HashFunction sha256():200:200 -> b
-com.android.tools.r8.com.google.common.hash.Hashing$Sha256Holder -> com.android.tools.r8.internal.bc:
+com.android.tools.r8.com.google.common.hash.Hashing$Sha256Holder -> com.android.tools.r8.internal.cc:
     com.android.tools.r8.com.google.common.hash.HashFunction SHA_256 -> a
     1:1:void <clinit>():204:204 -> <clinit>
-com.android.tools.r8.com.google.common.hash.MessageDigestHashFunction -> com.android.tools.r8.internal.ko:
+com.android.tools.r8.com.google.common.hash.MessageDigestHashFunction -> com.android.tools.r8.internal.lo:
     java.security.MessageDigest prototype -> a
     int bytes -> b
     boolean supportsClone -> c
@@ -11988,8 +12103,8 @@
     15:15:java.security.MessageDigest com.android.tools.r8.com.google.common.hash.MessageDigestHashFunction.getMessageDigest(java.lang.String):79:79 -> a
     15:15:com.android.tools.r8.com.google.common.hash.Hasher newHasher():92 -> a
     1:1:java.lang.String toString():72:72 -> toString
-com.android.tools.r8.com.google.common.hash.MessageDigestHashFunction$1 -> com.android.tools.r8.internal.io:
-com.android.tools.r8.com.google.common.hash.MessageDigestHashFunction$MessageDigestHasher -> com.android.tools.r8.internal.jo:
+com.android.tools.r8.com.google.common.hash.MessageDigestHashFunction$1 -> com.android.tools.r8.internal.jo:
+com.android.tools.r8.com.google.common.hash.MessageDigestHashFunction$MessageDigestHasher -> com.android.tools.r8.internal.ko:
     java.security.MessageDigest digest -> b
     java.nio.ByteBuffer com.android.tools.r8.com.google.common.hash.AbstractByteHasher.scratch -> a
     int bytes -> c
@@ -12021,7 +12136,7 @@
     4:4:void com.android.tools.r8.com.google.common.hash.MessageDigestHashFunction$MessageDigestHasher.checkNotDone():149:149 -> b
     4:4:void update(byte[],int,int):138 -> b
     5:5:void update(byte[],int,int):139:139 -> b
-com.android.tools.r8.com.google.common.hash.Murmur3_32HashFunction -> com.android.tools.r8.internal.rp:
+com.android.tools.r8.com.google.common.hash.Murmur3_32HashFunction -> com.android.tools.r8.internal.sp:
     com.android.tools.r8.com.google.common.hash.HashFunction MURMUR3_32 -> a
     1:3:void <clinit>():53:55 -> <clinit>
     1:1:void <init>(int):65:65 -> <init>
@@ -12052,7 +12167,7 @@
     1:3:boolean equals(java.lang.Object):86:88 -> equals
     1:1:int hashCode():95:95 -> hashCode
     1:1:java.lang.String toString():81:81 -> toString
-com.android.tools.r8.com.google.common.hash.Murmur3_32HashFunction$Murmur3_32Hasher -> com.android.tools.r8.internal.qp:
+com.android.tools.r8.com.google.common.hash.Murmur3_32HashFunction$Murmur3_32Hasher -> com.android.tools.r8.internal.rp:
     long buffer -> b
     boolean isDone -> e
     int length -> d
@@ -12191,10 +12306,10 @@
 com.android.tools.r8.com.google.common.io.CharSource$StringCharSource -> com.android.tools.r8.internal.Z4:
     1:1:void <init>(java.lang.String):630:630 -> <init>
     1:1:java.io.Reader openStream():635:635 -> a
-com.android.tools.r8.com.google.common.io.Closeables -> com.android.tools.r8.internal.q6:
+com.android.tools.r8.com.google.common.io.Closeables -> com.android.tools.r8.internal.r6:
     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.u6:
+com.android.tools.r8.com.google.common.io.Closer -> com.android.tools.r8.internal.v6:
     com.android.tools.r8.com.google.common.io.Closer$Suppressor suppressor -> b
     com.android.tools.r8.com.google.common.io.Closer$Suppressor SUPPRESSOR -> a
     java.util.Deque stack -> c
@@ -12229,12 +12344,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():227 -> close
-com.android.tools.r8.com.google.common.io.Closer$LoggingSuppressor -> com.android.tools.r8.internal.r6:
+com.android.tools.r8.com.google.common.io.Closer$LoggingSuppressor -> com.android.tools.r8.internal.s6:
     com.android.tools.r8.com.google.common.io.Closer$LoggingSuppressor INSTANCE -> a
     1:1:void <clinit>():251:251 -> <clinit>
     1:1:void <init>():249:249 -> <init>
     1:1:void suppress(java.io.Closeable,java.lang.Throwable,java.lang.Throwable):256:256 -> a
-com.android.tools.r8.com.google.common.io.Closer$SuppressingSuppressor -> com.android.tools.r8.internal.s6:
+com.android.tools.r8.com.google.common.io.Closer$SuppressingSuppressor -> com.android.tools.r8.internal.t6:
     com.android.tools.r8.com.google.common.io.Closer$SuppressingSuppressor INSTANCE -> a
     java.lang.reflect.Method addSuppressed -> b
     1:1:void <clinit>():268:268 -> <clinit>
@@ -12245,9 +12360,9 @@
     1:1:void suppress(java.io.Closeable,java.lang.Throwable,java.lang.Throwable):291:291 -> a
     2:2:void com.android.tools.r8.com.google.common.io.Closer$LoggingSuppressor.suppress(java.io.Closeable,java.lang.Throwable,java.lang.Throwable):256:256 -> a
     2:2:void suppress(java.io.Closeable,java.lang.Throwable,java.lang.Throwable):294 -> a
-com.android.tools.r8.com.google.common.io.Closer$Suppressor -> com.android.tools.r8.internal.t6:
+com.android.tools.r8.com.google.common.io.Closer$Suppressor -> com.android.tools.r8.internal.u6:
     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.Df:
+com.android.tools.r8.com.google.common.math.IntMath -> com.android.tools.r8.internal.Ef:
     int[] biggestBinomials -> a
     1:1:void <clinit>():675:675 -> <clinit>
     boolean isPowerOfTwo(int) -> a
@@ -12267,12 +12382,12 @@
     107:107:void com.android.tools.r8.com.google.common.math.MathPreconditions.checkRoundingUnnecessary(boolean):81:81 -> a
     107:107:int divide(int,int,java.math.RoundingMode):340 -> a
     108:108:int divide(int,int,java.math.RoundingMode):320:320 -> a
-com.android.tools.r8.com.google.common.math.IntMath$1 -> com.android.tools.r8.internal.Cf:
+com.android.tools.r8.com.google.common.math.IntMath$1 -> com.android.tools.r8.internal.Df:
     int[] $SwitchMap$java$math$RoundingMode -> a
     1:1:void <clinit>():121:121 -> <clinit>
-com.android.tools.r8.com.google.common.math.MathPreconditions -> com.android.tools.r8.internal.Pn:
+com.android.tools.r8.com.google.common.math.MathPreconditions -> com.android.tools.r8.internal.Qn:
     1:1:int checkNonNegative(java.lang.String,int):53:53 -> a
-com.android.tools.r8.com.google.gson.JsonArray -> com.android.tools.r8.internal.Wg:
+com.android.tools.r8.com.google.gson.JsonArray -> com.android.tools.r8.internal.Xg:
     java.util.List elements -> a
     1:2:void <init>():39:40 -> <init>
     1:1:void add(java.lang.Number):76:76 -> a
@@ -12287,7 +12402,7 @@
     1:1:int hashCode():371:371 -> hashCode
     1:1:java.util.Iterator iterator():171:171 -> iterator
     1:1:int size():161:161 -> size
-com.android.tools.r8.com.google.gson.JsonElement -> com.android.tools.r8.internal.Xg:
+com.android.tools.r8.com.google.gson.JsonElement -> com.android.tools.r8.internal.Yg:
     1:1:void <init>():33:33 -> <init>
     1:1:boolean getAsBoolean():152:152 -> a
     1:1:int getAsInt():243:243 -> b
@@ -12303,15 +12418,15 @@
     4:4:void com.android.tools.r8.com.google.gson.internal.Streams.write(com.android.tools.r8.com.google.gson.JsonElement,com.android.tools.r8.com.google.gson.stream.JsonWriter):72:72 -> toString
     4:4:java.lang.String toString():324 -> toString
     5:7:java.lang.String toString():325:327 -> toString
-com.android.tools.r8.com.google.gson.JsonIOException -> com.android.tools.r8.internal.Yg:
+com.android.tools.r8.com.google.gson.JsonIOException -> com.android.tools.r8.internal.Zg:
     1:1:void <init>(java.lang.Throwable):43:43 -> <init>
-com.android.tools.r8.com.google.gson.JsonNull -> com.android.tools.r8.internal.Zg:
+com.android.tools.r8.com.google.gson.JsonNull -> com.android.tools.r8.internal.ah:
     com.android.tools.r8.com.google.gson.JsonNull INSTANCE -> a
     1:1:void <clinit>():32:32 -> <clinit>
     1:1:void <init>():39:39 -> <init>
     1:1:boolean equals(java.lang.Object):61:61 -> equals
     1:1:int hashCode():53:53 -> hashCode
-com.android.tools.r8.com.google.gson.JsonObject -> com.android.tools.r8.internal.ah:
+com.android.tools.r8.com.google.gson.JsonObject -> com.android.tools.r8.internal.bh:
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap members -> a
     1:2:void <init>():32:33 -> <init>
     1:3:void add(java.lang.String,com.android.tools.r8.com.google.gson.JsonElement):55:57 -> a
@@ -12330,11 +12445,11 @@
     1:1:java.util.Set entrySet():132:132 -> entrySet
     1:2:boolean equals(java.lang.Object):196:197 -> equals
     1:1:int hashCode():202:202 -> hashCode
-com.android.tools.r8.com.google.gson.JsonParseException -> com.android.tools.r8.internal.bh:
+com.android.tools.r8.com.google.gson.JsonParseException -> com.android.tools.r8.internal.ch:
     1:1:void <init>(java.lang.String):42:42 -> <init>
     2:2:void <init>(java.lang.String,java.lang.Throwable):52:52 -> <init>
     3:3:void <init>(java.lang.Throwable):62:62 -> <init>
-com.android.tools.r8.com.google.gson.JsonParser -> com.android.tools.r8.internal.ch:
+com.android.tools.r8.com.google.gson.JsonParser -> com.android.tools.r8.internal.dh:
     1:1:void <init>():34:34 -> <init>
     1:1:com.android.tools.r8.com.google.gson.JsonElement parse(java.lang.String):45:45 -> a
     2:3:com.android.tools.r8.com.google.gson.JsonElement com.android.tools.r8.com.google.gson.JsonParser.parse(java.io.Reader):58:59 -> a
@@ -12351,7 +12466,7 @@
     91:100:com.android.tools.r8.com.google.gson.JsonElement parse(com.android.tools.r8.com.google.gson.stream.JsonReader):81:90 -> a
     101:101:com.android.tools.r8.com.google.gson.JsonElement parse(com.android.tools.r8.com.google.gson.stream.JsonReader):88:88 -> a
     102:106:com.android.tools.r8.com.google.gson.JsonElement parse(com.android.tools.r8.com.google.gson.stream.JsonReader):86:90 -> a
-com.android.tools.r8.com.google.gson.JsonPrimitive -> com.android.tools.r8.internal.dh:
+com.android.tools.r8.com.google.gson.JsonPrimitive -> com.android.tools.r8.internal.eh:
     java.lang.Class[] PRIMITIVE_TYPES -> a
     java.lang.Object value -> b
     1:1:void <clinit>():35:35 -> <clinit>
@@ -12390,20 +12505,20 @@
     1:1:java.lang.Number getAsNumber():157:157 -> i
     1:1:boolean isBoolean():112:112 -> j
     1:1:boolean isNumber():146:146 -> k
-com.android.tools.r8.com.google.gson.JsonSyntaxException -> com.android.tools.r8.internal.fh:
+com.android.tools.r8.com.google.gson.JsonSyntaxException -> com.android.tools.r8.internal.gh:
     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.XA:
+com.android.tools.r8.com.google.gson.TypeAdapter -> com.android.tools.r8.internal.YA:
     1:1:void <init>():119:119 -> <init>
     java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader) -> a
     void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object) -> a
     1:1:com.android.tools.r8.com.google.gson.TypeAdapter nullSafe():186:186 -> a
-com.android.tools.r8.com.google.gson.TypeAdapter$1 -> com.android.tools.r8.internal.WA:
+com.android.tools.r8.com.google.gson.TypeAdapter$1 -> com.android.tools.r8.internal.XA:
     com.android.tools.r8.com.google.gson.TypeAdapter this$0 -> a
     1:1:void <init>(com.android.tools.r8.com.google.gson.TypeAdapter):186:186 -> <init>
     1:3:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):189:191 -> a
     4:8:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):195:199 -> a
-com.android.tools.r8.com.google.gson.internal.LazilyParsedNumber -> com.android.tools.r8.internal.Ql:
+com.android.tools.r8.com.google.gson.internal.LazilyParsedNumber -> com.android.tools.r8.internal.Rl:
     java.lang.String value -> a
     1:2:void <init>(java.lang.String):30:31 -> <init>
     1:1:double doubleValue():63:63 -> doubleValue
@@ -12413,7 +12528,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.Am:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap -> com.android.tools.r8.internal.Bm:
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node root -> d
     int modCount -> f
     java.util.Comparator comparator -> c
@@ -12456,12 +12571,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.ym:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$1 -> com.android.tools.r8.internal.zm:
     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.Am$a:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$EntrySet -> com.android.tools.r8.internal.Bm$a:
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.LinkedTreeMap):560:560 -> <init>
     1:1:void clear():591:591 -> clear
@@ -12469,11 +12584,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.zm:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$EntrySet$1 -> com.android.tools.r8.internal.Am:
     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.Am$b:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$KeySet -> com.android.tools.r8.internal.Bm$b:
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.LinkedTreeMap):595:595 -> <init>
     1:1:void clear():617:617 -> clear
@@ -12485,10 +12600,10 @@
     2:4:com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node com.android.tools.r8.com.google.gson.internal.LinkedTreeMap.removeInternalByKey(java.lang.Object):277:279 -> remove
     2:4:boolean remove(java.lang.Object):613 -> remove
     1:1:int size():597:597 -> size
-com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$KeySet$1 -> com.android.tools.r8.internal.Bm:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$KeySet$1 -> com.android.tools.r8.internal.Cm:
     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.Am$c:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$LinkedTreeMapIterator -> com.android.tools.r8.internal.Bm$c:
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap this$0 -> d
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node lastReturned -> b
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node next -> a
@@ -12501,7 +12616,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.Cm:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node -> com.android.tools.r8.internal.Dm:
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node next -> d
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node right -> c
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node prev -> e
@@ -12518,7 +12633,7 @@
     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.bind.TypeAdapters -> com.android.tools.r8.internal.uB:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters -> com.android.tools.r8.internal.vB:
     com.android.tools.r8.com.google.gson.TypeAdapter STRING -> l
     com.android.tools.r8.com.google.gson.TypeAdapter STRING_BUILDER -> m
     com.android.tools.r8.com.google.gson.TypeAdapter NUMBER -> j
@@ -12542,21 +12657,21 @@
     com.android.tools.r8.com.google.gson.TypeAdapter CURRENCY -> s
     com.android.tools.r8.com.google.gson.TypeAdapter JSON_ELEMENT -> v
     1:646:void <clinit>():69:714 -> <clinit>
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$1 -> com.android.tools.r8.internal.dB:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$1 -> com.android.tools.r8.internal.eB:
     1:1:void <init>():69:69 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):69:69 -> a
     2:5:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$1.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Class):73:76 -> a
     2:5:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):69 -> a
     6:10:java.lang.Class com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$1.read(com.android.tools.r8.com.google.gson.stream.JsonReader):81:85 -> a
     6:10:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):69 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$10 -> com.android.tools.r8.internal.YA:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$10 -> com.android.tools.r8.internal.ZA:
     1:1:void <init>():282:282 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):282:282 -> a
     2:6:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$10.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.util.concurrent.atomic.AtomicIntegerArray):303:307 -> a
     2:6:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):282 -> a
     7:21:java.util.concurrent.atomic.AtomicIntegerArray com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$10.read(com.android.tools.r8.com.google.gson.stream.JsonReader):284:298 -> a
     7:21:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):282 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$14 -> com.android.tools.r8.internal.ZA:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$14 -> com.android.tools.r8.internal.aB:
     1:1:void <init>():362:362 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):362:362 -> a
     2:2:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$14.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Number):378:378 -> a
@@ -12565,7 +12680,7 @@
     3:11:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):362 -> a
     12:12:java.lang.Number com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$14.read(com.android.tools.r8.com.google.gson.stream.JsonReader):371:371 -> a
     12:12:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):362 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$15 -> com.android.tools.r8.internal.aB:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$15 -> com.android.tools.r8.internal.bB:
     1:1:void <init>():384:384 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):384:384 -> a
     2:2:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$15.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Character):399:399 -> a
@@ -12574,21 +12689,21 @@
     3:11:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):384 -> a
     12:12:java.lang.Character com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$15.read(com.android.tools.r8.com.google.gson.stream.JsonReader):393:393 -> a
     12:12:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):384 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$16 -> com.android.tools.r8.internal.bB:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$16 -> com.android.tools.r8.internal.cB:
     1:1:void <init>():406:406 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):406:406 -> a
     2:2:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$16.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.String):422:422 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):406 -> a
     3:12:java.lang.String com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$16.read(com.android.tools.r8.com.google.gson.stream.JsonReader):409:418 -> a
     3:12:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):406 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$19 -> com.android.tools.r8.internal.cB:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$19 -> com.android.tools.r8.internal.dB:
     1:1:void <init>():464:464 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):464:464 -> a
     2:2:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$19.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.StringBuilder):475:475 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):464 -> a
     3:7:java.lang.StringBuilder com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$19.read(com.android.tools.r8.com.google.gson.stream.JsonReader):467:471 -> a
     3:7:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):464 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$2 -> com.android.tools.r8.internal.nB:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$2 -> com.android.tools.r8.internal.oB:
     1:1:void <init>():92:92 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):92:92 -> a
     2:11:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$2.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.util.BitSet):136:145 -> a
@@ -12601,63 +12716,63 @@
     42:63:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):92 -> a
     64:77:java.util.BitSet com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$2.read(com.android.tools.r8.com.google.gson.stream.JsonReader):117:130 -> a
     64:77:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):92 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$20 -> com.android.tools.r8.internal.eB:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$20 -> com.android.tools.r8.internal.fB:
     1:1:void <init>():482:482 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):482:482 -> a
     2:2:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$20.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.StringBuffer):493:493 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):482 -> a
     3:7:java.lang.StringBuffer com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$20.read(com.android.tools.r8.com.google.gson.stream.JsonReader):485:489 -> a
     3:7:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):482 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$21 -> com.android.tools.r8.internal.fB:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$21 -> com.android.tools.r8.internal.gB:
     1:1:void <init>():500:500 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):500:500 -> a
     2:2:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$21.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.net.URL):512:512 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):500 -> a
     3:8:java.net.URL com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$21.read(com.android.tools.r8.com.google.gson.stream.JsonReader):503:508 -> a
     3:8:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):500 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$22 -> com.android.tools.r8.internal.gB:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$22 -> com.android.tools.r8.internal.hB:
     1:1:void <init>():518:518 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):518:518 -> a
     2:2:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$22.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.net.URI):534:534 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):518 -> a
     3:11:java.net.URI com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$22.read(com.android.tools.r8.com.google.gson.stream.JsonReader):521:529 -> a
     3:11:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):518 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$23 -> com.android.tools.r8.internal.hB:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$23 -> com.android.tools.r8.internal.iB:
     1:1:void <init>():540:540 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):540:540 -> a
     2:2:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$23.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.net.InetAddress):552:552 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):540 -> a
     3:8:java.net.InetAddress com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$23.read(com.android.tools.r8.com.google.gson.stream.JsonReader):543:548 -> a
     3:8:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):540 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$24 -> com.android.tools.r8.internal.iB:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$24 -> com.android.tools.r8.internal.jB:
     1:1:void <init>():559:559 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):559:559 -> a
     2:2:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$24.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.util.UUID):570:570 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):559 -> a
     3:7:java.util.UUID com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$24.read(com.android.tools.r8.com.google.gson.stream.JsonReader):562:566 -> a
     3:7:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):559 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$25 -> com.android.tools.r8.internal.jB:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$25 -> com.android.tools.r8.internal.kB:
     1:1:void <init>():576:576 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):576:576 -> a
     2:2:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$25.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.util.Currency):583:583 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):576 -> a
     3:3:java.util.Currency com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$25.read(com.android.tools.r8.com.google.gson.stream.JsonReader):579:579 -> a
     3:3:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):576 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$27 -> com.android.tools.r8.internal.kB:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$27 -> com.android.tools.r8.internal.lB:
     1:1:void <init>():609:609 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):609:609 -> a
     2:18:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$27.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.util.Calendar):654:670 -> a
     2:18:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):609 -> a
     19:48:java.util.Calendar com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$27.read(com.android.tools.r8.com.google.gson.stream.JsonReader):619:648 -> a
     19:48:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):609 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$28 -> com.android.tools.r8.internal.lB:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$28 -> com.android.tools.r8.internal.mB:
     1:1:void <init>():677:677 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):677:677 -> a
     2:2:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$28.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.util.Locale):708:708 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):677 -> a
     3:26:java.util.Locale com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$28.read(com.android.tools.r8.com.google.gson.stream.JsonReader):680:703 -> a
     3:26:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):677 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$29 -> com.android.tools.r8.internal.mB:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$29 -> com.android.tools.r8.internal.nB:
     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
@@ -12683,49 +12798,49 @@
     37:38:com.android.tools.r8.com.google.gson.JsonElement read(com.android.tools.r8.com.google.gson.stream.JsonReader):720:721 -> b
     39:62:com.android.tools.r8.com.google.gson.JsonElement read(com.android.tools.r8.com.google.gson.stream.JsonReader):718:741 -> b
     63:68:com.android.tools.r8.com.google.gson.JsonElement read(com.android.tools.r8.com.google.gson.stream.JsonReader):728:733 -> b
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$3 -> com.android.tools.r8.internal.oB:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$3 -> com.android.tools.r8.internal.pB:
     1:1:void <init>():151:151 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):151:151 -> a
     2:2:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$3.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Boolean):165:165 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):151 -> a
     3:10:java.lang.Boolean com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$3.read(com.android.tools.r8.com.google.gson.stream.JsonReader):154:161 -> a
     3:10:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):151 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$5 -> com.android.tools.r8.internal.pB:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$5 -> com.android.tools.r8.internal.qB:
     1:1:void <init>():190:190 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):190:190 -> a
     2:2:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$5.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Number):206:206 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):190 -> a
     3:11:java.lang.Number com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$5.read(com.android.tools.r8.com.google.gson.stream.JsonReader):193:201 -> a
     3:11:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):190 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$6 -> com.android.tools.r8.internal.qB:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$6 -> com.android.tools.r8.internal.rB:
     1:1:void <init>():213:213 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):213:213 -> a
     2:2:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$6.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Number):228:228 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):213 -> a
     3:10:java.lang.Number com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$6.read(com.android.tools.r8.com.google.gson.stream.JsonReader):216:223 -> a
     3:10:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):213 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$7 -> com.android.tools.r8.internal.rB:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$7 -> com.android.tools.r8.internal.sB:
     1:1:void <init>():235:235 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):235:235 -> a
     2:2:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$7.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Number):250:250 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):235 -> a
     3:10:java.lang.Number com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$7.read(com.android.tools.r8.com.google.gson.stream.JsonReader):238:245 -> a
     3:10:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):235 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$8 -> com.android.tools.r8.internal.sB:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$8 -> com.android.tools.r8.internal.tB:
     1:1:void <init>():256:256 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):256:256 -> a
     2:2:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$8.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.util.concurrent.atomic.AtomicInteger):265:265 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):256 -> a
     3:5:java.util.concurrent.atomic.AtomicInteger com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$8.read(com.android.tools.r8.com.google.gson.stream.JsonReader):259:261 -> a
     3:5:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):256 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$9 -> com.android.tools.r8.internal.tB:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$9 -> com.android.tools.r8.internal.uB:
     1:1:void <init>():271:271 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):271:271 -> a
     2:2:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$9.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.util.concurrent.atomic.AtomicBoolean):276:276 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):271 -> a
     3:3:java.util.concurrent.atomic.AtomicBoolean com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$9.read(com.android.tools.r8.com.google.gson.stream.JsonReader):273:273 -> a
     3:3:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):271 -> a
-com.android.tools.r8.com.google.gson.stream.JsonReader -> com.android.tools.r8.internal.eh:
+com.android.tools.r8.com.google.gson.stream.JsonReader -> com.android.tools.r8.internal.fh:
     char[] NON_EXECUTE_PREFIX -> a
     long peekedLong -> j
     int stackSize -> n
@@ -12822,7 +12937,7 @@
     54:54:com.android.tools.r8.com.google.gson.stream.JsonToken peek():430:430 -> p
     1:5:void skipToEndOfLine():1411:1415 -> q
     1:1:java.lang.String toString():1445:1445 -> toString
-com.android.tools.r8.com.google.gson.stream.JsonToken -> com.android.tools.r8.internal.gh:
+com.android.tools.r8.com.google.gson.stream.JsonToken -> com.android.tools.r8.internal.hh:
     com.android.tools.r8.com.google.gson.stream.JsonToken END_ARRAY -> b
     com.android.tools.r8.com.google.gson.stream.JsonToken BEGIN_OBJECT -> c
     com.android.tools.r8.com.google.gson.stream.JsonToken BEGIN_ARRAY -> a
@@ -12837,7 +12952,7 @@
     1:54:void <clinit>():31:84 -> <clinit>
     55:55:void <clinit>():25:25 -> <clinit>
     1:1:void <init>(java.lang.String,int):25:25 -> <init>
-com.android.tools.r8.com.google.gson.stream.JsonWriter -> com.android.tools.r8.internal.hh:
+com.android.tools.r8.com.google.gson.stream.JsonWriter -> com.android.tools.r8.internal.ih:
     java.lang.String separator -> f
     java.lang.String deferredName -> h
     boolean serializeNulls -> i
@@ -12890,7 +13005,7 @@
     10:11:void writeDeferredName():402:403 -> h
     12:12:void com.android.tools.r8.com.google.gson.stream.JsonWriter.beforeName():616:616 -> h
     12:12:void writeDeferredName():401 -> h
-com.android.tools.r8.com.google.gson.stream.MalformedJsonException -> com.android.tools.r8.internal.yn:
+com.android.tools.r8.com.google.gson.stream.MalformedJsonException -> com.android.tools.r8.internal.zn:
     1:1:void <init>(java.lang.String):29:29 -> <init>
 com.android.tools.r8.compatproguard.CompatProguard -> com.android.tools.r8.compatproguard.CompatProguard:
     1:21:void run(java.lang.String[]):190:210 -> a
@@ -12937,62 +13052,72 @@
     com.android.tools.r8.utils.AndroidApp inputApp -> e
     1:1:void <clinit>():61:61 -> <clinit>
     1:5:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing):72:76 -> <init>
-    1:231:int validateOrComputeMinApiLevel(int,com.android.tools.r8.dex.DexReader):0:230 -> a
-    1:231:int access$100(com.android.tools.r8.dex.ApplicationReader,int,com.android.tools.r8.dex.DexReader):61 -> a
-    232:242:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getMinAndroidApiLevel(com.android.tools.r8.utils.DexVersion):79:89 -> a
-    232:242:int validateOrComputeMinApiLevel(int,com.android.tools.r8.dex.DexReader):232 -> a
-    232:242:int access$100(com.android.tools.r8.dex.ApplicationReader,int,com.android.tools.r8.dex.DexReader):61 -> a
-    243:243:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getMinAndroidApiLevel(com.android.tools.r8.utils.DexVersion):87:87 -> a
-    243:243:int validateOrComputeMinApiLevel(int,com.android.tools.r8.dex.DexReader):232 -> a
-    243:243:int access$100(com.android.tools.r8.dex.ApplicationReader,int,com.android.tools.r8.dex.DexReader):61 -> a
-    244:244:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getMinAndroidApiLevel(com.android.tools.r8.utils.DexVersion):85:85 -> a
-    244:244:int validateOrComputeMinApiLevel(int,com.android.tools.r8.dex.DexReader):232 -> a
-    244:244:int access$100(com.android.tools.r8.dex.ApplicationReader,int,com.android.tools.r8.dex.DexReader):61 -> a
-    245:245:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getMinAndroidApiLevel(com.android.tools.r8.utils.DexVersion):83:83 -> a
-    245:245:int validateOrComputeMinApiLevel(int,com.android.tools.r8.dex.DexReader):232 -> a
-    245:245:int access$100(com.android.tools.r8.dex.ApplicationReader,int,com.android.tools.r8.dex.DexReader):61 -> a
-    246:246:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getMinAndroidApiLevel(com.android.tools.r8.utils.DexVersion):81:81 -> a
-    246:246:int validateOrComputeMinApiLevel(int,com.android.tools.r8.dex.DexReader):232 -> a
-    246:246:int access$100(com.android.tools.r8.dex.ApplicationReader,int,com.android.tools.r8.dex.DexReader):61 -> a
-    247:250:int validateOrComputeMinApiLevel(int,com.android.tools.r8.dex.DexReader):232:235 -> a
-    247:250:int access$100(com.android.tools.r8.dex.ApplicationReader,int,com.android.tools.r8.dex.DexReader):61 -> a
-    251:251:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    251:251:int validateOrComputeMinApiLevel(int,com.android.tools.r8.dex.DexReader):235 -> a
-    251:251:int access$100(com.android.tools.r8.dex.ApplicationReader,int,com.android.tools.r8.dex.DexReader):61 -> a
-    252:252:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    252:252:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    252:252:int validateOrComputeMinApiLevel(int,com.android.tools.r8.dex.DexReader):235 -> a
-    252:252:int access$100(com.android.tools.r8.dex.ApplicationReader,int,com.android.tools.r8.dex.DexReader):61 -> a
-    253:253:int validateOrComputeMinApiLevel(int,com.android.tools.r8.dex.DexReader):235:235 -> a
-    253:253:int access$100(com.android.tools.r8.dex.ApplicationReader,int,com.android.tools.r8.dex.DexReader):61 -> a
-    254:254:com.android.tools.r8.utils.InternalOptions access$000(com.android.tools.r8.dex.ApplicationReader):61:61 -> a
-    255:255:com.android.tools.r8.graph.LazyLoadedDexApplication read():80:80 -> a
-    256:260:com.android.tools.r8.graph.LazyLoadedDexApplication read(com.android.tools.r8.StringResource):86:90 -> a
-    261:265:com.android.tools.r8.graph.LazyLoadedDexApplication read(java.util.concurrent.ExecutorService):97:97 -> a
-    266:270:com.android.tools.r8.graph.LazyLoadedDexApplication read(com.android.tools.r8.StringResource,java.util.concurrent.ExecutorService):107:107 -> a
-    271:271:com.android.tools.r8.graph.LazyLoadedDexApplication read(com.android.tools.r8.StringResource,java.util.concurrent.ExecutorService,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver):118:118 -> a
-    272:281:boolean verifyMainDexOptionsCompatible(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):215:224 -> a
-    272:281:com.android.tools.r8.graph.LazyLoadedDexApplication read(com.android.tools.r8.StringResource,java.util.concurrent.ExecutorService,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver):118 -> a
-    282:293:com.android.tools.r8.graph.LazyLoadedDexApplication read(com.android.tools.r8.StringResource,java.util.concurrent.ExecutorService,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver):121:132 -> a
-    294:294:void dumpInputToFile(com.android.tools.r8.utils.AndroidApp,java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):210:210 -> a
-    294:294:com.android.tools.r8.graph.LazyLoadedDexApplication read(com.android.tools.r8.StringResource,java.util.concurrent.ExecutorService,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver):132 -> a
-    295:300:com.android.tools.r8.graph.LazyLoadedDexApplication read(com.android.tools.r8.StringResource,java.util.concurrent.ExecutorService,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver):136:141 -> a
-    301:336:com.android.tools.r8.graph.LazyLoadedDexApplication read(com.android.tools.r8.StringResource,java.util.concurrent.ExecutorService,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver):139:174 -> a
-    337:337:com.android.tools.r8.graph.LazyLoadedDexApplication read(com.android.tools.r8.StringResource,java.util.concurrent.ExecutorService,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver):170:170 -> a
-    338:338:java.lang.RuntimeException com.android.tools.r8.utils.ExceptionUtils.unwrapExecutionException(java.util.concurrent.ExecutionException):207:207 -> a
-    338:338:com.android.tools.r8.graph.LazyLoadedDexApplication read(com.android.tools.r8.StringResource,java.util.concurrent.ExecutorService,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver):168 -> a
-    339:343:com.android.tools.r8.graph.LazyLoadedDexApplication read(com.android.tools.r8.StringResource,java.util.concurrent.ExecutorService,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver):168:172 -> a
-    344:354:com.android.tools.r8.shaking.MainDexClasses readMainDexClasses(com.android.tools.r8.graph.DexApplication):178:188 -> a
-    355:362:com.android.tools.r8.shaking.MainDexClasses readMainDexClasses(com.android.tools.r8.graph.DexApplication):183:190 -> a
-    363:363:com.android.tools.r8.graph.DexType lambda$readMainDexClasses$0(java.lang.String):187:187 -> a
-    364:372:void addToMainDexClasses(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.shaking.MainDexClasses$Builder,java.lang.Iterable):195:203 -> a
-    373:373:void addToMainDexClasses(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.shaking.MainDexClasses$Builder,java.lang.Iterable):200:200 -> a
-    374:376:void readProguardMap(com.android.tools.r8.StringResource,com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,java.util.List):250:250 -> a
-    377:380:void lambda$readProguardMap$1(com.android.tools.r8.StringResource,com.android.tools.r8.graph.DexApplication$Builder):254:257 -> a
-    381:381:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
-    381:381:void lambda$readProguardMap$1(com.android.tools.r8.StringResource,com.android.tools.r8.graph.DexApplication$Builder):257 -> a
-    382:382:void lambda$readProguardMap$1(com.android.tools.r8.StringResource,com.android.tools.r8.graph.DexApplication$Builder):257:257 -> a
+    1:255:int validateOrComputeMinApiLevel(int,com.android.tools.r8.dex.DexReader):0:254 -> a
+    1:255:int access$100(com.android.tools.r8.dex.ApplicationReader,int,com.android.tools.r8.dex.DexReader):61 -> a
+    256:266:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getMinAndroidApiLevel(com.android.tools.r8.utils.DexVersion):79:89 -> a
+    256:266:int validateOrComputeMinApiLevel(int,com.android.tools.r8.dex.DexReader):256 -> a
+    256:266:int access$100(com.android.tools.r8.dex.ApplicationReader,int,com.android.tools.r8.dex.DexReader):61 -> a
+    267:267:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getMinAndroidApiLevel(com.android.tools.r8.utils.DexVersion):87:87 -> a
+    267:267:int validateOrComputeMinApiLevel(int,com.android.tools.r8.dex.DexReader):256 -> a
+    267:267:int access$100(com.android.tools.r8.dex.ApplicationReader,int,com.android.tools.r8.dex.DexReader):61 -> a
+    268:268:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getMinAndroidApiLevel(com.android.tools.r8.utils.DexVersion):85:85 -> a
+    268:268:int validateOrComputeMinApiLevel(int,com.android.tools.r8.dex.DexReader):256 -> a
+    268:268:int access$100(com.android.tools.r8.dex.ApplicationReader,int,com.android.tools.r8.dex.DexReader):61 -> a
+    269:269:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getMinAndroidApiLevel(com.android.tools.r8.utils.DexVersion):83:83 -> a
+    269:269:int validateOrComputeMinApiLevel(int,com.android.tools.r8.dex.DexReader):256 -> a
+    269:269:int access$100(com.android.tools.r8.dex.ApplicationReader,int,com.android.tools.r8.dex.DexReader):61 -> a
+    270:270:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getMinAndroidApiLevel(com.android.tools.r8.utils.DexVersion):81:81 -> a
+    270:270:int validateOrComputeMinApiLevel(int,com.android.tools.r8.dex.DexReader):256 -> a
+    270:270:int access$100(com.android.tools.r8.dex.ApplicationReader,int,com.android.tools.r8.dex.DexReader):61 -> a
+    271:274:int validateOrComputeMinApiLevel(int,com.android.tools.r8.dex.DexReader):256:259 -> a
+    271:274:int access$100(com.android.tools.r8.dex.ApplicationReader,int,com.android.tools.r8.dex.DexReader):61 -> a
+    275:275:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    275:275:int validateOrComputeMinApiLevel(int,com.android.tools.r8.dex.DexReader):259 -> a
+    275:275:int access$100(com.android.tools.r8.dex.ApplicationReader,int,com.android.tools.r8.dex.DexReader):61 -> a
+    276:276:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    276:276:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    276:276:int validateOrComputeMinApiLevel(int,com.android.tools.r8.dex.DexReader):259 -> a
+    276:276:int access$100(com.android.tools.r8.dex.ApplicationReader,int,com.android.tools.r8.dex.DexReader):61 -> a
+    277:277:int validateOrComputeMinApiLevel(int,com.android.tools.r8.dex.DexReader):259:259 -> a
+    277:277:int access$100(com.android.tools.r8.dex.ApplicationReader,int,com.android.tools.r8.dex.DexReader):61 -> a
+    278:278:com.android.tools.r8.utils.InternalOptions access$000(com.android.tools.r8.dex.ApplicationReader):61:61 -> a
+    279:279:com.android.tools.r8.graph.LazyLoadedDexApplication read():80:80 -> a
+    280:284:com.android.tools.r8.graph.LazyLoadedDexApplication read(com.android.tools.r8.StringResource):86:90 -> a
+    285:288:com.android.tools.r8.graph.LazyLoadedDexApplication read(java.util.concurrent.ExecutorService):97:100 -> a
+    289:289:com.android.tools.r8.graph.LazyLoadedDexApplication read(com.android.tools.r8.StringResource,java.util.concurrent.ExecutorService,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver):127:127 -> a
+    289:289:com.android.tools.r8.graph.LazyLoadedDexApplication read(java.util.concurrent.ExecutorService):97 -> a
+    290:293:com.android.tools.r8.graph.LazyLoadedDexApplication read(com.android.tools.r8.StringResource,java.util.concurrent.ExecutorService):116:119 -> a
+    294:294:com.android.tools.r8.graph.LazyLoadedDexApplication read(com.android.tools.r8.StringResource,java.util.concurrent.ExecutorService,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver):127:127 -> a
+    294:294:com.android.tools.r8.graph.LazyLoadedDexApplication read(com.android.tools.r8.StringResource,java.util.concurrent.ExecutorService):116 -> a
+    295:295:com.android.tools.r8.graph.LazyLoadedDexApplication read(com.android.tools.r8.StringResource,java.util.concurrent.ExecutorService,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver,boolean):136:136 -> a
+    296:305:boolean verifyMainDexOptionsCompatible(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):239:248 -> a
+    296:305:com.android.tools.r8.graph.LazyLoadedDexApplication read(com.android.tools.r8.StringResource,java.util.concurrent.ExecutorService,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver,boolean):136 -> a
+    306:317:void dumpApplication():176:187 -> a
+    306:317:com.android.tools.r8.graph.LazyLoadedDexApplication read(com.android.tools.r8.StringResource,java.util.concurrent.ExecutorService,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver,boolean):138 -> a
+    318:318:void dumpInputToFile(com.android.tools.r8.utils.AndroidApp,java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):234:234 -> a
+    318:318:void dumpApplication():187 -> a
+    318:318:com.android.tools.r8.graph.LazyLoadedDexApplication read(com.android.tools.r8.StringResource,java.util.concurrent.ExecutorService,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver,boolean):138 -> a
+    319:324:void dumpApplication():191:196 -> a
+    319:324:com.android.tools.r8.graph.LazyLoadedDexApplication read(com.android.tools.r8.StringResource,java.util.concurrent.ExecutorService,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver,boolean):138 -> a
+    325:325:void dumpApplication():194:194 -> a
+    325:325:com.android.tools.r8.graph.LazyLoadedDexApplication read(com.android.tools.r8.StringResource,java.util.concurrent.ExecutorService,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver,boolean):138 -> a
+    326:356:com.android.tools.r8.graph.LazyLoadedDexApplication read(com.android.tools.r8.StringResource,java.util.concurrent.ExecutorService,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver,boolean):140:170 -> a
+    357:357:com.android.tools.r8.graph.LazyLoadedDexApplication read(com.android.tools.r8.StringResource,java.util.concurrent.ExecutorService,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver,boolean):166:166 -> a
+    358:358:java.lang.RuntimeException com.android.tools.r8.utils.ExceptionUtils.unwrapExecutionException(java.util.concurrent.ExecutionException):216:216 -> a
+    358:358:com.android.tools.r8.graph.LazyLoadedDexApplication read(com.android.tools.r8.StringResource,java.util.concurrent.ExecutorService,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver,boolean):164 -> a
+    359:363:com.android.tools.r8.graph.LazyLoadedDexApplication read(com.android.tools.r8.StringResource,java.util.concurrent.ExecutorService,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver,boolean):164:168 -> a
+    364:374:com.android.tools.r8.shaking.MainDexClasses readMainDexClasses(com.android.tools.r8.graph.DexApplication):202:212 -> a
+    375:382:com.android.tools.r8.shaking.MainDexClasses readMainDexClasses(com.android.tools.r8.graph.DexApplication):207:214 -> a
+    383:383:com.android.tools.r8.graph.DexType lambda$readMainDexClasses$0(java.lang.String):211:211 -> a
+    384:392:void addToMainDexClasses(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.shaking.MainDexClasses$Builder,java.lang.Iterable):219:227 -> a
+    393:393:void addToMainDexClasses(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.shaking.MainDexClasses$Builder,java.lang.Iterable):224:224 -> a
+    394:396:void readProguardMap(com.android.tools.r8.StringResource,com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,java.util.List):274:274 -> a
+    397:400:void lambda$readProguardMap$1(com.android.tools.r8.StringResource,com.android.tools.r8.graph.DexApplication$Builder):278:281 -> a
+    401:401:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
+    401:401:void lambda$readProguardMap$1(com.android.tools.r8.StringResource,com.android.tools.r8.graph.DexApplication$Builder):281 -> a
+    402:402:void lambda$readProguardMap$1(com.android.tools.r8.StringResource,com.android.tools.r8.graph.DexApplication$Builder):281:281 -> a
     1:1:com.android.tools.r8.utils.AndroidApp access$200(com.android.tools.r8.dex.ApplicationReader):61:61 -> b
+    2:6:com.android.tools.r8.graph.LazyLoadedDexApplication readWithoutDumping(java.util.concurrent.ExecutorService):105:105 -> b
 com.android.tools.r8.dex.ApplicationReader$ClassReader -> com.android.tools.r8.dex.a$a:
     java.util.Queue libraryClasses -> f
     com.android.tools.r8.graph.JarApplicationReader application -> g
@@ -13002,20 +13127,20 @@
     boolean $assertionsDisabled -> a
     java.util.concurrent.ExecutorService executorService -> b
     com.android.tools.r8.dex.ApplicationReader this$0 -> h
-    1:1:void <clinit>():262:262 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.dex.ApplicationReader,java.util.concurrent.ExecutorService,java.util.List):274:274 -> <init>
-    2:10:void <init>(com.android.tools.r8.dex.ApplicationReader,java.util.concurrent.ExecutorService,java.util.List):268:276 -> <init>
+    1:1:void <clinit>():286:286 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.dex.ApplicationReader,java.util.concurrent.ExecutorService,java.util.List):298:298 -> <init>
+    2:10:void <init>(com.android.tools.r8.dex.ApplicationReader,java.util.concurrent.ExecutorService,java.util.List):292:300 -> <init>
     1:90:void com.android.tools.r8.graph.JarClassFileReader.read(com.android.tools.r8.ProgramResource,com.android.tools.r8.graph.ClassKind):0:89 -> a
-    1:90:java.lang.Object lambda$readClassSources$1(com.android.tools.r8.graph.JarClassFileReader,com.android.tools.r8.ProgramResource,com.android.tools.r8.graph.ClassKind):318 -> a
-    91:93:void lambda$readDexSources$0(com.android.tools.r8.dex.DexParser,com.android.tools.r8.graph.ClassKind,java.util.Queue):301:301 -> a
-    94:99:com.android.tools.r8.graph.JarClassFileReader readClassSources(java.util.List,com.android.tools.r8.graph.ClassKind,java.util.Queue):311:316 -> a
-    100:100:com.android.tools.r8.graph.JarClassFileReader readClassSources(java.util.List,com.android.tools.r8.graph.ClassKind,java.util.Queue):315:315 -> a
-    101:113:com.android.tools.r8.graph.JarClassFileReader readSources():328:340 -> a
-    114:131:com.android.tools.r8.utils.ClassProvider buildClassProvider(com.android.tools.r8.graph.ClassKind,java.util.Queue,java.util.List,com.android.tools.r8.graph.JarApplicationReader):346:363 -> a
-    132:138:void initializeLazyClassCollection(com.android.tools.r8.graph.LazyLoadedDexApplication$Builder):368:374 -> a
-    139:147:void initializeLazyClassCollection(com.android.tools.r8.graph.LazyLoadedDexApplication$Builder):373:381 -> a
-    148:151:void initializeLazyClassCollection(com.android.tools.r8.graph.LazyLoadedDexApplication$Builder):380:383 -> a
-    1:19:void readDexSources(java.util.List,com.android.tools.r8.graph.ClassKind,java.util.Queue):282:300 -> b
+    1:90:java.lang.Object lambda$readClassSources$1(com.android.tools.r8.graph.JarClassFileReader,com.android.tools.r8.ProgramResource,com.android.tools.r8.graph.ClassKind):342 -> a
+    91:93:void lambda$readDexSources$0(com.android.tools.r8.dex.DexParser,com.android.tools.r8.graph.ClassKind,java.util.Queue):325:325 -> a
+    94:99:com.android.tools.r8.graph.JarClassFileReader readClassSources(java.util.List,com.android.tools.r8.graph.ClassKind,java.util.Queue):335:340 -> a
+    100:100:com.android.tools.r8.graph.JarClassFileReader readClassSources(java.util.List,com.android.tools.r8.graph.ClassKind,java.util.Queue):339:339 -> a
+    101:113:com.android.tools.r8.graph.JarClassFileReader readSources():352:364 -> a
+    114:131:com.android.tools.r8.utils.ClassProvider buildClassProvider(com.android.tools.r8.graph.ClassKind,java.util.Queue,java.util.List,com.android.tools.r8.graph.JarApplicationReader):370:387 -> a
+    132:138:void initializeLazyClassCollection(com.android.tools.r8.graph.LazyLoadedDexApplication$Builder):392:398 -> a
+    139:147:void initializeLazyClassCollection(com.android.tools.r8.graph.LazyLoadedDexApplication$Builder):397:405 -> a
+    148:151:void initializeLazyClassCollection(com.android.tools.r8.graph.LazyLoadedDexApplication$Builder):404:407 -> a
+    1:19:void readDexSources(java.util.List,com.android.tools.r8.graph.ClassKind,java.util.Queue):306:324 -> b
 com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver -> com.android.tools.r8.dex.a$b:
     com.android.tools.r8.graph.DexProgramClass resolveClassConflict(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass) -> a
 com.android.tools.r8.dex.ApplicationWriter -> com.android.tools.r8.dex.b:
@@ -13035,10 +13160,10 @@
     1:1:void <init>(com.android.tools.r8.graph.AppView,java.util.List,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.naming.ProguardMapSupplier):160:160 -> <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):177:188 -> <init>
     1:1:java.util.List distribute(java.util.concurrent.ExecutorService):195:195 -> a
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():421:421 -> a
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():428:428 -> a
     2:2:java.util.List distribute(java.util.concurrent.ExecutorService):195 -> a
     3:3:java.util.List distribute(java.util.concurrent.ExecutorService):196:196 -> a
-    4:4:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():437:437 -> a
+    4:4:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():444:444 -> a
     4:4:java.util.List distribute(java.util.concurrent.ExecutorService):197 -> a
     5:14:java.util.List distribute(java.util.concurrent.ExecutorService):197:206 -> a
     15:16:void encodeChecksums(java.lang.Iterable):216:217 -> a
@@ -13048,10 +13173,10 @@
     28:28:java.lang.Boolean lambda$write$0(java.util.List,com.android.tools.r8.ir.analysis.proto.ProtoShrinker):269:269 -> a
     29:29:void lambda$write$1(com.android.tools.r8.dex.ApplicationWriter$SortAnnotations,com.android.tools.r8.graph.DexProgramClass):274:274 -> a
     30:34:java.lang.Boolean lambda$write$2(com.android.tools.r8.dex.VirtualFile):285:289 -> a
-    35:35:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():437:437 -> a
+    35:35:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():444:444 -> a
     35:35:java.lang.Boolean lambda$write$2(com.android.tools.r8.dex.VirtualFile):289 -> a
     36:43:java.lang.Boolean lambda$write$2(com.android.tools.r8.dex.VirtualFile):292:299 -> a
-    44:44:com.android.tools.r8.DexIndexedConsumer com.android.tools.r8.utils.InternalOptions.getDexIndexedConsumer():433:433 -> a
+    44:44:com.android.tools.r8.DexIndexedConsumer com.android.tools.r8.utils.InternalOptions.getDexIndexedConsumer():440:440 -> a
     44:44:java.lang.Boolean lambda$write$2(com.android.tools.r8.dex.VirtualFile):299 -> a
     45:47:java.lang.Boolean lambda$write$2(com.android.tools.r8.dex.VirtualFile):303:305 -> a
     48:52:java.lang.Boolean lambda$write$2(com.android.tools.r8.dex.VirtualFile):304:308 -> a
@@ -13124,10 +13249,7 @@
     369:370:void insertAttributeAnnotationsForMethod(com.android.tools.r8.graph.DexEncodedMethod):571 -> a
     371:371:void insertAttributeAnnotationsForMethod(com.android.tools.r8.graph.DexEncodedMethod):571:571 -> a
     372:379:void insertAttributeAnnotationsForMethod(com.android.tools.r8.graph.DexEncodedMethod):569:576 -> a
-    380:385:void setCallSiteContexts(com.android.tools.r8.graph.DexProgramClass):585:590 -> a
-    386:386:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getReference():375:375 -> a
-    386:386:void setCallSiteContexts(com.android.tools.r8.graph.DexProgramClass):592 -> a
-    387:387:void setCallSiteContexts(com.android.tools.r8.graph.DexProgramClass):592:592 -> a
+    380:387:void setCallSiteContexts(com.android.tools.r8.graph.DexProgramClass):585:592 -> a
     388:390:com.android.tools.r8.dex.MethodToCodeObjectMapping rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,java.util.Collection,com.android.tools.r8.graph.DexApplication):611:613 -> a
     391:391:com.android.tools.r8.dex.MethodToCodeObjectMapping com.android.tools.r8.dex.MethodToCodeObjectMapping.fromMethodBacking():21:21 -> a
     391:391:com.android.tools.r8.dex.MethodToCodeObjectMapping rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,java.util.Collection,com.android.tools.r8.graph.DexApplication):614 -> a
@@ -13147,7 +13269,7 @@
     37:42:void write(java.util.concurrent.ExecutorService):265:270 -> c
     43:56:void write(java.util.concurrent.ExecutorService):268:281 -> c
     57:116:void write(java.util.concurrent.ExecutorService):280:339 -> c
-    117:117:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():390:390 -> c
+    117:117:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():397:397 -> c
     117:117:void write(java.util.concurrent.ExecutorService):339 -> c
     118:126:void write(java.util.concurrent.ExecutorService):339:347 -> c
 com.android.tools.r8.dex.ApplicationWriter$1 -> com.android.tools.r8.dex.b$a:
@@ -13190,7 +13312,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.o6:
+com.android.tools.r8.dex.ClassesChecksum -> com.android.tools.r8.internal.p6:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap dictionary -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():14:14 -> <clinit>
@@ -13212,7 +13334,7 @@
     1:1:boolean com.android.tools.r8.naming.NamingLens.hasPrefixRewritingLogic():0:0 -> a
     1:1:com.android.tools.r8.dex.CodeToKeep createCodeToKeep(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.NamingLens):24 -> a
     2:3:com.android.tools.r8.dex.CodeToKeep createCodeToKeep(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.NamingLens):24:25 -> a
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():390:390 -> a
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():397:397 -> a
     4:4:com.android.tools.r8.dex.CodeToKeep createCodeToKeep(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.NamingLens):26 -> a
     5:7:com.android.tools.r8.dex.CodeToKeep createCodeToKeep(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.NamingLens):27:29 -> a
     void generateKeepRules(com.android.tools.r8.utils.InternalOptions) -> a
@@ -13265,7 +13387,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):216:216 -> a
-com.android.tools.r8.dex.CompatByteBuffer -> com.android.tools.r8.internal.R6:
+com.android.tools.r8.dex.CompatByteBuffer -> com.android.tools.r8.internal.S6:
     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
@@ -13333,12 +13455,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.h7:
+com.android.tools.r8.dex.Constants -> com.android.tools.r8.internal.i7:
     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.B7:
+com.android.tools.r8.dex.DebugBytecodeWriter -> com.android.tools.r8.internal.C7:
     com.android.tools.r8.graph.ObjectToOffsetMapping mapping -> a
     com.android.tools.r8.graph.DexDebugInfo info -> b
     java.nio.ByteBuffer buffer -> c
@@ -13532,7 +13654,7 @@
     935:938:com.android.tools.r8.graph.DexCode parseCodeItem():931:934 -> a
     935:938:void ensureCodesInited(int):163 -> a
     935:938:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):672 -> a
-    939:939:void com.android.tools.r8.graph.DexCode$Try.setHandlerIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap):468:468 -> a
+    939:939:void com.android.tools.r8.graph.DexCode$Try.setHandlerIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap):473:473 -> a
     939:939:com.android.tools.r8.graph.DexCode parseCodeItem():935 -> a
     939:939:void ensureCodesInited(int):163 -> a
     939:939:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):672 -> a
@@ -13965,7 +14087,7 @@
     8:8:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> h
     8:8:void setByteOrder():83 -> h
     9:9:void setByteOrder():83:83 -> h
-com.android.tools.r8.dex.DexSection -> com.android.tools.r8.internal.I8:
+com.android.tools.r8.dex.DexSection -> com.android.tools.r8.internal.J8:
     int offset -> d
     boolean $assertionsDisabled -> a
     int type -> b
@@ -14375,7 +14497,7 @@
     1:2:void <init>(com.android.tools.r8.dex.FileWriter,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexProgramClass[]):1369:1370 -> <init>
     3:7:void <init>(com.android.tools.r8.dex.FileWriter,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexProgramClass[]):1367:1371 -> <init>
     1:4:void visit(com.android.tools.r8.graph.DexClass):1382:1385 -> b
-com.android.tools.r8.dex.IndexedItemCollection -> com.android.tools.r8.internal.sd:
+com.android.tools.r8.dex.IndexedItemCollection -> com.android.tools.r8.internal.td:
     boolean addCallSite(com.android.tools.r8.graph.DexCallSite) -> a
     boolean addMethodHandle(com.android.tools.r8.graph.DexMethodHandle) -> a
     boolean addProto(com.android.tools.r8.graph.DexProto) -> a
@@ -14434,7 +14556,7 @@
     102:102:java.util.Collection assignClassesWithLinkingError(java.util.Set,java.util.Collection):458 -> a
     103:106:java.util.Collection assignClassesWithLinkingError(java.util.Set,java.util.Collection):461:464 -> a
     107:107:java.util.Collection assignClassesWithLinkingError(java.util.Set,java.util.Collection):453:453 -> a
-    108:108:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():580:580 -> a
+    108:108:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():584:584 -> a
     108:108:java.util.Collection assignClassesWithLinkingError(java.util.Set,java.util.Collection):454 -> a
     109:109:java.util.Collection assignClassesWithLinkingError(java.util.Set,java.util.Collection):454:454 -> a
     110:110:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
@@ -14502,7 +14624,7 @@
     111:111:void markDexFull(com.android.tools.r8.dex.VirtualFile):727:727 -> b
     111:111:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):654 -> b
     112:112:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):648:648 -> b
-    113:113:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():580:580 -> b
+    113:113:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():584:584 -> b
     113:113:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):649 -> b
     114:114:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):649:649 -> b
     115:115:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> b
@@ -14572,7 +14694,7 @@
     2:5:void addDirectSubClass(com.android.tools.r8.graph.AppView,java.util.Set,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):274:277 -> a
     6:7:java.util.Collection getDirectSubClasses(com.android.tools.r8.graph.DexProgramClass):262:263 -> a
     1:1:java.util.Collection lambda$addDirectSubClass$0(com.android.tools.r8.graph.DexProgramClass):276:276 -> b
-com.android.tools.r8.dex.JumboStringRewriter -> com.android.tools.r8.internal.ih:
+com.android.tools.r8.dex.JumboStringRewriter -> com.android.tools.r8.internal.jh:
     com.android.tools.r8.graph.DexItemFactory factory -> d
     com.android.tools.r8.graph.DexString firstJumboString -> c
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap tryRangeStartAndEndTargets -> i
@@ -14644,7 +14766,7 @@
     407:417:com.android.tools.r8.graph.DexCode rewrite():121 -> a
     418:430:com.android.tools.r8.graph.DexCode rewrite():123:135 -> a
     com.android.tools.r8.code.Instruction lambda$replaceTarget$1(com.android.tools.r8.code.Instruction,com.android.tools.r8.code.Instruction,com.android.tools.r8.code.Instruction) -> b
-com.android.tools.r8.dex.JumboStringRewriter$TryTargets -> com.android.tools.r8.internal.ih$a:
+com.android.tools.r8.dex.JumboStringRewriter$TryTargets -> com.android.tools.r8.internal.jh$a:
     com.android.tools.r8.code.Instruction start -> b
     com.android.tools.r8.code.Instruction end -> c
     boolean $assertionsDisabled -> a
@@ -14654,7 +14776,7 @@
     1:5:void replaceTarget(com.android.tools.r8.code.Instruction,com.android.tools.r8.code.Instruction):71:75 -> a
     6:6:int getStartOffset():80:80 -> a
     1:4:int getStartToEndDelta():84:87 -> b
-com.android.tools.r8.dex.Marker -> com.android.tools.r8.internal.Nn:
+com.android.tools.r8.dex.Marker -> com.android.tools.r8.internal.On:
     com.android.tools.r8.com.google.gson.JsonObject jsonObject -> e
     com.android.tools.r8.dex.Marker$Tool tool -> f
     java.lang.String D8_PREFIX -> a
@@ -14705,12 +14827,12 @@
     1:1:boolean isL8():124:124 -> n
     1:1:boolean isRelocator():128:128 -> o
     1:5:java.lang.String toString():258:262 -> toString
-com.android.tools.r8.dex.Marker$Backend -> com.android.tools.r8.internal.Nn$a:
+com.android.tools.r8.dex.Marker$Backend -> com.android.tools.r8.internal.On$a:
     com.android.tools.r8.dex.Marker$Backend DEX -> b
     com.android.tools.r8.dex.Marker$Backend CF -> a
     1:2:void <clinit>():47:48 -> <clinit>
     1:1:void <init>(java.lang.String,int):46:46 -> <init>
-com.android.tools.r8.dex.Marker$Tool -> com.android.tools.r8.internal.Nn$b:
+com.android.tools.r8.dex.Marker$Tool -> com.android.tools.r8.internal.On$b:
     com.android.tools.r8.dex.Marker$Tool R8 -> b
     com.android.tools.r8.dex.Marker$Tool D8 -> a
     com.android.tools.r8.dex.Marker$Tool Relocator -> d
@@ -14718,7 +14840,7 @@
     1:4:void <clinit>():36:39 -> <clinit>
     1:1:void <init>(java.lang.String,int):35:35 -> <init>
     1:1:com.android.tools.r8.dex.Marker$Tool[] valuesR8andD8():42:42 -> a
-com.android.tools.r8.dex.MethodToCodeObjectMapping -> com.android.tools.r8.internal.Jo:
+com.android.tools.r8.dex.MethodToCodeObjectMapping -> com.android.tools.r8.internal.Ko:
     1:1:void <init>():12:12 -> <init>
     void clearCode(com.android.tools.r8.graph.DexEncodedMethod,boolean) -> a
     com.android.tools.r8.graph.DexCode getCode(com.android.tools.r8.graph.DexEncodedMethod) -> a
@@ -14754,7 +14876,7 @@
     1:1:com.android.tools.r8.dex.MethodToCodeObjectMapping com.android.tools.r8.dex.MethodToCodeObjectMapping.fromMethodBacking():21:21 -> a
     1:1:void visit(com.android.tools.r8.graph.DexEncodedMethod):63 -> a
     2:2:void visit(com.android.tools.r8.graph.DexEncodedMethod):62:62 -> a
-com.android.tools.r8.dex.ResourceAdapter -> com.android.tools.r8.internal.fx:
+com.android.tools.r8.dex.ResourceAdapter -> com.android.tools.r8.internal.hx:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.utils.InternalOptions options -> e
     com.android.tools.r8.naming.NamingLens namingLens -> d
@@ -14781,14 +14903,14 @@
     56:64:boolean shouldAdapt(com.android.tools.r8.DataEntryResource,com.android.tools.r8.utils.InternalOptions,java.util.function.Function):96:104 -> a
     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
-com.android.tools.r8.dex.ResourceAdapter$DefaultFileNameAdapter -> com.android.tools.r8.internal.Zw:
+com.android.tools.r8.dex.ResourceAdapter$DefaultFileNameAdapter -> com.android.tools.r8.internal.bx:
     1:1:void <init>(com.android.tools.r8.dex.ResourceAdapter,java.lang.String):419:419 -> <init>
     1:1:boolean com.android.tools.r8.dex.ResourceAdapter$StringAdapter.eof(int):346:346 -> b
     1:1:boolean isRenamingCandidate(int,int):424 -> b
-com.android.tools.r8.dex.ResourceAdapter$DirectoryNameAdapter -> com.android.tools.r8.internal.ax:
+com.android.tools.r8.dex.ResourceAdapter$DirectoryNameAdapter -> com.android.tools.r8.internal.cx:
     1:1:void <init>(com.android.tools.r8.dex.ResourceAdapter,java.lang.String):451:451 -> <init>
     boolean isRenamingCandidate(int,int) -> b
-com.android.tools.r8.dex.ResourceAdapter$FileContentsAdapter -> com.android.tools.r8.internal.bx:
+com.android.tools.r8.dex.ResourceAdapter$FileContentsAdapter -> com.android.tools.r8.internal.dx:
     1:1:void <init>(com.android.tools.r8.dex.ResourceAdapter,java.lang.String):353:353 -> <init>
     boolean allowRenamingOfPrefixes() -> a
     1:1:boolean shouldRecordPrefix(char):368:368 -> a
@@ -14798,7 +14920,7 @@
     2:2:boolean com.android.tools.r8.dex.ResourceAdapter$StringAdapter.eof(int):346:346 -> b
     2:2:boolean isRenamingCandidate(int,int):380 -> b
     3:3:boolean isRenamingCandidate(int,int):380:380 -> b
-com.android.tools.r8.dex.ResourceAdapter$FileNameAdapter -> com.android.tools.r8.internal.cx:
+com.android.tools.r8.dex.ResourceAdapter$FileNameAdapter -> com.android.tools.r8.internal.ex:
     1:1:void <init>(com.android.tools.r8.dex.ResourceAdapter,java.lang.String):390:390 -> <init>
     boolean allowRenamingOfPrefixes() -> a
     1:1:boolean com.android.tools.r8.dex.ResourceAdapter$StringAdapter.eof(int):346:346 -> a
@@ -14807,12 +14929,12 @@
     6:6:boolean handlePrefix(int,int):411:411 -> a
     7:7:boolean shouldRecordPrefix(char):405:405 -> a
     char getClassNameSeparator() -> b
-com.android.tools.r8.dex.ResourceAdapter$ServiceFileNameAdapter -> com.android.tools.r8.internal.dx:
+com.android.tools.r8.dex.ResourceAdapter$ServiceFileNameAdapter -> com.android.tools.r8.internal.fx:
     1:1:void <init>(com.android.tools.r8.dex.ResourceAdapter,java.lang.String):430:430 -> <init>
     char getClassNameSeparator() -> b
     1:1:boolean com.android.tools.r8.dex.ResourceAdapter$StringAdapter.eof(int):346:346 -> b
     1:1:boolean isRenamingCandidate(int,int):445 -> b
-com.android.tools.r8.dex.ResourceAdapter$StringAdapter -> com.android.tools.r8.internal.ex:
+com.android.tools.r8.dex.ResourceAdapter$StringAdapter -> com.android.tools.r8.internal.gx:
     int position -> f
     com.android.tools.r8.dex.ResourceAdapter this$0 -> h
     int outputFrom -> e
@@ -15322,7 +15444,7 @@
     1:1:int getCodeSize():32:32 -> getCodeSize
     1:5:java.lang.String getDiagnosticMessage():42:46 -> getDiagnosticMessage
     1:1:com.android.tools.r8.position.Position getPosition():37:37 -> getPosition
-com.android.tools.r8.errors.CompilationError -> com.android.tools.r8.internal.S6:
+com.android.tools.r8.errors.CompilationError -> com.android.tools.r8.internal.T6:
     com.android.tools.r8.origin.Origin origin -> a
     com.android.tools.r8.position.Position position -> b
     1:1:void <init>(java.lang.String):22:22 -> <init>
@@ -15339,14 +15461,14 @@
     1:3:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.references.ClassReference,int):21:23 -> <init>
     1:1:int getConstantPoolSize():28:28 -> getConstantPoolSize
     1:5:java.lang.String getDiagnosticMessage():33:37 -> getDiagnosticMessage
-com.android.tools.r8.errors.DefaultInterfaceMethodDiagnostic -> com.android.tools.r8.internal.P7:
+com.android.tools.r8.errors.DefaultInterfaceMethodDiagnostic -> com.android.tools.r8.internal.Q7:
     com.android.tools.r8.position.MethodPosition position -> b
     boolean $assertionsDisabled -> a
     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.j8:
+com.android.tools.r8.errors.DesugaredLibraryMismatchDiagnostic -> com.android.tools.r8.internal.k8:
     java.util.Set desugaredLibraryIdentifiers -> a
     1:2:void <init>(java.util.Set):16:17 -> <init>
     1:1:java.lang.String getDiagnosticMessage():32:32 -> getDiagnosticMessage
@@ -15389,14 +15511,14 @@
     1:1:com.android.tools.r8.references.ClassReference getMissingType():58:58 -> getMissingType
     1:1:com.android.tools.r8.origin.Origin getOrigin():47:47 -> getOrigin
     1:1:com.android.tools.r8.position.Position getPosition():53:53 -> getPosition
-com.android.tools.r8.errors.InternalCompilerError -> com.android.tools.r8.internal.cg:
+com.android.tools.r8.errors.InternalCompilerError -> com.android.tools.r8.internal.dg:
     1:1:void <init>():17:17 -> <init>
     2:2:void <init>(java.lang.String):21:21 -> <init>
     3:3:void <init>(java.lang.String,java.lang.Throwable):25:25 -> <init>
     4:4:void <init>(java.lang.Throwable):29:29 -> <init>
-com.android.tools.r8.errors.InvalidDebugInfoException -> com.android.tools.r8.internal.jg:
+com.android.tools.r8.errors.InvalidDebugInfoException -> com.android.tools.r8.internal.kg:
     1:1:void <init>(java.lang.String):9:9 -> <init>
-com.android.tools.r8.errors.InvalidDescriptorException -> com.android.tools.r8.internal.kg:
+com.android.tools.r8.errors.InvalidDescriptorException -> com.android.tools.r8.internal.lg:
     1:1:void <init>(java.lang.String):8:8 -> <init>
 com.android.tools.r8.errors.InvalidLibrarySuperclassDiagnostic -> com.android.tools.r8.errors.InvalidLibrarySuperclassDiagnostic:
     com.android.tools.r8.references.ClassReference invalidSuperType -> e
@@ -15410,7 +15532,7 @@
     1:13:java.lang.String getDiagnosticMessage():57:69 -> getDiagnosticMessage
     1:1:com.android.tools.r8.origin.Origin getOrigin():47:47 -> getOrigin
     1:1:com.android.tools.r8.position.Position getPosition():52:52 -> getPosition
-com.android.tools.r8.errors.InvokeCustomDiagnostic -> com.android.tools.r8.internal.og:
+com.android.tools.r8.errors.InvokeCustomDiagnostic -> com.android.tools.r8.internal.pg:
     1:1:void <init>():9:9 -> <init>
     1:1:java.lang.String getDiagnosticMessage():13:13 -> getDiagnosticMessage
 com.android.tools.r8.errors.MissingNestHostNestDesugarDiagnostic -> com.android.tools.r8.errors.MissingNestHostNestDesugarDiagnostic:
@@ -15423,24 +15545,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.Zs:
+com.android.tools.r8.errors.PrivateInterfaceMethodDiagnostic -> com.android.tools.r8.internal.bt:
     com.android.tools.r8.position.MethodPosition position -> b
     boolean $assertionsDisabled -> a
     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.Iy:
+com.android.tools.r8.errors.StaticInterfaceMethodDiagnostic -> com.android.tools.r8.internal.Ky:
     com.android.tools.r8.position.MethodPosition position -> b
     boolean $assertionsDisabled -> a
     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.SB:
+com.android.tools.r8.errors.Unimplemented -> com.android.tools.r8.internal.TB:
     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.eC:
+com.android.tools.r8.errors.Unreachable -> com.android.tools.r8.internal.fC:
     1:1:void <init>():11:11 -> <init>
     2:2:void <init>(java.lang.String):15:15 -> <init>
     3:3:void <init>(java.lang.Throwable):19:19 -> <init>
@@ -15469,7 +15591,7 @@
     1:1:com.android.tools.r8.references.FieldReference getReference():21:21 -> getReference
     1:1:int hashCode():32:32 -> hashCode
     1:1:java.lang.String toString():37:37 -> toString
-com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo -> com.android.tools.r8.internal.Kb:
+com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo -> com.android.tools.r8.internal.Lb:
     com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo UNKNOWN -> a
     boolean $assertionsDisabled -> b
     com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind kind -> c
@@ -15481,7 +15603,7 @@
     1:1:boolean equals(java.lang.Object):103:103 -> equals
     1:1:int hashCode():108:108 -> hashCode
     1:1:java.lang.String toString():98:98 -> toString
-com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind -> com.android.tools.r8.internal.Kb$a:
+com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind -> com.android.tools.r8.internal.Lb$a:
     com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind[] $VALUES -> u
     com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind Unknown -> t
     com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind ReachableFromLiveType -> m
@@ -15545,7 +15667,7 @@
     1:1:com.android.tools.r8.references.MethodReference getReference():21:21 -> getReference
     1:1:int hashCode():32:32 -> hashCode
     1:1:java.lang.String toString():37:37 -> toString
-com.android.tools.r8.features.ClassToFeatureSplitMap -> com.android.tools.r8.internal.a6:
+com.android.tools.r8.features.ClassToFeatureSplitMap -> com.android.tools.r8.internal.b6:
     java.util.Map classToFeatureSplitMap -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():24:24 -> <clinit>
@@ -15567,12 +15689,12 @@
     2:2:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInBase(com.android.tools.r8.graph.DexProgramClass):92:92 -> b
     2:2:boolean isInFeature(com.android.tools.r8.graph.DexProgramClass):101 -> b
     3:4:com.android.tools.r8.features.ClassToFeatureSplitMap withoutPrunedClasses(java.util.Set):131:132 -> b
-com.android.tools.r8.features.FeatureSplitConfiguration -> com.android.tools.r8.internal.ka:
+com.android.tools.r8.features.FeatureSplitConfiguration -> com.android.tools.r8.internal.la:
     java.util.List featureSplits -> a
     1:2:void <init>(java.util.List):20:21 -> <init>
     1:16:java.util.Collection getDataResourceProvidersAndConsumers():44:59 -> a
     1:1:java.util.List getFeatureSplits():68:68 -> b
-com.android.tools.r8.features.FeatureSplitConfiguration$DataResourceProvidersAndConsumer -> com.android.tools.r8.internal.ka$a:
+com.android.tools.r8.features.FeatureSplitConfiguration$DataResourceProvidersAndConsumer -> com.android.tools.r8.internal.la$a:
     com.android.tools.r8.DataResourceConsumer consumer -> b
     java.util.Set providers -> a
     1:3:void <init>(java.util.Set,com.android.tools.r8.DataResourceConsumer):29:31 -> <init>
@@ -15646,7 +15768,7 @@
     13:16:boolean com.android.tools.r8.graph.AccessControl.isNestMate(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass):91:94 -> a
     13:16:com.android.tools.r8.utils.OptionalBool isMemberAccessible(com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppInfoWithClassHierarchy):72 -> a
     17:28:com.android.tools.r8.utils.OptionalBool isMemberAccessible(com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppInfoWithClassHierarchy):73:84 -> a
-    29:29:boolean com.android.tools.r8.graph.DexClass.isPublic():560:560 -> a
+    29:29:boolean com.android.tools.r8.graph.DexClass.isPublic():564:564 -> a
     29:29:com.android.tools.r8.utils.OptionalBool isClassAccessible(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.features.ClassToFeatureSplitMap):26 -> a
     30:35:com.android.tools.r8.utils.OptionalBool isClassAccessible(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.features.ClassToFeatureSplitMap):26:31 -> a
     36:37:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInBaseOrSameFeatureAs(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):96:97 -> a
@@ -15737,7 +15859,7 @@
     20:20:com.android.tools.r8.graph.DexClass definitionForDesugarDependency(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):151 -> a
     21:21:com.android.tools.r8.graph.DexClass definitionForDesugarDependency(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):151:151 -> a
     22:25:com.android.tools.r8.graph.DexEncodedMethod lookupDirectTargetOnItself(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):194:197 -> a
-    26:26:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupDirectMethod(com.android.tools.r8.graph.DexMethod):418:418 -> a
+    26:26:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupDirectMethod(com.android.tools.r8.graph.DexMethod):422:422 -> a
     26:26:com.android.tools.r8.graph.DexEncodedMethod lookupDirectTargetOnItself(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):197 -> a
     27:27:com.android.tools.r8.graph.DexEncodedMethod lookupDirectTargetOnItself(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):198:198 -> a
     28:28:com.android.tools.r8.graph.FieldResolutionResult resolveFieldOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):230:230 -> a
@@ -15748,7 +15870,7 @@
     34:34:com.android.tools.r8.graph.FieldResolutionResult resolveFieldOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):237 -> a
     1:2:com.android.tools.r8.graph.DexApplication app():88:89 -> b
     3:6:com.android.tools.r8.graph.DexEncodedMethod lookupStaticTargetOnItself(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):175:178 -> b
-    7:7:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupDirectMethod(com.android.tools.r8.graph.DexMethod):418:418 -> b
+    7:7:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupDirectMethod(com.android.tools.r8.graph.DexMethod):422:422 -> b
     7:7:com.android.tools.r8.graph.DexEncodedMethod lookupStaticTargetOnItself(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):178 -> b
     8:8:com.android.tools.r8.graph.DexEncodedMethod lookupStaticTargetOnItself(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):179:179 -> b
     1:1:boolean checkIfObsolete():83:83 -> c
@@ -15824,21 +15946,21 @@
     170:170:com.android.tools.r8.graph.ResolutionResult resolveMethodStep3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):642:642 -> a
     170:170:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):593 -> a
     171:171:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):606:606 -> a
-    172:178:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupSignaturePolymorphicMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory):457:463 -> a
+    172:178:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupSignaturePolymorphicMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory):461:467 -> a
     172:178:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):606 -> a
-    179:180:boolean com.android.tools.r8.graph.DexClass.isSignaturePolymorphicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexItemFactory):479:480 -> a
-    179:180:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupSignaturePolymorphicMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory):470 -> a
+    179:180:boolean com.android.tools.r8.graph.DexClass.isSignaturePolymorphicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexItemFactory):483:484 -> a
+    179:180:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupSignaturePolymorphicMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory):474 -> a
     179:180:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):606 -> a
     181:181:boolean com.android.tools.r8.graph.AccessFlags.isSet(int):240:240 -> a
     181:181:boolean com.android.tools.r8.graph.MethodAccessFlags.isVarargs():138 -> a
-    181:181:boolean com.android.tools.r8.graph.DexClass.isSignaturePolymorphicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexItemFactory):480 -> a
-    181:181:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupSignaturePolymorphicMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory):470 -> a
+    181:181:boolean com.android.tools.r8.graph.DexClass.isSignaturePolymorphicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexItemFactory):484 -> a
+    181:181:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupSignaturePolymorphicMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory):474 -> a
     181:181:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):606 -> a
-    182:184:boolean com.android.tools.r8.graph.DexClass.isSignaturePolymorphicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexItemFactory):480:482 -> a
-    182:184:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupSignaturePolymorphicMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory):470 -> a
+    182:184:boolean com.android.tools.r8.graph.DexClass.isSignaturePolymorphicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexItemFactory):484:486 -> a
+    182:184:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupSignaturePolymorphicMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory):474 -> a
     182:184:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):606 -> a
     185:185:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):608:608 -> a
-    186:186:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexMethod):447:447 -> a
+    186:186:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexMethod):451:451 -> a
     186:186:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):611 -> a
     187:196:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):618:627 -> a
     197:197:com.android.tools.r8.graph.DexClassAndMethod lookupMaximallySpecificTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):647:647 -> a
@@ -15852,7 +15974,7 @@
     202:204:com.android.tools.r8.graph.DexClassAndMethod lookupMaximallySpecificMethod(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexMethod):386 -> a
     205:207:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy$MaximallySpecificMethodsBuilder):662:662 -> a
     208:214:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.AppInfoWithClassHierarchy$MaximallySpecificMethodsBuilder):671:677 -> a
-    215:215:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexMethod):447:447 -> a
+    215:215:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexMethod):451:451 -> a
     215:215:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.AppInfoWithClassHierarchy$MaximallySpecificMethodsBuilder):678 -> a
     216:216:boolean isMaximallySpecificCandidate(com.android.tools.r8.graph.DexEncodedMethod):702:702 -> a
     216:216:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.AppInfoWithClassHierarchy$MaximallySpecificMethodsBuilder):679 -> a
@@ -15881,10 +16003,10 @@
     28:29:com.android.tools.r8.graph.DexEncodedMethod lookupDirectTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):480 -> c
     30:39:com.android.tools.r8.graph.ResolutionResult unsafeResolveMethodDueToDexFormat(com.android.tools.r8.graph.DexMethod):494:503 -> c
     40:41:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):739:740 -> c
-    42:42:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexMethod):447:447 -> c
+    42:42:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexMethod):451:451 -> c
     42:42:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):742 -> c
     43:48:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):744:749 -> c
-    49:49:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexMethod):447:447 -> c
+    49:49:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexMethod):451:451 -> c
     49:49:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):751 -> c
     50:51:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):752:753 -> c
     52:52:com.android.tools.r8.graph.ResolutionResult resolveMethodStep3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):640:640 -> c
@@ -15901,7 +16023,7 @@
     7:8:com.android.tools.r8.graph.DexEncodedMethod lookupStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):440 -> d
     1:17:java.util.Set implementedInterfaces(com.android.tools.r8.graph.DexType):252:268 -> f
     1:1:boolean isMissingOrHasMissingSuperType(com.android.tools.r8.graph.DexType):246:246 -> g
-    2:6:boolean com.android.tools.r8.graph.DexClass.hasMissingSuperType(com.android.tools.r8.graph.AppInfoWithClassHierarchy):614:618 -> g
+    2:6:boolean com.android.tools.r8.graph.DexClass.hasMissingSuperType(com.android.tools.r8.graph.AppInfoWithClassHierarchy):618:622 -> g
     2:6:boolean isMissingOrHasMissingSuperType(com.android.tools.r8.graph.DexType):247 -> g
     1:1:boolean hasClassHierarchy():102:102 -> h
     1:1:com.android.tools.r8.graph.AppInfoWithClassHierarchy withClassHierarchy():108:108 -> n
@@ -15927,64 +16049,67 @@
     java.util.Map services -> c
     com.android.tools.r8.graph.AppView appView -> b
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():37:37 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.AppServices$1):37:37 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.AppView,java.util.Map):46:48 -> <init>
-    1:2:java.util.Set allServiceTypes():56:57 -> a
-    3:10:java.util.List serviceImplementationsFor(com.android.tools.r8.graph.DexType):61:68 -> a
-    11:21:java.util.List serviceImplementationsFor(com.android.tools.r8.graph.DexType):64:74 -> a
-    22:39:boolean hasServiceImplementationsInFeature(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):79:96 -> a
-    40:40:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInBase(com.android.tools.r8.graph.DexProgramClass):92:92 -> a
-    40:40:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInFeature(com.android.tools.r8.graph.DexProgramClass):101 -> a
-    40:40:boolean hasServiceImplementationsInFeature(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):97 -> a
-    41:42:boolean hasServiceImplementationsInFeature(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):100:101 -> a
-    43:43:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInBase(com.android.tools.r8.graph.DexProgramClass):92:92 -> a
-    43:43:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInFeature(com.android.tools.r8.graph.DexProgramClass):101 -> a
-    43:43:boolean hasServiceImplementationsInFeature(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):102 -> a
-    44:46:boolean hasServiceImplementationsInFeature(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):85:87 -> a
-    47:59:com.android.tools.r8.graph.AppServices rewrittenWithLens(com.android.tools.r8.graph.GraphLens):111:123 -> a
-    60:65:com.android.tools.r8.graph.AppServices rewrittenWithLens(com.android.tools.r8.graph.GraphLens):122:127 -> a
-    66:85:com.android.tools.r8.graph.AppServices prunedCopy(java.util.Collection):132:151 -> a
-    86:96:com.android.tools.r8.graph.AppServices prunedCopy(java.util.Collection):150:160 -> a
-    97:97:void visit(java.util.function.BiConsumer):176:176 -> a
-    98:100:void lambda$visit$0(java.util.function.BiConsumer,com.android.tools.r8.graph.DexType,java.util.Map):178:180 -> a
-    101:101:com.android.tools.r8.graph.AppServices$Builder builder(com.android.tools.r8.graph.AppView):185:185 -> a
-    1:1:boolean isEmpty():52:52 -> b
-    1:5:boolean verifyRewrittenWithLens():164:168 -> c
+    1:1:void <clinit>():38:38 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.AppServices$1):38:38 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.AppView,java.util.Map):47:49 -> <init>
+    1:2:java.util.Set allServiceTypes():57:58 -> a
+    3:3:void lambda$computeAllServiceImplementations$1(java.util.Set,com.android.tools.r8.graph.DexType,java.util.Map):66:66 -> a
+    4:4:void lambda$computeAllServiceImplementations$0(java.util.Set,com.android.tools.r8.FeatureSplit,java.util.List):68:68 -> a
+    5:12:java.util.List serviceImplementationsFor(com.android.tools.r8.graph.DexType):73:80 -> a
+    13:23:java.util.List serviceImplementationsFor(com.android.tools.r8.graph.DexType):76:86 -> a
+    24:41:boolean hasServiceImplementationsInFeature(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):91:108 -> a
+    42:42:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInBase(com.android.tools.r8.graph.DexProgramClass):92:92 -> a
+    42:42:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInFeature(com.android.tools.r8.graph.DexProgramClass):101 -> a
+    42:42:boolean hasServiceImplementationsInFeature(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):109 -> a
+    43:44:boolean hasServiceImplementationsInFeature(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):112:113 -> a
+    45:45:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInBase(com.android.tools.r8.graph.DexProgramClass):92:92 -> a
+    45:45:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInFeature(com.android.tools.r8.graph.DexProgramClass):101 -> a
+    45:45:boolean hasServiceImplementationsInFeature(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):114 -> a
+    46:48:boolean hasServiceImplementationsInFeature(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):97:99 -> a
+    49:61:com.android.tools.r8.graph.AppServices rewrittenWithLens(com.android.tools.r8.graph.GraphLens):123:135 -> a
+    62:67:com.android.tools.r8.graph.AppServices rewrittenWithLens(com.android.tools.r8.graph.GraphLens):134:139 -> a
+    68:87:com.android.tools.r8.graph.AppServices prunedCopy(java.util.Collection):144:163 -> a
+    88:98:com.android.tools.r8.graph.AppServices prunedCopy(java.util.Collection):162:172 -> a
+    99:99:void visit(java.util.function.BiConsumer):188:188 -> a
+    100:102:void lambda$visit$2(java.util.function.BiConsumer,com.android.tools.r8.graph.DexType,java.util.Map):190:192 -> a
+    103:103:com.android.tools.r8.graph.AppServices$Builder builder(com.android.tools.r8.graph.AppView):197:197 -> a
+    1:3:java.util.Set computeAllServiceImplementations():62:64 -> b
+    1:1:boolean isEmpty():53:53 -> c
+    1:5:boolean verifyRewrittenWithLens():176:180 -> d
 com.android.tools.r8.graph.AppServices$1 -> com.android.tools.r8.internal.g1$a:
 com.android.tools.r8.graph.AppServices$Builder -> com.android.tools.r8.internal.g1$b:
     java.util.Map services -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.utils.InternalOptions options -> b
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.AppServices$1):188:188 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.AppView):194:194 -> <init>
-    3:7:void <init>(com.android.tools.r8.graph.AppView):192:196 -> <init>
-    1:1:com.android.tools.r8.graph.AppView access$200(com.android.tools.r8.graph.AppServices$Builder):188:188 -> a
-    2:3:com.android.tools.r8.graph.AppServices build():200:201 -> a
-    4:6:void com.android.tools.r8.graph.AppServices$Builder.readServices(com.android.tools.r8.DataResourceProvider,com.android.tools.r8.FeatureSplit):220:222 -> a
-    4:6:com.android.tools.r8.graph.AppServices build():201 -> a
-    7:11:com.android.tools.r8.graph.AppServices build():203:207 -> a
-    12:14:void com.android.tools.r8.graph.AppServices$Builder.readServices(com.android.tools.r8.DataResourceProvider,com.android.tools.r8.FeatureSplit):220:222 -> a
-    12:14:com.android.tools.r8.graph.AppServices build():209 -> a
-    15:15:com.android.tools.r8.graph.AppServices build():214:214 -> a
-    1:1:java.util.Map access$300(com.android.tools.r8.graph.AppServices$Builder):188:188 -> b
-    1:1:com.android.tools.r8.utils.InternalOptions access$400(com.android.tools.r8.graph.AppServices$Builder):188:188 -> c
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.AppServices$1):200:200 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.AppView):206:206 -> <init>
+    3:7:void <init>(com.android.tools.r8.graph.AppView):204:208 -> <init>
+    1:1:com.android.tools.r8.graph.AppView access$200(com.android.tools.r8.graph.AppServices$Builder):200:200 -> a
+    2:3:com.android.tools.r8.graph.AppServices build():212:213 -> a
+    4:6:void com.android.tools.r8.graph.AppServices$Builder.readServices(com.android.tools.r8.DataResourceProvider,com.android.tools.r8.FeatureSplit):232:234 -> a
+    4:6:com.android.tools.r8.graph.AppServices build():213 -> a
+    7:11:com.android.tools.r8.graph.AppServices build():215:219 -> a
+    12:14:void com.android.tools.r8.graph.AppServices$Builder.readServices(com.android.tools.r8.DataResourceProvider,com.android.tools.r8.FeatureSplit):232:234 -> a
+    12:14:com.android.tools.r8.graph.AppServices build():221 -> a
+    15:15:com.android.tools.r8.graph.AppServices build():226:226 -> a
+    1:1:java.util.Map access$300(com.android.tools.r8.graph.AppServices$Builder):200:200 -> b
+    1:1:com.android.tools.r8.utils.InternalOptions access$400(com.android.tools.r8.graph.AppServices$Builder):200:200 -> c
 com.android.tools.r8.graph.AppServices$Builder$DataResourceProviderVisitor -> com.android.tools.r8.internal.g1$b$a:
     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):230:231 -> <init>
-    1:1:java.util.Map lambda$visit$0(com.android.tools.r8.graph.DexType):267:267 -> a
-    2:2:java.util.List lambda$visit$1(com.android.tools.r8.FeatureSplit):269:269 -> a
-    3:44:void readServiceImplementationsForService(java.lang.String,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexType,java.util.List):283:324 -> a
-    45:45:boolean lambda$readServiceImplementationsForService$2(java.lang.String):286:286 -> a
-    46:52:boolean lambda$readServiceImplementationsForService$3(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,java.util.List,com.android.tools.r8.graph.DexType):292:298 -> a
-    53:74:boolean lambda$readServiceImplementationsForService$3(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,java.util.List,com.android.tools.r8.graph.DexType):294:315 -> a
-    75:87:boolean lambda$readServiceImplementationsForService$3(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,java.util.List,com.android.tools.r8.graph.DexType):310:322 -> a
-    88:90:void warn(java.lang.String,com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin):334:336 -> a
-    1:2:java.lang.String prefixUntilCommentChar(java.lang.String):329:330 -> b
-    1:20:void visit(com.android.tools.r8.DataEntryResource):242:261 -> visit
-    21:36:void visit(com.android.tools.r8.DataEntryResource):256:271 -> visit
-    37:40:void visit(com.android.tools.r8.DataEntryResource):270:273 -> visit
+    1:2:void <init>(com.android.tools.r8.graph.AppServices$Builder,com.android.tools.r8.FeatureSplit):242:243 -> <init>
+    1:1:java.util.Map lambda$visit$0(com.android.tools.r8.graph.DexType):279:279 -> a
+    2:2:java.util.List lambda$visit$1(com.android.tools.r8.FeatureSplit):281:281 -> a
+    3:44:void readServiceImplementationsForService(java.lang.String,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexType,java.util.List):295:336 -> a
+    45:45:boolean lambda$readServiceImplementationsForService$2(java.lang.String):298:298 -> a
+    46:52:boolean lambda$readServiceImplementationsForService$3(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,java.util.List,com.android.tools.r8.graph.DexType):304:310 -> a
+    53:74:boolean lambda$readServiceImplementationsForService$3(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,java.util.List,com.android.tools.r8.graph.DexType):306:327 -> a
+    75:87:boolean lambda$readServiceImplementationsForService$3(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,java.util.List,com.android.tools.r8.graph.DexType):322:334 -> a
+    88:90:void warn(java.lang.String,com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin):346:348 -> a
+    1:2:java.lang.String prefixUntilCommentChar(java.lang.String):341:342 -> b
+    1:20:void visit(com.android.tools.r8.DataEntryResource):254:273 -> visit
+    21:36:void visit(com.android.tools.r8.DataEntryResource):268:283 -> visit
+    37:40:void visit(com.android.tools.r8.DataEntryResource):282:285 -> visit
 com.android.tools.r8.graph.AppView -> com.android.tools.r8.graph.d:
     com.android.tools.r8.graph.InitClassLens initClassLens -> g
     com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator callSiteOptimizationInfoPropagator -> o
@@ -16063,7 +16188,7 @@
     81:81:void setUnboxedEnums(com.android.tools.r8.graph.EnumValueInfoMapCollection):499:499 -> a
     82:84:com.android.tools.r8.utils.OptionalBool isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):529:531 -> a
     85:85:boolean isCfByteCodePassThrough(com.android.tools.r8.graph.DexEncodedMethod):535:535 -> a
-    86:86:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():425:425 -> a
+    86:86:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> a
     86:86:boolean isCfByteCodePassThrough(com.android.tools.r8.graph.DexEncodedMethod):535 -> a
     87:91:boolean isCfByteCodePassThrough(com.android.tools.r8.graph.DexEncodedMethod):538:542 -> a
     92:92:void removePrunedClasses(com.android.tools.r8.graph.DirectMappedDexApplication,java.util.Set):551:551 -> a
@@ -16240,197 +16365,199 @@
     java.util.List instructions -> g
     com.android.tools.r8.graph.CfCode$StackMapStatus stackMapStatus -> j
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():64:64 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):145:145 -> <init>
-    2:16:void <init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):137:151 -> <init>
-    1:1:int getMaxLocals():163:163 -> A
-    1:1:int getMaxStack():159:159 -> B
-    1:1:com.android.tools.r8.graph.DexType getOriginalHolder():155:155 -> C
-    1:2:com.android.tools.r8.graph.CfCode$StackMapStatus getStackMapStatus():167:168 -> D
-    1:1:java.util.List getTryCatchRanges():176:176 -> E
-    1:1:boolean shouldComputeInitialFrame():833:833 -> F
-    2:2:boolean com.android.tools.r8.cf.code.CfInstruction.isFrame():0:0 -> F
-    2:2:boolean shouldComputeInitialFrame():834 -> F
-    3:3:boolean com.android.tools.r8.cf.code.CfInstruction.isLabel():0:0 -> F
-    3:3:boolean shouldComputeInitialFrame():836 -> F
-    4:4:boolean com.android.tools.r8.cf.code.CfInstruction.isPosition():0:0 -> F
-    4:4:boolean shouldComputeInitialFrame():836 -> F
-    5:5:boolean shouldComputeInitialFrame():841:841 -> F
-    1:20:int compareTo(com.android.tools.r8.graph.CfCode):227:246 -> a
-    21:22:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap getLabelOrdering(java.util.List):250:251 -> a
+    1:1:void <clinit>():65:65 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):146:146 -> <init>
+    2:16:void <init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):138:152 -> <init>
+    1:1:java.util.List getLocalVariables():189:189 -> A
+    1:1:int getMaxLocals():164:164 -> B
+    1:1:int getMaxStack():160:160 -> C
+    1:1:com.android.tools.r8.graph.DexType getOriginalHolder():156:156 -> D
+    1:2:com.android.tools.r8.graph.CfCode$StackMapStatus getStackMapStatus():168:169 -> E
+    1:1:java.util.List getTryCatchRanges():177:177 -> F
+    1:1:boolean shouldComputeInitialFrame():839:839 -> G
+    2:2:boolean com.android.tools.r8.cf.code.CfInstruction.isFrame():0:0 -> G
+    2:2:boolean shouldComputeInitialFrame():840 -> G
+    3:3:boolean com.android.tools.r8.cf.code.CfInstruction.isLabel():0:0 -> G
+    3:3:boolean shouldComputeInitialFrame():842 -> G
+    4:4:boolean com.android.tools.r8.cf.code.CfInstruction.isPosition():0:0 -> G
+    4:4:boolean shouldComputeInitialFrame():842 -> G
+    5:5:boolean shouldComputeInitialFrame():847:847 -> G
+    1:20:int compareTo(com.android.tools.r8.graph.CfCode):233:252 -> a
+    21:22:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap getLabelOrdering(java.util.List):256:257 -> a
     23:23:boolean com.android.tools.r8.cf.code.CfInstruction.isLabel():0:0 -> a
-    23:23:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap getLabelOrdering(java.util.List):252 -> a
-    24:24:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap getLabelOrdering(java.util.List):253:253 -> a
-    25:28:void write(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):292:295 -> a
-    29:35:void write(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):294:300 -> a
-    36:52:boolean shouldAddParameterNames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):263:279 -> a
-    36:52:void write(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):300 -> a
-    53:53:void write(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):301:301 -> a
+    23:23:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap getLabelOrdering(java.util.List):258 -> a
+    24:24:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap getLabelOrdering(java.util.List):259:259 -> a
+    25:28:void write(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):298:301 -> a
+    29:35:void write(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):300:306 -> a
+    36:52:boolean shouldAddParameterNames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):269:285 -> a
+    36:52:void write(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):306 -> a
+    53:53:void write(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):307:307 -> a
     54:54:void com.android.tools.r8.cf.code.CfLabel.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):70:70 -> a
-    54:54:void write(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):302 -> a
-    55:80:void write(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):305:330 -> a
-    81:95:void write(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):324:338 -> a
-    96:102:void write(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):337:343 -> a
-    103:103:void write(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):342:342 -> a
-    104:110:void writeLocalVariableEntry(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.cf.code.CfLabel,int):355:355 -> a
-    111:112: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):388:389 -> a
-    113:116: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.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.ir.conversion.MethodProcessor):401:404 -> a
-    117:119: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.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.ir.conversion.MethodProcessor):403:405 -> a
-    120:134:com.android.tools.r8.ir.code.IRCode internalBuild(java.util.List,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.ir.conversion.MethodProcessor):489:503 -> a
-    135:138:void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry):508:511 -> a
-    139:139:void lambda$registerCodeReferences$6(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.code.CfTryCatch):511:511 -> a
-    140:143:void registerCodeReferencesForDesugaring(com.android.tools.r8.graph.ClasspathMethod,com.android.tools.r8.graph.UseRegistry):516:519 -> a
-    144:144:void lambda$registerCodeReferencesForDesugaring$7(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.cf.code.CfTryCatch):519:519 -> a
-    145:185:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap collectParameterInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):526:566 -> a
-    186:186:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap collectParameterInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):565:565 -> a
-    187:187:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap collectParameterInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):537:537 -> a
-    188:216:void registerArgumentReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.ArgumentUse):574:602 -> a
-    217:217:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.ClassNameMapper):614:614 -> a
-    218:228:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ProgramMethod):622:632 -> a
-    229:229:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():486:486 -> a
-    229:229:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ProgramMethod):632 -> a
+    54:54:void write(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):308 -> a
+    55:80:void write(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):311:336 -> a
+    81:95:void write(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):330:344 -> a
+    96:102:void write(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):343:349 -> a
+    103:103:void write(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):348:348 -> a
+    104:110:void writeLocalVariableEntry(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.cf.code.CfLabel,int):361:361 -> a
+    111:112: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):394:395 -> a
+    113:116: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.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.ir.conversion.MethodProcessor):407:410 -> a
+    117:119: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.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.ir.conversion.MethodProcessor):409:411 -> a
+    120:134:com.android.tools.r8.ir.code.IRCode internalBuild(java.util.List,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.ir.conversion.MethodProcessor):495:509 -> a
+    135:138:void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry):514:517 -> a
+    139:139:void lambda$registerCodeReferences$6(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.code.CfTryCatch):517:517 -> a
+    140:143:void registerCodeReferencesForDesugaring(com.android.tools.r8.graph.ClasspathMethod,com.android.tools.r8.graph.UseRegistry):522:525 -> a
+    144:144:void lambda$registerCodeReferencesForDesugaring$7(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.cf.code.CfTryCatch):525:525 -> a
+    145:185:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap collectParameterInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):532:572 -> a
+    186:186:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap collectParameterInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):571:571 -> a
+    187:187:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap collectParameterInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):543:543 -> a
+    188:216:void registerArgumentReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.ArgumentUse):580:608 -> a
+    217:217:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.ClassNameMapper):620:620 -> a
+    218:228:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ProgramMethod):628:638 -> a
+    229:229:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():492:492 -> a
+    229:229:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ProgramMethod):638 -> a
     230:230:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMonitor():271:271 -> a
-    230:230:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ProgramMethod):633 -> a
-    231:239:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ProgramMethod):634:642 -> a
-    240:246:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ProgramMethod):641:647 -> a
+    230:230:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ProgramMethod):639 -> a
+    231:239:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ProgramMethod):640:648 -> a
+    240:246:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ProgramMethod):647:653 -> a
     247:247:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMoveException():279:279 -> a
-    247:247:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ProgramMethod):650 -> a
-    248:248:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ProgramMethod):650:650 -> a
-    249:273:void addFakeThisParameter(com.android.tools.r8.graph.DexItemFactory):656:680 -> a
-    274:275:void com.android.tools.r8.graph.CfCode$LocalVariableInfo.<init>(int,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.cf.code.CfLabel):86:87 -> a
-    274:275:void addFakeThisParameter(com.android.tools.r8.graph.DexItemFactory):680 -> a
-    276:276:void addFakeThisParameter(com.android.tools.r8.graph.DexItemFactory):677:677 -> a
-    277:290:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):685:698 -> a
+    247:247:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ProgramMethod):656 -> a
+    248:248:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ProgramMethod):656:656 -> a
+    249:273:void addFakeThisParameter(com.android.tools.r8.graph.DexItemFactory):662:686 -> a
+    274:275:void com.android.tools.r8.graph.CfCode$LocalVariableInfo.<init>(int,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.cf.code.CfLabel):87:88 -> a
+    274:275:void addFakeThisParameter(com.android.tools.r8.graph.DexItemFactory):686 -> a
+    276:276:void addFakeThisParameter(com.android.tools.r8.graph.DexItemFactory):683:683 -> a
+    277:290:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):691:704 -> a
     291:291:boolean com.android.tools.r8.graph.DexMethod.isInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):261:261 -> a
-    291:291:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):698 -> a
-    292:299:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):700:707 -> a
+    291:291:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):704 -> a
+    292:299:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):706:713 -> a
     300:300:boolean com.android.tools.r8.cf.code.CfInstruction.isFrame():0:0 -> a
-    300:300:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):708 -> a
-    301:308:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):709:716 -> a
+    300:300:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):714 -> a
+    301:308:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):715:722 -> a
     309:344:com.android.tools.r8.graph.CfCodeDiagnostics com.android.tools.r8.graph.CfCodeStackMapValidatingException.multipleFramesForLabel(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView):0:35 -> a
-    309:344:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):714 -> a
-    345:346:boolean reportStackMapError(com.android.tools.r8.graph.CfCodeDiagnostics,com.android.tools.r8.graph.AppView):809:810 -> a
-    345:346:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):713 -> a
-    347:353:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):720:726 -> a
+    309:344:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):720 -> a
+    345:346:boolean reportStackMapError(com.android.tools.r8.graph.CfCodeDiagnostics,com.android.tools.r8.graph.AppView):815:816 -> a
+    345:346:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):719 -> a
+    347:353:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):726:732 -> a
     354:380:com.android.tools.r8.graph.CfCodeDiagnostics com.android.tools.r8.graph.CfCodeStackMapValidatingException.unexpectedStackMapFrame(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView):0:26 -> a
-    354:380:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):725 -> a
-    381:382:boolean reportStackMapError(com.android.tools.r8.graph.CfCodeDiagnostics,com.android.tools.r8.graph.AppView):809:810 -> a
-    381:382:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):724 -> a
+    354:380:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):731 -> a
+    381:382:boolean reportStackMapError(com.android.tools.r8.graph.CfCodeDiagnostics,com.android.tools.r8.graph.AppView):815:816 -> a
+    381:382:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):730 -> a
     383:383:boolean com.android.tools.r8.cf.code.CfInstruction.isPosition():0:0 -> a
-    383:383:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):732 -> a
+    383:383:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):738 -> a
     384:384:boolean com.android.tools.r8.cf.code.CfInstruction.isLabel():0:0 -> a
-    384:384:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):734 -> a
-    385:390:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):735:740 -> a
+    384:384:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):740 -> a
+    385:390:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):741:746 -> a
     391:391:boolean com.android.tools.r8.cf.code.CfInstruction.isThrow():0:0 -> a
-    391:391:boolean finalAndExitInstruction(com.android.tools.r8.cf.code.CfInstruction):815 -> a
-    391:391:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):740 -> a
-    392:397:boolean finalAndExitInstruction(com.android.tools.r8.cf.code.CfInstruction):815:820 -> a
-    392:397:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):740 -> a
+    391:391:boolean finalAndExitInstruction(com.android.tools.r8.cf.code.CfInstruction):821 -> a
+    391:391:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):746 -> a
+    392:397:boolean finalAndExitInstruction(com.android.tools.r8.cf.code.CfInstruction):821:826 -> a
+    392:397:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):746 -> a
     398:398:boolean com.android.tools.r8.cf.code.CfInstruction.isPosition():0:0 -> a
-    398:398:boolean finalAndExitInstruction(com.android.tools.r8.cf.code.CfInstruction):824 -> a
-    398:398:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):740 -> a
+    398:398:boolean finalAndExitInstruction(com.android.tools.r8.cf.code.CfInstruction):830 -> a
+    398:398:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):746 -> a
     399:399:boolean com.android.tools.r8.cf.code.CfInstruction.isLabel():0:0 -> a
-    399:399:boolean finalAndExitInstruction(com.android.tools.r8.cf.code.CfInstruction):824 -> a
-    399:399:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):740 -> a
-    400:400:boolean finalAndExitInstruction(com.android.tools.r8.cf.code.CfInstruction):829:829 -> a
-    400:400:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):740 -> a
-    401:404:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):744:747 -> a
+    399:399:boolean finalAndExitInstruction(com.android.tools.r8.cf.code.CfInstruction):830 -> a
+    399:399:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):746 -> a
+    400:400:boolean finalAndExitInstruction(com.android.tools.r8.cf.code.CfInstruction):835:835 -> a
+    400:400:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):746 -> a
+    401:404:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):750:753 -> a
     405:450:com.android.tools.r8.graph.CfCodeDiagnostics com.android.tools.r8.graph.CfCodeStackMapValidatingException.noFramesForMethodWithJumps(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView):0:45 -> a
-    405:450:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):746 -> a
-    451:452:boolean reportStackMapError(com.android.tools.r8.graph.CfCodeDiagnostics,com.android.tools.r8.graph.AppView):809:810 -> a
-    451:452:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):745 -> a
-    453:475:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):750:772 -> a
-    476:512:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap computeInitialLocals(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription):848:884 -> a
-    476:512:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):774 -> a
-    513:513:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):774:774 -> a
-    514:524:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):772:782 -> a
-    525:525:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():425:425 -> a
-    525:525:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):782 -> a
+    405:450:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):752 -> a
+    451:452:boolean reportStackMapError(com.android.tools.r8.graph.CfCodeDiagnostics,com.android.tools.r8.graph.AppView):815:816 -> a
+    451:452:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):751 -> a
+    453:475:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):756:778 -> a
+    476:512:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap computeInitialLocals(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription):854:890 -> a
+    476:512:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):780 -> a
+    513:513:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):780:780 -> a
+    514:524:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):778:788 -> a
+    525:525:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> a
+    525:525:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):788 -> a
     526:526:boolean com.android.tools.r8.ir.conversion.CfSourceCode.canThrowHelper(com.android.tools.r8.cf.code.CfInstruction,boolean):0:0 -> a
-    526:526:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):782 -> a
+    526:526:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):788 -> a
     527:527:boolean com.android.tools.r8.cf.code.CfInstruction.isConstString():0:0 -> a
     527:527:boolean com.android.tools.r8.ir.conversion.CfSourceCode.canThrowHelper(com.android.tools.r8.cf.code.CfInstruction,boolean):305 -> a
-    527:527:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):782 -> a
+    527:527:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):788 -> a
     528:528:boolean com.android.tools.r8.cf.code.CfInstruction.isDexItemBasedConstString():0:0 -> a
     528:528:boolean com.android.tools.r8.ir.conversion.CfSourceCode.canThrowHelper(com.android.tools.r8.cf.code.CfInstruction,boolean):305 -> a
-    528:528:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):782 -> a
+    528:528:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):788 -> a
     529:529:boolean com.android.tools.r8.ir.conversion.CfSourceCode.canThrowHelper(com.android.tools.r8.cf.code.CfInstruction,boolean):308:308 -> a
-    529:529:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):782 -> a
-    530:530:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):783:783 -> a
+    529:529:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):788 -> a
+    530:530:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):789:789 -> a
     531:531:boolean com.android.tools.r8.cf.code.CfInstruction.isStore():0:0 -> a
-    531:531:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):783 -> a
-    532:536:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):783:787 -> a
-    537:546:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):786:795 -> a
+    531:531:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):789 -> a
+    532:536:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):789:793 -> a
+    537:546:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):792:801 -> a
     547:558:com.android.tools.r8.graph.CfCodeDiagnostics com.android.tools.r8.graph.CfCodeStackMapValidatingException.toDiagnostics(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexMethod,int,com.android.tools.r8.cf.code.CfInstruction,java.lang.String,com.android.tools.r8.graph.AppView):55:66 -> a
-    547:558:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):790 -> a
-    559:560:boolean reportStackMapError(com.android.tools.r8.graph.CfCodeDiagnostics,com.android.tools.r8.graph.AppView):809:810 -> a
-    559:560:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):789 -> a
-    561:561:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):800:800 -> a
-    562:562:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):687:687 -> a
-    563:563:java.util.function.BiPredicate isAssignablePredicate(com.android.tools.r8.graph.AppView):891:891 -> a
-    564:564:boolean lambda$isAssignablePredicate$8(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):891:891 -> a
-    565:588:boolean isAssignable(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):896:919 -> a
-    589:593:boolean isAssignable(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):918:922 -> a
-    594:595:com.android.tools.r8.graph.DexType byteCharShortOrBooleanToInt(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):927:928 -> a
-    1:1:void setInstructions(java.util.List):184:184 -> b
-    2:2:int lambda$compareTo$0(com.android.tools.r8.graph.CfCode):228:228 -> b
-    3:5:void verifyFramesOrRemove(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):414:416 -> b
-    6:6:void setInstructions(java.util.List):184:184 -> b
-    6:6:void verifyFramesOrRemove(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):417 -> 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.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.ir.conversion.MethodProcessor):430:432 -> b
-    10:10: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.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.ir.conversion.MethodProcessor):431:431 -> b
-    11:13: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.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.ir.conversion.MethodProcessor):456:456 -> b
-    11:13: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.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.ir.conversion.MethodProcessor):441 -> b
-    23:25: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.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.ir.conversion.MethodProcessor):466:468 -> b
-    23:25: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.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.ir.conversion.MethodProcessor):441 -> b
-    26:26: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.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.ir.conversion.MethodProcessor):467:467 -> b
-    26: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.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.ir.conversion.MethodProcessor):441 -> b
-    1:1:int lambda$compareTo$1(com.android.tools.r8.graph.CfCode):229:229 -> c
-    2:2:boolean computeEquals(java.lang.Object):371:371 -> c
-    1:1:int compareTo(java.lang.Object):64:64 -> compareTo
-    1:1:int lambda$compareTo$2(com.android.tools.r8.graph.CfCode):230:230 -> d
-    1:1:java.util.List lambda$compareTo$3(com.android.tools.r8.graph.CfCode):243:243 -> e
-    1:1:java.util.List lambda$compareTo$4(com.android.tools.r8.graph.CfCode):244:244 -> f
-    1:1:boolean estimatedSizeForInliningAtMost(int):198:198 -> g
-    2:2:java.util.List lambda$compareTo$5(com.android.tools.r8.graph.CfCode):245:245 -> g
-    1:2:int countNonStackOperations(int):203:204 -> h
-    1:1:void setMaxLocals(int):172:172 -> i
-    1:1:int computeHashCode():366:366 -> p
+    547:558:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):796 -> a
+    559:560:boolean reportStackMapError(com.android.tools.r8.graph.CfCodeDiagnostics,com.android.tools.r8.graph.AppView):815:816 -> a
+    559:560:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):795 -> a
+    561:561:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):806:806 -> a
+    562:562:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):693:693 -> a
+    563:563:java.util.function.BiPredicate isAssignablePredicate(com.android.tools.r8.graph.AppView):897:897 -> a
+    564:564:boolean lambda$isAssignablePredicate$8(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):897:897 -> a
+    565:588:boolean isAssignable(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):902:925 -> a
+    589:593:boolean isAssignable(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):924:928 -> a
+    594:595:com.android.tools.r8.graph.DexType byteCharShortOrBooleanToInt(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):933:934 -> a
+    1:1:void setInstructions(java.util.List):185:185 -> b
+    2:2:int lambda$compareTo$0(com.android.tools.r8.graph.CfCode):234:234 -> b
+    3:5:void verifyFramesOrRemove(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):420:422 -> b
+    6:6:void setInstructions(java.util.List):185:185 -> b
+    6:6:void verifyFramesOrRemove(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):423 -> 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.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.ir.conversion.MethodProcessor):436:438 -> b
+    10:10: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.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.ir.conversion.MethodProcessor):437:437 -> b
+    11:13: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.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.ir.conversion.MethodProcessor):462:462 -> b
+    11:13: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.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.ir.conversion.MethodProcessor):447 -> b
+    23:25: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.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.ir.conversion.MethodProcessor):472:474 -> b
+    23:25: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.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.ir.conversion.MethodProcessor):447 -> b
+    26:26: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.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.ir.conversion.MethodProcessor):473:473 -> b
+    26: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.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.ir.conversion.MethodProcessor):447 -> b
+    1:1:int lambda$compareTo$1(com.android.tools.r8.graph.CfCode):235:235 -> c
+    2:2:boolean computeEquals(java.lang.Object):377:377 -> c
+    1:1:int compareTo(java.lang.Object):65:65 -> compareTo
+    1:1:int lambda$compareTo$2(com.android.tools.r8.graph.CfCode):236:236 -> d
+    1:1:java.util.List lambda$compareTo$3(com.android.tools.r8.graph.CfCode):249:249 -> e
+    1:1:java.util.List lambda$compareTo$4(com.android.tools.r8.graph.CfCode):250:250 -> f
+    1:1:boolean estimatedSizeForInliningAtMost(int):199:199 -> g
+    2:2:java.util.List lambda$compareTo$5(com.android.tools.r8.graph.CfCode):251:251 -> g
+    1:2:int countNonStackOperations(int):209:210 -> h
+    1:1:void setMaxLocals(int):173:173 -> i
+    1:1:int computeHashCode():372:372 -> p
     com.android.tools.r8.graph.CfCode asCfCode() -> q
-    1:1:int estimatedSizeForInlining():193:193 -> t
-    1:1:java.lang.String toString():609:609 -> toString
+    1:1:int estimatedSizeForInlining():194:194 -> t
+    1:1:int estimatedDexCodeSizeUpperBoundInBytes():204 -> t
+    1:1:java.lang.String toString():615:615 -> toString
     2:2:void com.android.tools.r8.cf.CfPrinter.<init>(com.android.tools.r8.graph.CfCode):124:124 -> toString
-    2:2:java.lang.String toString():609 -> toString
-    3:3:java.lang.String toString():609:609 -> toString
-    boolean isCfCode() -> u
-    1:2:boolean isEmptyVoidMethod():376:377 -> w
-    1:1:java.util.List getInstructions():180:180 -> y
-    1:1:java.util.List getLocalVariables():188:188 -> z
+    2:2:java.lang.String toString():615 -> toString
+    3:3:java.lang.String toString():615:615 -> toString
+    1:1:int estimatedSizeForInlining():194:194 -> u
+    boolean isCfCode() -> v
+    1:2:boolean isEmptyVoidMethod():382:383 -> x
+    1:1:java.util.List getInstructions():181:181 -> z
 com.android.tools.r8.graph.CfCode$LocalVariableInfo -> com.android.tools.r8.graph.g$a:
     com.android.tools.r8.graph.DebugLocalInfo local -> c
     boolean $assertionsDisabled -> a
     int index -> b
     com.android.tools.r8.cf.code.CfLabel start -> d
     com.android.tools.r8.cf.code.CfLabel end -> e
-    1:1:void <clinit>():72:72 -> <clinit>
-    1:4:void <init>(int,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.cf.code.CfLabel):79:82 -> <init>
-    1:1:com.android.tools.r8.graph.DebugLocalInfo access$000(com.android.tools.r8.graph.CfCode$LocalVariableInfo):72:72 -> a
-    2:4:void setEnd(com.android.tools.r8.cf.code.CfLabel):91:93 -> a
-    5:5:com.android.tools.r8.cf.code.CfLabel getEnd():109:109 -> a
-    6:10:int compareTo(com.android.tools.r8.graph.CfCode$LocalVariableInfo,com.android.tools.r8.graph.CfCompareHelper):113:117 -> a
-    1:1:com.android.tools.r8.cf.code.CfLabel access$100(com.android.tools.r8.graph.CfCode$LocalVariableInfo):72:72 -> b
-    2:2:int getIndex():97:97 -> b
-    1:1:com.android.tools.r8.cf.code.CfLabel access$200(com.android.tools.r8.graph.CfCode$LocalVariableInfo):72:72 -> c
-    2:2:com.android.tools.r8.graph.DebugLocalInfo getLocal():101:101 -> c
-    1:1:int access$300(com.android.tools.r8.graph.CfCode$LocalVariableInfo):72:72 -> d
-    2:2:com.android.tools.r8.cf.code.CfLabel getStart():105:105 -> d
-    1:1:java.lang.String toString():122:122 -> toString
+    1:1:void <clinit>():73:73 -> <clinit>
+    1:4:void <init>(int,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.cf.code.CfLabel):80:83 -> <init>
+    1:1:com.android.tools.r8.graph.DebugLocalInfo access$000(com.android.tools.r8.graph.CfCode$LocalVariableInfo):73:73 -> a
+    2:4:void setEnd(com.android.tools.r8.cf.code.CfLabel):92:94 -> a
+    5:5:com.android.tools.r8.cf.code.CfLabel getEnd():110:110 -> a
+    6:10:int compareTo(com.android.tools.r8.graph.CfCode$LocalVariableInfo,com.android.tools.r8.graph.CfCompareHelper):114:118 -> a
+    1:1:com.android.tools.r8.cf.code.CfLabel access$100(com.android.tools.r8.graph.CfCode$LocalVariableInfo):73:73 -> b
+    2:2:int getIndex():98:98 -> b
+    1:1:com.android.tools.r8.cf.code.CfLabel access$200(com.android.tools.r8.graph.CfCode$LocalVariableInfo):73:73 -> c
+    2:2:com.android.tools.r8.graph.DebugLocalInfo getLocal():102:102 -> c
+    1:1:int access$300(com.android.tools.r8.graph.CfCode$LocalVariableInfo):73:73 -> d
+    2:2:com.android.tools.r8.cf.code.CfLabel getStart():106:106 -> d
+    1:1:java.lang.String toString():123:123 -> toString
 com.android.tools.r8.graph.CfCode$StackMapStatus -> com.android.tools.r8.graph.g$b:
     com.android.tools.r8.graph.CfCode$StackMapStatus VALID -> c
     com.android.tools.r8.graph.CfCode$StackMapStatus INVALID_OR_NOT_PRESENT -> b
     com.android.tools.r8.graph.CfCode$StackMapStatus NOT_VERIFIED -> a
-    1:3:void <clinit>():67:69 -> <clinit>
-    1:1:void <init>(java.lang.String,int):66:66 -> <init>
+    1:3:void <clinit>():68:70 -> <clinit>
+    1:1:void <init>(java.lang.String,int):67:67 -> <init>
 com.android.tools.r8.graph.CfCodeDiagnostics -> com.android.tools.r8.internal.o3:
     com.android.tools.r8.origin.Origin origin -> a
     com.android.tools.r8.position.MethodPosition methodPosition -> b
@@ -16568,17 +16695,18 @@
     1:2: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.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.ir.conversion.MethodProcessor):29:30 -> a
     3:3:void registerArgumentReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.ArgumentUse):39:39 -> a
     4:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap collectParameterInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):44:44 -> a
-    5:5:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):92:92 -> a
+    5:5:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):94:94 -> a
     1:1:boolean estimatedSizeForInliningAtMost(int):71:71 -> g
-    1:1:com.android.tools.r8.graph.CfCode asCfCode():75:75 -> q
-    1:1:com.android.tools.r8.graph.DexCode asDexCode():83:83 -> r
-    1:1:com.android.tools.r8.graph.LazyCfCode asLazyCfCode():79:79 -> s
-    int estimatedSizeForInlining() -> t
-    boolean isCfCode() -> u
-    boolean isDexCode() -> v
-    boolean isEmptyVoidMethod() -> w
-    boolean verifyNoInputReaders() -> x
-com.android.tools.r8.graph.DebugLocalInfo -> com.android.tools.r8.internal.C7:
+    1:1:com.android.tools.r8.graph.CfCode asCfCode():77:77 -> q
+    1:1:com.android.tools.r8.graph.DexCode asDexCode():85:85 -> r
+    1:1:com.android.tools.r8.graph.LazyCfCode asLazyCfCode():81:81 -> s
+    int estimatedDexCodeSizeUpperBoundInBytes() -> t
+    int estimatedSizeForInlining() -> u
+    boolean isCfCode() -> v
+    boolean isDexCode() -> w
+    boolean isEmptyVoidMethod() -> x
+    boolean verifyNoInputReaders() -> y
+com.android.tools.r8.graph.DebugLocalInfo -> com.android.tools.r8.internal.D7:
     com.android.tools.r8.graph.DexString name -> a
     com.android.tools.r8.graph.DexString signature -> c
     com.android.tools.r8.graph.DexType type -> b
@@ -16596,7 +16724,7 @@
     1:5:boolean equals(java.lang.Object):94:98 -> equals
     1:3:int hashCode():103:105 -> hashCode
     1:1:java.lang.String toString():112:112 -> toString
-com.android.tools.r8.graph.DebugLocalInfo$PrintLevel -> com.android.tools.r8.internal.C7$a:
+com.android.tools.r8.graph.DebugLocalInfo$PrintLevel -> com.android.tools.r8.internal.D7$a:
     com.android.tools.r8.graph.DebugLocalInfo$PrintLevel[] $VALUES -> d
     com.android.tools.r8.graph.DebugLocalInfo$PrintLevel NAME -> b
     com.android.tools.r8.graph.DebugLocalInfo$PrintLevel NONE -> a
@@ -16604,7 +16732,7 @@
     1:3:void <clinit>():17:19 -> <clinit>
     4:4:void <clinit>():16:16 -> <clinit>
     1:1:void <init>(java.lang.String,int):16:16 -> <init>
-com.android.tools.r8.graph.DefaultInitClassLens -> com.android.tools.r8.internal.L7:
+com.android.tools.r8.graph.DefaultInitClassLens -> com.android.tools.r8.internal.M7:
     com.android.tools.r8.graph.DefaultInitClassLens INSTANCE -> a
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>():13:13 -> <init>
@@ -16799,7 +16927,7 @@
     1:2:void <init>(java.util.List):80:81 -> <init>
     1:1:java.util.List getClasses():94:94 -> a
     1:3:boolean reorderClasses():86:88 -> b
-com.android.tools.r8.graph.DexByteCodeWriter -> com.android.tools.r8.internal.C8:
+com.android.tools.r8.graph.DexByteCodeWriter -> com.android.tools.r8.internal.D8:
     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):25:27 -> <init>
@@ -16831,7 +16959,7 @@
     void writeMethodsHeader(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream) -> c
     void writeFieldsFooter(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream) -> d
     void writeFieldsHeader(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream) -> e
-com.android.tools.r8.graph.DexByteCodeWriter$OutputStreamProvider -> com.android.tools.r8.internal.C8$a:
+com.android.tools.r8.graph.DexByteCodeWriter$OutputStreamProvider -> com.android.tools.r8.internal.D8$a:
     java.io.PrintStream get(com.android.tools.r8.graph.DexClass) -> a
 com.android.tools.r8.graph.DexCallSite -> com.android.tools.r8.graph.r:
     com.android.tools.r8.graph.DexString methodName -> e
@@ -16933,148 +17061,150 @@
     1:1:void <init>(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.GenericSignature$ClassSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):86:86 -> <init>
     2:73: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):45:116 -> <init>
     74:74: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):106:106 -> <init>
-    boolean isStaticMember() -> A
-    1:1:com.android.tools.r8.graph.DexReference toReference():524:524 -> B
-    1:3:java.lang.Iterable allImmediateSupertypes():706:708 -> C
-    4:7:java.lang.Iterable allImmediateSupertypes():707:710 -> C
-    1:1:java.util.List allMethodsSorted():213:213 -> D
+    boolean isStaticMember() -> B
+    1:3:java.lang.Iterable allImmediateSupertypes():710:712 -> C
+    4:7:java.lang.Iterable allImmediateSupertypes():711:714 -> C
+    1:1:java.util.List allMethodsSorted():217:217 -> D
     com.android.tools.r8.graph.DexClasspathClass asClasspathClass() -> E
     com.android.tools.r8.graph.DexLibraryClass asLibraryClass() -> F
-    1:1:void clearClassSignature():772:772 -> G
-    1:1:void clearEnclosingMethodAttribute():758:758 -> H
-    1:1:void clearInnerClasses():768:768 -> I
-    1:1:void clearNestHost():833:833 -> J
-    1:2:boolean defaultValuesForStaticFieldsMayTriggerAllocation():737:738 -> K
-    1:1:java.lang.Iterable directMethods():162:162 -> L
-    1:1:java.lang.Iterable fields():131:131 -> M
+    1:1:void clearClassSignature():776:776 -> G
+    1:1:void clearEnclosingMethodAttribute():762:762 -> H
+    1:1:void clearInnerClasses():772:772 -> I
+    1:1:void clearNestHost():837:837 -> J
+    1:2:boolean defaultValuesForStaticFieldsMayTriggerAllocation():741:742 -> K
+    1:1:java.lang.Iterable directMethods():166:166 -> L
+    1:1:java.lang.Iterable fields():135:135 -> M
     1:1:com.android.tools.r8.graph.ClassAccessFlags getAccessFlags():123:123 -> N
-    1:2:com.android.tools.r8.graph.DexEncodedMethod getClassInitializer():574:575 -> O
-    1:1:com.android.tools.r8.graph.GenericSignature$ClassSignature getClassSignature():801:801 -> P
-    1:1:com.android.tools.r8.graph.EnclosingMethodAttribute getEnclosingMethodAttribute():750:750 -> Q
-    1:2:com.android.tools.r8.graph.InnerClassAttribute getInnerClassAttributeForThisClass():780:781 -> R
-    1:1:java.util.List getInnerClasses():742:742 -> S
-    1:1:com.android.tools.r8.graph.MethodCollection getMethodCollection():145:145 -> T
-    1:5:com.android.tools.r8.graph.DexType getNestHost():850:854 -> U
-    1:1:com.android.tools.r8.graph.NestHostClassAttribute getNestHostClassAttribute():865:865 -> V
-    1:1:java.util.List getNestMembersClassAttributes():869:869 -> W
-    1:1:com.android.tools.r8.graph.DexType getType():584:584 -> X
-    1:1:boolean hasClassInitializer():592:592 -> Y
-    1:1:com.android.tools.r8.graph.DexEncodedMethod getDefaultInitializer():610:610 -> Z
-    1:1:boolean hasDefaultInitializer():596 -> Z
+    1:2:com.android.tools.r8.graph.DexEncodedMethod getClassInitializer():578:579 -> O
+    1:1:com.android.tools.r8.graph.GenericSignature$ClassSignature getClassSignature():805:805 -> P
+    1:1:com.android.tools.r8.graph.EnclosingMethodAttribute getEnclosingMethodAttribute():754:754 -> Q
+    1:2:com.android.tools.r8.graph.InnerClassAttribute getInnerClassAttributeForThisClass():784:785 -> R
+    1:1:java.util.List getInnerClasses():746:746 -> S
+    1:1:com.android.tools.r8.graph.DexTypeList getInterfaces():127:127 -> T
+    1:1:com.android.tools.r8.graph.MethodCollection getMethodCollection():149:149 -> U
+    1:5:com.android.tools.r8.graph.DexType getNestHost():854:858 -> V
+    1:1:com.android.tools.r8.graph.NestHostClassAttribute getNestHostClassAttribute():869:869 -> W
+    1:1:java.util.List getNestMembersClassAttributes():873:873 -> X
+    1:1:com.android.tools.r8.graph.DexType getType():588:588 -> Y
+    1:1:boolean hasClassInitializer():596:596 -> Z
     java.util.Iterator lambda$allImmediateSupertypes$0(java.util.Iterator) -> a
-    1:1:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):158:158 -> a
-    2:2:java.lang.Iterable directMethods(java.util.function.Predicate):166:166 -> a
-    3:3:void addDirectMethods(java.util.Collection):170:170 -> a
-    4:4:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):178:178 -> a
-    5:5:void virtualizeMethods(java.util.Set):217:217 -> a
-    6:10:void forEachField(java.util.function.Consumer):236:240 -> a
-    11:16:void appendInstanceField(com.android.tools.r8.graph.DexEncodedField):320:325 -> a
-    17:19:void setInstanceField(int,com.android.tools.r8.graph.DexEncodedField):350:352 -> a
-    20:22:void setInstanceFields(com.android.tools.r8.graph.DexEncodedField[]):356:358 -> a
-    23:24:boolean verifyCorrectnessOfFieldHolders(java.lang.Iterable):372:373 -> a
-    25:25:com.android.tools.r8.graph.DexEncodedField lookupInstanceField(com.android.tools.r8.graph.DexField):394:394 -> a
-    25:25:com.android.tools.r8.graph.DexEncodedField lookupField(com.android.tools.r8.graph.DexField):412 -> a
-    26:26:com.android.tools.r8.graph.DexEncodedField lookupStaticField(com.android.tools.r8.graph.DexField):389:389 -> a
-    26:26:com.android.tools.r8.graph.DexEncodedField lookupField(com.android.tools.r8.graph.DexField):413 -> a
-    27:27:com.android.tools.r8.graph.DexEncodedMethod lookupDirectMethod(com.android.tools.r8.graph.DexMethod):418:418 -> a
-    28:28:com.android.tools.r8.graph.DexEncodedMember lookupMember(com.android.tools.r8.graph.DexMember):441:441 -> a
-    29:29:com.android.tools.r8.graph.DexEncodedMethod lookupMethod(com.android.tools.r8.graph.DexMethod):447:447 -> a
-    29:29:com.android.tools.r8.graph.DexEncodedMember lookupMember(com.android.tools.r8.graph.DexMember):441 -> a
-    30:31:com.android.tools.r8.graph.DexEncodedMember lookupTarget(com.android.tools.r8.graph.DexEncodedMember[],com.android.tools.r8.graph.DexMember):488:489 -> a
+    1:1:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):162:162 -> a
+    2:2:java.lang.Iterable directMethods(java.util.function.Predicate):170:170 -> a
+    3:3:void addDirectMethods(java.util.Collection):174:174 -> a
+    4:4:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):182:182 -> a
+    5:5:void virtualizeMethods(java.util.Set):221:221 -> a
+    6:10:void forEachField(java.util.function.Consumer):240:244 -> a
+    11:16:void appendInstanceField(com.android.tools.r8.graph.DexEncodedField):324:329 -> a
+    17:19:void setInstanceField(int,com.android.tools.r8.graph.DexEncodedField):354:356 -> a
+    20:22:void setInstanceFields(com.android.tools.r8.graph.DexEncodedField[]):360:362 -> a
+    23:24:boolean verifyCorrectnessOfFieldHolders(java.lang.Iterable):376:377 -> a
+    25:25:com.android.tools.r8.graph.DexEncodedField lookupInstanceField(com.android.tools.r8.graph.DexField):398:398 -> a
+    25:25:com.android.tools.r8.graph.DexEncodedField lookupField(com.android.tools.r8.graph.DexField):416 -> a
+    26:26:com.android.tools.r8.graph.DexEncodedField lookupStaticField(com.android.tools.r8.graph.DexField):393:393 -> a
+    26:26:com.android.tools.r8.graph.DexEncodedField lookupField(com.android.tools.r8.graph.DexField):417 -> a
+    27:27:com.android.tools.r8.graph.DexEncodedMethod lookupDirectMethod(com.android.tools.r8.graph.DexMethod):422:422 -> a
+    28:28:com.android.tools.r8.graph.DexEncodedMember lookupMember(com.android.tools.r8.graph.DexMember):445:445 -> a
+    29:29:com.android.tools.r8.graph.DexEncodedMethod lookupMethod(com.android.tools.r8.graph.DexMethod):451:451 -> a
+    29:29:com.android.tools.r8.graph.DexEncodedMember lookupMember(com.android.tools.r8.graph.DexMember):445 -> a
+    30:31:com.android.tools.r8.graph.DexEncodedMember lookupTarget(com.android.tools.r8.graph.DexEncodedMember[],com.android.tools.r8.graph.DexMember):492:493 -> a
     32:48:boolean com.android.tools.r8.graph.DexField.match(com.android.tools.r8.graph.DexEncodedMember):0:16 -> a
-    32:48:com.android.tools.r8.graph.DexEncodedMember lookupTarget(com.android.tools.r8.graph.DexEncodedMember[],com.android.tools.r8.graph.DexMember):489 -> a
-    49:51:com.android.tools.r8.graph.DexEncodedMethod getInitializer(com.android.tools.r8.graph.DexType[]):600:602 -> a
-    52:55:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate,java.util.Set):660:663 -> a
+    32:48:com.android.tools.r8.graph.DexEncodedMember lookupTarget(com.android.tools.r8.graph.DexEncodedMember[],com.android.tools.r8.graph.DexMember):493 -> a
+    49:51:com.android.tools.r8.graph.DexEncodedMethod getInitializer(com.android.tools.r8.graph.DexType[]):604:606 -> a
+    52:55:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate,java.util.Set):664:667 -> a
     56:56:boolean isLibraryClass():0:0 -> a
-    56:56:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate,java.util.Set):666 -> a
-    57:60:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate,java.util.Set):667:670 -> a
-    61:67:boolean hasClassInitializerThatCannotBePostponed():686:692 -> a
-    61:67:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate,java.util.Set):674 -> a
-    68:71:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate,java.util.Set):677:680 -> a
-    72:72:boolean definesFinalizer(com.android.tools.r8.graph.DexItemFactory):733:733 -> a
-    73:73:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualMethod(com.android.tools.r8.graph.DexMethod):428:428 -> a
-    73:73:boolean definesFinalizer(com.android.tools.r8.graph.DexItemFactory):733 -> a
-    74:74:void setEnclosingMethodAttribute(com.android.tools.r8.graph.EnclosingMethodAttribute):754:754 -> a
-    75:83:void replaceInnerClassAttributeForThisClass(com.android.tools.r8.graph.InnerClassAttribute):789:797 -> a
-    84:84:void setClassSignature(com.android.tools.r8.graph.GenericSignature$ClassSignature):805:805 -> a
-    85:86:void setNestHost(com.android.tools.r8.graph.DexType):837:838 -> a
-    87:87:void lambda$forEachNestMember$2(java.util.function.Consumer,com.android.tools.r8.graph.NestMemberClassAttribute):861:861 -> a
-    88:88:boolean isValid(com.android.tools.r8.utils.InternalOptions):901:901 -> a
-    89:92:boolean verifyNoAbstractMethodsOnNonAbstractClasses(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):199:202 -> a
-    89:92:boolean isValid(com.android.tools.r8.utils.InternalOptions):901 -> a
-    93:96:boolean isValid(com.android.tools.r8.utils.InternalOptions):902:905 -> a
-    1:2:boolean hasStaticSynchronizedMethods():910:911 -> a0
-    3:3:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():486:486 -> a0
-    3:3:boolean hasStaticSynchronizedMethods():911 -> a0
+    56:56:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate,java.util.Set):670 -> a
+    57:60:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate,java.util.Set):671:674 -> a
+    61:67:boolean hasClassInitializerThatCannotBePostponed():690:696 -> a
+    61:67:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate,java.util.Set):678 -> a
+    68:71:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate,java.util.Set):681:684 -> a
+    72:72:boolean definesFinalizer(com.android.tools.r8.graph.DexItemFactory):737:737 -> a
+    73:73:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualMethod(com.android.tools.r8.graph.DexMethod):432:432 -> a
+    73:73:boolean definesFinalizer(com.android.tools.r8.graph.DexItemFactory):737 -> a
+    74:74:void setEnclosingMethodAttribute(com.android.tools.r8.graph.EnclosingMethodAttribute):758:758 -> a
+    75:83:void replaceInnerClassAttributeForThisClass(com.android.tools.r8.graph.InnerClassAttribute):793:801 -> a
+    84:84:void setClassSignature(com.android.tools.r8.graph.GenericSignature$ClassSignature):809:809 -> a
+    85:86:void setNestHost(com.android.tools.r8.graph.DexType):841:842 -> a
+    87:87:void lambda$forEachNestMember$2(java.util.function.Consumer,com.android.tools.r8.graph.NestMemberClassAttribute):865:865 -> a
+    88:88:boolean isValid(com.android.tools.r8.utils.InternalOptions):905:905 -> a
+    89:92:boolean verifyNoAbstractMethodsOnNonAbstractClasses(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):203:206 -> a
+    89:92:boolean isValid(com.android.tools.r8.utils.InternalOptions):905 -> a
+    93:96:boolean isValid(com.android.tools.r8.utils.InternalOptions):906:909 -> a
+    1:1:com.android.tools.r8.graph.DexEncodedMethod getDefaultInitializer():614:614 -> a0
+    1:1:boolean hasDefaultInitializer():600 -> a0
     void addDependencies(com.android.tools.r8.dex.MixedSectionCollection) -> b
-    1:3:java.lang.Iterable fields(java.util.function.Predicate):135:137 -> b
+    1:3:java.lang.Iterable fields(java.util.function.Predicate):139:141 -> b
     4:4:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> b
-    4:4:java.lang.Iterable fields(java.util.function.Predicate):135 -> b
-    5:5:void addVirtualMethods(java.util.Collection):190:190 -> b
-    6:6:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):194:194 -> b
-    7:7:void forEachMethod(java.util.function.Consumer):209:209 -> b
+    4:4:java.lang.Iterable fields(java.util.function.Predicate):139 -> b
+    5:5:void addVirtualMethods(java.util.Collection):194:194 -> b
+    6:6:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):198:198 -> b
+    7:7:void forEachMethod(java.util.function.Consumer):213:213 -> b
     8:8:void com.android.tools.r8.graph.MethodCollection.forEachMethod(java.util.function.Consumer):88:88 -> b
-    8:8:void forEachMethod(java.util.function.Consumer):209 -> b
-    9:14:void appendStaticField(com.android.tools.r8.graph.DexEncodedField):262:267 -> b
-    15:17:void setStaticField(int,com.android.tools.r8.graph.DexEncodedField):291:293 -> b
-    18:20:void setStaticFields(com.android.tools.r8.graph.DexEncodedField[]):297:299 -> b
-    21:21:com.android.tools.r8.graph.DexEncodedField lookupInstanceField(com.android.tools.r8.graph.DexField):394:394 -> b
-    22:22:com.android.tools.r8.graph.DexEncodedMethod lookupMethod(com.android.tools.r8.graph.DexMethod):447:447 -> b
-    23:23:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView):655:655 -> b
-    24:24:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView):654:654 -> b
-    25:31:boolean initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate,java.util.Set):720:726 -> b
-    1:5:java.util.List instanceFields():312:316 -> b0
-    1:10:void appendStaticFields(java.util.Collection):271:280 -> c
-    11:11:com.android.tools.r8.graph.DexEncodedField lookupStaticField(com.android.tools.r8.graph.DexField):389:389 -> c
-    12:12:com.android.tools.r8.graph.DexEncodedMethod lookupDirectMethod(java.util.function.Predicate):423:423 -> c
-    13:13:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualMethod(com.android.tools.r8.graph.DexMethod):428:428 -> c
-    14:14:boolean isEffectivelyFinal(com.android.tools.r8.graph.AppView):509:509 -> c
-    15:15:boolean lambda$defaultValuesForStaticFieldsMayTriggerAllocation$1(com.android.tools.r8.graph.DexEncodedField):738:738 -> c
-    16:17:void forEachNestMember(java.util.function.Consumer):860:861 -> c
-    1:1:boolean isAbstract():497:497 -> c0
-    1:1:com.android.tools.r8.graph.DexEncodedMethod removeMethod(com.android.tools.r8.graph.DexMethod):174:174 -> d
-    2:6:boolean verifyCorrectnessOfFieldHolder(com.android.tools.r8.graph.DexEncodedField):362:366 -> d
-    7:7:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualMethod(java.util.function.Predicate):433:433 -> d
-    8:14:boolean isResolvable(com.android.tools.r8.graph.AppView):626:632 -> d
+    8:8:void forEachMethod(java.util.function.Consumer):213 -> b
+    9:14:void appendStaticField(com.android.tools.r8.graph.DexEncodedField):266:271 -> b
+    15:17:void setStaticField(int,com.android.tools.r8.graph.DexEncodedField):295:297 -> b
+    18:20:void setStaticFields(com.android.tools.r8.graph.DexEncodedField[]):301:303 -> b
+    21:21:com.android.tools.r8.graph.DexEncodedField lookupInstanceField(com.android.tools.r8.graph.DexField):398:398 -> b
+    22:22:com.android.tools.r8.graph.DexEncodedMethod lookupMethod(com.android.tools.r8.graph.DexMethod):451:451 -> b
+    23:23:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView):659:659 -> b
+    24:24:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView):658:658 -> b
+    25:31:boolean initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate,java.util.Set):724:730 -> b
+    1:1:boolean hasInstanceFields():880:880 -> b0
+    1:10:void appendStaticFields(java.util.Collection):275:284 -> c
+    11:11:com.android.tools.r8.graph.DexEncodedField lookupStaticField(com.android.tools.r8.graph.DexField):393:393 -> c
+    12:12:com.android.tools.r8.graph.DexEncodedMethod lookupDirectMethod(java.util.function.Predicate):427:427 -> c
+    13:13:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualMethod(com.android.tools.r8.graph.DexMethod):432:432 -> c
+    14:14:boolean isEffectivelyFinal(com.android.tools.r8.graph.AppView):513:513 -> c
+    15:15:boolean lambda$defaultValuesForStaticFieldsMayTriggerAllocation$1(com.android.tools.r8.graph.DexEncodedField):742:742 -> c
+    16:17:void forEachNestMember(java.util.function.Consumer):864:865 -> c
+    1:2:boolean hasStaticSynchronizedMethods():914:915 -> c0
+    3:3:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():492:492 -> c0
+    3:3:boolean hasStaticSynchronizedMethods():915 -> c0
+    1:1:com.android.tools.r8.graph.DexEncodedMethod removeMethod(com.android.tools.r8.graph.DexMethod):178:178 -> d
+    2:6:boolean verifyCorrectnessOfFieldHolder(com.android.tools.r8.graph.DexEncodedField):366:370 -> d
+    7:7:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualMethod(java.util.function.Predicate):437:437 -> d
+    8:14:boolean isResolvable(com.android.tools.r8.graph.AppView):630:636 -> d
     15:15:boolean com.android.tools.r8.graph.DexType.isResolvable(com.android.tools.r8.graph.AppView):0:0 -> d
-    15:15:boolean isResolvable(com.android.tools.r8.graph.AppView):633 -> d
+    15:15:boolean isResolvable(com.android.tools.r8.graph.AppView):637 -> d
     16:16:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> d
     16:16:boolean com.android.tools.r8.graph.DexType.isResolvable(com.android.tools.r8.graph.AppView):352 -> d
-    16:16:boolean isResolvable(com.android.tools.r8.graph.AppView):633 -> d
+    16:16:boolean isResolvable(com.android.tools.r8.graph.AppView):637 -> d
     17:17:boolean com.android.tools.r8.graph.DexType.isResolvable(com.android.tools.r8.graph.AppView):353:353 -> d
-    17:17:boolean isResolvable(com.android.tools.r8.graph.AppView):633 -> d
-    18:21:boolean isResolvable(com.android.tools.r8.graph.AppView):639:642 -> d
-    1:1:boolean isAnnotation():501:501 -> d0
-    1:1:java.lang.Iterable methods(java.util.function.Predicate):153:153 -> e
-    2:2:boolean isSerializable(com.android.tools.r8.graph.AppView):646:646 -> e
+    17:17:boolean isResolvable(com.android.tools.r8.graph.AppView):637 -> d
+    18:21:boolean isResolvable(com.android.tools.r8.graph.AppView):643:646 -> d
+    1:5:java.util.List instanceFields():316:320 -> d0
+    1:1:java.lang.Iterable methods(java.util.function.Predicate):157:157 -> e
+    2:2:boolean isSerializable(com.android.tools.r8.graph.AppView):650:650 -> e
     3:3:boolean com.android.tools.r8.graph.AppInfoWithClassHierarchy.isSerializable(com.android.tools.r8.graph.DexType):281:281 -> e
-    3:3:boolean isSerializable(com.android.tools.r8.graph.AppView):646 -> e
-    1:4:boolean isAnonymousClass():822:825 -> e0
-    1:2:void removeEnclosingMethodAttribute(java.util.function.Predicate):762:763 -> f
-    boolean isClasspathClass() -> f0
-    1:1:void removeInnerClasses(java.util.function.Predicate):776:776 -> g
-    1:1:boolean isEnum():517:517 -> g0
+    3:3:boolean isSerializable(com.android.tools.r8.graph.AppView):650 -> e
+    1:1:boolean isAbstract():501:501 -> e0
+    1:2:void removeEnclosingMethodAttribute(java.util.function.Predicate):766:767 -> f
+    1:1:boolean isAnnotation():505:505 -> f0
+    1:1:void removeInnerClasses(java.util.function.Predicate):780:780 -> g
+    1:4:boolean isAnonymousClass():826:829 -> g0
     1:1:com.android.tools.r8.graph.ClassAccessFlags getAccessFlags():123:123 -> getAccessFlags
     1:1:com.android.tools.r8.graph.AccessFlags getAccessFlags():32 -> getAccessFlags
-    1:1:java.lang.Iterable virtualMethods(java.util.function.Predicate):186:186 -> h
-    1:1:boolean isFinal():505:505 -> h0
-    1:1:boolean isInANest():829:829 -> i0
-    1:1:boolean isInterface():513:513 -> j0
-    boolean isLibraryClass() -> k0
-    1:3:boolean isLocalClass():809:811 -> l0
-    1:3:boolean isMemberClass():815:817 -> m0
-    1:1:boolean isNestHost():842:842 -> n0
-    1:1:boolean isNestMember():846:846 -> o0
-    boolean isNotProgramClass() -> p0
+    1:1:java.lang.Iterable virtualMethods(java.util.function.Predicate):190:190 -> h
+    boolean isClasspathClass() -> h0
+    1:1:boolean isEnum():521:521 -> i0
+    1:1:boolean isFinal():509:509 -> j0
+    1:1:boolean isInANest():833:833 -> k0
+    1:1:boolean isInterface():517:517 -> l0
+    boolean isLibraryClass() -> m0
+    1:3:boolean isLocalClass():813:815 -> n0
+    1:3:boolean isMemberClass():819:821 -> o0
+    1:1:boolean isNestHost():846:846 -> p0
     com.android.tools.r8.graph.DexClass asDexClass() -> q
-    1:1:java.lang.Iterable members():141:141 -> q0
-    2:2:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> q0
-    2:2:java.lang.Iterable members():141 -> q0
-    1:1:java.lang.Iterable methods():149:149 -> r0
-    1:5:java.util.List staticFields():254:258 -> s0
-    1:4:boolean verifyNoDuplicateFields():379:382 -> t0
-    1:1:java.lang.Iterable virtualMethods():182:182 -> u0
-    boolean isDexClass() -> v
+    1:1:boolean isNestMember():850:850 -> q0
+    boolean isNotProgramClass() -> r0
+    1:1:java.lang.Iterable members():145:145 -> s0
+    2:2:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> s0
+    2:2:java.lang.Iterable members():145 -> s0
+    1:1:java.lang.Iterable methods():153:153 -> t0
+    1:5:java.util.List staticFields():258:262 -> u0
+    1:1:com.android.tools.r8.graph.DexReference getReference():528:528 -> v
+    1:4:boolean verifyNoDuplicateFields():383:386 -> v0
+    boolean isDexClass() -> w
+    1:1:java.lang.Iterable virtualMethods():186:186 -> w0
 com.android.tools.r8.graph.DexClass$FieldSetter -> com.android.tools.r8.graph.s$a:
     void setField(int,com.android.tools.r8.graph.DexEncodedField) -> a
 com.android.tools.r8.graph.DexClassAndField -> com.android.tools.r8.graph.t:
@@ -17132,7 +17262,7 @@
     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):37:55 -> <init>
     com.android.tools.r8.graph.DexClasspathClass asClasspathClass() -> E
     1:1:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):66:66 -> b
-    boolean isNotProgramClass() -> p0
+    boolean isNotProgramClass() -> r0
     1:1:java.lang.String toString():60:60 -> toString
 com.android.tools.r8.graph.DexCode -> com.android.tools.r8.graph.x:
     com.android.tools.r8.graph.DexDebugInfoForWriting debugInfoForWriting -> l
@@ -17147,107 +17277,109 @@
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():39:39 -> <clinit>
     1:12: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):62:73 -> <init>
-    1:1:com.android.tools.r8.graph.DexCode withoutThisParameter():83:83 -> A
-    2:11:com.android.tools.r8.graph.DexDebugInfo debugInfoWithoutFirstParameter():157:166 -> A
-    2:11:com.android.tools.r8.graph.DexCode withoutThisParameter():90 -> A
-    12:12:com.android.tools.r8.graph.DexCode withoutThisParameter():90:90 -> A
-    1:3:void setDebugInfo(com.android.tools.r8.graph.DexDebugInfo):113:115 -> a
-    4:25:com.android.tools.r8.graph.DexDebugInfo debugInfoWithFakeThisParameter(com.android.tools.r8.graph.DexItemFactory):120:141 -> a
-    26:29:int getLargestPrefix(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexString):145:148 -> a
-    30:39:int compareTo(com.android.tools.r8.graph.DexCode):185:194 -> a
-    40:46: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):210:216 -> a
-    47:55: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.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.ir.conversion.MethodProcessor):228:236 -> a
-    56:56:void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry):241:241 -> a
-    57:57:void registerCodeReferencesForDesugaring(com.android.tools.r8.graph.ClasspathMethod,com.android.tools.r8.graph.UseRegistry):246:246 -> a
-    58:63:void internalRegisterCodeReferences(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.UseRegistry):250:255 -> a
-    64:127:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.ClassNameMapper):267:330 -> a
-    128:128:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.ClassNameMapper):313:313 -> a
-    129:131: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):397:399 -> a
+    1:8:com.android.tools.r8.graph.DexDebugInfoForWriting getDebugInfoForWriting():421:428 -> A
+    1:1:com.android.tools.r8.graph.DexCode withoutThisParameter():83:83 -> B
+    2:11:com.android.tools.r8.graph.DexDebugInfo debugInfoWithoutFirstParameter():162:171 -> B
+    2:11:com.android.tools.r8.graph.DexCode withoutThisParameter():90 -> B
+    12:12:com.android.tools.r8.graph.DexCode withoutThisParameter():90:90 -> B
+    1:3:void setDebugInfo(com.android.tools.r8.graph.DexDebugInfo):118:120 -> a
+    4:25:com.android.tools.r8.graph.DexDebugInfo debugInfoWithFakeThisParameter(com.android.tools.r8.graph.DexItemFactory):125:146 -> a
+    26:29:int getLargestPrefix(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexString):150:153 -> a
+    30:39:int compareTo(com.android.tools.r8.graph.DexCode):190:199 -> a
+    40:46: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):215:221 -> a
+    47:55: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.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.ir.conversion.MethodProcessor):233:241 -> a
+    56:56:void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry):246:246 -> a
+    57:57:void registerCodeReferencesForDesugaring(com.android.tools.r8.graph.ClasspathMethod,com.android.tools.r8.graph.UseRegistry):251:251 -> a
+    58:63:void internalRegisterCodeReferences(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.UseRegistry):255:260 -> a
+    64:127:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.ClassNameMapper):272:335 -> a
+    128:128:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.ClassNameMapper):318:318 -> a
+    129:131: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):402:404 -> a
     132:132:boolean com.android.tools.r8.code.Instruction.isDexItemBasedConstString():0:0 -> a
-    132:132: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):399 -> a
-    133:136: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):399:402 -> a
+    132:132: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):404 -> a
+    133:136: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):404:407 -> a
     137:137:boolean com.android.tools.r8.code.Instruction.isConstStringJumbo():0:0 -> a
-    137:137: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):403 -> a
-    138:142:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):404:408 -> a
+    137:137: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):408 -> a
+    138:142:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):409:413 -> a
     143:143:void com.android.tools.r8.graph.DexDebugInfo.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens):63:63 -> a
-    143:143: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):408 -> a
+    143:143: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):413 -> a
     144:144:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):243:243 -> a
     144:144:void com.android.tools.r8.graph.DexDebugInfo.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens):65 -> a
-    144:144: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):408 -> a
+    144:144: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):413 -> a
     145:146:void com.android.tools.r8.graph.DexDebugInfo.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens):68:69 -> a
-    145:146: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):408 -> a
-    147:147: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):410:410 -> a
-    148:149:void com.android.tools.r8.graph.DexCode$TryHandler.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens):543:544 -> a
-    148:149: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):411 -> a
-    150:152:void updateHighestSortingString(com.android.tools.r8.graph.DexString):427:429 -> a
-    153:155:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):439:441 -> a
+    145:146: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):413 -> a
+    147:147: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):415:415 -> a
+    148:149:void com.android.tools.r8.graph.DexCode$TryHandler.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens):548:549 -> a
+    148:149:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):416 -> a
+    150:152:void updateHighestSortingString(com.android.tools.r8.graph.DexString):432:434 -> a
+    153:155:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):444:446 -> a
     156:231:void com.android.tools.r8.graph.DexDebugInfo.collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):0:75 -> a
-    156:231:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):441 -> a
-    1:1:int lambda$compareTo$0(com.android.tools.r8.graph.DexCode):186:186 -> b
-    1:1:int lambda$compareTo$1(com.android.tools.r8.graph.DexCode):187:187 -> c
-    2:2:boolean computeEquals(java.lang.Object):200:200 -> c
+    156:231:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):446 -> a
+    1:1:int lambda$compareTo$0(com.android.tools.r8.graph.DexCode):191:191 -> b
+    1:1:int lambda$compareTo$1(com.android.tools.r8.graph.DexCode):192:192 -> c
+    2:2:boolean computeEquals(java.lang.Object):205:205 -> c
     1:1:int compareTo(java.lang.Object):39:39 -> compareTo
-    1:1:int lambda$compareTo$2(com.android.tools.r8.graph.DexCode):188:188 -> d
-    1:1:com.android.tools.r8.graph.DexCode$Try[] lambda$compareTo$3(com.android.tools.r8.graph.DexCode):189:189 -> e
-    1:1:com.android.tools.r8.graph.DexCode$TryHandler[] lambda$compareTo$4(com.android.tools.r8.graph.DexCode):190:190 -> f
-    1:1:com.android.tools.r8.graph.DexDebugInfo lambda$compareTo$5(com.android.tools.r8.graph.DexCode):191:191 -> g
-    1:1:com.android.tools.r8.code.Instruction[] lambda$compareTo$6(com.android.tools.r8.graph.DexCode):192:192 -> h
-    1:7:int computeHashCode():171:177 -> p
+    1:1:int lambda$compareTo$2(com.android.tools.r8.graph.DexCode):193:193 -> d
+    1:1:com.android.tools.r8.graph.DexCode$Try[] lambda$compareTo$3(com.android.tools.r8.graph.DexCode):194:194 -> e
+    1:1:com.android.tools.r8.graph.DexCode$TryHandler[] lambda$compareTo$4(com.android.tools.r8.graph.DexCode):195:195 -> f
+    1:1:com.android.tools.r8.graph.DexDebugInfo lambda$compareTo$5(com.android.tools.r8.graph.DexCode):196:196 -> g
+    1:1:com.android.tools.r8.code.Instruction[] lambda$compareTo$6(com.android.tools.r8.graph.DexCode):197:197 -> h
+    1:7:int computeHashCode():176:182 -> p
     com.android.tools.r8.graph.DexCode asDexCode() -> r
-    1:1:int estimatedSizeForInlining():100:100 -> t
-    1:1:java.lang.String toString():262:262 -> toString
-    boolean isDexCode() -> v
-    1:1:boolean isEmptyVoidMethod():205:205 -> w
-    1:1:com.android.tools.r8.graph.DexDebugInfo getDebugInfo():109:109 -> y
-    1:8:com.android.tools.r8.graph.DexDebugInfoForWriting getDebugInfoForWriting():416:423 -> z
+    1:2:int codeSizeInBytes():452:453 -> t
+    1:2:int estimatedDexCodeSizeUpperBoundInBytes():105 -> t
+    1:1:java.lang.String toString():267:267 -> toString
+    1:1:int estimatedSizeForInlining():100:100 -> u
+    boolean isDexCode() -> w
+    1:1:boolean isEmptyVoidMethod():210:210 -> x
+    1:1:com.android.tools.r8.graph.DexDebugInfo getDebugInfo():114:114 -> z
 com.android.tools.r8.graph.DexCode$Try -> com.android.tools.r8.graph.x$a:
     int instructionCount -> d
     int handlerIndex -> e
     boolean $assertionsDisabled -> a
     int handlerOffset -> b
     int startAddress -> c
-    1:1:void <clinit>():451:451 -> <clinit>
-    1:5:void <init>(int,int,int):460:464 -> <init>
-    1:1:int compareTo(com.android.tools.r8.graph.DexCode$Try):486:486 -> a
-    2:2:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):505:505 -> a
-    1:1:int compareTo(java.lang.Object):451:451 -> compareTo
-    1:1:boolean equals(java.lang.Object):478:478 -> equals
-    1:1:int hashCode():473:473 -> hashCode
-    1:4:java.lang.String toString():494:497 -> toString
+    1:1:void <clinit>():456:456 -> <clinit>
+    1:5:void <init>(int,int,int):465:469 -> <init>
+    1:1:int compareTo(com.android.tools.r8.graph.DexCode$Try):491:491 -> a
+    2:2:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):510:510 -> a
+    1:1:int compareTo(java.lang.Object):456:456 -> compareTo
+    1:1:boolean equals(java.lang.Object):483:483 -> equals
+    1:1:int hashCode():478:478 -> hashCode
+    1:4:java.lang.String toString():499:502 -> toString
 com.android.tools.r8.graph.DexCode$TryHandler -> com.android.tools.r8.graph.x$b:
     com.android.tools.r8.graph.DexCode$TryHandler$TypeAddrPair[] pairs -> b
     boolean $assertionsDisabled -> a
     int catchAllAddr -> c
-    1:1:void <clinit>():510:510 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.graph.DexCode$TryHandler$TypeAddrPair[],int):517:519 -> <init>
-    1:3:int compareTo(com.android.tools.r8.graph.DexCode$TryHandler):537:539 -> a
-    4:4:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):551:551 -> a
-    1:1:int lambda$compareTo$0(com.android.tools.r8.graph.DexCode$TryHandler):537:537 -> b
-    1:1:com.android.tools.r8.graph.DexCode$TryHandler$TypeAddrPair[] lambda$compareTo$1(com.android.tools.r8.graph.DexCode$TryHandler):538:538 -> c
-    1:1:int compareTo(java.lang.Object):510:510 -> compareTo
-    1:1:boolean equals(java.lang.Object):529:529 -> equals
-    1:1:int hashCode():524:524 -> hashCode
-    1:16:java.lang.String toString():556:571 -> toString
+    1:1:void <clinit>():515:515 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.graph.DexCode$TryHandler$TypeAddrPair[],int):522:524 -> <init>
+    1:3:int compareTo(com.android.tools.r8.graph.DexCode$TryHandler):542:544 -> a
+    4:4:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):556:556 -> a
+    1:1:int lambda$compareTo$0(com.android.tools.r8.graph.DexCode$TryHandler):542:542 -> b
+    1:1:com.android.tools.r8.graph.DexCode$TryHandler$TypeAddrPair[] lambda$compareTo$1(com.android.tools.r8.graph.DexCode$TryHandler):543:543 -> c
+    1:1:int compareTo(java.lang.Object):515:515 -> compareTo
+    1:1:boolean equals(java.lang.Object):534:534 -> equals
+    1:1:int hashCode():529:529 -> hashCode
+    1:16:java.lang.String toString():561:576 -> toString
 com.android.tools.r8.graph.DexCode$TryHandler$TypeAddrPair -> com.android.tools.r8.graph.x$b$a:
     com.android.tools.r8.graph.DexType type -> b
     boolean $assertionsDisabled -> a
     int addr -> c
-    1:1:void <clinit>():574:574 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.graph.DexType,int):579:581 -> <init>
-    1:1:com.android.tools.r8.graph.DexType access$000(com.android.tools.r8.graph.DexCode$TryHandler$TypeAddrPair):574:574 -> a
-    2:2:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.GraphLens):589:589 -> a
-    2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens):593 -> a
-    3:3:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens):594:594 -> a
-    4:4:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.GraphLens):589:589 -> a
-    5:5:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):600:600 -> a
-    1:3:int compareTo(com.android.tools.r8.graph.DexCode$TryHandler$TypeAddrPair):618:620 -> b
-    1:1:int lambda$compareTo$0(com.android.tools.r8.graph.DexCode$TryHandler$TypeAddrPair):618:618 -> c
-    1:1:int compareTo(java.lang.Object):574:574 -> compareTo
-    1:1:com.android.tools.r8.graph.DexType lambda$compareTo$1(com.android.tools.r8.graph.DexCode$TryHandler$TypeAddrPair):619:619 -> d
-    1:1:boolean equals(java.lang.Object):610:610 -> equals
-    1:1:int hashCode():605:605 -> hashCode
-    1:1:com.android.tools.r8.graph.DexType getType():585:585 -> p
-com.android.tools.r8.graph.DexDebugEntry -> com.android.tools.r8.internal.D8:
+    1:1:void <clinit>():579:579 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.graph.DexType,int):584:586 -> <init>
+    1:1:com.android.tools.r8.graph.DexType access$000(com.android.tools.r8.graph.DexCode$TryHandler$TypeAddrPair):579:579 -> a
+    2:2:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.GraphLens):594:594 -> a
+    2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens):598 -> a
+    3:3:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens):599:599 -> a
+    4:4:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.GraphLens):594:594 -> a
+    5:5:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):605:605 -> a
+    1:3:int compareTo(com.android.tools.r8.graph.DexCode$TryHandler$TypeAddrPair):623:625 -> b
+    1:1:int lambda$compareTo$0(com.android.tools.r8.graph.DexCode$TryHandler$TypeAddrPair):623:623 -> c
+    1:1:int compareTo(java.lang.Object):579:579 -> compareTo
+    1:1:com.android.tools.r8.graph.DexType lambda$compareTo$1(com.android.tools.r8.graph.DexCode$TryHandler$TypeAddrPair):624:624 -> d
+    1:1:boolean equals(java.lang.Object):615:615 -> equals
+    1:1:int hashCode():610:610 -> hashCode
+    1:1:com.android.tools.r8.graph.DexType getType():590:590 -> p
+com.android.tools.r8.graph.DexDebugEntry -> com.android.tools.r8.internal.E8:
     com.android.tools.r8.ir.code.Position callerPosition -> j
     com.android.tools.r8.graph.DexString sourceFile -> e
     com.android.tools.r8.graph.DexMethod method -> i
@@ -17540,7 +17672,7 @@
     1:1:com.android.tools.r8.graph.DexDebugEvent[] lambda$compareTo$2(com.android.tools.r8.graph.DexDebugInfo):58:58 -> d
     1:3:int computeHashCode():39:41 -> p
     1:8:java.lang.String toString():80:87 -> toString
-com.android.tools.r8.graph.DexDebugInfoForWriting -> com.android.tools.r8.internal.E8:
+com.android.tools.r8.graph.DexDebugInfoForWriting -> com.android.tools.r8.internal.F8:
     1:5:void <init>(com.android.tools.r8.graph.DexDebugInfo):17:17 -> <init>
     1:1:boolean lambda$new$0(com.android.tools.r8.graph.DexDebugEvent):19:19 -> a
     1:1:com.android.tools.r8.graph.DexDebugEvent[] lambda$new$1(int):20:20 -> g
@@ -17574,8 +17706,8 @@
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():15:15 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.DexAnnotationSet):19:21 -> <init>
-    boolean isStaticMember() -> A
-    com.android.tools.r8.graph.DexReference toReference() -> B
+    boolean isStatic() -> A
+    boolean isStaticMember() -> B
     1:1:boolean com.android.tools.r8.shaking.AnnotationRemover.shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):0:0 -> a
     1:1:boolean lambda$liveAnnotations$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexAnnotation):32 -> a
     2:3:boolean com.android.tools.r8.shaking.AnnotationRemover.isAnnotationTypeLive(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.AppView):137:138 -> a
@@ -17585,12 +17717,12 @@
     4:4:boolean lambda$liveAnnotations$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexAnnotation):32 -> a
     5:5:com.android.tools.r8.graph.DexAnnotationSet liveAnnotations(com.android.tools.r8.graph.AppView):31:31 -> a
     6:6:void setAnnotations(com.android.tools.r8.graph.DexAnnotationSet):40:40 -> a
-    7:7:java.util.stream.Stream filterDexEncodedField(java.util.stream.Stream):105:105 -> a
-    8:8:java.util.stream.Stream filter(java.util.stream.Stream,java.util.function.Predicate,java.util.function.Function):97:97 -> a
-    8:8:java.util.stream.Stream filterDexEncodedField(java.util.stream.Stream):105 -> a
-    1:1:java.util.stream.Stream filterDexEncodedMethod(java.util.stream.Stream):109:109 -> b
-    2:2:java.util.stream.Stream filter(java.util.stream.Stream,java.util.function.Predicate,java.util.function.Function):97:97 -> b
-    2:2:java.util.stream.Stream filterDexEncodedMethod(java.util.stream.Stream):109 -> b
+    7:7:java.util.stream.Stream filterDexEncodedField(java.util.stream.Stream):93:93 -> a
+    8:8:java.util.stream.Stream filter(java.util.stream.Stream,java.util.function.Predicate,java.util.function.Function):89:89 -> a
+    8:8:java.util.stream.Stream filterDexEncodedField(java.util.stream.Stream):93 -> a
+    1:1:java.util.stream.Stream filterDexEncodedMethod(java.util.stream.Stream):97:97 -> b
+    2:2:java.util.stream.Stream filter(java.util.stream.Stream,java.util.function.Predicate,java.util.function.Function):89:89 -> b
+    2:2:java.util.stream.Stream filterDexEncodedMethod(java.util.stream.Stream):97 -> b
     com.android.tools.r8.graph.DexProgramClass asProgramClass() -> e
     boolean isProgramClass() -> h
     1:1:com.android.tools.r8.graph.DexAnnotationSet annotations():25:25 -> p
@@ -17601,12 +17733,12 @@
     1:1:void clearAnnotations():36:36 -> u
     2:2:void setAnnotations(com.android.tools.r8.graph.DexAnnotationSet):40:40 -> u
     2:2:void clearAnnotations():36 -> u
-    boolean isDexClass() -> v
-    boolean isDexEncodedField() -> w
-    boolean isDexEncodedMember() -> x
-    boolean isDexEncodedMethod() -> y
-    boolean isStatic() -> z
-com.android.tools.r8.graph.DexDefinitionSupplier -> com.android.tools.r8.internal.F8:
+    com.android.tools.r8.graph.DexReference getReference() -> v
+    boolean isDexClass() -> w
+    boolean isDexEncodedField() -> x
+    boolean isDexEncodedMember() -> y
+    boolean isDexEncodedMethod() -> z
+com.android.tools.r8.graph.DexDefinitionSupplier -> com.android.tools.r8.internal.G8:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory() -> a
     1:1:com.android.tools.r8.graph.DexClass contextIndependentDefinitionFor(com.android.tools.r8.graph.DexType):18:18 -> a
     2:2:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):31:31 -> a
@@ -17668,11 +17800,10 @@
     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,boolean):45:45 -> <init>
     2:19: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,boolean):35:52 -> <init>
     1:1:boolean isStatic():171:171 -> A
-    1:1:boolean isStaticMember():192 -> A
-    1:1:com.android.tools.r8.graph.DexField toReference():134:134 -> B
-    1:1:com.android.tools.r8.graph.DexReference toReference():25 -> B
-    1:1:com.android.tools.r8.graph.DexField toReference():134:134 -> D
-    1:1:com.android.tools.r8.graph.DexMember toReference():25 -> D
+    1:1:boolean isStatic():171:171 -> B
+    1:1:boolean isStaticMember():192 -> B
+    1:1:com.android.tools.r8.graph.DexField getReference():134:134 -> C
+    1:1:com.android.tools.r8.graph.DexMember getReference():25 -> C
     1:1:void clearGenericSignature():334:334 -> E
     1:2:void clearStaticValue():215:216 -> F
     1:1:com.android.tools.r8.graph.FieldAccessFlags getAccessFlags():104:104 -> G
@@ -17686,15 +17817,15 @@
     8:8:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo getMutableOptimizationInfo():90 -> J
     9:10:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo getMutableOptimizationInfo():90:91 -> J
     1:1:com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo getOptimizationInfo():81:81 -> K
-    1:2:com.android.tools.r8.graph.DexValue getStaticValue():220:221 -> L
-    1:1:boolean hasAnnotation():200:200 -> M
-    1:2:boolean hasExplicitStaticValue():204:205 -> N
-    1:1:boolean isDeprecated():69:69 -> O
-    1:1:boolean isVolatile():196:196 -> P
-    2:2:boolean com.android.tools.r8.graph.AccessFlags.isSet(int):240:240 -> P
-    2:2:boolean com.android.tools.r8.graph.FieldAccessFlags.isVolatile():81 -> P
-    2:2:boolean isVolatile():196 -> P
-    1:1:com.android.tools.r8.graph.DexField toReference():134:134 -> Q
+    1:1:com.android.tools.r8.graph.DexField getReference():134:134 -> L
+    1:2:com.android.tools.r8.graph.DexValue getStaticValue():220:221 -> M
+    1:1:boolean hasAnnotation():200:200 -> N
+    1:2:boolean hasExplicitStaticValue():204:205 -> O
+    1:1:boolean isDeprecated():69:69 -> P
+    1:1:boolean isVolatile():196:196 -> Q
+    2:2:boolean com.android.tools.r8.graph.AccessFlags.isSet(int):240:240 -> Q
+    2:2:boolean com.android.tools.r8.graph.FieldAccessFlags.isVolatile():81 -> Q
+    2:2:boolean isVolatile():196 -> Q
     1:1:com.android.tools.r8.graph.DexType type():65:65 -> R
     1:1:void setOptimizationInfo(com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo):95:95 -> a
     2:3:void setKotlinMemberInfo(com.android.tools.r8.kotlin.KotlinFieldLevelInfo):108:109 -> a
@@ -17745,17 +17876,18 @@
     1:1:java.lang.String toSourceString():129:129 -> m
     com.android.tools.r8.graph.DexEncodedField asDexEncodedField() -> r
     1:1:java.lang.String toString():119:119 -> toString
-    1:1:boolean isStatic():171:171 -> z
-com.android.tools.r8.graph.DexEncodedMember -> com.android.tools.r8.internal.G8:
+    1:1:com.android.tools.r8.graph.DexField getReference():134:134 -> v
+    1:1:com.android.tools.r8.graph.DexReference getReference():25 -> v
+com.android.tools.r8.graph.DexEncodedMember -> com.android.tools.r8.internal.H8:
     1:1:void <init>(com.android.tools.r8.graph.DexAnnotationSet):10:10 -> <init>
-    1:1:com.android.tools.r8.graph.DexReference toReference():6:6 -> B
-    1:1:com.android.tools.r8.graph.DexType holder():14:14 -> C
-    com.android.tools.r8.graph.DexMember toReference() -> D
+    com.android.tools.r8.graph.DexMember getReference() -> C
+    1:1:com.android.tools.r8.graph.DexType holder():14:14 -> D
     com.android.tools.r8.graph.ProgramMember asProgramMember(com.android.tools.r8.graph.DexDefinitionSupplier) -> a
     1:2:boolean equals(java.lang.Object):37:38 -> equals
     1:1:int hashCode():43:43 -> hashCode
     com.android.tools.r8.graph.DexEncodedMember asDexEncodedMember() -> s
-    boolean isDexEncodedMember() -> x
+    1:1:com.android.tools.r8.graph.DexReference getReference():6:6 -> v
+    boolean isDexEncodedMember() -> y
 com.android.tools.r8.graph.DexEncodedMethod -> com.android.tools.r8.graph.I:
     com.android.tools.r8.cf.CfVersion classFileVersion -> o
     com.android.tools.r8.graph.ParameterAnnotationsList parameterAnnotationsList -> j
@@ -17778,297 +17910,303 @@
     com.android.tools.r8.graph.DexEncodedMethod$CompilationState compilationState -> l
     com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo callSiteOptimizationInfo -> n
     1:50:void <clinit>():92:141 -> <clinit>
-    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):238:238 -> <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.cf.CfVersion):277:277 -> <init>
-    3:3: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.cf.CfVersion,boolean):299:299 -> <init>
-    4:163: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.cf.CfVersion,boolean):151:310 -> <init>
-    1:2:boolean isStaticMember():580:581 -> A
-    1:2:java.lang.String qualifiedName():820:821 -> A0
-    1:2:com.android.tools.r8.graph.DexMethod toReference():1381:1382 -> B
-    1:2:com.android.tools.r8.graph.DexReference toReference():92 -> B
-    1:2:void removeCode():798:799 -> B0
-    1:1:com.android.tools.r8.graph.DexType returnType():387:387 -> C0
-    1:2:com.android.tools.r8.graph.DexMethod toReference():1381:1382 -> D
-    1:2:com.android.tools.r8.graph.DexMember toReference():92 -> D
-    1:1:void setObsolete():196:196 -> D0
+    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):242:242 -> <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.cf.CfVersion):281:281 -> <init>
+    3:3: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.cf.CfVersion,boolean):303:303 -> <init>
+    4:167: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.cf.CfVersion,boolean):151:314 -> <init>
+    1:2:boolean isStatic():580:581 -> A
+    1:1:com.android.tools.r8.graph.DexTypeList parameters():385:385 -> A0
+    1:2:boolean isStaticMember():586:587 -> B
+    1:1:com.android.tools.r8.graph.DexProto proto():389:389 -> B0
+    1:2:com.android.tools.r8.graph.DexMethod getReference():380:381 -> C
+    1:2:com.android.tools.r8.graph.DexMember getReference():92 -> C
+    1:2:java.lang.String qualifiedName():826:827 -> C0
+    1:2:void removeCode():804:805 -> D0
     1:2:void abandonCallSiteOptimizationInfo():1429:1430 -> E
-    1:1:boolean shouldNotHaveCode():785:785 -> E0
-    1:8:com.android.tools.r8.graph.CfCode buildEmptyThrowingCfCode():950:957 -> F
-    1:7:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():876:882 -> F0
-    8:8:void com.android.tools.r8.graph.MethodAccessFlags.setAbstract():158:158 -> F0
-    8:8:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():882 -> F0
-    9:9:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():883:883 -> F0
-    1:2:com.android.tools.r8.graph.DexCode buildEmptyThrowingDexCode():961:962 -> G
-    1:2:com.android.tools.r8.graph.DexMethod toReference():1381:1382 -> G0
+    1:1:com.android.tools.r8.graph.DexType returnType():393:393 -> E0
+    1:8:com.android.tools.r8.graph.CfCode buildEmptyThrowingCfCode():956:963 -> F
+    1:1:void setObsolete():196:196 -> F0
+    1:2:com.android.tools.r8.graph.DexCode buildEmptyThrowingDexCode():967:968 -> G
+    1:1:boolean shouldNotHaveCode():791:791 -> G0
     1:1:void checkIfObsolete():184:184 -> H
-    1:8:com.android.tools.r8.graph.DexEncodedMethod toStaticMethodWithoutThis():1333:1340 -> H0
-    9:11:void copyMetadata(com.android.tools.r8.graph.DexEncodedMethod):1445:1447 -> H0
-    9:11:com.android.tools.r8.graph.DexEncodedMethod toStaticMethodWithoutThis():1341 -> H0
-    12:12:void setObsolete():196:196 -> H0
-    12:12:com.android.tools.r8.graph.DexEncodedMethod toStaticMethodWithoutThis():1342 -> H0
+    1:7:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():882:888 -> H0
+    8:8:void com.android.tools.r8.graph.MethodAccessFlags.setAbstract():158:158 -> H0
+    8:8:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():888 -> H0
+    9:9:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():889:889 -> H0
     1:1:void clearGenericSignature():1461:1461 -> I
-    1:1:void unsetObsolete():228:228 -> I0
-    1:2:java.lang.String codeToString():1375:1376 -> J
-    1:2:java.lang.String descriptor():825:826 -> K
+    1:8:com.android.tools.r8.graph.DexEncodedMethod toStaticMethodWithoutThis():1339:1346 -> I0
+    9:11:void copyMetadata(com.android.tools.r8.graph.DexEncodedMethod):1445:1447 -> I0
+    9:11:com.android.tools.r8.graph.DexEncodedMethod toStaticMethodWithoutThis():1347 -> I0
+    12:12:void setObsolete():196:196 -> I0
+    12:12:com.android.tools.r8.graph.DexEncodedMethod toStaticMethodWithoutThis():1348 -> I0
+    1:2:java.lang.String codeToString():1381:1382 -> J
+    1:1:void unsetObsolete():232:232 -> J0
+    1:2:java.lang.String descriptor():831:832 -> K
     1:1:com.android.tools.r8.graph.MethodAccessFlags getAccessFlags():201:201 -> L
     1:2:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo getCallSiteOptimizationInfo():1434:1435 -> M
-    1:3:com.android.tools.r8.cf.CfVersion getClassFileVersion():803:805 -> N
-    1:2:com.android.tools.r8.graph.Code getCode():793:794 -> O
-    1:1:com.android.tools.r8.graph.DexEncodedMethod getDefaultInterfaceMethodImplementation():205:205 -> P
-    1:1:com.android.tools.r8.graph.GenericSignature$MethodTypeSignature getGenericSignature():1452:1452 -> Q
-    1:1:com.android.tools.r8.kotlin.KotlinMethodLevelInfo getKotlinMemberInfo():593:593 -> R
-    1:5:com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo getMutableOptimizationInfo():1416:1420 -> S
-    1:1:com.android.tools.r8.graph.DexMethod getReference():375:375 -> T
-    1:1:com.android.tools.r8.graph.DexString getName():367 -> T
-    2:2:com.android.tools.r8.graph.DexString getName():367:367 -> T
-    1:2:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo getOptimizationInfo():1411:1412 -> U
-    1:1:java.util.Map getParameterInfo():760:760 -> V
-    1:1:com.android.tools.r8.graph.DexMethod getReference():375:375 -> W
-    1:2:boolean hasAnnotation():1402:1403 -> X
-    1:2:boolean hasClassFileVersion():809:810 -> Y
-    1:1:boolean hasCode():789:789 -> Z
+    1:3:com.android.tools.r8.cf.CfVersion getClassFileVersion():809:811 -> N
+    1:2:com.android.tools.r8.graph.Code getCode():799:800 -> O
+    1:1:com.android.tools.r8.graph.DexEncodedMethod$CompilationState getCompilationState():205:205 -> P
+    1:1:com.android.tools.r8.graph.DexEncodedMethod getDefaultInterfaceMethodImplementation():209:209 -> Q
+    1:1:com.android.tools.r8.graph.GenericSignature$MethodTypeSignature getGenericSignature():1452:1452 -> R
+    1:1:com.android.tools.r8.kotlin.KotlinMethodLevelInfo getKotlinMemberInfo():599:599 -> S
+    1:5:com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo getMutableOptimizationInfo():1416:1420 -> T
+    1:2:com.android.tools.r8.graph.DexMethod getReference():380:381 -> U
+    1:2:com.android.tools.r8.graph.DexString getName():371 -> U
+    3:3:com.android.tools.r8.graph.DexString getName():371:371 -> U
+    1:2:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo getOptimizationInfo():1411:1412 -> V
+    1:1:java.util.Map getParameterInfo():766:766 -> W
+    1:2:com.android.tools.r8.graph.DexMethod getReference():380:381 -> X
+    1:2:com.android.tools.r8.graph.DexProto getProto():375 -> X
+    3:3:com.android.tools.r8.graph.DexProto getProto():375:375 -> X
+    1:2:com.android.tools.r8.graph.DexMethod getReference():380:381 -> Y
+    1:2:boolean hasAnnotation():1402:1403 -> Z
     1:1:boolean access$300(com.android.tools.r8.graph.DexEncodedMethod):92:92 -> a
     2:2:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo access$502(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo):92:92 -> a
     3:3:com.android.tools.r8.graph.DexEncodedMethod$CompilationState access$802(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$CompilationState):92:92 -> a
-    4:4:void hashSyntheticContent(com.android.tools.r8.com.google.common.hash.Hasher):320:320 -> a
+    4:4:void hashSyntheticContent(com.android.tools.r8.com.google.common.hash.Hasher):324:324 -> a
     5:7:void com.android.tools.r8.graph.DexProto.hashSyntheticContent(com.android.tools.r8.com.google.common.hash.Hasher):123:125 -> a
-    5:7:void hashSyntheticContent(com.android.tools.r8.com.google.common.hash.Hasher):320 -> a
-    8:21:void hashSyntheticContent(com.android.tools.r8.com.google.common.hash.Hasher):321:334 -> a
-    22:25:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):400:403 -> a
-    26:32:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):402:408 -> a
-    33:38:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):407:412 -> a
-    39:39:com.android.tools.r8.graph.ProgramMethod asProgramMember(com.android.tools.r8.graph.DexDefinitionSupplier):425:425 -> a
+    5:7:void hashSyntheticContent(com.android.tools.r8.com.google.common.hash.Hasher):324 -> a
+    8:21:void hashSyntheticContent(com.android.tools.r8.com.google.common.hash.Hasher):325:338 -> a
+    22:25:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):406:409 -> a
+    26:32:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):408:414 -> a
+    33:38:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):413:418 -> a
+    39:39:com.android.tools.r8.graph.ProgramMethod asProgramMember(com.android.tools.r8.graph.DexDefinitionSupplier):431:431 -> a
     39:39:com.android.tools.r8.graph.ProgramMember asProgramMember(com.android.tools.r8.graph.DexDefinitionSupplier):92 -> a
-    40:40:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():425:425 -> a
-    40:40:com.android.tools.r8.graph.Code buildInstanceOfCode(com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.utils.InternalOptions):966 -> a
-    41:56:com.android.tools.r8.graph.CfCode buildInstanceOfCfCode(com.android.tools.r8.graph.DexType,boolean):972:987 -> a
-    41:56:com.android.tools.r8.graph.Code buildInstanceOfCode(com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.utils.InternalOptions):967 -> a
-    57:64:com.android.tools.r8.graph.DexCode buildInstanceOfDexCode(com.android.tools.r8.graph.DexType,boolean):991:998 -> a
-    57:64:com.android.tools.r8.graph.Code buildInstanceOfCode(com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.utils.InternalOptions):968 -> a
-    65:66:com.android.tools.r8.graph.DexClassAndMethod asDexClassAndMethod(com.android.tools.r8.graph.DexDefinitionSupplier):429:430 -> a
-    65:66:com.android.tools.r8.graph.DexClassAndMethod asDexClassAndMethodOrNull(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier):448 -> a
+    40:40:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> a
+    40:40:com.android.tools.r8.graph.Code buildInstanceOfCode(com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.utils.InternalOptions):972 -> a
+    41:56:com.android.tools.r8.graph.CfCode buildInstanceOfCfCode(com.android.tools.r8.graph.DexType,boolean):978:993 -> a
+    41:56:com.android.tools.r8.graph.Code buildInstanceOfCode(com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.utils.InternalOptions):973 -> a
+    57:64:com.android.tools.r8.graph.DexCode buildInstanceOfDexCode(com.android.tools.r8.graph.DexType,boolean):997:1004 -> a
+    57:64:com.android.tools.r8.graph.Code buildInstanceOfCode(com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.utils.InternalOptions):974 -> a
+    65:66:com.android.tools.r8.graph.DexClassAndMethod asDexClassAndMethod(com.android.tools.r8.graph.DexDefinitionSupplier):435:436 -> a
+    65:66:com.android.tools.r8.graph.DexClassAndMethod asDexClassAndMethodOrNull(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier):454 -> a
     67:67:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89:89 -> a
-    67:67:com.android.tools.r8.graph.DexClassAndMethod asDexClassAndMethod(com.android.tools.r8.graph.DexDefinitionSupplier):430 -> a
-    67:67:com.android.tools.r8.graph.DexClassAndMethod asDexClassAndMethodOrNull(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier):448 -> a
-    68:68:com.android.tools.r8.graph.DexClassAndMethod asDexClassAndMethod(com.android.tools.r8.graph.DexDefinitionSupplier):432:432 -> a
-    68:68:com.android.tools.r8.graph.DexClassAndMethod asDexClassAndMethodOrNull(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier):448 -> a
-    69:70:void setKotlinMemberInfo(com.android.tools.r8.kotlin.KotlinMethodLevelInfo):606:607 -> a
-    71:73:boolean isInliningCandidate(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):627:629 -> a
-    74:74: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):628:628 -> a
-    75:130: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):637:692 -> a
-    131:131: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
-    132:132: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):684:684 -> a
-    133:136: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):677:680 -> a
-    137:140: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):670:673 -> a
-    141:144: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):663:666 -> a
-    145:148: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):656:659 -> a
-    149:168:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):697:716 -> a
-    169:169:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):713:713 -> a
-    170:170:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):710:710 -> a
-    171:171:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):707:707 -> a
-    172:172:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):704:704 -> a
-    173:191:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):701:719 -> a
-    192:195:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):728:731 -> a
-    196:196:boolean hasParameterInfo():756:756 -> a
-    196:196:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):731 -> a
-    197:198:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):731:732 -> a
-    199:200:void setParameterInfo(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):751:752 -> a
-    199:200:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):732 -> a
-    201:201:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):734:734 -> a
-    202:204:void setCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.graph.AppView):738:740 -> a
-    205:208:boolean keepLocals(com.android.tools.r8.utils.InternalOptions):744:747 -> a
+    67:67:com.android.tools.r8.graph.DexClassAndMethod asDexClassAndMethod(com.android.tools.r8.graph.DexDefinitionSupplier):436 -> a
+    67:67:com.android.tools.r8.graph.DexClassAndMethod asDexClassAndMethodOrNull(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier):454 -> a
+    68:68:com.android.tools.r8.graph.DexClassAndMethod asDexClassAndMethod(com.android.tools.r8.graph.DexDefinitionSupplier):438:438 -> a
+    68:68:com.android.tools.r8.graph.DexClassAndMethod asDexClassAndMethodOrNull(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier):454 -> a
+    69:70:void setKotlinMemberInfo(com.android.tools.r8.kotlin.KotlinMethodLevelInfo):612:613 -> a
+    71:73: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):633:635 -> a
+    74:74: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):634:634 -> a
+    75:130: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):643:698 -> a
+    131:131: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):694:694 -> a
+    132:132: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):690:690 -> a
+    133:136: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):683:686 -> a
+    137:140:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):676:679 -> a
+    141:144:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):669:672 -> a
+    145:148:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):662:665 -> a
+    149:168:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):703:722 -> a
+    169:169:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):719:719 -> a
+    170:170:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):716:716 -> a
+    171:171:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):713:713 -> a
+    172:172:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):710:710 -> a
+    173:191:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):707:725 -> a
+    192:195:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):734:737 -> a
+    196:196:boolean hasParameterInfo():762:762 -> a
+    196:196:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):737 -> a
+    197:198:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):737:738 -> a
+    199:200:void setParameterInfo(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):757:758 -> a
+    199:200:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):738 -> a
+    201:201:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):740:740 -> a
+    202:204:void setCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.graph.AppView):744:746 -> a
+    205:208:boolean keepLocals(com.android.tools.r8.utils.InternalOptions):750:753 -> a
     209:210:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo getOptimizationInfo():1411:1412 -> a
-    209:210:boolean keepLocals(com.android.tools.r8.utils.InternalOptions):747 -> a
-    211:211:boolean keepLocals(com.android.tools.r8.utils.InternalOptions):747:747 -> a
-    212:212:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):771:771 -> a
-    213:218:void collectMixedSectionItemsWithCodeMapping(com.android.tools.r8.dex.MixedSectionCollection,com.android.tools.r8.dex.MethodToCodeObjectMapping):776:781 -> a
-    219:221:void upgradeClassFileVersion(com.android.tools.r8.cf.CfVersion):814:816 -> a
-    222:230:java.lang.String descriptor(com.android.tools.r8.naming.NamingLens):830:838 -> a
-    231:236:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):850:855 -> a
+    209:210:boolean keepLocals(com.android.tools.r8.utils.InternalOptions):753 -> a
+    211:211:boolean keepLocals(com.android.tools.r8.utils.InternalOptions):753:753 -> a
+    212:212:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):777:777 -> a
+    213:218:void collectMixedSectionItemsWithCodeMapping(com.android.tools.r8.dex.MixedSectionCollection,com.android.tools.r8.dex.MethodToCodeObjectMapping):782:787 -> a
+    219:221:void upgradeClassFileVersion(com.android.tools.r8.cf.CfVersion):820:822 -> a
+    222:230:java.lang.String descriptor(com.android.tools.r8.naming.NamingLens):836:844 -> a
+    231:236:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):856:861 -> a
     237:237:java.lang.String com.android.tools.r8.graph.DexItem.toSmaliString():44:44 -> a
-    237:237:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):855 -> a
-    238:239:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):855:856 -> a
+    237:237:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):861 -> a
+    238:239:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):861:862 -> a
     240:240:java.lang.String com.android.tools.r8.graph.DexProto.toSmaliString():0:0 -> a
-    240:240:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):856 -> a
+    240:240:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):862 -> a
     241:241:java.lang.String com.android.tools.r8.graph.DexProto.toDescriptorString():108:108 -> a
     241:241:java.lang.String com.android.tools.r8.graph.DexProto.toSmaliString():104 -> a
-    241:241:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):856 -> a
-    242:248:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):856:862 -> a
-    249:304:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):334:389 -> a
-    249:304:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):863 -> a
-    305:308:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):863:866 -> a
-    309:318:com.android.tools.r8.graph.DexCode generateCodeFromTemplate(int,int,com.android.tools.r8.code.Instruction[]):893:902 -> a
-    319:323:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):1010:1014 -> a
-    324:329:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):1013:1018 -> a
-    330:331:com.android.tools.r8.graph.DexEncodedMethod toTypeSubstitutedMethod(com.android.tools.r8.graph.DexMethod):1113:1114 -> a
-    332:346:com.android.tools.r8.graph.DexEncodedMethod toTypeSubstitutedMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):1118:1132 -> a
-    347:351:com.android.tools.r8.graph.ProgramMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):1136:1140 -> a
+    241:241:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):862 -> a
+    242:248:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):862:868 -> a
+    249:304:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):339:394 -> a
+    249:304:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):869 -> a
+    305:308:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):869:872 -> a
+    309:318:com.android.tools.r8.graph.DexCode generateCodeFromTemplate(int,int,com.android.tools.r8.code.Instruction[]):899:908 -> a
+    319:323:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):1016:1020 -> a
+    324:329:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):1019:1024 -> a
+    330:331:com.android.tools.r8.graph.DexEncodedMethod toTypeSubstitutedMethod(com.android.tools.r8.graph.DexMethod):1119:1120 -> a
+    332:346:com.android.tools.r8.graph.DexEncodedMethod toTypeSubstitutedMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):1124:1138 -> a
+    347:351:com.android.tools.r8.graph.ProgramMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):1142:1146 -> a
     352:376:com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode.builder(com.android.tools.r8.graph.DexMethod):0:24 -> a
-    352:376:com.android.tools.r8.graph.ProgramMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):1142 -> a
-    377:390:com.android.tools.r8.graph.ProgramMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):1143:1156 -> a
+    352:376:com.android.tools.r8.graph.ProgramMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):1148 -> a
+    377:390:com.android.tools.r8.graph.ProgramMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):1149:1162 -> a
     391:391:void com.android.tools.r8.graph.MethodAccessFlags.setConstructor():178:178 -> a
-    391:391:com.android.tools.r8.graph.ProgramMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):1156 -> a
-    392:392:com.android.tools.r8.graph.ProgramMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):1157:1157 -> a
-    393:398:com.android.tools.r8.graph.ProgramMethod createFieldAccessorBridge(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):1162:1167 -> a
-    399:428:com.android.tools.r8.graph.ProgramMethod createFieldAccessorBridge(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):1164:1193 -> a
-    429:429: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.cf.CfVersion):277:277 -> a
-    429:429: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):257 -> a
-    429:429:com.android.tools.r8.graph.ProgramMethod createFieldAccessorBridge(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):1193 -> a
-    430:430:com.android.tools.r8.graph.ProgramMethod createFieldAccessorBridge(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):1193:1193 -> a
-    431:431:com.android.tools.r8.ir.conversion.SourceCode lambda$createFieldAccessorBridge$5(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.ir.code.Position):1172:1172 -> a
-    432:435:void lambda$createFieldAccessorBridge$6(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):1175:1178 -> a
+    391:391:com.android.tools.r8.graph.ProgramMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):1162 -> a
+    392:392:com.android.tools.r8.graph.ProgramMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):1163:1163 -> a
+    393:398:com.android.tools.r8.graph.ProgramMethod createFieldAccessorBridge(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):1168:1173 -> a
+    399:428:com.android.tools.r8.graph.ProgramMethod createFieldAccessorBridge(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):1170:1199 -> a
+    429:429: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.cf.CfVersion):281:281 -> a
+    429:429: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):261 -> a
+    429:429:com.android.tools.r8.graph.ProgramMethod createFieldAccessorBridge(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):1199 -> a
+    430:430:com.android.tools.r8.graph.ProgramMethod createFieldAccessorBridge(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):1199:1199 -> a
+    431:431:com.android.tools.r8.ir.conversion.SourceCode lambda$createFieldAccessorBridge$5(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.ir.code.Position):1178:1178 -> a
+    432:435:void lambda$createFieldAccessorBridge$6(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):1181:1184 -> a
     436:436:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isInstance():496:496 -> a
     436:436:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isInstancePut():512 -> a
-    436:436:void lambda$createFieldAccessorBridge$6(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):1179 -> a
+    436:436:void lambda$createFieldAccessorBridge$6(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):1185 -> a
     437:437:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isInstancePut():512:512 -> a
-    437:437:void lambda$createFieldAccessorBridge$6(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):1179 -> a
-    438:440:void lambda$createFieldAccessorBridge$6(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):1180:1182 -> a
+    437:437:void lambda$createFieldAccessorBridge$6(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):1185 -> a
+    438:440:void lambda$createFieldAccessorBridge$6(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):1186:1188 -> a
     441:441:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isStaticPut():504:504 -> a
-    441:441:void lambda$createFieldAccessorBridge$6(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):1182 -> a
-    442:443:void lambda$createFieldAccessorBridge$6(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):1182:1183 -> a
-    444:446:com.android.tools.r8.graph.DexEncodedMethod toRenamedHolderMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):1199:1201 -> a
-    447:458:com.android.tools.r8.graph.DexEncodedMethod toEmulateDispatchLibraryMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,java.util.List,com.android.tools.r8.graph.AppView):1212:1223 -> a
-    459:459: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):257:257 -> a
-    459:459:com.android.tools.r8.graph.DexEncodedMethod toEmulateDispatchLibraryMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,java.util.List,com.android.tools.r8.graph.AppView):1223 -> a
-    460:465:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1260:1265 -> a
+    441:441:void lambda$createFieldAccessorBridge$6(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):1188 -> a
+    442:443:void lambda$createFieldAccessorBridge$6(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):1188:1189 -> a
+    444:446:com.android.tools.r8.graph.DexEncodedMethod toRenamedHolderMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):1205:1207 -> a
+    447:458:com.android.tools.r8.graph.DexEncodedMethod toEmulateDispatchLibraryMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,java.util.List,com.android.tools.r8.graph.AppView):1218:1229 -> a
+    459:459: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):261:261 -> a
+    459:459:com.android.tools.r8.graph.DexEncodedMethod toEmulateDispatchLibraryMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,java.util.List,com.android.tools.r8.graph.AppView):1229 -> a
+    460:465:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1266:1271 -> a
     466:466:void com.android.tools.r8.graph.AccessFlags.demoteFromFinal():219:219 -> a
-    466:466:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1265 -> a
-    467:474:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1267:1274 -> a
+    466:466:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1271 -> a
+    467:474:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1273:1280 -> a
     475:475:void com.android.tools.r8.graph.MethodAccessFlags.setAbstract():158:158 -> a
-    475:475:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1274 -> a
-    476:476:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1277:1277 -> a
+    475:475:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1280 -> a
+    476:476:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1283:1283 -> a
     477:477:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    477:477:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1277 -> a
+    477:477:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1283 -> a
     478:502:com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode.builder(com.android.tools.r8.graph.DexMethod):0:24 -> a
-    478:502:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1279 -> a
-    503:523:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1281:1301 -> a
-    524:527:void lambda$toForwardingMethod$8(com.android.tools.r8.graph.UseRegistry):1290:1293 -> a
-    528:535:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1306:1313 -> a
+    478:502:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1285 -> a
+    503:523:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1287:1307 -> a
+    524:527:void lambda$toForwardingMethod$8(com.android.tools.r8.graph.UseRegistry):1296:1299 -> a
+    528:535:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1312:1319 -> a
     536:536:void com.android.tools.r8.graph.MethodAccessFlags.unsetAbstract():162:162 -> a
-    536:536:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1314 -> a
+    536:536:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1320 -> a
     537:561:com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode.builder(com.android.tools.r8.graph.DexMethod):0:24 -> a
-    537:561:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1316 -> a
-    562:572:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1317:1327 -> a
-    573:573: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.cf.CfVersion):277:277 -> a
-    573:573: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):257 -> a
-    573:573:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1327 -> a
-    574:585:com.android.tools.r8.graph.DexCode rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexItemFactory,boolean):1349:1360 -> a
-    586:596:com.android.tools.r8.graph.DexCode rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexItemFactory,boolean):1359:1369 -> a
+    537:561:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1322 -> a
+    562:572:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1323:1333 -> a
+    573:573: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.cf.CfVersion):281:281 -> a
+    573:573: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):261 -> a
+    573:573:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1333 -> a
+    574:585:com.android.tools.r8.graph.DexCode rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexItemFactory,boolean):1355:1366 -> a
+    586:596:com.android.tools.r8.graph.DexCode rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexItemFactory,boolean):1365:1375 -> a
     597:598:void setOptimizationInfo(com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo):1424:1425 -> a
     599:600:void joinCallSiteOptimizationInfo(com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo,com.android.tools.r8.graph.AppView):1440:1441 -> a
     601:602:void setGenericSignature(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature):1456:1457 -> a
-    1:1:boolean hasParameterInfo():756:756 -> a0
+    1:2:boolean hasClassFileVersion():815:816 -> a0
     1:1:boolean com.android.tools.r8.shaking.AnnotationRemover.shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):0:0 -> b
-    1:1:boolean lambda$liveParameterAnnotations$3(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexAnnotation):392 -> b
+    1:1:boolean lambda$liveParameterAnnotations$3(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexAnnotation):398 -> b
     2:3:boolean com.android.tools.r8.shaking.AnnotationRemover.isAnnotationTypeLive(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.AppView):137:138 -> b
     2:3:boolean com.android.tools.r8.shaking.AnnotationRemover.shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):67 -> b
-    2:3:boolean lambda$liveParameterAnnotations$3(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexAnnotation):392 -> b
+    2:3:boolean lambda$liveParameterAnnotations$3(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexAnnotation):398 -> b
     4:4:boolean com.android.tools.r8.shaking.AnnotationRemover.shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):66:66 -> b
-    4:4:boolean lambda$liveParameterAnnotations$3(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexAnnotation):392 -> b
+    4:4:boolean lambda$liveParameterAnnotations$3(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexAnnotation):398 -> b
     5:5:com.android.tools.r8.graph.Code access$400(com.android.tools.r8.graph.DexEncodedMethod):92:92 -> b
-    6:6:com.android.tools.r8.graph.ParameterAnnotationsList liveParameterAnnotations(com.android.tools.r8.graph.AppView):391:391 -> b
-    7:7:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():425:425 -> b
-    7:7:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):912 -> b
-    8:15:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethodCf():931:938 -> b
-    8:15:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):913 -> b
+    6:6:com.android.tools.r8.graph.ParameterAnnotationsList liveParameterAnnotations(com.android.tools.r8.graph.AppView):397:397 -> b
+    7:7:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> b
+    7:7:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):918 -> b
+    8:15:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethodCf():937:944 -> b
+    8:15:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):919 -> b
     16:16:void setObsolete():196:196 -> b
-    16:16:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethodCf():939 -> b
-    16:16:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):913 -> b
-    17:24:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethodDex(boolean):918:925 -> b
-    17:24:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):914 -> b
+    16:16:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethodCf():945 -> b
+    16:16:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):919 -> b
+    17:24:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethodDex(boolean):924:931 -> b
+    17:24:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):920 -> b
     25:25:void setObsolete():196:196 -> b
-    25:25:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethodDex(boolean):926 -> b
-    25:25:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):914 -> b
-    26:29:com.android.tools.r8.graph.ProgramMethod asProgramMethod(com.android.tools.r8.graph.DexDefinitionSupplier):438:441 -> b
-    30:30:void lambda$toInitializerForwardingBridge$4(com.android.tools.r8.graph.UseRegistry):1151:1151 -> b
-    31:34:com.android.tools.r8.graph.ProgramMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):1229:1232 -> b
+    25:25:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethodDex(boolean):932 -> b
+    25:25:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):920 -> b
+    26:29:com.android.tools.r8.graph.ProgramMethod asProgramMethod(com.android.tools.r8.graph.DexDefinitionSupplier):444:447 -> b
+    30:30:void lambda$toInitializerForwardingBridge$4(com.android.tools.r8.graph.UseRegistry):1157:1157 -> b
+    31:34:com.android.tools.r8.graph.ProgramMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):1235:1238 -> b
     35:59:com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode.builder(com.android.tools.r8.graph.DexMethod):0:24 -> b
-    35:59:com.android.tools.r8.graph.ProgramMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):1234 -> b
-    60:80:com.android.tools.r8.graph.ProgramMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):1236:1256 -> b
-    1:1:boolean isAbstract():462:462 -> b0
+    35:59:com.android.tools.r8.graph.ProgramMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):1240 -> b
+    60:80:com.android.tools.r8.graph.ProgramMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):1242:1262 -> b
+    1:1:boolean hasCode():795:795 -> b0
     1:1:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo access$500(com.android.tools.r8.graph.DexEncodedMethod):92:92 -> c
-    2:4:boolean isProgramMethod(com.android.tools.r8.graph.DexDefinitionSupplier):416:418 -> c
-    5:6:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1002:1003 -> c
-    7:11:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):1023:1027 -> c
-    7:11:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1003 -> c
-    12:19:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):1026:1033 -> c
-    12:19:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1003 -> c
-    20:26:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):1032:1038 -> c
-    20:26:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1003 -> c
-    27:42:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):1036:1051 -> c
-    27:42:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1003 -> c
+    2:4:boolean isProgramMethod(com.android.tools.r8.graph.DexDefinitionSupplier):422:424 -> c
+    5:6:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1008:1009 -> c
+    7:11:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):1029:1033 -> c
+    7:11:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1009 -> c
+    12:19:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):1032:1039 -> c
+    12:19:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1009 -> c
+    20:26:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):1038:1044 -> c
+    20:26:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1009 -> c
+    27:42:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):1042:1057 -> c
+    27:42:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1009 -> c
     43:43:void setObsolete():196:196 -> c
-    43:43:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):1052 -> c
-    43:43:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1003 -> c
-    44:44:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):1053:1053 -> c
-    44:44:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1003 -> c
-    45:45:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1005:1005 -> c
-    46:50:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):1057:1061 -> c
-    46:50:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1005 -> c
-    51:59:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):1060:1068 -> c
-    51:59:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1005 -> c
-    60:68:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):1065:1073 -> c
-    60:68:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1005 -> c
-    69:77:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):1070:1078 -> c
-    69:77:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1005 -> c
-    78:82:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):1076:1080 -> c
-    78:82:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1005 -> c
-    83:84:boolean isStaticMember():580:581 -> c
-    83:84:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):1081 -> c
-    83:84:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1005 -> c
-    85:107:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):1085:1107 -> c
-    85:107:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1005 -> c
+    43:43:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):1058 -> c
+    43:43:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1009 -> c
+    44:44:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):1059:1059 -> c
+    44:44:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1009 -> c
+    45:45:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1011:1011 -> c
+    46:50:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):1063:1067 -> c
+    46:50:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1011 -> c
+    51:59:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):1066:1074 -> c
+    51:59:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1011 -> c
+    60:68:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):1071:1079 -> c
+    60:68:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1011 -> c
+    69:77:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):1076:1084 -> c
+    69:77:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1011 -> c
+    78:82:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):1082:1086 -> c
+    78:82:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1011 -> c
+    83:84:boolean isStaticMember():586:587 -> c
+    83:84:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):1087 -> c
+    83:84:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1011 -> c
+    85:107:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):1091:1113 -> c
+    85:107:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1011 -> c
     108:108:void setObsolete():196:196 -> c
-    108:108:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):1108 -> c
-    108:108:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1005 -> c
-    109:109:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):1109:1109 -> c
-    109:109:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1005 -> c
-    110:113:void lambda$toStaticForwardingBridge$7(com.android.tools.r8.graph.UseRegistry):1244:1247 -> c
-    1:2:boolean isClassInitializer():505:506 -> c0
+    108:108:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):1114 -> c
+    108:108:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1011 -> c
+    109:109:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):1115:1115 -> c
+    109:109:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1011 -> c
+    110:113:void lambda$toStaticForwardingBridge$7(com.android.tools.r8.graph.UseRegistry):1250:1253 -> c
+    1:1:boolean hasParameterInfo():762:762 -> c0
     1:1:com.android.tools.r8.kotlin.KotlinMethodLevelInfo access$600(com.android.tools.r8.graph.DexEncodedMethod):92:92 -> d
-    1:1:boolean isD8R8Synthesized():180:180 -> d0
+    2:3:com.android.tools.r8.graph.DexMethod getReference():380:381 -> d
+    2:3:com.android.tools.r8.graph.DexType getHolderType():367 -> d
+    4:4:com.android.tools.r8.graph.DexType getHolderType():367:367 -> d
+    1:1:boolean isAbstract():468:468 -> d0
     1:1:com.android.tools.r8.cf.CfVersion access$700(com.android.tools.r8.graph.DexEncodedMethod):92:92 -> e
-    1:1:boolean isDefaultMethod():511:511 -> e0
+    1:2:boolean isClassInitializer():511:512 -> e0
     1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder builder(com.android.tools.r8.graph.DexEncodedMethod):1469:1469 -> f
-    1:2:boolean isDirectMethod():568:569 -> f0
+    1:1:boolean isD8R8Synthesized():180:180 -> f0
     1:3:void copyMetadata(com.android.tools.r8.graph.DexEncodedMethod):1445:1447 -> g
-    1:1:boolean isFinal():470:470 -> g0
+    1:1:boolean isDefaultMethod():517:517 -> g0
     1:1:com.android.tools.r8.graph.MethodAccessFlags getAccessFlags():201:201 -> getAccessFlags
     1:1:com.android.tools.r8.graph.AccessFlags getAccessFlags():92 -> getAccessFlags
-    1:1:int lambda$syntheticCompareTo$0(com.android.tools.r8.graph.DexEncodedMethod):347:347 -> h
-    1:2:boolean isInitializer():490:491 -> h0
-    1:1:com.android.tools.r8.graph.CfCode lambda$syntheticCompareTo$1(com.android.tools.r8.graph.DexEncodedMethod):349:349 -> i
-    1:2:boolean isInstanceInitializer():495:496 -> i0
-    1:1:com.android.tools.r8.graph.DexCode lambda$syntheticCompareTo$2(com.android.tools.r8.graph.DexEncodedMethod):351:351 -> j
-    1:1:com.android.tools.r8.utils.OptionalBool isLibraryMethodOverride():396:396 -> j0
-    1:5:void setDefaultInterfaceMethodImplementation(com.android.tools.r8.graph.DexEncodedMethod):209:213 -> k
+    1:1:int lambda$syntheticCompareTo$0(com.android.tools.r8.graph.DexEncodedMethod):351:351 -> h
+    1:2:boolean isDirectMethod():574:575 -> h0
+    1:1:com.android.tools.r8.graph.CfCode lambda$syntheticCompareTo$1(com.android.tools.r8.graph.DexEncodedMethod):353:353 -> i
+    1:1:boolean isFinal():476:476 -> i0
+    1:1:com.android.tools.r8.graph.DexCode lambda$syntheticCompareTo$2(com.android.tools.r8.graph.DexEncodedMethod):355:355 -> j
+    1:2:boolean isInitializer():496:497 -> j0
+    1:5:void setDefaultInterfaceMethodImplementation(com.android.tools.r8.graph.DexEncodedMethod):213:217 -> k
     6:6:void com.android.tools.r8.graph.MethodAccessFlags.setAbstract():158:158 -> k
-    6:6:void setDefaultInterfaceMethodImplementation(com.android.tools.r8.graph.DexEncodedMethod):213 -> k
-    7:8:void setDefaultInterfaceMethodImplementation(com.android.tools.r8.graph.DexEncodedMethod):214:215 -> k
-    1:1:boolean isNative():474:474 -> k0
+    6:6:void setDefaultInterfaceMethodImplementation(com.android.tools.r8.graph.DexEncodedMethod):217 -> k
+    7:8:void setDefaultInterfaceMethodImplementation(com.android.tools.r8.graph.DexEncodedMethod):218:219 -> k
+    1:2:boolean isInstanceInitializer():501:502 -> k0
     1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder syntheticBuilder(com.android.tools.r8.graph.DexEncodedMethod):1465:1465 -> l
-    1:2:boolean isNonAbstractNonNativeMethod():540:541 -> l0
-    1:17:int syntheticCompareTo(com.android.tools.r8.graph.DexEncodedMethod):343:359 -> m
-    18:22:int syntheticCompareTo(com.android.tools.r8.graph.DexEncodedMethod):353:357 -> m
-    23:24:java.lang.String toSourceString():871:872 -> m
-    1:2:boolean isNonAbstractVirtualMethod():535:536 -> m0
-    1:2:boolean isNonPrivateVirtualMethod():526:527 -> n0
-    1:1:boolean isObsolete():190:190 -> o0
-    1:1:boolean isOnlyInlinedIntoNestMembers():619:619 -> p0
-    1:2:boolean isPrivateMethod():560:561 -> q0
-    1:2:boolean isProcessed():457:458 -> r0
-    1:2:boolean isPublicMethod():550:551 -> s0
+    1:1:com.android.tools.r8.utils.OptionalBool isLibraryMethodOverride():402:402 -> l0
+    1:17:int syntheticCompareTo(com.android.tools.r8.graph.DexEncodedMethod):347:363 -> m
+    18:22:int syntheticCompareTo(com.android.tools.r8.graph.DexEncodedMethod):357:361 -> m
+    23:24:java.lang.String toSourceString():877:878 -> m
+    1:1:boolean isNative():480:480 -> m0
+    1:2:boolean isNonAbstractNonNativeMethod():546:547 -> n0
+    1:2:boolean isNonAbstractVirtualMethod():541:542 -> o0
+    1:2:boolean isNonPrivateVirtualMethod():532:533 -> p0
+    1:1:boolean isObsolete():190:190 -> q0
+    1:1:boolean isOnlyInlinedIntoNestMembers():625:625 -> r0
+    1:2:boolean isPrivateMethod():566:567 -> s0
     1:1:com.android.tools.r8.graph.DexEncodedMethod asDexEncodedMethod():1397:1397 -> t
-    1:2:boolean isPublicized():545:546 -> t0
-    1:2:java.lang.String toString():765:766 -> toString
-    1:1:boolean isSynchronized():486:486 -> u0
-    1:2:boolean isSyntheticMethod():588:589 -> v0
-    1:2:boolean isVirtualMethod():521:522 -> w0
-    1:2:void markNotProcessed():723:724 -> x0
-    1:1:boolean isDexEncodedMethod():1391:1391 -> y
-    1:1:com.android.tools.r8.graph.DexTypeList parameters():379:379 -> y0
-    1:2:boolean isStatic():574:575 -> z
-    1:1:com.android.tools.r8.graph.DexProto proto():383:383 -> z0
+    1:2:boolean isProcessed():463:464 -> t0
+    1:2:java.lang.String toString():771:772 -> toString
+    1:2:boolean isPublicMethod():556:557 -> u0
+    1:2:com.android.tools.r8.graph.DexMethod getReference():380:381 -> v
+    1:2:com.android.tools.r8.graph.DexReference getReference():92 -> v
+    1:2:boolean isPublicized():551:552 -> v0
+    1:1:boolean isSynchronized():492:492 -> w0
+    1:2:boolean isSyntheticMethod():594:595 -> x0
+    1:2:boolean isVirtualMethod():527:528 -> y0
+    1:1:boolean isDexEncodedMethod():1391:1391 -> z
+    1:2:void markNotProcessed():729:730 -> z0
 com.android.tools.r8.graph.DexEncodedMethod$1 -> com.android.tools.r8.graph.I$a:
 com.android.tools.r8.graph.DexEncodedMethod$Builder -> com.android.tools.r8.graph.I$b:
     com.android.tools.r8.graph.ParameterAnnotationsList parameterAnnotations -> g
@@ -18093,24 +18231,25 @@
     38:38:void <init>(com.android.tools.r8.graph.DexEncodedMethod,boolean):1506:1506 -> <init>
     1:1:com.android.tools.r8.graph.MethodAccessFlags access$000(com.android.tools.r8.graph.DexEncodedMethod$Builder):1472:1472 -> a
     2:2:void setMethod(com.android.tools.r8.graph.DexMethod):1515:1515 -> a
-    3:4:com.android.tools.r8.graph.DexEncodedMethod$Builder setIsLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):1519:1520 -> a
-    5:24:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1530:1549 -> a
-    25:25:com.android.tools.r8.graph.DexEncodedMethod$Builder setParameterAnnotations(com.android.tools.r8.graph.ParameterAnnotationsList):1525:1525 -> a
-    25:25:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1549 -> a
-    26:28:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1552:1554 -> a
-    29:29:com.android.tools.r8.graph.DexEncodedMethod$Builder setParameterAnnotations(com.android.tools.r8.graph.ParameterAnnotationsList):1525:1525 -> a
-    29:29:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1552 -> a
-    30:32:com.android.tools.r8.graph.DexEncodedMethod$Builder adjustOptimizationInfoAfterRemovingThisParameter():1574:1576 -> a
-    33:33:void setCode(com.android.tools.r8.graph.Code):1582:1582 -> a
-    1:6:com.android.tools.r8.graph.DexEncodedMethod build():1586:1591 -> b
-    7:9:com.android.tools.r8.graph.DexEncodedMethod build():1590:1592 -> b
-    10:10:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean,com.android.tools.r8.cf.CfVersion):277:277 -> b
-    10:10:com.android.tools.r8.graph.DexEncodedMethod build():1592 -> b
-    11:15:com.android.tools.r8.graph.DexEncodedMethod build():1602:1606 -> b
-    1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder promoteToStatic():1559:1559 -> c
+    3:4:com.android.tools.r8.graph.DexEncodedMethod$Builder setCompilationState(com.android.tools.r8.graph.DexEncodedMethod$CompilationState):1519:1520 -> a
+    5:6:com.android.tools.r8.graph.DexEncodedMethod$Builder setIsLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):1525:1526 -> a
+    7:26:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1544:1563 -> a
+    27:27:com.android.tools.r8.graph.DexEncodedMethod$Builder setParameterAnnotations(com.android.tools.r8.graph.ParameterAnnotationsList):1539:1539 -> a
+    27:27:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1563 -> a
+    28:30:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1566:1568 -> a
+    31:31:com.android.tools.r8.graph.DexEncodedMethod$Builder setParameterAnnotations(com.android.tools.r8.graph.ParameterAnnotationsList):1539:1539 -> a
+    31:31:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1566 -> a
+    32:34:com.android.tools.r8.graph.DexEncodedMethod$Builder adjustOptimizationInfoAfterRemovingThisParameter():1588:1590 -> a
+    35:35:void setCode(com.android.tools.r8.graph.Code):1596:1596 -> a
+    1:6:com.android.tools.r8.graph.DexEncodedMethod build():1600:1605 -> b
+    7:9:com.android.tools.r8.graph.DexEncodedMethod build():1604:1606 -> b
+    10:10:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean,com.android.tools.r8.cf.CfVersion):281:281 -> b
+    10:10:com.android.tools.r8.graph.DexEncodedMethod build():1606 -> b
+    11:15:com.android.tools.r8.graph.DexEncodedMethod build():1616:1620 -> b
+    1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder promoteToStatic():1573:1573 -> c
     2:2:void com.android.tools.r8.graph.AccessFlags.promoteToStatic():232:232 -> c
-    2:2:com.android.tools.r8.graph.DexEncodedMethod$Builder promoteToStatic():1559 -> c
-    1:5:com.android.tools.r8.graph.DexEncodedMethod$Builder withoutThisParameter():1564:1568 -> d
+    2:2:com.android.tools.r8.graph.DexEncodedMethod$Builder promoteToStatic():1573 -> c
+    1:5:com.android.tools.r8.graph.DexEncodedMethod$Builder withoutThisParameter():1578:1582 -> d
 com.android.tools.r8.graph.DexEncodedMethod$CompilationState -> com.android.tools.r8.graph.I$c:
     com.android.tools.r8.graph.DexEncodedMethod$CompilationState PROCESSED_INLINING_CANDIDATE_SAME_NEST -> f
     com.android.tools.r8.graph.DexEncodedMethod$CompilationState PROCESSED_INLINING_CANDIDATE_SAME_CLASS -> g
@@ -18537,106 +18676,111 @@
     616:636:void <init>():642:662 -> <init>
     637:693:void <init>():655:711 -> <init>
     694:694:void <init>():107:107 -> <init>
-    com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame lambda$createSetInlineFrame$3(com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame) -> a
+    com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame lambda$createSetInlineFrame$4(com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame) -> a
     1:1:boolean isInternalSentinel(com.android.tools.r8.graph.DexItem):111:111 -> a
-    2:13:java.util.Set boxedValueOfMethods():602:613 -> a
-    14:16:com.android.tools.r8.graph.DexMethod lambda$boxedValueOfMethods$0(java.util.Map$Entry):605:607 -> a
-    17:17:void setSkipNameValidationForTesting(boolean):714:714 -> a
-    18:18:com.android.tools.r8.graph.DexItem canonicalize(java.util.Map,com.android.tools.r8.graph.DexItem):1734:1734 -> a
-    19:19:boolean isInternalSentinel(com.android.tools.r8.graph.DexItem):111:111 -> a
-    19:19:com.android.tools.r8.graph.DexItem canonicalize(java.util.Map,com.android.tools.r8.graph.DexItem):1735 -> a
-    20:21:com.android.tools.r8.graph.DexItem canonicalize(java.util.Map,com.android.tools.r8.graph.DexItem):1735:1736 -> a
-    22:22:com.android.tools.r8.graph.DexString createString(int,byte[]):1742:1742 -> a
-    23:25:java.lang.String createMemberString(java.lang.String,com.android.tools.r8.graph.DexType,int):1755:1757 -> a
-    26:26:java.lang.String escapeMemberString(java.lang.String):1751:1751 -> a
-    26:26:java.lang.String createMemberString(java.lang.String,com.android.tools.r8.graph.DexType,int):1757 -> a
-    27:34:java.lang.String createMemberString(java.lang.String,com.android.tools.r8.graph.DexType,int):1757:1764 -> a
-    35:38:com.android.tools.r8.graph.DexMember createFreshMember(java.util.function.Function,java.lang.String,com.android.tools.r8.graph.DexType):1777:1780 -> a
-    39:39:com.android.tools.r8.graph.DexString createGloballyFreshMemberString(java.lang.String,com.android.tools.r8.graph.DexType):1804:1804 -> a
-    40:40:com.android.tools.r8.graph.DexString lookupString(java.lang.String):1874:1874 -> a
-    40:40:com.android.tools.r8.graph.DexString createGloballyFreshMemberString(java.lang.String,com.android.tools.r8.graph.DexType):1805 -> a
-    41:41:com.android.tools.r8.graph.DexString createGloballyFreshMemberString(java.lang.String,com.android.tools.r8.graph.DexType):1807:1807 -> a
-    42:43:com.android.tools.r8.graph.DexMethod createFreshMethodName(java.lang.String,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType,java.util.function.Predicate):1834:1835 -> a
-    44:48:java.util.Optional lambda$createFreshMethodName$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.util.function.Predicate,com.android.tools.r8.graph.DexString):1837:1841 -> a
-    49:49:com.android.tools.r8.graph.DexMethod createInstanceInitializerWithFreshProto(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,java.util.function.Predicate):1851:1851 -> a
-    50:50:boolean com.android.tools.r8.graph.DexMethod.isInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):261:261 -> a
-    50:50:com.android.tools.r8.graph.DexMethod createInstanceInitializerWithFreshProto(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,java.util.function.Predicate):1851 -> a
-    51:52:com.android.tools.r8.graph.DexMethod createInstanceInitializerWithFreshProto(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,java.util.function.Predicate):1851:1852 -> a
-    53:57:com.android.tools.r8.graph.DexMethod createInstanceInitializerWithFreshProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType,java.util.function.Function):1861:1865 -> a
-    53:57:com.android.tools.r8.graph.DexMethod createInstanceInitializerWithFreshProto(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,java.util.function.Predicate):1852 -> a
-    58:58:java.util.Optional lambda$createInstanceInitializerWithFreshProto$2(com.android.tools.r8.graph.DexMethod,java.util.function.Predicate,com.android.tools.r8.graph.DexProto):1855:1855 -> a
-    59:59:com.android.tools.r8.graph.DexType createStaticallyKnownType(java.lang.String):1909:1909 -> a
-    60:62:com.android.tools.r8.graph.DexType createStaticallyKnownType(com.android.tools.r8.graph.DexString):1913:1915 -> a
-    60:62:com.android.tools.r8.graph.DexType createStaticallyKnownType(java.lang.String):1909 -> a
-    63:67:void addPossiblySynthesizedType(com.android.tools.r8.graph.DexType):1934:1938 -> a
-    68:69:com.android.tools.r8.graph.DexType createArrayType(int,com.android.tools.r8.graph.DexType):1964:1965 -> a
-    70:72:com.android.tools.r8.graph.DexField createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):1969:1971 -> a
-    73:73:com.android.tools.r8.graph.DexField createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String):1975:1975 -> a
-    74:75:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString):1980:1981 -> a
-    76:79:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1985:1988 -> a
-    80:85:com.android.tools.r8.graph.DexString createShorty(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):2058:2063 -> a
-    80:85:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1989 -> a
-    86:86:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1986:1986 -> a
-    87:87:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,java.util.List):1993:1993 -> a
-    88:91:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):2007:2010 -> a
-    92:94:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):2009:2011 -> a
-    95:97:com.android.tools.r8.graph.DexProto appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):2015:2017 -> a
-    98:101:com.android.tools.r8.graph.DexProto appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):2016:2019 -> a
-    102:106:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):2024:2028 -> a
-    107:116:com.android.tools.r8.graph.DexType[] applyClassMappingToDexTypes(com.android.tools.r8.graph.DexType[],java.util.function.Function):2045:2054 -> a
-    107:116:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):2028 -> a
-    117:123:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):2029:2035 -> a
-    124:128:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):2034:2038 -> a
-    129:131:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):2067:2069 -> a
-    132:132:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):2073:2073 -> a
-    133:133:com.android.tools.r8.graph.DexMethodHandle createMethodHandle(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.DexMember,boolean):2081:2081 -> a
-    134:134:void com.android.tools.r8.graph.DexMethodHandle.<init>(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.DexMember,boolean):209:209 -> a
-    134:134:com.android.tools.r8.graph.DexMethodHandle createMethodHandle(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.DexMember,boolean):2081 -> a
-    135:135:com.android.tools.r8.graph.DexMethodHandle createMethodHandle(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.DexMember,boolean):2082:2082 -> a
-    136:137:com.android.tools.r8.graph.DexCallSite createCallSite(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexMethodHandle,java.util.List):2091:2092 -> a
-    138:147:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString[]):2100:2109 -> a
-    148:150:com.android.tools.r8.graph.DexDebugEvent$AdvanceLine createAdvanceLine(int):2113:2115 -> a
-    151:153:com.android.tools.r8.graph.DexDebugEvent$SetFile createSetFile(com.android.tools.r8.graph.DexString):2151:2153 -> a
-    154:156:com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame createSetInlineFrame(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):2158:2160 -> a
-    157:157:boolean isClassConstructor(com.android.tools.r8.graph.DexMethod):2168:2168 -> a
-    158:165:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement createReferenceTypeElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):2201:2208 -> a
-    166:194:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement createReferenceTypeElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):2207:2235 -> a
-    195:203:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement lambda$createReferenceTypeElement$4(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DexType):2215:2223 -> a
-    204:215:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement lambda$createReferenceTypeElement$4(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DexType):2222:2233 -> a
-    216:216:java.util.Set getOrComputeLeastUpperBoundOfImplementedInterfaces(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):2240:2240 -> a
-    217:218:java.util.Set lambda$getOrComputeLeastUpperBoundOfImplementedInterfaces$5(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):2243:2244 -> a
-    219:219:void forAllTypes(java.util.function.Consumer):2250:2250 -> a
+    2:2:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexField.withName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory):179:179 -> a
+    2:2:java.util.Optional lambda$createFreshFieldName$2(com.android.tools.r8.graph.DexField,java.util.function.Predicate,com.android.tools.r8.graph.DexString):1860 -> a
+    3:3:java.util.Optional lambda$createFreshFieldName$2(com.android.tools.r8.graph.DexField,java.util.function.Predicate,com.android.tools.r8.graph.DexString):1860:1860 -> a
+    4:15:java.util.Set boxedValueOfMethods():602:613 -> a
+    16:18:com.android.tools.r8.graph.DexMethod lambda$boxedValueOfMethods$0(java.util.Map$Entry):605:607 -> a
+    19:19:void setSkipNameValidationForTesting(boolean):714:714 -> a
+    20:20:com.android.tools.r8.graph.DexItem canonicalize(java.util.Map,com.android.tools.r8.graph.DexItem):1734:1734 -> a
+    21:21:boolean isInternalSentinel(com.android.tools.r8.graph.DexItem):111:111 -> a
+    21:21:com.android.tools.r8.graph.DexItem canonicalize(java.util.Map,com.android.tools.r8.graph.DexItem):1735 -> a
+    22:23:com.android.tools.r8.graph.DexItem canonicalize(java.util.Map,com.android.tools.r8.graph.DexItem):1735:1736 -> a
+    24:24:com.android.tools.r8.graph.DexString createString(int,byte[]):1742:1742 -> a
+    25:27:java.lang.String createMemberString(java.lang.String,com.android.tools.r8.graph.DexType,int):1755:1757 -> a
+    28:28:java.lang.String escapeMemberString(java.lang.String):1751:1751 -> a
+    28:28:java.lang.String createMemberString(java.lang.String,com.android.tools.r8.graph.DexType,int):1757 -> a
+    29:36:java.lang.String createMemberString(java.lang.String,com.android.tools.r8.graph.DexType,int):1757:1764 -> a
+    37:40:com.android.tools.r8.graph.DexMember createFreshMember(java.util.function.Function,java.lang.String,com.android.tools.r8.graph.DexType):1777:1780 -> a
+    41:41:com.android.tools.r8.graph.DexString createGloballyFreshMemberString(java.lang.String,com.android.tools.r8.graph.DexType):1804:1804 -> a
+    42:42:com.android.tools.r8.graph.DexString lookupString(java.lang.String):1891:1891 -> a
+    42:42:com.android.tools.r8.graph.DexString createGloballyFreshMemberString(java.lang.String,com.android.tools.r8.graph.DexType):1805 -> a
+    43:43:com.android.tools.r8.graph.DexString createGloballyFreshMemberString(java.lang.String,com.android.tools.r8.graph.DexType):1807:1807 -> a
+    44:45:com.android.tools.r8.graph.DexMethod createFreshMethodName(java.lang.String,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType,java.util.function.Predicate):1834:1835 -> a
+    46:50:java.util.Optional lambda$createFreshMethodName$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.util.function.Predicate,com.android.tools.r8.graph.DexString):1837:1841 -> a
+    51:54:com.android.tools.r8.graph.DexField createFreshFieldName(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType,java.util.function.Predicate):1858:1861 -> a
+    55:55:com.android.tools.r8.graph.DexField createFreshFieldName(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType,java.util.function.Predicate):1859:1859 -> a
+    56:56:com.android.tools.r8.graph.DexMethod createInstanceInitializerWithFreshProto(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,java.util.function.Predicate):1868:1868 -> a
+    57:57:boolean com.android.tools.r8.graph.DexMethod.isInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):261:261 -> a
+    57:57:com.android.tools.r8.graph.DexMethod createInstanceInitializerWithFreshProto(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,java.util.function.Predicate):1868 -> a
+    58:59:com.android.tools.r8.graph.DexMethod createInstanceInitializerWithFreshProto(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,java.util.function.Predicate):1868:1869 -> a
+    60:64:com.android.tools.r8.graph.DexMethod createInstanceInitializerWithFreshProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType,java.util.function.Function):1878:1882 -> a
+    60:64:com.android.tools.r8.graph.DexMethod createInstanceInitializerWithFreshProto(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,java.util.function.Predicate):1869 -> a
+    65:65:java.util.Optional lambda$createInstanceInitializerWithFreshProto$3(com.android.tools.r8.graph.DexMethod,java.util.function.Predicate,com.android.tools.r8.graph.DexProto):1872:1872 -> a
+    66:66:com.android.tools.r8.graph.DexType createStaticallyKnownType(java.lang.String):1926:1926 -> a
+    67:69:com.android.tools.r8.graph.DexType createStaticallyKnownType(com.android.tools.r8.graph.DexString):1930:1932 -> a
+    67:69:com.android.tools.r8.graph.DexType createStaticallyKnownType(java.lang.String):1926 -> a
+    70:74:void addPossiblySynthesizedType(com.android.tools.r8.graph.DexType):1951:1955 -> a
+    75:76:com.android.tools.r8.graph.DexType createArrayType(int,com.android.tools.r8.graph.DexType):1981:1982 -> a
+    77:79:com.android.tools.r8.graph.DexField createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):1986:1988 -> a
+    80:80:com.android.tools.r8.graph.DexField createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String):1992:1992 -> a
+    81:82:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString):1997:1998 -> a
+    83:86:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):2002:2005 -> a
+    87:92:com.android.tools.r8.graph.DexString createShorty(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):2080:2085 -> a
+    87:92:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):2006 -> a
+    93:93:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):2003:2003 -> a
+    94:94:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,java.util.List):2010:2010 -> a
+    95:98:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):2024:2027 -> a
+    99:101:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):2026:2028 -> a
+    102:104:com.android.tools.r8.graph.DexProto appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):2032:2034 -> a
+    105:108:com.android.tools.r8.graph.DexProto appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):2033:2036 -> a
+    109:113:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):2046:2050 -> a
+    114:123:com.android.tools.r8.graph.DexType[] applyClassMappingToDexTypes(com.android.tools.r8.graph.DexType[],java.util.function.Function):2067:2076 -> a
+    114:123:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):2050 -> a
+    124:130:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):2051:2057 -> a
+    131:135:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):2056:2060 -> a
+    136:138:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):2089:2091 -> a
+    139:139:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):2095:2095 -> a
+    140:140:com.android.tools.r8.graph.DexMethodHandle createMethodHandle(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.DexMember,boolean):2103:2103 -> a
+    141:141:void com.android.tools.r8.graph.DexMethodHandle.<init>(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.DexMember,boolean):209:209 -> a
+    141:141:com.android.tools.r8.graph.DexMethodHandle createMethodHandle(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.DexMember,boolean):2103 -> a
+    142:142:com.android.tools.r8.graph.DexMethodHandle createMethodHandle(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.DexMember,boolean):2104:2104 -> a
+    143:144:com.android.tools.r8.graph.DexCallSite createCallSite(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexMethodHandle,java.util.List):2113:2114 -> a
+    145:154:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString[]):2122:2131 -> a
+    155:157:com.android.tools.r8.graph.DexDebugEvent$AdvanceLine createAdvanceLine(int):2135:2137 -> a
+    158:160:com.android.tools.r8.graph.DexDebugEvent$SetFile createSetFile(com.android.tools.r8.graph.DexString):2173:2175 -> a
+    161:163:com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame createSetInlineFrame(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):2180:2182 -> a
+    164:164:boolean isClassConstructor(com.android.tools.r8.graph.DexMethod):2190:2190 -> a
+    165:172:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement createReferenceTypeElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):2223:2230 -> a
+    173:201:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement createReferenceTypeElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):2229:2257 -> a
+    202:210:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement lambda$createReferenceTypeElement$5(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DexType):2237:2245 -> a
+    211:222:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement lambda$createReferenceTypeElement$5(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DexType):2244:2255 -> a
+    223:223:java.util.Set getOrComputeLeastUpperBoundOfImplementedInterfaces(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):2262:2262 -> a
+    224:225:java.util.Set lambda$getOrComputeLeastUpperBoundOfImplementedInterfaces$6(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):2265:2266 -> a
+    226:226:void forAllTypes(java.util.function.Consumer):2272:2272 -> a
     1:2:com.android.tools.r8.graph.DexType getBoxedForPrimitiveType(com.android.tools.r8.graph.DexType):592:593 -> b
     3:4:com.android.tools.r8.graph.DexString createString(java.lang.String):1746:1747 -> b
-    5:5:com.android.tools.r8.graph.DexString lookupString(int,byte[]):1870:1870 -> b
-    6:8:com.android.tools.r8.graph.DexType createStaticallyKnownType(com.android.tools.r8.graph.DexString):1913:1915 -> b
-    9:9:void forEachPossiblyCompilerSynthesizedType(java.util.function.Consumer):1947:1947 -> b
-    10:12:com.android.tools.r8.graph.DexProto protoWithDifferentFirstParameter(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1997:1999 -> b
-    13:15:com.android.tools.r8.graph.DexDebugEvent$AdvancePC createAdvancePC(int):2119:2121 -> b
-    16:16:boolean isConstructor(com.android.tools.r8.graph.DexMethod):2164:2164 -> b
-    17:19:void clearTypeElementsCache():2172:2174 -> b
+    5:5:com.android.tools.r8.graph.DexString lookupString(int,byte[]):1887:1887 -> b
+    6:8:com.android.tools.r8.graph.DexType createStaticallyKnownType(com.android.tools.r8.graph.DexString):1930:1932 -> b
+    9:9:void forEachPossiblyCompilerSynthesizedType(java.util.function.Consumer):1964:1964 -> b
+    10:12:com.android.tools.r8.graph.DexProto protoWithDifferentFirstParameter(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):2014:2016 -> b
+    13:15:com.android.tools.r8.graph.DexDebugEvent$AdvancePC createAdvancePC(int):2141:2143 -> b
+    16:16:boolean isConstructor(com.android.tools.r8.graph.DexMethod):2186:2186 -> b
+    17:19:void clearTypeElementsCache():2194:2196 -> b
     1:1:boolean isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexMethod):722:722 -> c
-    2:3:com.android.tools.r8.graph.DexType createSynthesizedType(java.lang.String):1922:1923 -> c
-    4:4:boolean isPossiblyCompilerSynthesizedType(com.android.tools.r8.graph.DexType):1943:1943 -> c
-    5:5:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):1952:1952 -> c
-    6:8:com.android.tools.r8.graph.DexDebugEvent$Default createDefault(int):2125:2127 -> c
-    9:9:com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin createSetEpilogueBegin():2143:2143 -> c
-    1:9:com.android.tools.r8.graph.DexType internalCreateType(com.android.tools.r8.graph.DexString):1893:1901 -> d
-    10:10:com.android.tools.r8.graph.DexType internalCreateType(com.android.tools.r8.graph.DexString):1898:1898 -> d
+    2:3:com.android.tools.r8.graph.DexType createSynthesizedType(java.lang.String):1939:1940 -> c
+    4:4:boolean isPossiblyCompilerSynthesizedType(com.android.tools.r8.graph.DexType):1960:1960 -> c
+    5:5:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):1969:1969 -> c
+    6:8:com.android.tools.r8.graph.DexDebugEvent$Default createDefault(int):2147:2149 -> c
+    9:9:com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin createSetEpilogueBegin():2165:2165 -> c
+    1:9:com.android.tools.r8.graph.DexType internalCreateType(com.android.tools.r8.graph.DexString):1910:1918 -> d
+    10:10:com.android.tools.r8.graph.DexType internalCreateType(com.android.tools.r8.graph.DexString):1915:1915 -> d
     11:11:boolean isInternalSentinel(com.android.tools.r8.graph.DexItem):111:111 -> d
-    11:11:com.android.tools.r8.graph.DexType internalCreateType(com.android.tools.r8.graph.DexString):1902 -> d
-    12:13:com.android.tools.r8.graph.DexType internalCreateType(com.android.tools.r8.graph.DexString):1902:1903 -> d
-    14:14:void registerTypeNeededForDesugaring(com.android.tools.r8.graph.DexType):1930:1930 -> d
-    15:15:com.android.tools.r8.graph.DexType createType(java.lang.String):1956:1956 -> d
-    16:16:com.android.tools.r8.graph.DexProto prependHolderToProto(com.android.tools.r8.graph.DexMethod):2003:2003 -> d
-    17:19:com.android.tools.r8.graph.DexDebugEvent$EndLocal createEndLocal(int):2131:2133 -> d
-    20:20:com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd createSetPrologueEnd():2147:2147 -> d
-    1:1:com.android.tools.r8.graph.DexString lookupString(java.lang.String):1874:1874 -> e
-    2:6:java.util.List extractMarkers():1881:1885 -> e
-    7:7:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexString):1960:1960 -> e
-    8:10:com.android.tools.r8.graph.DexDebugEvent$RestartLocal createRestartLocal(int):2137:2139 -> e
+    11:11:com.android.tools.r8.graph.DexType internalCreateType(com.android.tools.r8.graph.DexString):1919 -> d
+    12:13:com.android.tools.r8.graph.DexType internalCreateType(com.android.tools.r8.graph.DexString):1919:1920 -> d
+    14:14:void registerTypeNeededForDesugaring(com.android.tools.r8.graph.DexType):1947:1947 -> d
+    15:15:com.android.tools.r8.graph.DexType createType(java.lang.String):1973:1973 -> d
+    16:16:com.android.tools.r8.graph.DexProto prependHolderToProto(com.android.tools.r8.graph.DexMethod):2020:2020 -> d
+    17:19:com.android.tools.r8.graph.DexDebugEvent$EndLocal createEndLocal(int):2153:2155 -> d
+    20:20:com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd createSetPrologueEnd():2169:2169 -> d
+    1:1:com.android.tools.r8.graph.DexString lookupString(java.lang.String):1891:1891 -> e
+    2:6:java.util.List extractMarkers():1898:1902 -> e
+    7:7:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexString):1977:1977 -> e
+    8:10:com.android.tools.r8.graph.DexDebugEvent$RestartLocal createRestartLocal(int):2159:2161 -> e
     1:1:boolean getSkipNameValidationForTesting():718:718 -> f
-    1:3:boolean verifyNoCachedTypeElements():2178:2180 -> g
+    1:3:boolean verifyNoCachedTypeElements():2200:2202 -> g
 com.android.tools.r8.graph.DexItemFactory$1 -> com.android.tools.r8.graph.L$a:
 com.android.tools.r8.graph.DexItemFactory$AndroidOsBuildMembers -> com.android.tools.r8.graph.L$b:
     com.android.tools.r8.graph.DexField TYPE -> q
@@ -18996,7 +19140,7 @@
     4:4:boolean verifyLibraryField(com.android.tools.r8.graph.DexEncodedField):81 -> e
     5:5:boolean verifyLibraryField(com.android.tools.r8.graph.DexEncodedField):81:81 -> e
     1:1:java.lang.String toSourceString():92:92 -> m
-    boolean isNotProgramClass() -> p0
+    boolean isNotProgramClass() -> r0
     1:1:java.lang.String toString():87:87 -> toString
 com.android.tools.r8.graph.DexMember -> com.android.tools.r8.graph.N:
     com.android.tools.r8.graph.DexString name -> g
@@ -19241,83 +19385,86 @@
     2:2: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):78:78 -> <init>
     3:3: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,java.util.Collection):122:122 -> <init>
     4:97: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,java.util.Collection):52:145 -> <init>
-    1:1:com.android.tools.r8.graph.ProgramMethod getProgramClassInitializer():195:195 -> A0
-    1:1:com.android.tools.r8.graph.ProgramMethod getProgramDefaultInitializer():199:199 -> B0
-    2:2:com.android.tools.r8.graph.ProgramMethod getProgramInitializer(com.android.tools.r8.graph.DexType[]):203:203 -> B0
-    2:2:com.android.tools.r8.graph.ProgramMethod getProgramDefaultInitializer():199 -> B0
-    1:1:java.util.Collection getSynthesizedFrom():314:314 -> C0
-    1:1:boolean hasClassFileVersion():576:576 -> D0
-    1:1:boolean hasClassOrMemberAnnotations():419:419 -> E0
-    2:3:boolean hasAnnotations(com.android.tools.r8.graph.MethodCollection):438:439 -> E0
-    2:3:boolean hasClassOrMemberAnnotations():420 -> E0
-    4:6:boolean hasClassOrMemberAnnotations():420:422 -> E0
-    7:7:boolean hasAnnotations(com.android.tools.r8.graph.MethodCollection):440:440 -> E0
-    7:7:boolean hasClassOrMemberAnnotations():420 -> E0
-    1:1:boolean hasFields():406:406 -> F0
-    1:1:boolean hasMethods():410:410 -> G0
-    1:1:boolean hasMethodsOrFields():414 -> G0
-    2:2:boolean hasMethodsOrFields():414:414 -> G0
-    1:1:boolean hasOnlyInternalizableAnnotations():426:426 -> H0
-    2:3:boolean hasAnnotations(com.android.tools.r8.graph.MethodCollection):438:439 -> H0
-    2:3:boolean hasOnlyInternalizableAnnotations():426 -> H0
-    4:6:boolean hasOnlyInternalizableAnnotations():426:428 -> H0
-    7:7:boolean hasAnnotations(com.android.tools.r8.graph.MethodCollection):440:440 -> H0
-    7:7:boolean hasOnlyInternalizableAnnotations():426 -> H0
-    1:1:boolean isDeprecated():589:589 -> I0
-    1:1:boolean originatesFromClassResource():282:282 -> J0
-    1:1:boolean originatesFromDexResource():278:278 -> K0
-    1:1:java.lang.Iterable programInstanceInitializers():171:171 -> L0
-    1:1:void setDeprecated():585:585 -> M0
+    1:1:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo():396:396 -> A0
+    1:1:com.android.tools.r8.ProgramResource$Kind getOriginKind():274:274 -> B0
+    1:1:com.android.tools.r8.graph.ProgramMethod getProgramClassInitializer():195:195 -> C0
+    1:1:com.android.tools.r8.graph.ProgramMethod getProgramDefaultInitializer():199:199 -> D0
+    2:2:com.android.tools.r8.graph.ProgramMethod getProgramInitializer(com.android.tools.r8.graph.DexType[]):203:203 -> D0
+    2:2:com.android.tools.r8.graph.ProgramMethod getProgramDefaultInitializer():199 -> D0
+    1:1:java.util.Collection getSynthesizedFrom():314:314 -> E0
+    1:1:boolean hasClassFileVersion():576:576 -> F0
+    1:1:boolean hasClassOrMemberAnnotations():419:419 -> G0
+    2:3:boolean hasAnnotations(com.android.tools.r8.graph.MethodCollection):438:439 -> G0
+    2:3:boolean hasClassOrMemberAnnotations():420 -> G0
+    4:6:boolean hasClassOrMemberAnnotations():420:422 -> G0
+    7:7:boolean hasAnnotations(com.android.tools.r8.graph.MethodCollection):440:440 -> G0
+    7:7:boolean hasClassOrMemberAnnotations():420 -> G0
+    1:1:boolean hasFields():406:406 -> H0
+    1:1:boolean hasMethods():410:410 -> I0
+    1:1:boolean hasMethodsOrFields():414 -> I0
+    2:2:boolean hasFields():406:406 -> I0
+    2:2:boolean hasMethodsOrFields():414 -> I0
+    1:1:boolean hasOnlyInternalizableAnnotations():426:426 -> J0
+    2:3:boolean hasAnnotations(com.android.tools.r8.graph.MethodCollection):438:439 -> J0
+    2:3:boolean hasOnlyInternalizableAnnotations():426 -> J0
+    4:6:boolean hasOnlyInternalizableAnnotations():426:428 -> J0
+    7:7:boolean hasAnnotations(com.android.tools.r8.graph.MethodCollection):440:440 -> J0
+    7:7:boolean hasOnlyInternalizableAnnotations():426 -> J0
+    1:1:boolean isDeprecated():589:589 -> K0
+    1:1:boolean originatesFromClassResource():282:282 -> L0
+    1:1:boolean originatesFromDexResource():278:278 -> M0
+    1:1:java.lang.Iterable programInstanceInitializers():171:171 -> N0
+    1:1:void setDeprecated():585:585 -> O0
     com.android.tools.r8.graph.DexProgramClass getContextClass() -> a
-    1:772:void com.android.tools.r8.graph.DexEncodedMethod.collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):0:771 -> a
-    1:772:void lambda$addDependencies$11(com.android.tools.r8.dex.MixedSectionCollection,com.android.tools.r8.graph.DexEncodedMethod):335 -> a
-    773:775:void com.android.tools.r8.graph.ProgramField.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):17:19 -> a
-    773:775:void lambda$collectIndexedItems$9(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramField):308 -> a
-    776:776:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():171:171 -> a
-    776:776:void com.android.tools.r8.graph.ProgramField.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):20 -> a
-    776:776:void lambda$collectIndexedItems$9(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramField):308 -> a
-    777:778:void com.android.tools.r8.graph.ProgramField.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):20:21 -> a
-    777:778:void lambda$collectIndexedItems$9(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramField):308 -> a
-    779:788:void com.android.tools.r8.graph.ProgramMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):43:52 -> a
-    779:788:void lambda$collectIndexedItems$10(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ProgramMethod):309 -> a
-    789:789:void lambda$forEachProgramField$0(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField):149:149 -> a
-    790:790:void forEachProgramDirectMethodMatching(java.util.function.Predicate,java.util.function.Consumer):180:180 -> a
-    791:791:void lambda$forEachProgramDirectMethodMatching$4(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod):181:181 -> a
-    792:792:com.android.tools.r8.utils.TraversalContinuation lambda$traverseProgramFields$6(java.util.function.Function,com.android.tools.r8.graph.DexEncodedField):250:250 -> a
-    793:793:com.android.tools.r8.utils.TraversalContinuation traverseProgramFields(java.util.function.Function):250:250 -> a
-    794:799:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.graph.DexClass.traverseFields(java.util.function.Function):245:250 -> a
-    794:799:com.android.tools.r8.utils.TraversalContinuation traverseProgramFields(java.util.function.Function):250 -> a
-    800:800:com.android.tools.r8.utils.TraversalContinuation lambda$traverseProgramMethods$7(java.util.function.Function,com.android.tools.r8.graph.DexEncodedMethod):255:255 -> a
-    801:802:com.android.tools.r8.utils.TraversalContinuation traverseProgramMethods(java.util.function.Function,java.util.function.Predicate):265:266 -> a
-    803:805:com.android.tools.r8.utils.TraversalContinuation lambda$traverseProgramMethods$8(java.util.function.Predicate,java.util.function.Function,com.android.tools.r8.graph.DexEncodedMethod):268:270 -> a
-    806:813:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):287:294 -> a
-    814:814:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):243:243 -> a
-    814:814:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):295 -> a
-    815:816:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):297:298 -> a
-    817:818:void com.android.tools.r8.graph.DexTypeList.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):53:54 -> a
-    817:818:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):299 -> a
-    819:827:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):301:309 -> a
-    828:832:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):319:323 -> a
-    833:833:com.android.tools.r8.graph.DexProgramClass asProgramClassOrNull(com.android.tools.r8.graph.DexClass):386:386 -> a
-    834:836:void setKotlinInfo(com.android.tools.r8.kotlin.KotlinClassLevelInfo):400:402 -> a
-    837:840:void addSynthesizedFrom(com.android.tools.r8.graph.DexProgramClass):444:447 -> a
-    841:841:int lambda$computeStaticValuesArray$12(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedField):457:457 -> a
-    842:844:boolean hasNonDefaultStaticFieldValues():475:477 -> a
-    842:844:com.android.tools.r8.graph.DexEncodedArray computeStaticValuesArray(com.android.tools.r8.naming.NamingLens):453 -> a
-    845:859:com.android.tools.r8.graph.DexEncodedArray computeStaticValuesArray(com.android.tools.r8.naming.NamingLens):456:470 -> a
-    860:860:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):493:493 -> a
-    861:861:void addExtraInterfaces(java.util.List):516:516 -> a
-    862:865:void addExtraInterfacesToInterfacesArray(java.util.List):524:527 -> a
-    862:865:void addExtraInterfaces(java.util.List):519 -> a
-    866:866:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GenericSignature$ClassTypeSignature.type():413:413 -> a
-    866:866:void addExtraInterfacesToInterfacesArray(java.util.List):527 -> a
-    866:866:void addExtraInterfaces(java.util.List):519 -> a
-    867:869:void addExtraInterfacesToInterfacesArray(java.util.List):527:529 -> a
-    867:869:void addExtraInterfaces(java.util.List):519 -> a
-    870:882:void addExtraInterfacesToSignatureIfPresent(java.util.List):534:546 -> a
-    870:882:void addExtraInterfaces(java.util.List):520 -> a
-    883:885:void setInitialClassFileVersion(com.android.tools.r8.cf.CfVersion):570:572 -> a
-    886:886:java.lang.Iterable asProgramClasses(java.lang.Iterable,com.android.tools.r8.graph.DexDefinitionSupplier):613:613 -> a
+    1:778:void com.android.tools.r8.graph.DexEncodedMethod.collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):0:777 -> a
+    1:778:void lambda$addDependencies$11(com.android.tools.r8.dex.MixedSectionCollection,com.android.tools.r8.graph.DexEncodedMethod):335 -> a
+    779:781:void com.android.tools.r8.graph.ProgramField.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):17:19 -> a
+    779:781:void lambda$collectIndexedItems$9(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramField):308 -> a
+    782:782:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():171:171 -> a
+    782:782:void com.android.tools.r8.graph.ProgramField.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):20 -> a
+    782:782:void lambda$collectIndexedItems$9(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramField):308 -> a
+    783:784:void com.android.tools.r8.graph.ProgramField.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):20:21 -> a
+    783:784:void lambda$collectIndexedItems$9(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramField):308 -> a
+    785:794:void com.android.tools.r8.graph.ProgramMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):43:52 -> a
+    785:794:void lambda$collectIndexedItems$10(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ProgramMethod):309 -> a
+    795:795:void lambda$forEachProgramField$0(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField):149:149 -> a
+    796:796:void forEachProgramDirectMethodMatching(java.util.function.Predicate,java.util.function.Consumer):180:180 -> a
+    797:797:void lambda$forEachProgramDirectMethodMatching$4(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod):181:181 -> a
+    798:798:com.android.tools.r8.utils.TraversalContinuation lambda$traverseProgramFields$6(java.util.function.Function,com.android.tools.r8.graph.DexEncodedField):250:250 -> a
+    799:799:com.android.tools.r8.utils.TraversalContinuation traverseProgramFields(java.util.function.Function):250:250 -> a
+    800:805:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.graph.DexClass.traverseFields(java.util.function.Function):249:254 -> a
+    800:805:com.android.tools.r8.utils.TraversalContinuation traverseProgramFields(java.util.function.Function):250 -> a
+    806:806:com.android.tools.r8.utils.TraversalContinuation lambda$traverseProgramMethods$7(java.util.function.Function,com.android.tools.r8.graph.DexEncodedMethod):255:255 -> a
+    807:808:com.android.tools.r8.utils.TraversalContinuation traverseProgramMethods(java.util.function.Function,java.util.function.Predicate):265:266 -> a
+    809:811:com.android.tools.r8.utils.TraversalContinuation lambda$traverseProgramMethods$8(java.util.function.Predicate,java.util.function.Function,com.android.tools.r8.graph.DexEncodedMethod):268:270 -> a
+    812:819:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):287:294 -> a
+    820:820:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):243:243 -> a
+    820:820:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):295 -> a
+    821:822:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):297:298 -> a
+    823:824:void com.android.tools.r8.graph.DexTypeList.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):53:54 -> a
+    823:824:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):299 -> a
+    825:833:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):301:309 -> a
+    834:838:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):319:323 -> a
+    839:839:com.android.tools.r8.graph.DexProgramClass asProgramClassOrNull(com.android.tools.r8.graph.DexClass):386:386 -> a
+    840:842:void setKotlinInfo(com.android.tools.r8.kotlin.KotlinClassLevelInfo):400:402 -> a
+    843:846:void addSynthesizedFrom(com.android.tools.r8.graph.DexProgramClass):444:447 -> a
+    847:847:int lambda$computeStaticValuesArray$12(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedField):457:457 -> a
+    848:850:boolean hasNonDefaultStaticFieldValues():475:477 -> a
+    848:850:com.android.tools.r8.graph.DexEncodedArray computeStaticValuesArray(com.android.tools.r8.naming.NamingLens):453 -> a
+    851:865:com.android.tools.r8.graph.DexEncodedArray computeStaticValuesArray(com.android.tools.r8.naming.NamingLens):456:470 -> a
+    866:866:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):493:493 -> a
+    867:867:void addExtraInterfaces(java.util.List):516:516 -> a
+    868:871:void addExtraInterfacesToInterfacesArray(java.util.List):524:527 -> a
+    868:871:void addExtraInterfaces(java.util.List):519 -> a
+    872:872:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GenericSignature$ClassTypeSignature.type():413:413 -> a
+    872:872:void addExtraInterfacesToInterfacesArray(java.util.List):527 -> a
+    872:872:void addExtraInterfaces(java.util.List):519 -> a
+    873:875:void addExtraInterfacesToInterfacesArray(java.util.List):527:529 -> a
+    873:875:void addExtraInterfaces(java.util.List):519 -> a
+    876:888:void addExtraInterfacesToSignatureIfPresent(java.util.List):534:546 -> a
+    876:888:void addExtraInterfaces(java.util.List):520 -> a
+    889:891:void setInitialClassFileVersion(com.android.tools.r8.cf.CfVersion):570:572 -> a
+    892:892:java.lang.Iterable asProgramClasses(java.lang.Iterable,com.android.tools.r8.graph.DexDefinitionSupplier):613:613 -> a
     com.android.tools.r8.graph.DexDefinition getDefinition() -> b
     1:1:void forEachProgramMethodMatching(java.util.function.Predicate,java.util.function.Consumer):158:158 -> b
     2:2:void lambda$forEachProgramMethodMatching$1(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod):159:159 -> b
@@ -19360,13 +19507,11 @@
     1:1:java.lang.Iterable directProgramMethods(java.util.function.Predicate):167:167 -> i
     1:1:com.android.tools.r8.graph.DexType getContextType():561:561 -> k
     1:1:java.lang.String toSourceString():352:352 -> m
-    boolean isNotProgramClass() -> p0
+    boolean isNotProgramClass() -> r0
     1:1:java.lang.String toString():347:347 -> toString
-    1:1:java.lang.Iterable directProgramMethods():163:163 -> v0
-    1:1:long getChecksum():655:655 -> w0
-    1:2:com.android.tools.r8.cf.CfVersion getInitialClassFileVersion():580:581 -> x0
-    1:1:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo():396:396 -> y0
-    1:1:com.android.tools.r8.ProgramResource$Kind getOriginKind():274:274 -> z0
+    1:1:java.lang.Iterable directProgramMethods():163:163 -> x0
+    1:1:long getChecksum():655:655 -> y0
+    1:2:com.android.tools.r8.cf.CfVersion getInitialClassFileVersion():580:581 -> z0
 com.android.tools.r8.graph.DexProgramClass$1 -> com.android.tools.r8.graph.S$a:
     java.util.Iterator iterator -> b
     com.android.tools.r8.graph.DexProgramClass next -> a
@@ -19592,7 +19737,8 @@
     1:3:void <clinit>():17:19 -> <clinit>
     1:2:void <init>():27:28 -> <init>
     3:5:void <init>(com.android.tools.r8.graph.DexType[]):31:33 -> <init>
-    1:1:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):60:60 -> a
+    1:1:boolean contains(com.android.tools.r8.graph.DexType):37:37 -> a
+    2:2:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):60:60 -> a
     1:2:boolean equals(java.lang.Object):68:69 -> equals
     1:2:void forEach(java.util.function.Consumer):42:43 -> forEach
     1:1:int hashCode():49:49 -> hashCode
@@ -20063,7 +20209,7 @@
     1:1:java.util.Collection classpathClasses():71:71 -> j
     1:1:java.util.Collection libraryClasses():67:67 -> k
     1:4:boolean verifyCodeObjectsOwners():160:163 -> l
-    5:5:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods(java.util.function.Predicate):153:153 -> l
+    5:5:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods(java.util.function.Predicate):157:157 -> l
     5:5:boolean verifyCodeObjectsOwners():163 -> l
     6:14:boolean verifyCodeObjectsOwners():163:171 -> l
 com.android.tools.r8.graph.DirectMappedDexApplication$1 -> com.android.tools.r8.graph.Z$a:
@@ -20080,7 +20226,7 @@
     com.android.tools.r8.graph.DexApplication$Builder self() -> d
     1:1:com.android.tools.r8.graph.DirectMappedDexApplication$Builder replaceLibraryClasses(java.util.Collection):203:203 -> d
     1:15:com.android.tools.r8.graph.DirectMappedDexApplication build():231:245 -> e
-com.android.tools.r8.graph.EnclosingMethodAttribute -> com.android.tools.r8.internal.m9:
+com.android.tools.r8.graph.EnclosingMethodAttribute -> com.android.tools.r8.internal.n9:
     com.android.tools.r8.graph.DexType enclosingClass -> c
     com.android.tools.r8.graph.DexMethod enclosingMethod -> d
     boolean $assertionsDisabled -> a
@@ -20096,7 +20242,7 @@
     1:1:boolean equals(java.lang.Object):66:66 -> equals
     1:2:int hashCode():60:61 -> hashCode
     1:4:java.lang.String toString():82:85 -> toString
-com.android.tools.r8.graph.EnumValueInfoMapCollection -> com.android.tools.r8.internal.R9:
+com.android.tools.r8.graph.EnumValueInfoMapCollection -> com.android.tools.r8.internal.S9:
     java.util.Map maps -> a
     1:1:void <init>(java.util.Map,com.android.tools.r8.graph.EnumValueInfoMapCollection$1):13:13 -> <init>
     2:3:void <init>(java.util.Map):21:22 -> <init>
@@ -20110,18 +20256,18 @@
     2:2:com.android.tools.r8.graph.EnumValueInfoMapCollection$EnumValueInfoMap getEnumValueInfoMap(com.android.tools.r8.graph.DexType):26:26 -> b
     1:1:java.util.Set enumSet():38:38 -> c
     1:1:boolean isEmpty():30:30 -> d
-com.android.tools.r8.graph.EnumValueInfoMapCollection$1 -> com.android.tools.r8.internal.R9$a:
-com.android.tools.r8.graph.EnumValueInfoMapCollection$Builder -> com.android.tools.r8.internal.R9$b:
+com.android.tools.r8.graph.EnumValueInfoMapCollection$1 -> com.android.tools.r8.internal.S9$a:
+com.android.tools.r8.graph.EnumValueInfoMapCollection$Builder -> com.android.tools.r8.internal.S9$b:
     com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder builder -> a
     1:1:void <init>():59:59 -> <init>
     1:4:com.android.tools.r8.graph.EnumValueInfoMapCollection$Builder put(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.EnumValueInfoMapCollection$EnumValueInfoMap):64:67 -> a
     5:8:com.android.tools.r8.graph.EnumValueInfoMapCollection build():72:75 -> a
-com.android.tools.r8.graph.EnumValueInfoMapCollection$EnumValueInfo -> com.android.tools.r8.internal.R9$c:
+com.android.tools.r8.graph.EnumValueInfoMapCollection$EnumValueInfo -> com.android.tools.r8.internal.S9$c:
     com.android.tools.r8.graph.DexType type -> a
     int ordinal -> b
     1:3:void <init>(com.android.tools.r8.graph.DexType,int):122:124 -> <init>
     1:1:int convertToInt():128:128 -> a
-com.android.tools.r8.graph.EnumValueInfoMapCollection$EnumValueInfoMap -> com.android.tools.r8.internal.R9$d:
+com.android.tools.r8.graph.EnumValueInfoMapCollection$EnumValueInfoMap -> com.android.tools.r8.internal.S9$d:
     java.util.LinkedHashMap map -> a
     1:2:void <init>(java.util.LinkedHashMap):83:84 -> <init>
     1:1:java.util.Set enumValues():88:88 -> a
@@ -20159,9 +20305,9 @@
     1:2:com.android.tools.r8.graph.FieldAccessFlags fromSharedAccessFlags(int):58:59 -> g
     3:3:void <init>(int):40:40 -> g
     3:3:com.android.tools.r8.graph.FieldAccessFlags fromSharedAccessFlags(int):59 -> g
-com.android.tools.r8.graph.FieldAccessInfo -> com.android.tools.r8.internal.ma:
-com.android.tools.r8.graph.FieldAccessInfoCollection -> com.android.tools.r8.internal.na:
-com.android.tools.r8.graph.FieldAccessInfoCollectionImpl -> com.android.tools.r8.internal.oa:
+com.android.tools.r8.graph.FieldAccessInfo -> com.android.tools.r8.internal.na:
+com.android.tools.r8.graph.FieldAccessInfoCollection -> com.android.tools.r8.internal.oa:
+com.android.tools.r8.graph.FieldAccessInfoCollectionImpl -> com.android.tools.r8.internal.pa:
     java.util.Map infos -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():14:14 -> <clinit>
@@ -20186,7 +20332,7 @@
     2:2:com.android.tools.r8.graph.FieldAccessInfo get(com.android.tools.r8.graph.DexField):14 -> b
     1:1:com.android.tools.r8.graph.FieldAccessInfoImpl get(com.android.tools.r8.graph.DexField):49:49 -> c
     2:2:boolean verifyMappingIsOneToOne():88:88 -> c
-com.android.tools.r8.graph.FieldAccessInfoImpl -> com.android.tools.r8.internal.pa:
+com.android.tools.r8.graph.FieldAccessInfoImpl -> com.android.tools.r8.internal.qa:
     com.android.tools.r8.graph.FieldAccessInfoImpl MISSING_FIELD_ACCESS_INFO -> a
     com.android.tools.r8.graph.DexField field -> b
     com.android.tools.r8.graph.AbstractAccessContexts writesWithContexts -> e
@@ -20292,7 +20438,7 @@
     com.android.tools.r8.graph.FieldResolutionResult$SuccessfulFieldResolutionResult asSuccessfulResolution() -> e
     1:1:com.android.tools.r8.graph.DexEncodedField getResolvedField():81:81 -> f
     1:1:com.android.tools.r8.graph.DexField getResolvedFieldReference():86:86 -> g
-    2:2:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.toReference():134:134 -> g
+    2:2:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getReference():134:134 -> g
     2:2:com.android.tools.r8.graph.DexField getResolvedFieldReference():86 -> g
     boolean isSuccessfulResolution() -> i
     1:1:com.android.tools.r8.graph.DexClassAndField getResolutionPair():96:96 -> j
@@ -20306,7 +20452,7 @@
     com.android.tools.r8.graph.SuccessfulMemberResolutionResult asSuccessfulMemberResolutionResult() -> c
     boolean isFailedOrUnknownResolution() -> h
     1:1:com.android.tools.r8.graph.FieldResolutionResult$UnknownFieldResolutionResult access$100():146:146 -> j
-com.android.tools.r8.graph.FinalInitClassLens -> com.android.tools.r8.internal.Oa:
+com.android.tools.r8.graph.FinalInitClassLens -> com.android.tools.r8.internal.Pa:
     java.util.Map mapping -> a
     1:2:void <init>(java.util.Map):14:15 -> <init>
     1:1:com.android.tools.r8.graph.InitClassLens$Builder com.android.tools.r8.graph.InitClassLens.builder():13:13 -> a
@@ -20686,7 +20832,7 @@
     1:1:void <clinit>():9:9 -> <clinit>
     1:11:boolean verifyNoDuplicateGenericDefinitions(com.android.tools.r8.graph.GenericSignature$DexDefinitionSignature,com.android.tools.r8.graph.DexAnnotationSet):13:23 -> a
     12:12:boolean verifyNoDuplicateGenericDefinitions(com.android.tools.r8.graph.GenericSignature$DexDefinitionSignature,com.android.tools.r8.graph.DexAnnotationSet):19:19 -> a
-com.android.tools.r8.graph.GenericSignatureVisitor -> com.android.tools.r8.internal.Hb:
+com.android.tools.r8.graph.GenericSignatureVisitor -> com.android.tools.r8.internal.Ib:
     1:1:void visitClassSignature(com.android.tools.r8.graph.GenericSignature$ClassSignature):20:20 -> a
     2:2:void visitMethodSignature(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature):24:24 -> a
     3:3:void visitFormalTypeParameters(java.util.List):32:32 -> a
@@ -20720,7 +20866,7 @@
     1:1:com.android.tools.r8.graph.DexReference lookupReference(com.android.tools.r8.graph.DexReference):388 -> a
     2:7:com.android.tools.r8.graph.DexReference lookupReference(com.android.tools.r8.graph.DexReference):389:394 -> a
     8:16:com.android.tools.r8.graph.DexEncodedMethod mapDexEncodedMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens):306:314 -> a
-    17:17:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexMethod):447:447 -> a
+    17:17:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexMethod):451:451 -> a
     17:17:com.android.tools.r8.graph.DexEncodedMethod mapDexEncodedMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens):315 -> a
     18:18:com.android.tools.r8.graph.DexEncodedMethod mapDexEncodedMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens):316:316 -> a
     19:19:com.android.tools.r8.graph.ProgramMethod mapProgramMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexDefinitionSupplier):322:322 -> a
@@ -20758,7 +20904,7 @@
     329:333:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):591:595 -> a
     334:486:boolean com.android.tools.r8.graph.DexField.match(com.android.tools.r8.graph.DexField):0:152 -> a
     334:486:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):595 -> a
-    487:487:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.toReference():134:134 -> a
+    487:487:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getReference():134:134 -> a
     487:487:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):600 -> a
     488:502:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):600:614 -> a
     com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens asNonIdentityLens() -> b
@@ -21035,20 +21181,20 @@
     1:1:void <init>():9:9 -> <init>
     int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping) -> a
     1:1:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):14:14 -> a
-com.android.tools.r8.graph.InitClassLens -> com.android.tools.r8.internal.xd:
+com.android.tools.r8.graph.InitClassLens -> com.android.tools.r8.internal.yd:
     1:1:void <init>():10:10 -> <init>
     com.android.tools.r8.graph.DexField getInitClassField(com.android.tools.r8.graph.DexType) -> a
     com.android.tools.r8.graph.InitClassLens rewrittenWithLens(com.android.tools.r8.graph.GraphLens) -> a
     1:1:com.android.tools.r8.graph.InitClassLens$Builder builder():13:13 -> a
     1:1:com.android.tools.r8.graph.DefaultInitClassLens getDefault():17:17 -> b
-com.android.tools.r8.graph.InitClassLens$Builder -> com.android.tools.r8.internal.xd$a:
+com.android.tools.r8.graph.InitClassLens$Builder -> com.android.tools.r8.internal.yd$a:
     java.util.Map mapping -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():28:28 -> <clinit>
     1:3:void <init>():28:30 -> <init>
     1:2:void map(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):33:34 -> a
     3:3:com.android.tools.r8.graph.FinalInitClassLens build():38:38 -> a
-com.android.tools.r8.graph.InnerClassAttribute -> com.android.tools.r8.internal.Kd:
+com.android.tools.r8.graph.InnerClassAttribute -> com.android.tools.r8.internal.Ld:
     com.android.tools.r8.graph.DexString innerName -> f
     com.android.tools.r8.graph.DexType inner -> d
     boolean $assertionsDisabled -> a
@@ -21075,7 +21221,7 @@
     1:1:boolean isAnonymous():62:62 -> e
     1:1:boolean isNamed():58:58 -> f
     1:4:java.lang.String toString():124:127 -> toString
-com.android.tools.r8.graph.InstantiatedSubTypeInfo -> com.android.tools.r8.internal.ae:
+com.android.tools.r8.graph.InstantiatedSubTypeInfo -> com.android.tools.r8.internal.be:
     void forEachInstantiatedSubType(com.android.tools.r8.graph.DexType,java.util.function.Consumer,java.util.function.Consumer) -> a
 com.android.tools.r8.graph.JarApplicationReader -> com.android.tools.r8.graph.v0:
     java.util.concurrent.ConcurrentHashMap stringCache -> e
@@ -21160,7 +21306,7 @@
     67:67:com.android.tools.r8.graph.DexAnnotationSet access$200(java.util.List,com.android.tools.r8.utils.InternalOptions):72 -> a
     int cleanAccessFlags(int) -> b
     1:1:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,byte[]):93:93 -> b
-    2:2:void com.android.tools.r8.utils.ExceptionUtils.withOriginAttachmentHandler(com.android.tools.r8.origin.Origin,java.lang.Runnable):211:211 -> b
+    2:2:void com.android.tools.r8.utils.ExceptionUtils.withOriginAttachmentHandler(com.android.tools.r8.origin.Origin,java.lang.Runnable):220:220 -> b
     2:2:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,byte[]):93 -> b
     3:3:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor createAnnotationVisitor(java.lang.String,boolean,java.util.List,com.android.tools.r8.graph.JarApplicationReader):160:160 -> b
     4:6:boolean retainCompileTimeAnnotation(java.lang.String,com.android.tools.r8.graph.JarApplicationReader):175:177 -> b
@@ -21450,37 +21596,38 @@
     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):98:109 -> <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):99:102 -> <init>
     1:1:void parseCode(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,boolean):167:167 -> a
-    2:24:com.android.tools.r8.graph.LazyCfCode$DebugParsingOptions getParsingOptions(com.android.tools.r8.graph.JarApplicationReader,boolean):996:1018 -> a
+    2:24:com.android.tools.r8.graph.LazyCfCode$DebugParsingOptions getParsingOptions(com.android.tools.r8.graph.JarApplicationReader,boolean):1001:1023 -> a
     2:24:void parseCode(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,boolean):167 -> a
     25:25:void parseCode(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,boolean):169:169 -> a
-    26:26:java.util.function.BiFunction createCodeLocator(com.android.tools.r8.graph.JarClassFileReader$ReparseContext):264:264 -> a
+    26:26:java.util.function.BiFunction createCodeLocator(com.android.tools.r8.graph.JarClassFileReader$ReparseContext):269:269 -> a
     26:26:void parseCode(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,boolean):172 -> a
     27:32:void parseCode(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,boolean):172:177 -> a
     33:33:void com.android.tools.r8.org.objectweb.asm.ClassReader.accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):401:401 -> a
     33:33:void parseCode(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,boolean):177 -> a
     34:38:void setCode(com.android.tools.r8.graph.CfCode):181:185 -> a
     34:38:void access$100(com.android.tools.r8.graph.LazyCfCode,com.android.tools.r8.graph.CfCode):89 -> a
-    39:39:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):215:215 -> a
-    40:41:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.ir.conversion.MethodProcessor):227:228 -> a
-    42:42:void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry):240:240 -> a
-    43:43:void registerCodeReferencesForDesugaring(com.android.tools.r8.graph.ClasspathMethod,com.android.tools.r8.graph.UseRegistry):245:245 -> a
-    44:44:void registerArgumentReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.ArgumentUse):250:250 -> a
-    45:45:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.ClassNameMapper):260:260 -> a
-    46:46:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap collectParameterInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):1042:1042 -> a
+    39:39:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):220:220 -> a
+    40:41:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.ir.conversion.MethodProcessor):232:233 -> a
+    42:42:void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry):245:245 -> a
+    43:43:void registerCodeReferencesForDesugaring(com.android.tools.r8.graph.ClasspathMethod,com.android.tools.r8.graph.UseRegistry):250:250 -> a
+    44:44:void registerArgumentReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.ArgumentUse):255:255 -> a
+    45:45:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.ClassNameMapper):265:265 -> a
+    46:46:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap collectParameterInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):1047:1047 -> a
     1:1:boolean computeEquals(java.lang.Object):195:195 -> c
     1:1:boolean estimatedSizeForInliningAtMost(int):210:210 -> g
     1:1:int computeHashCode():190:190 -> p
     1:21:com.android.tools.r8.graph.CfCode asCfCode():128:148 -> q
-    22:28:boolean verifyNoReparseContext(com.android.tools.r8.graph.DexClass):1028:1034 -> q
+    22:28:boolean verifyNoReparseContext(com.android.tools.r8.graph.DexClass):1033:1039 -> q
     22:28:com.android.tools.r8.graph.CfCode asCfCode():148 -> q
     29:35:com.android.tools.r8.graph.CfCode asCfCode():145:151 -> q
     com.android.tools.r8.graph.LazyCfCode asLazyCfCode() -> s
-    1:1:int estimatedSizeForInlining():205:205 -> t
-    1:1:java.lang.String toString():255:255 -> toString
-    boolean isCfCode() -> u
-    1:1:boolean isEmptyVoidMethod():200:200 -> w
-    1:1:boolean verifyNoInputReaders():1023:1023 -> x
-    1:2:void markReachabilitySensitive():112:113 -> y
+    1:1:int estimatedDexCodeSizeUpperBoundInBytes():215:215 -> t
+    1:1:java.lang.String toString():260:260 -> toString
+    1:1:int estimatedSizeForInlining():205:205 -> u
+    boolean isCfCode() -> v
+    1:1:boolean isEmptyVoidMethod():200:200 -> x
+    1:1:boolean verifyNoInputReaders():1028:1028 -> y
+    1:2:void markReachabilitySensitive():112:113 -> z
 com.android.tools.r8.graph.LazyCfCode$1 -> com.android.tools.r8.graph.x0:
 com.android.tools.r8.graph.LazyCfCode$ClassCodeVisitor -> com.android.tools.r8.graph.y0:
     java.util.function.BiFunction codeLocator -> d
@@ -21489,9 +21636,9 @@
     com.android.tools.r8.origin.Origin origin -> g
     boolean usrJsrInliner -> f
     com.android.tools.r8.graph.DexClass clazz -> c
-    1:7:void <init>(com.android.tools.r8.graph.DexClass,java.util.function.BiFunction,com.android.tools.r8.graph.JarApplicationReader,boolean,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.LazyCfCode$DebugParsingOptions):299:305 -> <init>
-    1:11:com.android.tools.r8.org.objectweb.asm.MethodVisitor visitMethod(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):311:321 -> a
-com.android.tools.r8.graph.LazyCfCode$DebugParsingOptions -> com.android.tools.r8.internal.Tl:
+    1:7:void <init>(com.android.tools.r8.graph.DexClass,java.util.function.BiFunction,com.android.tools.r8.graph.JarApplicationReader,boolean,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.LazyCfCode$DebugParsingOptions):304:310 -> <init>
+    1:11:com.android.tools.r8.org.objectweb.asm.MethodVisitor visitMethod(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):316:326 -> a
+com.android.tools.r8.graph.LazyCfCode$DebugParsingOptions -> com.android.tools.r8.internal.Ul:
     boolean lineInfo -> a
     boolean localInfo -> b
     int asmReaderOptions -> c
@@ -21499,12 +21646,12 @@
 com.android.tools.r8.graph.LazyCfCode$DefaultCodeLocator -> com.android.tools.r8.graph.z0:
     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):267:267 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,com.android.tools.r8.graph.JarApplicationReader):272:272 -> <init>
-    3:6:void <init>(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,com.android.tools.r8.graph.JarApplicationReader):270:273 -> <init>
-    1:1:java.lang.Object apply(java.lang.Object,java.lang.Object):267:267 -> apply
-    2:2:com.android.tools.r8.graph.LazyCfCode apply(java.lang.String,java.lang.String):279:279 -> apply
-    2:2:java.lang.Object apply(java.lang.Object,java.lang.Object):267 -> apply
+    1:1:void <init>(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.LazyCfCode$1):272:272 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,com.android.tools.r8.graph.JarApplicationReader):277:277 -> <init>
+    3:6:void <init>(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,com.android.tools.r8.graph.JarApplicationReader):275:278 -> <init>
+    1:1:java.lang.Object apply(java.lang.Object,java.lang.Object):272:272 -> apply
+    2:2:com.android.tools.r8.graph.LazyCfCode apply(java.lang.String,java.lang.String):284:284 -> apply
+    2:2:java.lang.Object apply(java.lang.Object,java.lang.Object):272 -> apply
 com.android.tools.r8.graph.LazyCfCode$JsrEncountered -> com.android.tools.r8.graph.A0:
     1:1:void <init>(java.lang.String):93:93 -> <init>
 com.android.tools.r8.graph.LazyCfCode$MethodCodeVisitor -> com.android.tools.r8.graph.B0:
@@ -21522,283 +21669,283 @@
     com.android.tools.r8.graph.DexMethod method -> v
     com.android.tools.r8.graph.DexItemFactory factory -> l
     com.android.tools.r8.graph.JarApplicationReader application -> k
-    1:1:void <clinit>():328:328 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.LazyCfCode,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.LazyCfCode$DebugParsingOptions):349:349 -> <init>
-    2:21:void <init>(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.LazyCfCode,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.LazyCfCode$DebugParsingOptions):337:356 -> <init>
+    1:1:void <clinit>():333:333 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.LazyCfCode,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.LazyCfCode$DebugParsingOptions):354:354 -> <init>
+    2:21:void <init>(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.LazyCfCode,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.LazyCfCode$DebugParsingOptions):342:361 -> <init>
     com.android.tools.r8.graph.DebugLocalInfo lambda$canonicalize$1(com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.DebugLocalInfo) -> a
-    1:1:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):390:390 -> a
-    2:8:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap parseLocals(int,java.lang.Object[]):397:403 -> a
-    2:8:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):391 -> a
-    9:11:java.util.Deque parseStack(int,java.lang.Object[]):411:413 -> a
-    9:11:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):392 -> a
-    12:12:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):393:393 -> a
-    13:14:com.android.tools.r8.graph.DexType createTypeFromInternalType(java.lang.String):454:455 -> a
-    15:15:void visitInsn(int):621:621 -> a
-    16:16:void visitInsn(int):606:606 -> a
-    17:17:void visitInsn(int):603:603 -> a
-    18:18:void visitInsn(int):600:600 -> a
-    19:19:void visitInsn(int):597:597 -> a
-    20:20:void visitInsn(int):594:594 -> a
-    21:21:void visitInsn(int):591:591 -> a
-    22:22:void visitInsn(int):588:588 -> a
+    1:1:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):395:395 -> a
+    2:8:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap parseLocals(int,java.lang.Object[]):402:408 -> a
+    2:8:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):396 -> a
+    9:11:java.util.Deque parseStack(int,java.lang.Object[]):416:418 -> a
+    9:11:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):397 -> a
+    12:12:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):398:398 -> a
+    13:14:com.android.tools.r8.graph.DexType createTypeFromInternalType(java.lang.String):459:460 -> a
+    15:15:void visitInsn(int):626:626 -> a
+    16:16:void visitInsn(int):611:611 -> a
+    17:17:void visitInsn(int):608:608 -> a
+    18:18:void visitInsn(int):605:605 -> a
+    19:19:void visitInsn(int):602:602 -> a
+    20:20:void visitInsn(int):599:599 -> a
+    21:21:void visitInsn(int):596:596 -> a
+    22:22:void visitInsn(int):593:593 -> a
     23:99:com.android.tools.r8.cf.code.CfCmp com.android.tools.r8.cf.code.CfCmp.fromAsm(int):0:76 -> a
-    23:99:void visitInsn(int):588 -> a
+    23:99:void visitInsn(int):593 -> a
     100:100:com.android.tools.r8.cf.code.CfCmp com.android.tools.r8.cf.code.CfCmp.fromAsm(int):74:74 -> a
-    100:100:void visitInsn(int):588 -> a
+    100:100:void visitInsn(int):593 -> a
     101:101:com.android.tools.r8.cf.code.CfCmp com.android.tools.r8.cf.code.CfCmp.fromAsm(int):72:72 -> a
-    101:101:void visitInsn(int):588 -> a
+    101:101:void visitInsn(int):593 -> a
     102:102:com.android.tools.r8.cf.code.CfCmp com.android.tools.r8.cf.code.CfCmp.fromAsm(int):70:70 -> a
-    102:102:void visitInsn(int):588 -> a
+    102:102:void visitInsn(int):593 -> a
     103:103:com.android.tools.r8.cf.code.CfCmp com.android.tools.r8.cf.code.CfCmp.fromAsm(int):68:68 -> a
-    103:103:void visitInsn(int):588 -> a
+    103:103:void visitInsn(int):593 -> a
     104:104:com.android.tools.r8.cf.code.CfCmp com.android.tools.r8.cf.code.CfCmp.fromAsm(int):66:66 -> a
-    104:104:void visitInsn(int):588 -> a
-    105:105:void visitInsn(int):588:588 -> a
-    106:106:void visitInsn(int):581:581 -> a
+    104:104:void visitInsn(int):593 -> a
+    105:105:void visitInsn(int):593:593 -> a
+    106:106:void visitInsn(int):586:586 -> a
     107:275:com.android.tools.r8.cf.code.CfNumberConversion com.android.tools.r8.cf.code.CfNumberConversion.fromAsm(int):0:168 -> a
-    107:275:void visitInsn(int):581 -> a
+    107:275:void visitInsn(int):586 -> a
     276:276:com.android.tools.r8.cf.code.CfNumberConversion com.android.tools.r8.cf.code.CfNumberConversion.fromAsm(int):166:166 -> a
-    276:276:void visitInsn(int):581 -> a
+    276:276:void visitInsn(int):586 -> a
     277:277:com.android.tools.r8.cf.code.CfNumberConversion com.android.tools.r8.cf.code.CfNumberConversion.fromAsm(int):164:164 -> a
-    277:277:void visitInsn(int):581 -> a
+    277:277:void visitInsn(int):586 -> a
     278:278:com.android.tools.r8.cf.code.CfNumberConversion com.android.tools.r8.cf.code.CfNumberConversion.fromAsm(int):162:162 -> a
-    278:278:void visitInsn(int):581 -> a
+    278:278:void visitInsn(int):586 -> a
     279:279:com.android.tools.r8.cf.code.CfNumberConversion com.android.tools.r8.cf.code.CfNumberConversion.fromAsm(int):160:160 -> a
-    279:279:void visitInsn(int):581 -> a
+    279:279:void visitInsn(int):586 -> a
     280:280:com.android.tools.r8.cf.code.CfNumberConversion com.android.tools.r8.cf.code.CfNumberConversion.fromAsm(int):158:158 -> a
-    280:280:void visitInsn(int):581 -> a
+    280:280:void visitInsn(int):586 -> a
     281:281:com.android.tools.r8.cf.code.CfNumberConversion com.android.tools.r8.cf.code.CfNumberConversion.fromAsm(int):156:156 -> a
-    281:281:void visitInsn(int):581 -> a
+    281:281:void visitInsn(int):586 -> a
     282:282:com.android.tools.r8.cf.code.CfNumberConversion com.android.tools.r8.cf.code.CfNumberConversion.fromAsm(int):154:154 -> a
-    282:282:void visitInsn(int):581 -> a
+    282:282:void visitInsn(int):586 -> a
     283:283:com.android.tools.r8.cf.code.CfNumberConversion com.android.tools.r8.cf.code.CfNumberConversion.fromAsm(int):152:152 -> a
-    283:283:void visitInsn(int):581 -> a
+    283:283:void visitInsn(int):586 -> a
     284:284:com.android.tools.r8.cf.code.CfNumberConversion com.android.tools.r8.cf.code.CfNumberConversion.fromAsm(int):150:150 -> a
-    284:284:void visitInsn(int):581 -> a
+    284:284:void visitInsn(int):586 -> a
     285:285:com.android.tools.r8.cf.code.CfNumberConversion com.android.tools.r8.cf.code.CfNumberConversion.fromAsm(int):148:148 -> a
-    285:285:void visitInsn(int):581 -> a
+    285:285:void visitInsn(int):586 -> a
     286:286:com.android.tools.r8.cf.code.CfNumberConversion com.android.tools.r8.cf.code.CfNumberConversion.fromAsm(int):146:146 -> a
-    286:286:void visitInsn(int):581 -> a
+    286:286:void visitInsn(int):586 -> a
     287:287:com.android.tools.r8.cf.code.CfNumberConversion com.android.tools.r8.cf.code.CfNumberConversion.fromAsm(int):144:144 -> a
-    287:287:void visitInsn(int):581 -> a
+    287:287:void visitInsn(int):586 -> a
     288:288:com.android.tools.r8.cf.code.CfNumberConversion com.android.tools.r8.cf.code.CfNumberConversion.fromAsm(int):142:142 -> a
-    288:288:void visitInsn(int):581 -> a
+    288:288:void visitInsn(int):586 -> a
     289:289:com.android.tools.r8.cf.code.CfNumberConversion com.android.tools.r8.cf.code.CfNumberConversion.fromAsm(int):140:140 -> a
-    289:289:void visitInsn(int):581 -> a
+    289:289:void visitInsn(int):586 -> a
     290:290:com.android.tools.r8.cf.code.CfNumberConversion com.android.tools.r8.cf.code.CfNumberConversion.fromAsm(int):138:138 -> a
-    290:290:void visitInsn(int):581 -> a
-    291:291:void visitInsn(int):581:581 -> a
-    292:292:void visitInsn(int):564:564 -> a
+    290:290:void visitInsn(int):586 -> a
+    291:291:void visitInsn(int):586:586 -> a
+    292:292:void visitInsn(int):569:569 -> a
     293:388:com.android.tools.r8.cf.code.CfLogicalBinop com.android.tools.r8.cf.code.CfLogicalBinop.fromAsm(int):0:95 -> a
-    293:388:void visitInsn(int):564 -> a
+    293:388:void visitInsn(int):569 -> a
     389:389:com.android.tools.r8.cf.code.CfLogicalBinop com.android.tools.r8.cf.code.CfLogicalBinop.fromAsm(int):93:93 -> a
-    389:389:void visitInsn(int):564 -> a
+    389:389:void visitInsn(int):569 -> a
     390:390:com.android.tools.r8.cf.code.CfLogicalBinop com.android.tools.r8.cf.code.CfLogicalBinop.fromAsm(int):91:91 -> a
-    390:390:void visitInsn(int):564 -> a
+    390:390:void visitInsn(int):569 -> a
     391:391:com.android.tools.r8.cf.code.CfLogicalBinop com.android.tools.r8.cf.code.CfLogicalBinop.fromAsm(int):89:89 -> a
-    391:391:void visitInsn(int):564 -> a
+    391:391:void visitInsn(int):569 -> a
     392:392:com.android.tools.r8.cf.code.CfLogicalBinop com.android.tools.r8.cf.code.CfLogicalBinop.fromAsm(int):87:87 -> a
-    392:392:void visitInsn(int):564 -> a
+    392:392:void visitInsn(int):569 -> a
     393:393:com.android.tools.r8.cf.code.CfLogicalBinop com.android.tools.r8.cf.code.CfLogicalBinop.fromAsm(int):85:85 -> a
-    393:393:void visitInsn(int):564 -> a
+    393:393:void visitInsn(int):569 -> a
     394:394:com.android.tools.r8.cf.code.CfLogicalBinop com.android.tools.r8.cf.code.CfLogicalBinop.fromAsm(int):83:83 -> a
-    394:394:void visitInsn(int):564 -> a
+    394:394:void visitInsn(int):569 -> a
     395:395:com.android.tools.r8.cf.code.CfLogicalBinop com.android.tools.r8.cf.code.CfLogicalBinop.fromAsm(int):81:81 -> a
-    395:395:void visitInsn(int):564 -> a
+    395:395:void visitInsn(int):569 -> a
     396:396:com.android.tools.r8.cf.code.CfLogicalBinop com.android.tools.r8.cf.code.CfLogicalBinop.fromAsm(int):79:79 -> a
-    396:396:void visitInsn(int):564 -> a
+    396:396:void visitInsn(int):569 -> a
     397:397:com.android.tools.r8.cf.code.CfLogicalBinop com.android.tools.r8.cf.code.CfLogicalBinop.fromAsm(int):77:77 -> a
-    397:397:void visitInsn(int):564 -> a
+    397:397:void visitInsn(int):569 -> a
     398:398:com.android.tools.r8.cf.code.CfLogicalBinop com.android.tools.r8.cf.code.CfLogicalBinop.fromAsm(int):75:75 -> a
-    398:398:void visitInsn(int):564 -> a
+    398:398:void visitInsn(int):569 -> a
     399:399:com.android.tools.r8.cf.code.CfLogicalBinop com.android.tools.r8.cf.code.CfLogicalBinop.fromAsm(int):73:73 -> a
-    399:399:void visitInsn(int):564 -> a
+    399:399:void visitInsn(int):569 -> a
     400:400:com.android.tools.r8.cf.code.CfLogicalBinop com.android.tools.r8.cf.code.CfLogicalBinop.fromAsm(int):71:71 -> a
-    400:400:void visitInsn(int):564 -> a
-    401:401:void visitInsn(int):564:564 -> a
-    402:402:void visitInsn(int):550:550 -> a
+    400:400:void visitInsn(int):569 -> a
+    401:401:void visitInsn(int):569:569 -> a
+    402:402:void visitInsn(int):555:555 -> a
     403:403:com.android.tools.r8.cf.code.CfNeg com.android.tools.r8.cf.code.CfNeg.fromAsm(int):97:97 -> a
-    403:403:void visitInsn(int):550 -> a
+    403:403:void visitInsn(int):555 -> a
     404:404:com.android.tools.r8.cf.code.CfNeg com.android.tools.r8.cf.code.CfNeg.fromAsm(int):95:95 -> a
-    404:404:void visitInsn(int):550 -> a
+    404:404:void visitInsn(int):555 -> a
     405:405:com.android.tools.r8.cf.code.CfNeg com.android.tools.r8.cf.code.CfNeg.fromAsm(int):93:93 -> a
-    405:405:void visitInsn(int):550 -> a
+    405:405:void visitInsn(int):555 -> a
     406:406:com.android.tools.r8.cf.code.CfNeg com.android.tools.r8.cf.code.CfNeg.fromAsm(int):91:91 -> a
-    406:406:void visitInsn(int):550 -> a
+    406:406:void visitInsn(int):555 -> a
     407:407:com.android.tools.r8.cf.code.CfNeg com.android.tools.r8.cf.code.CfNeg.fromAsm(int):89:89 -> a
-    407:407:void visitInsn(int):550 -> a
-    408:408:void visitInsn(int):550:550 -> a
-    409:409:void visitInsn(int):544:544 -> a
+    407:407:void visitInsn(int):555 -> a
+    408:408:void visitInsn(int):555:555 -> a
+    409:409:void visitInsn(int):549:549 -> a
     410:519:com.android.tools.r8.cf.code.CfArithmeticBinop com.android.tools.r8.cf.code.CfArithmeticBinop.fromAsm(int):0:109 -> a
-    410:519:void visitInsn(int):544 -> a
+    410:519:void visitInsn(int):549 -> a
     520:520:com.android.tools.r8.cf.code.CfArithmeticBinop com.android.tools.r8.cf.code.CfArithmeticBinop.fromAsm(int):107:107 -> a
-    520:520:void visitInsn(int):544 -> a
+    520:520:void visitInsn(int):549 -> a
     521:521:com.android.tools.r8.cf.code.CfArithmeticBinop com.android.tools.r8.cf.code.CfArithmeticBinop.fromAsm(int):105:105 -> a
-    521:521:void visitInsn(int):544 -> a
+    521:521:void visitInsn(int):549 -> a
     522:522:com.android.tools.r8.cf.code.CfArithmeticBinop com.android.tools.r8.cf.code.CfArithmeticBinop.fromAsm(int):103:103 -> a
-    522:522:void visitInsn(int):544 -> a
+    522:522:void visitInsn(int):549 -> a
     523:523:com.android.tools.r8.cf.code.CfArithmeticBinop com.android.tools.r8.cf.code.CfArithmeticBinop.fromAsm(int):101:101 -> a
-    523:523:void visitInsn(int):544 -> a
+    523:523:void visitInsn(int):549 -> a
     524:524:com.android.tools.r8.cf.code.CfArithmeticBinop com.android.tools.r8.cf.code.CfArithmeticBinop.fromAsm(int):99:99 -> a
-    524:524:void visitInsn(int):544 -> a
+    524:524:void visitInsn(int):549 -> a
     525:525:com.android.tools.r8.cf.code.CfArithmeticBinop com.android.tools.r8.cf.code.CfArithmeticBinop.fromAsm(int):97:97 -> a
-    525:525:void visitInsn(int):544 -> a
+    525:525:void visitInsn(int):549 -> a
     526:526:com.android.tools.r8.cf.code.CfArithmeticBinop com.android.tools.r8.cf.code.CfArithmeticBinop.fromAsm(int):95:95 -> a
-    526:526:void visitInsn(int):544 -> a
+    526:526:void visitInsn(int):549 -> a
     527:527:com.android.tools.r8.cf.code.CfArithmeticBinop com.android.tools.r8.cf.code.CfArithmeticBinop.fromAsm(int):93:93 -> a
-    527:527:void visitInsn(int):544 -> a
+    527:527:void visitInsn(int):549 -> a
     528:528:com.android.tools.r8.cf.code.CfArithmeticBinop com.android.tools.r8.cf.code.CfArithmeticBinop.fromAsm(int):91:91 -> a
-    528:528:void visitInsn(int):544 -> a
+    528:528:void visitInsn(int):549 -> a
     529:529:com.android.tools.r8.cf.code.CfArithmeticBinop com.android.tools.r8.cf.code.CfArithmeticBinop.fromAsm(int):89:89 -> a
-    529:529:void visitInsn(int):544 -> a
+    529:529:void visitInsn(int):549 -> a
     530:530:com.android.tools.r8.cf.code.CfArithmeticBinop com.android.tools.r8.cf.code.CfArithmeticBinop.fromAsm(int):87:87 -> a
-    530:530:void visitInsn(int):544 -> a
+    530:530:void visitInsn(int):549 -> a
     531:531:com.android.tools.r8.cf.code.CfArithmeticBinop com.android.tools.r8.cf.code.CfArithmeticBinop.fromAsm(int):85:85 -> a
-    531:531:void visitInsn(int):544 -> a
+    531:531:void visitInsn(int):549 -> a
     532:532:com.android.tools.r8.cf.code.CfArithmeticBinop com.android.tools.r8.cf.code.CfArithmeticBinop.fromAsm(int):83:83 -> a
-    532:532:void visitInsn(int):544 -> a
+    532:532:void visitInsn(int):549 -> a
     533:533:com.android.tools.r8.cf.code.CfArithmeticBinop com.android.tools.r8.cf.code.CfArithmeticBinop.fromAsm(int):81:81 -> a
-    533:533:void visitInsn(int):544 -> a
+    533:533:void visitInsn(int):549 -> a
     534:534:com.android.tools.r8.cf.code.CfArithmeticBinop com.android.tools.r8.cf.code.CfArithmeticBinop.fromAsm(int):79:79 -> a
-    534:534:void visitInsn(int):544 -> a
+    534:534:void visitInsn(int):549 -> a
     535:535:com.android.tools.r8.cf.code.CfArithmeticBinop com.android.tools.r8.cf.code.CfArithmeticBinop.fromAsm(int):77:77 -> a
-    535:535:void visitInsn(int):544 -> a
+    535:535:void visitInsn(int):549 -> a
     536:536:com.android.tools.r8.cf.code.CfArithmeticBinop com.android.tools.r8.cf.code.CfArithmeticBinop.fromAsm(int):75:75 -> a
-    536:536:void visitInsn(int):544 -> a
+    536:536:void visitInsn(int):549 -> a
     537:537:com.android.tools.r8.cf.code.CfArithmeticBinop com.android.tools.r8.cf.code.CfArithmeticBinop.fromAsm(int):73:73 -> a
-    537:537:void visitInsn(int):544 -> a
+    537:537:void visitInsn(int):549 -> a
     538:538:com.android.tools.r8.cf.code.CfArithmeticBinop com.android.tools.r8.cf.code.CfArithmeticBinop.fromAsm(int):71:71 -> a
-    538:538:void visitInsn(int):544 -> a
+    538:538:void visitInsn(int):549 -> a
     539:539:com.android.tools.r8.cf.code.CfArithmeticBinop com.android.tools.r8.cf.code.CfArithmeticBinop.fromAsm(int):69:69 -> a
-    539:539:void visitInsn(int):544 -> a
-    540:540:void visitInsn(int):544:544 -> a
-    541:541:void visitInsn(int):522:522 -> a
-    542:542:void visitInsn(int):511:511 -> a
-    543:543:void visitInsn(int):501:501 -> a
-    544:547:void visitInsn(int):489:489 -> a
-    548:551:void visitInsn(int):483:483 -> a
-    552:552:void visitInsn(int):478:478 -> a
-    553:553:void visitInsn(int):474:474 -> a
-    554:554:void visitInsn(int):465:465 -> a
-    555:711:void visitInsn(int):462:618 -> a
-    712:712:void visitInsn(int):615:615 -> a
-    713:713:void visitInsn(int):612:612 -> a
-    714:714:void visitInsn(int):609:609 -> a
-    715:730:void visitTypeInsn(int,java.lang.String):736:751 -> a
-    731:731:void visitTypeInsn(int,java.lang.String):745:745 -> a
-    732:732:void visitTypeInsn(int,java.lang.String):742:742 -> a
-    733:733:void visitTypeInsn(int,java.lang.String):739:739 -> a
-    734:738:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):757:761 -> a
-    739:739:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):766:766 -> a
+    539:539:void visitInsn(int):549 -> a
+    540:540:void visitInsn(int):549:549 -> a
+    541:541:void visitInsn(int):527:527 -> a
+    542:542:void visitInsn(int):516:516 -> a
+    543:543:void visitInsn(int):506:506 -> a
+    544:547:void visitInsn(int):494:494 -> a
+    548:551:void visitInsn(int):488:488 -> a
+    552:552:void visitInsn(int):483:483 -> a
+    553:553:void visitInsn(int):479:479 -> a
+    554:554:void visitInsn(int):470:470 -> a
+    555:711:void visitInsn(int):467:623 -> a
+    712:712:void visitInsn(int):620:620 -> a
+    713:713:void visitInsn(int):617:617 -> a
+    714:714:void visitInsn(int):614:614 -> a
+    715:730:void visitTypeInsn(int,java.lang.String):741:756 -> a
+    731:731:void visitTypeInsn(int,java.lang.String):750:750 -> a
+    732:732:void visitTypeInsn(int,java.lang.String):747:747 -> a
+    733:733:void visitTypeInsn(int,java.lang.String):744:744 -> a
+    734:738:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):762:766 -> a
+    739:739:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):771:771 -> a
     740:740:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.JarApplicationReader.getMethod(java.lang.String,java.lang.String,java.lang.String):92:92 -> a
-    740:740:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):766 -> a
-    741:741:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):767:767 -> a
-    742:742:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):772:772 -> a
+    740:740:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):771 -> a
+    741:741:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):772:772 -> a
+    742:742:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):777:777 -> a
     743:815:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.graph.DexCallSite.fromAsmInvokeDynamic(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):0:72 -> a
-    743:815:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):773 -> a
+    743:815:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):778 -> a
     816:816:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
     816:816:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.graph.DexCallSite.fromAsmInvokeDynamic(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):72 -> a
-    816:816:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):773 -> a
+    816:816:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):778 -> a
     817:824:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.graph.DexCallSite.fromAsmInvokeDynamic(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):72:79 -> a
-    817:824:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):773 -> a
+    817:824:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):778 -> a
     825:846:com.android.tools.r8.graph.DexValue com.android.tools.r8.graph.DexValue.fromAsmBootstrapArgument(java.lang.Object,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):275:296 -> a
     825:846:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.graph.DexCallSite.fromAsmInvokeDynamic(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):80 -> a
-    825:846:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):773 -> a
+    825:846:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):778 -> a
     847:857:com.android.tools.r8.graph.DexValue com.android.tools.r8.graph.DexValue.fromAsmBootstrapArgument(java.lang.Object,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):290:300 -> a
     847:857:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.graph.DexCallSite.fromAsmInvokeDynamic(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):80 -> a
-    847:857:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):773 -> a
+    847:857:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):778 -> a
     858:858:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.graph.DexCallSite.fromAsmInvokeDynamic(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):80:80 -> a
-    858:858:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):773 -> a
+    858:858:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):778 -> a
     859:860:com.android.tools.r8.graph.DexValue com.android.tools.r8.graph.DexValue.fromAsmBootstrapArgument(java.lang.Object,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):302:303 -> a
     859:860:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.graph.DexCallSite.fromAsmInvokeDynamic(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):80 -> a
-    859:860:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):773 -> a
+    859:860:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):778 -> a
     861:863:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.graph.JarApplicationReader.getCallSite(java.lang.String,java.lang.String,com.android.tools.r8.graph.DexMethodHandle,java.util.List):101:101 -> a
     861:863:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.graph.DexCallSite.fromAsmInvokeDynamic(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):84 -> a
-    861:863:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):773 -> a
-    864:864:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):774:774 -> a
-    865:895:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):779:809 -> a
-    896:900:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):803:807 -> a
-    901:901:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):799:799 -> a
-    902:902:void visitLabel(com.android.tools.r8.org.objectweb.asm.Label):843:843 -> a
-    903:926:void visitLdcInsn(java.lang.Object):848:871 -> a
-    927:931:void visitLdcInsn(java.lang.Object):869:873 -> a
+    861:863:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):778 -> a
+    864:864:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):779:779 -> a
+    865:895:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):784:814 -> a
+    896:900:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):808:812 -> a
+    901:901:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):804:804 -> a
+    902:902:void visitLabel(com.android.tools.r8.org.objectweb.asm.Label):848:848 -> a
+    903:926:void visitLdcInsn(java.lang.Object):853:876 -> a
+    927:931:void visitLdcInsn(java.lang.Object):874:878 -> a
     932:932:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    932:932:void visitLdcInsn(java.lang.Object):873 -> a
-    933:935:void visitLdcInsn(java.lang.Object):873:875 -> a
+    932:932:void visitLdcInsn(java.lang.Object):878 -> a
+    933:935:void visitLdcInsn(java.lang.Object):878:880 -> a
     936:936:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    936:936:void visitLdcInsn(java.lang.Object):875 -> a
-    937:937:void visitLdcInsn(java.lang.Object):875:875 -> a
-    938:938:void visitIincInsn(int,int):881:881 -> a
-    939:944:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):886:891 -> a
-    945:949:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):896:900 -> a
-    950:989:void visitMultiANewArrayInsn(java.lang.String,int):905:944 -> a
-    990:990:void visitTryCatchBlock(com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,java.lang.String):952:952 -> a
-    991:994:void visitTryCatchBlock(com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,java.lang.String):951:954 -> a
-    995:1001:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):960:966 -> a
-    1002:1008:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):962:968 -> a
-    1009:1010:void com.android.tools.r8.graph.CfCode$LocalVariableInfo.<init>(int,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.cf.code.CfLabel):86:87 -> a
-    1009:1010:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):968 -> a
-    1011:1011:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):967:967 -> a
-    1012:1012:com.android.tools.r8.graph.DebugLocalInfo canonicalize(com.android.tools.r8.graph.DebugLocalInfo):973:973 -> a
-    1:6:void visitCode():361:366 -> b
-    7:11:com.android.tools.r8.cf.code.CfFrame$FrameType getFrameType(java.lang.Object):419:423 -> b
-    12:24:com.android.tools.r8.graph.DexType parseAsmType(java.lang.Object):435:447 -> b
-    12:24:com.android.tools.r8.cf.code.CfFrame$FrameType getFrameType(java.lang.Object):426 -> b
-    25:25:com.android.tools.r8.cf.code.CfFrame$FrameType getFrameType(java.lang.Object):426:426 -> b
-    26:26:com.android.tools.r8.graph.DexType parseAsmType(java.lang.Object):449:449 -> b
-    26:26:com.android.tools.r8.cf.code.CfFrame$FrameType getFrameType(java.lang.Object):426 -> b
-    27:27:com.android.tools.r8.cf.code.CfFrame$FrameType getFrameType(java.lang.Object):424:424 -> b
-    28:28:com.android.tools.r8.cf.code.CfLabel getLabel(com.android.tools.r8.org.objectweb.asm.Label):431:431 -> b
-    29:29:com.android.tools.r8.ir.code.MemberType getMemberTypeForOpcode(int):652:652 -> b
-    30:30:com.android.tools.r8.ir.code.MemberType getMemberTypeForOpcode(int):650:650 -> b
-    31:31:com.android.tools.r8.ir.code.MemberType getMemberTypeForOpcode(int):647:647 -> b
-    32:32:com.android.tools.r8.ir.code.MemberType getMemberTypeForOpcode(int):644:644 -> b
-    33:33:com.android.tools.r8.ir.code.MemberType getMemberTypeForOpcode(int):641:641 -> b
-    34:34:com.android.tools.r8.ir.code.MemberType getMemberTypeForOpcode(int):638:638 -> b
-    35:38:com.android.tools.r8.ir.code.MemberType getMemberTypeForOpcode(int):632:635 -> b
-    39:39:com.android.tools.r8.ir.code.MemberType getMemberTypeForOpcode(int):629:629 -> b
-    40:40:void visitIntInsn(int,int):664:664 -> b
-    41:41:com.android.tools.r8.graph.DexType arrayTypeDesc(int,com.android.tools.r8.graph.DexItemFactory):691:691 -> b
-    41:41:void visitIntInsn(int,int):665 -> b
-    42:42:com.android.tools.r8.graph.DexType arrayTypeDesc(int,com.android.tools.r8.graph.DexItemFactory):689:689 -> b
-    42:42:void visitIntInsn(int,int):665 -> b
-    43:43:com.android.tools.r8.graph.DexType arrayTypeDesc(int,com.android.tools.r8.graph.DexItemFactory):687:687 -> b
-    43:43:void visitIntInsn(int,int):665 -> b
-    44:44:com.android.tools.r8.graph.DexType arrayTypeDesc(int,com.android.tools.r8.graph.DexItemFactory):685:685 -> b
-    44:44:void visitIntInsn(int,int):665 -> b
-    45:45:com.android.tools.r8.graph.DexType arrayTypeDesc(int,com.android.tools.r8.graph.DexItemFactory):683:683 -> b
-    45:45:void visitIntInsn(int,int):665 -> b
-    46:46:com.android.tools.r8.graph.DexType arrayTypeDesc(int,com.android.tools.r8.graph.DexItemFactory):681:681 -> b
-    46:46:void visitIntInsn(int,int):665 -> b
-    47:47:com.android.tools.r8.graph.DexType arrayTypeDesc(int,com.android.tools.r8.graph.DexItemFactory):679:679 -> b
-    47:47:void visitIntInsn(int,int):665 -> b
-    48:48:com.android.tools.r8.graph.DexType arrayTypeDesc(int,com.android.tools.r8.graph.DexItemFactory):677:677 -> b
-    48:48:void visitIntInsn(int,int):665 -> b
-    49:49:com.android.tools.r8.graph.DexType arrayTypeDesc(int,com.android.tools.r8.graph.DexItemFactory):675:675 -> b
-    49:49:void visitIntInsn(int,int):665 -> b
-    50:50:void visitIntInsn(int,int):665:665 -> b
-    51:55:void visitIntInsn(int,int):664:668 -> b
-    56:56:void visitIntInsn(int,int):661:661 -> b
-    57:58:void visitLineNumber(int,com.android.tools.r8.org.objectweb.asm.Label):978:979 -> b
-    1:10:void visitEnd():371:380 -> c
+    936:936:void visitLdcInsn(java.lang.Object):880 -> a
+    937:937:void visitLdcInsn(java.lang.Object):880:880 -> a
+    938:938:void visitIincInsn(int,int):886:886 -> a
+    939:944:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):891:896 -> a
+    945:949:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):901:905 -> a
+    950:989:void visitMultiANewArrayInsn(java.lang.String,int):910:949 -> a
+    990:990:void visitTryCatchBlock(com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,java.lang.String):957:957 -> a
+    991:994:void visitTryCatchBlock(com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,java.lang.String):956:959 -> a
+    995:1001:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):965:971 -> a
+    1002:1008:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):967:973 -> a
+    1009:1010:void com.android.tools.r8.graph.CfCode$LocalVariableInfo.<init>(int,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.cf.code.CfLabel):87:88 -> a
+    1009:1010:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):973 -> a
+    1011:1011:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):972:972 -> a
+    1012:1012:com.android.tools.r8.graph.DebugLocalInfo canonicalize(com.android.tools.r8.graph.DebugLocalInfo):978:978 -> a
+    1:6:void visitCode():366:371 -> b
+    7:11:com.android.tools.r8.cf.code.CfFrame$FrameType getFrameType(java.lang.Object):424:428 -> b
+    12:24:com.android.tools.r8.graph.DexType parseAsmType(java.lang.Object):440:452 -> b
+    12:24:com.android.tools.r8.cf.code.CfFrame$FrameType getFrameType(java.lang.Object):431 -> b
+    25:25:com.android.tools.r8.cf.code.CfFrame$FrameType getFrameType(java.lang.Object):431:431 -> b
+    26:26:com.android.tools.r8.graph.DexType parseAsmType(java.lang.Object):454:454 -> b
+    26:26:com.android.tools.r8.cf.code.CfFrame$FrameType getFrameType(java.lang.Object):431 -> b
+    27:27:com.android.tools.r8.cf.code.CfFrame$FrameType getFrameType(java.lang.Object):429:429 -> b
+    28:28:com.android.tools.r8.cf.code.CfLabel getLabel(com.android.tools.r8.org.objectweb.asm.Label):436:436 -> b
+    29:29:com.android.tools.r8.ir.code.MemberType getMemberTypeForOpcode(int):657:657 -> b
+    30:30:com.android.tools.r8.ir.code.MemberType getMemberTypeForOpcode(int):655:655 -> b
+    31:31:com.android.tools.r8.ir.code.MemberType getMemberTypeForOpcode(int):652:652 -> b
+    32:32:com.android.tools.r8.ir.code.MemberType getMemberTypeForOpcode(int):649:649 -> b
+    33:33:com.android.tools.r8.ir.code.MemberType getMemberTypeForOpcode(int):646:646 -> b
+    34:34:com.android.tools.r8.ir.code.MemberType getMemberTypeForOpcode(int):643:643 -> b
+    35:38:com.android.tools.r8.ir.code.MemberType getMemberTypeForOpcode(int):637:640 -> b
+    39:39:com.android.tools.r8.ir.code.MemberType getMemberTypeForOpcode(int):634:634 -> b
+    40:40:void visitIntInsn(int,int):669:669 -> b
+    41:41:com.android.tools.r8.graph.DexType arrayTypeDesc(int,com.android.tools.r8.graph.DexItemFactory):696:696 -> b
+    41:41:void visitIntInsn(int,int):670 -> b
+    42:42:com.android.tools.r8.graph.DexType arrayTypeDesc(int,com.android.tools.r8.graph.DexItemFactory):694:694 -> b
+    42:42:void visitIntInsn(int,int):670 -> b
+    43:43:com.android.tools.r8.graph.DexType arrayTypeDesc(int,com.android.tools.r8.graph.DexItemFactory):692:692 -> b
+    43:43:void visitIntInsn(int,int):670 -> b
+    44:44:com.android.tools.r8.graph.DexType arrayTypeDesc(int,com.android.tools.r8.graph.DexItemFactory):690:690 -> b
+    44:44:void visitIntInsn(int,int):670 -> b
+    45:45:com.android.tools.r8.graph.DexType arrayTypeDesc(int,com.android.tools.r8.graph.DexItemFactory):688:688 -> b
+    45:45:void visitIntInsn(int,int):670 -> b
+    46:46:com.android.tools.r8.graph.DexType arrayTypeDesc(int,com.android.tools.r8.graph.DexItemFactory):686:686 -> b
+    46:46:void visitIntInsn(int,int):670 -> b
+    47:47:com.android.tools.r8.graph.DexType arrayTypeDesc(int,com.android.tools.r8.graph.DexItemFactory):684:684 -> b
+    47:47:void visitIntInsn(int,int):670 -> b
+    48:48:com.android.tools.r8.graph.DexType arrayTypeDesc(int,com.android.tools.r8.graph.DexItemFactory):682:682 -> b
+    48:48:void visitIntInsn(int,int):670 -> b
+    49:49:com.android.tools.r8.graph.DexType arrayTypeDesc(int,com.android.tools.r8.graph.DexItemFactory):680:680 -> b
+    49:49:void visitIntInsn(int,int):670 -> b
+    50:50:void visitIntInsn(int,int):670:670 -> b
+    51:55:void visitIntInsn(int,int):669:673 -> b
+    56:56:void visitIntInsn(int,int):666:666 -> b
+    57:58:void visitLineNumber(int,com.android.tools.r8.org.objectweb.asm.Label):983:984 -> b
+    1:10:void visitEnd():376:385 -> c
     11:11:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position):34:34 -> c
-    11:11:void visitEnd():380 -> c
-    12:14:void visitEnd():380:382 -> c
-    15:15:com.android.tools.r8.cf.code.CfLabel lambda$getLabel$0(com.android.tools.r8.org.objectweb.asm.Label):431:431 -> c
-    16:16:com.android.tools.r8.ir.code.If$Type ifType(int):837:837 -> c
-    17:17:com.android.tools.r8.ir.code.If$Type ifType(int):835:835 -> c
-    18:18:com.android.tools.r8.ir.code.If$Type ifType(int):832:832 -> c
-    19:19:com.android.tools.r8.ir.code.If$Type ifType(int):829:829 -> c
-    20:20:com.android.tools.r8.ir.code.If$Type ifType(int):826:826 -> c
-    21:21:com.android.tools.r8.ir.code.If$Type ifType(int):823:823 -> c
-    22:22:com.android.tools.r8.ir.code.If$Type ifType(int):819:819 -> c
-    23:26:void visitMaxs(int,int):985:988 -> c
-    1:1:void visitVarInsn(int,int):725:725 -> d
-    2:2:void visitVarInsn(int,int):717:717 -> d
-    3:3:void visitVarInsn(int,int):713:713 -> d
-    4:8:void visitVarInsn(int,int):705:709 -> d
-    9:38:void visitVarInsn(int,int):701:730 -> d
-    39:39:void visitVarInsn(int,int):721:721 -> d
+    11:11:void visitEnd():385 -> c
+    12:14:void visitEnd():385:387 -> c
+    15:15:com.android.tools.r8.cf.code.CfLabel lambda$getLabel$0(com.android.tools.r8.org.objectweb.asm.Label):436:436 -> c
+    16:16:com.android.tools.r8.ir.code.If$Type ifType(int):842:842 -> c
+    17:17:com.android.tools.r8.ir.code.If$Type ifType(int):840:840 -> c
+    18:18:com.android.tools.r8.ir.code.If$Type ifType(int):837:837 -> c
+    19:19:com.android.tools.r8.ir.code.If$Type ifType(int):834:834 -> c
+    20:20:com.android.tools.r8.ir.code.If$Type ifType(int):831:831 -> c
+    21:21:com.android.tools.r8.ir.code.If$Type ifType(int):828:828 -> c
+    22:22:com.android.tools.r8.ir.code.If$Type ifType(int):824:824 -> c
+    23:26:void visitMaxs(int,int):990:993 -> c
+    1:1:void visitVarInsn(int,int):730:730 -> d
+    2:2:void visitVarInsn(int,int):722:722 -> d
+    3:3:void visitVarInsn(int,int):718:718 -> d
+    4:8:void visitVarInsn(int,int):710:714 -> d
+    9:38:void visitVarInsn(int,int):706:735 -> d
+    39:39:void visitVarInsn(int,int):726:726 -> d
 com.android.tools.r8.graph.LazyLoadedDexApplication -> com.android.tools.r8.graph.D0:
     com.android.tools.r8.utils.LibraryClassCollection libraryClasses -> k
     boolean $assertionsDisabled -> h
@@ -21874,13 +22021,13 @@
     13:21:com.android.tools.r8.graph.LookupResult$LookupResultSuccess$LookupResultCollectionState computeCollectionState(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppInfoWithClassHierarchy):48:56 -> a
     22:23:boolean isMethodKeptInSuperTypeOrIsLibrary(com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppInfoWithClassHierarchy):66:67 -> a
     22:23:com.android.tools.r8.graph.LookupResult$LookupResultSuccess$LookupResultCollectionState computeCollectionState(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppInfoWithClassHierarchy):57 -> a
-    24:24:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupVirtualMethod(com.android.tools.r8.graph.DexMethod):428:428 -> a
+    24:24:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupVirtualMethod(com.android.tools.r8.graph.DexMethod):432:432 -> a
     24:24:boolean isMethodKeptInSuperTypeOrIsLibrary(com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppInfoWithClassHierarchy):71 -> a
     24:24:com.android.tools.r8.graph.LookupResult$LookupResultSuccess$LookupResultCollectionState computeCollectionState(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppInfoWithClassHierarchy):57 -> a
     25:31:boolean isMethodKeptInSuperTypeOrIsLibrary(com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppInfoWithClassHierarchy):73:79 -> a
     25:31:com.android.tools.r8.graph.LookupResult$LookupResultSuccess$LookupResultCollectionState computeCollectionState(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppInfoWithClassHierarchy):57 -> a
     32:35:com.android.tools.r8.graph.LookupResult$LookupResultSuccess$LookupResultCollectionState computeCollectionState(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppInfoWithClassHierarchy):58:61 -> a
-com.android.tools.r8.graph.LookupLambdaTarget -> com.android.tools.r8.internal.nn:
+com.android.tools.r8.graph.LookupLambdaTarget -> com.android.tools.r8.internal.on:
     boolean $assertionsDisabled -> a
     com.android.tools.r8.graph.DexClassAndMethod method -> b
     1:1:void <clinit>():8:8 -> <clinit>
@@ -21927,12 +22074,12 @@
     com.android.tools.r8.graph.LookupResult$LookupResultSuccess$LookupResultCollectionState Complete -> a
     1:2:void <clinit>():135:136 -> <clinit>
     1:1:void <init>(java.lang.String,int):134:134 -> <init>
-com.android.tools.r8.graph.LookupTarget -> com.android.tools.r8.internal.pn:
+com.android.tools.r8.graph.LookupTarget -> com.android.tools.r8.internal.qn:
     boolean isLambdaTarget() -> f
     com.android.tools.r8.graph.DexClassAndMethod asMethodTarget() -> g
     com.android.tools.r8.graph.LookupLambdaTarget asLambdaTarget() -> l
     boolean isMethodTarget() -> m
-com.android.tools.r8.graph.MemberResolutionResult -> com.android.tools.r8.internal.bo:
+com.android.tools.r8.graph.MemberResolutionResult -> com.android.tools.r8.internal.co:
     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):21:21 -> a
@@ -21987,7 +22134,7 @@
     13:13:com.android.tools.r8.graph.MethodAccessFlags fromDexAccessFlags(int):88 -> e
     14:14:void unsetDeclaredSynchronized():196:196 -> e
     14:14:com.android.tools.r8.graph.MethodAccessFlags fromDexAccessFlags(int):89 -> e
-com.android.tools.r8.graph.MethodAccessInfoCollection -> com.android.tools.r8.internal.qo:
+com.android.tools.r8.graph.MethodAccessInfoCollection -> com.android.tools.r8.internal.ro:
     java.util.Map directInvokes -> a
     java.util.Map interfaceInvokes -> b
     java.util.Map staticInvokes -> c
@@ -22011,8 +22158,8 @@
     1:1:com.android.tools.r8.graph.MethodAccessInfoCollection$SortedBuilder sortedBuilder():51:51 -> d
     2:2:void forEachSuperInvoke(java.util.function.BiConsumer):81:81 -> d
     1:1:void forEachVirtualInvoke(java.util.function.BiConsumer):85:85 -> e
-com.android.tools.r8.graph.MethodAccessInfoCollection$1 -> com.android.tools.r8.internal.po:
-com.android.tools.r8.graph.MethodAccessInfoCollection$Builder -> com.android.tools.r8.internal.qo$a:
+com.android.tools.r8.graph.MethodAccessInfoCollection$1 -> com.android.tools.r8.internal.qo:
+com.android.tools.r8.graph.MethodAccessInfoCollection$Builder -> com.android.tools.r8.internal.ro$a:
     java.util.Map directInvokes -> a
     java.util.Map interfaceInvokes -> b
     java.util.Map staticInvokes -> c
@@ -22050,21 +22197,21 @@
     1:1:boolean registerInvokeStaticInContext(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):175:175 -> h
     1:1:boolean registerInvokeSuperInContext(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):183:183 -> i
     1:1:boolean registerInvokeVirtualInContext(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):191:191 -> j
-com.android.tools.r8.graph.MethodAccessInfoCollection$ConcurrentBuilder -> com.android.tools.r8.internal.ro:
+com.android.tools.r8.graph.MethodAccessInfoCollection$ConcurrentBuilder -> com.android.tools.r8.internal.so:
     1:1:void <init>(com.android.tools.r8.graph.MethodAccessInfoCollection$1):212:212 -> <init>
     2:2:void <init>():216:216 -> <init>
-com.android.tools.r8.graph.MethodAccessInfoCollection$IdentityBuilder -> com.android.tools.r8.internal.so:
+com.android.tools.r8.graph.MethodAccessInfoCollection$IdentityBuilder -> com.android.tools.r8.internal.to:
     1:1:void <init>(com.android.tools.r8.graph.MethodAccessInfoCollection$1):220:220 -> <init>
     2:2:void <init>():224:224 -> <init>
-com.android.tools.r8.graph.MethodAccessInfoCollection$Modifier -> com.android.tools.r8.internal.to:
+com.android.tools.r8.graph.MethodAccessInfoCollection$Modifier -> com.android.tools.r8.internal.uo:
     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):235:235 -> <init>
     2:2:void <init>(java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Map):243:243 -> <init>
     1:5:void addAll(com.android.tools.r8.graph.MethodAccessInfoCollection):247:251 -> a
-com.android.tools.r8.graph.MethodAccessInfoCollection$SortedBuilder -> com.android.tools.r8.internal.qo$b:
+com.android.tools.r8.graph.MethodAccessInfoCollection$SortedBuilder -> com.android.tools.r8.internal.ro$b:
     1:1:void <init>(com.android.tools.r8.graph.MethodAccessInfoCollection$1):228:228 -> <init>
     2:2:void <init>():231:231 -> <init>
     1:1:java.util.TreeMap lambda$new$0():231:231 -> g
-com.android.tools.r8.graph.MethodArrayBacking -> com.android.tools.r8.internal.uo:
+com.android.tools.r8.graph.MethodArrayBacking -> com.android.tools.r8.internal.vo:
     com.android.tools.r8.graph.DexEncodedMethod[] virtualMethods -> c
     com.android.tools.r8.graph.DexEncodedMethod[] directMethods -> b
     boolean $assertionsDisabled -> a
@@ -22144,7 +22291,7 @@
     1:2:boolean verifyNoDuplicateMethods():26:27 -> h
     3:3:void com.android.tools.r8.graph.MethodCollectionBacking.forEachMethod(java.util.function.Consumer):44:44 -> h
     3:3:boolean verifyNoDuplicateMethods():27 -> h
-com.android.tools.r8.graph.MethodCollection -> com.android.tools.r8.internal.vo:
+com.android.tools.r8.graph.MethodCollection -> com.android.tools.r8.internal.wo:
     com.android.tools.r8.graph.DexClass holder -> b
     com.android.tools.r8.graph.MethodCollectionBacking backing -> c
     com.android.tools.r8.graph.DexEncodedMethod cachedClassInitializer -> d
@@ -22278,7 +22425,7 @@
     2:2:boolean verify():332 -> l
     3:3:boolean verify():336:336 -> l
     1:1:java.lang.Iterable virtualMethods():149:149 -> m
-com.android.tools.r8.graph.MethodCollectionBacking -> com.android.tools.r8.internal.wo:
+com.android.tools.r8.graph.MethodCollectionBacking -> com.android.tools.r8.internal.xo:
     1:1:void <init>():15:15 -> <init>
     void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod) -> a
     void addDirectMethods(java.util.Collection) -> a
@@ -22316,7 +22463,7 @@
     com.android.tools.r8.utils.TraversalContinuation traverse(java.util.function.Function) -> f
     boolean verify() -> f
     java.lang.Iterable virtualMethods() -> g
-com.android.tools.r8.graph.MethodMapBacking -> com.android.tools.r8.internal.Ao:
+com.android.tools.r8.graph.MethodMapBacking -> com.android.tools.r8.internal.Bo:
     boolean $assertionsDisabled -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap methodMap -> b
     1:1:void <clinit>():24:24 -> <clinit>
@@ -22467,11 +22614,9 @@
     1:1:boolean verify():66:66 -> f
     2:8:com.android.tools.r8.utils.TraversalContinuation traverse(java.util.function.Function):100:106 -> f
     9:9:void lambda$removeMethods$5(com.android.tools.r8.graph.DexEncodedMethod):216:216 -> f
-    10:10:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getReference():375:375 -> f
+    10:10:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper com.android.tools.r8.graph.MethodMapBacking.wrap(com.android.tools.r8.graph.DexMethod):52:52 -> f
     10:10:void lambda$removeMethods$5(com.android.tools.r8.graph.DexEncodedMethod):216 -> f
-    11:11:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper com.android.tools.r8.graph.MethodMapBacking.wrap(com.android.tools.r8.graph.DexMethod):52:52 -> f
-    11:11:void lambda$removeMethods$5(com.android.tools.r8.graph.DexEncodedMethod):216 -> f
-    12:12:void lambda$removeMethods$5(com.android.tools.r8.graph.DexEncodedMethod):216:216 -> f
+    11:11:void lambda$removeMethods$5(com.android.tools.r8.graph.DexEncodedMethod):216:216 -> f
     1:1:java.lang.Iterable virtualMethods():121:121 -> g
     1:1:void clearDirectMethods():201:201 -> h
     1:1:void clearVirtualMethods():206:206 -> i
@@ -22481,7 +22626,7 @@
     1:2:com.android.tools.r8.graph.MethodMapBacking createSorted():37:38 -> k
     1:1:java.util.Iterator lambda$directMethods$2():116:116 -> l
     1:1:java.util.Iterator lambda$virtualMethods$3():121:121 -> m
-com.android.tools.r8.graph.NestHostClassAttribute -> com.android.tools.r8.internal.Ap:
+com.android.tools.r8.graph.NestHostClassAttribute -> com.android.tools.r8.internal.Bp:
     com.android.tools.r8.graph.DexType nestHost -> c
     boolean $assertionsDisabled -> a
     int $r8$clinit -> b
@@ -22489,7 +22634,7 @@
     1:2:void <init>(com.android.tools.r8.graph.DexType):14:15 -> <init>
     1:1:com.android.tools.r8.graph.DexType getNestHost():19:19 -> a
     2:3:void write(com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.naming.NamingLens):27:28 -> a
-com.android.tools.r8.graph.NestMemberClassAttribute -> com.android.tools.r8.internal.Bp:
+com.android.tools.r8.graph.NestMemberClassAttribute -> com.android.tools.r8.internal.Cp:
     com.android.tools.r8.graph.DexType nestMember -> c
     boolean $assertionsDisabled -> a
     int $r8$clinit -> b
@@ -22497,8 +22642,8 @@
     1:2:void <init>(com.android.tools.r8.graph.DexType):16:17 -> <init>
     1:1:com.android.tools.r8.graph.DexType getNestMember():25:25 -> a
     2:3:void write(com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.naming.NamingLens):29:30 -> a
-com.android.tools.r8.graph.ObjectAllocationInfoCollection -> com.android.tools.r8.internal.ar:
-com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl -> com.android.tools.r8.internal.dr:
+com.android.tools.r8.graph.ObjectAllocationInfoCollection -> com.android.tools.r8.internal.cr:
+com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl -> com.android.tools.r8.internal.fr:
     java.util.Map classesWithAllocationSiteTracking -> b
     java.util.Set classesWithoutAllocationSiteTracking -> c
     java.util.Set interfacesWithUnknownSubtypeHierarchy -> d
@@ -22526,8 +22671,8 @@
     1:1:boolean isImmediateInterfaceOfInstantiatedLambda(com.android.tools.r8.graph.DexProgramClass):117:117 -> b
     1:8:boolean isInstantiatedDirectly(com.android.tools.r8.graph.DexProgramClass):78:85 -> c
     1:1:boolean isInterfaceWithUnknownSubtypeHierarchy(com.android.tools.r8.graph.DexProgramClass):111:111 -> d
-com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$1 -> com.android.tools.r8.internal.br:
-com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder -> com.android.tools.r8.internal.dr$a:
+com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$1 -> com.android.tools.r8.internal.dr:
+com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder -> com.android.tools.r8.internal.fr$a:
     com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder$Data data -> h
     boolean $assertionsDisabled -> g
     1:1:void <clinit>():218:218 -> <clinit>
@@ -22540,7 +22685,7 @@
     14:26:boolean recordDirectAllocationSite(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.AppInfo):288 -> a
     27:36:boolean recordDirectAllocationSite(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.AppInfo):289:298 -> a
     37:37:boolean recordInstantiatedInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfo):305:305 -> a
-    38:38:boolean com.android.tools.r8.graph.DexClass.isAnnotation():501:501 -> a
+    38:38:boolean com.android.tools.r8.graph.DexClass.isAnnotation():505:505 -> a
     38:38:boolean recordInstantiatedInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfo):306 -> a
     39:41:boolean recordInstantiatedInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfo):306:308 -> a
     42:42:void recordInstantiatedLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.AppInfo):316:316 -> a
@@ -22585,14 +22730,14 @@
     1:1:java.util.Set lambda$recordDirectAllocationSite$0(com.android.tools.r8.graph.DexProgramClass):292:292 -> e
     1:1:java.util.Set lambda$rewrittenWithLens$7(com.android.tools.r8.graph.DexProgramClass):404:404 -> f
     1:3:void markNoLongerInstantiated(com.android.tools.r8.graph.DexProgramClass):368:370 -> g
-com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder$Data -> com.android.tools.r8.internal.cr:
+com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder$Data -> com.android.tools.r8.internal.er:
     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):220:220 -> <init>
     2:4:void <init>(boolean,com.android.tools.r8.shaking.GraphReporter):225:227 -> <init>
     1:1:boolean access$300(com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder$Data):220:220 -> a
     1:1:com.android.tools.r8.shaking.GraphReporter access$400(com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder$Data):220:220 -> b
-com.android.tools.r8.graph.ObjectToOffsetMapping -> com.android.tools.r8.internal.Br:
+com.android.tools.r8.graph.ObjectToOffsetMapping -> com.android.tools.r8.internal.Dr:
     com.android.tools.r8.ir.conversion.LensCodeRewriterUtils lensCodeRewriter -> e
     com.android.tools.r8.graph.InitClassLens initClassLens -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap callSites -> l
@@ -22646,7 +22791,7 @@
     1:1:java.util.Collection getStrings():215:215 -> l
     1:1:java.util.Collection getTypes():203:203 -> m
     1:1:boolean hasJumboStrings():227:227 -> n
-com.android.tools.r8.graph.ObjectToOffsetMapping$ProgramClassDepthsMemoized -> com.android.tools.r8.internal.Br$a:
+com.android.tools.r8.graph.ObjectToOffsetMapping$ProgramClassDepthsMemoized -> com.android.tools.r8.internal.Dr$a:
     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):127:127 -> <init>
@@ -22658,7 +22803,7 @@
     19:19:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):48:48 -> a
     19:19:int getDepth(com.android.tools.r8.graph.DexProgramClass):150 -> a
     20:23:int getDepth(com.android.tools.r8.graph.DexProgramClass):151:154 -> a
-com.android.tools.r8.graph.OffsetToObjectMapping -> com.android.tools.r8.internal.Fr:
+com.android.tools.r8.graph.OffsetToObjectMapping -> com.android.tools.r8.internal.Hr:
     com.android.tools.r8.graph.DexProto[] protos -> d
     com.android.tools.r8.graph.DexMethod[] methods -> c
     com.android.tools.r8.graph.DexMethodHandle[] methodHandles -> i
@@ -22720,13 +22865,13 @@
     1:1:int countNonMissing():124:124 -> p
     1:1:com.android.tools.r8.graph.ParameterAnnotationsList empty():47:47 -> q
     1:1:int size():116:116 -> size
-com.android.tools.r8.graph.PinnedPredicate -> com.android.tools.r8.internal.vs:
+com.android.tools.r8.graph.PinnedPredicate -> com.android.tools.r8.internal.xs:
     boolean isPinned(com.android.tools.r8.graph.DexDefinition) -> a
-com.android.tools.r8.graph.PresortedComparable -> com.android.tools.r8.internal.Ts:
+com.android.tools.r8.graph.PresortedComparable -> com.android.tools.r8.internal.Vs:
     int slowCompareTo(java.lang.Object) -> a
     int slowCompareTo(java.lang.Object,com.android.tools.r8.naming.NamingLens) -> a
     1:1:int slowCompare(com.android.tools.r8.graph.PresortedComparable,com.android.tools.r8.graph.PresortedComparable):14:14 -> a
-com.android.tools.r8.graph.ProgramClassVisitor -> com.android.tools.r8.internal.bt:
+com.android.tools.r8.graph.ProgramClassVisitor -> com.android.tools.r8.internal.dt:
     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>
@@ -22738,7 +22883,7 @@
     18:19:void accept(com.android.tools.r8.graph.DexClass):61:62 -> a
     20:21:void run(com.android.tools.r8.graph.DexProgramClass[]):66:67 -> a
     void visit(com.android.tools.r8.graph.DexClass) -> b
-com.android.tools.r8.graph.ProgramDefinition -> com.android.tools.r8.internal.ct:
+com.android.tools.r8.graph.ProgramDefinition -> com.android.tools.r8.internal.et:
     com.android.tools.r8.graph.DexProgramClass getContextClass() -> a
     com.android.tools.r8.graph.DexDefinition getDefinition() -> b
     boolean isProgramMethod() -> c
@@ -22748,7 +22893,7 @@
     com.android.tools.r8.graph.DexType getContextType() -> k
     boolean isProgramField() -> n
     com.android.tools.r8.graph.ProgramField asProgramField() -> o
-com.android.tools.r8.graph.ProgramDexCode -> com.android.tools.r8.internal.dt:
+com.android.tools.r8.graph.ProgramDexCode -> com.android.tools.r8.internal.ft:
     com.android.tools.r8.graph.ProgramMethod method -> b
     com.android.tools.r8.graph.DexCode code -> a
     1:3:void <init>(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.ProgramMethod):12:14 -> <init>
@@ -22762,7 +22907,7 @@
     1:3:com.android.tools.r8.graph.DexProgramClass getHolder():41:43 -> j
     com.android.tools.r8.graph.ProgramField asProgramField() -> o
     1:1:com.android.tools.r8.graph.DexClass getHolder():9:9 -> p
-com.android.tools.r8.graph.ProgramMember -> com.android.tools.r8.internal.ft:
+com.android.tools.r8.graph.ProgramMember -> com.android.tools.r8.internal.ht:
     1:1:com.android.tools.r8.graph.DexProgramClass getContextClass():12:12 -> a
     com.android.tools.r8.graph.DexEncodedMember getDefinition() -> b
     com.android.tools.r8.graph.DexType getHolderType() -> d
@@ -22781,7 +22926,7 @@
     com.android.tools.r8.graph.ProgramMethod asProgramMethod() -> i
     1:3:com.android.tools.r8.graph.DexProgramClass getHolder():81:83 -> j
     1:1:com.android.tools.r8.graph.DexClass getHolder():17:17 -> p
-com.android.tools.r8.graph.ProgramPackage -> com.android.tools.r8.internal.jt:
+com.android.tools.r8.graph.ProgramPackage -> com.android.tools.r8.internal.lt:
     java.util.Set classes -> c
     boolean $assertionsDisabled -> a
     java.lang.String packageDescriptor -> b
@@ -22798,7 +22943,7 @@
     8:8:void lambda$forEachMethod$1(java.util.function.Consumer,com.android.tools.r8.graph.DexProgramClass):59:59 -> b
     1:1:java.lang.String getPackageDescriptor():47:47 -> c
     1:1:java.util.Iterator iterator():68:68 -> iterator
-com.android.tools.r8.graph.ProgramPackageCollection -> com.android.tools.r8.internal.kt:
+com.android.tools.r8.graph.ProgramPackageCollection -> com.android.tools.r8.internal.mt:
     java.util.Map packages -> a
     1:1:void <clinit>():11:11 -> <clinit>
     1:2:void <init>(java.util.Map):15:16 -> <init>
@@ -22915,7 +23060,7 @@
     27:27:com.android.tools.r8.graph.DexEncodedMethod getResolvedMethod():163:163 -> a
     27:27:com.android.tools.r8.graph.DexEncodedMethod internalInvokeSpecialOrSuper(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.function.BiPredicate):344 -> a
     28:28:com.android.tools.r8.graph.DexEncodedMethod internalInvokeSpecialOrSuper(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.function.BiPredicate):344:344 -> a
-    29:29:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexMethod):447:447 -> a
+    29:29:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexMethod):451:451 -> a
     29:29:com.android.tools.r8.graph.DexEncodedMethod internalInvokeSpecialOrSuper(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.function.BiPredicate):348 -> a
     30:56:com.android.tools.r8.graph.DexEncodedMethod internalInvokeSpecialOrSuper(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.function.BiPredicate):352:378 -> a
     57:61:com.android.tools.r8.graph.DexEncodedMethod lookupInvokeDirectTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):299:303 -> a
@@ -22951,7 +23096,7 @@
     431:520:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):0:89 -> a
     431:520:com.android.tools.r8.graph.LookupTarget lookupVirtualDispatchTarget(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.AppInfoWithClassHierarchy):574 -> a
     521:521:com.android.tools.r8.graph.LookupTarget lookupVirtualDispatchTarget(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.AppInfoWithClassHierarchy):576:576 -> a
-    522:522:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexMethod):447:447 -> a
+    522:522:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexMethod):451:451 -> a
     522:522:com.android.tools.r8.graph.LookupTarget lookupVirtualDispatchTarget(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.AppInfoWithClassHierarchy):579 -> a
     523:523:com.android.tools.r8.graph.LookupTarget lookupVirtualDispatchTarget(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.AppInfoWithClassHierarchy):584:584 -> a
     524:524:com.android.tools.r8.graph.DexClassAndMethod lookupMaximallySpecificDispatchTarget(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.AppInfoWithClassHierarchy):636:636 -> a
@@ -22959,7 +23104,7 @@
     525:537:com.android.tools.r8.graph.DexClassAndMethod lookupVirtualDispatchTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType):591:603 -> a
     538:538:com.android.tools.r8.graph.DexEncodedMethod lookupOverrideCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):647:647 -> a
     538:538:com.android.tools.r8.graph.DexClassAndMethod lookupVirtualDispatchTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType):605 -> a
-    539:539:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupVirtualMethod(com.android.tools.r8.graph.DexMethod):428:428 -> a
+    539:539:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupVirtualMethod(com.android.tools.r8.graph.DexMethod):432:432 -> a
     539:539:com.android.tools.r8.graph.DexEncodedMethod lookupOverrideCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):647 -> a
     539:539:com.android.tools.r8.graph.DexClassAndMethod lookupVirtualDispatchTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType):605 -> a
     540:542:com.android.tools.r8.graph.DexEncodedMethod lookupOverrideCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):648:650 -> a
@@ -22967,7 +23112,7 @@
     543:544:com.android.tools.r8.graph.DexClassAndMethod lookupVirtualDispatchTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType):606:607 -> a
     545:551:com.android.tools.r8.graph.DexEncodedMethod findWideningOverride(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):658:664 -> a
     545:551:com.android.tools.r8.graph.DexClassAndMethod lookupVirtualDispatchTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType):607 -> a
-    552:552:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupVirtualMethod(com.android.tools.r8.graph.DexMethod):428:428 -> a
+    552:552:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupVirtualMethod(com.android.tools.r8.graph.DexMethod):432:432 -> a
     552:552:com.android.tools.r8.graph.DexEncodedMethod findWideningOverride(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):664 -> a
     552:552:com.android.tools.r8.graph.DexClassAndMethod lookupVirtualDispatchTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType):607 -> a
     553:555:com.android.tools.r8.graph.DexEncodedMethod findWideningOverride(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):666:668 -> a
@@ -23114,7 +23259,7 @@
     com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo asRewrittenTypeInfo() -> d
     1:1:com.android.tools.r8.graph.DexType getNewType():146:146 -> e
     1:1:com.android.tools.r8.graph.DexType getOldType():150:150 -> f
-com.android.tools.r8.graph.SmaliWriter -> com.android.tools.r8.internal.iy:
+com.android.tools.r8.graph.SmaliWriter -> com.android.tools.r8.internal.ky:
     1:1:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.InternalOptions):21:21 -> <init>
     java.lang.String getFileEnding() -> a
     void writeField(com.android.tools.r8.graph.DexEncodedField,java.io.PrintStream) -> a
@@ -23123,17 +23268,17 @@
     18:20: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.qy:
+com.android.tools.r8.graph.SortedProgramPackage -> com.android.tools.r8.internal.sy:
     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.ry:
+com.android.tools.r8.graph.SortedProgramPackageCollection -> com.android.tools.r8.internal.ty:
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:void <init>():12:12 -> <init>
     1:4:com.android.tools.r8.graph.SortedProgramPackageCollection createWithAllProgramClasses(com.android.tools.r8.graph.AppView):16:19 -> a
     5:7:boolean addProgramClass(com.android.tools.r8.graph.DexProgramClass):26:28 -> a
-com.android.tools.r8.graph.SubtypingInfo -> com.android.tools.r8.internal.Az:
+com.android.tools.r8.graph.SubtypingInfo -> com.android.tools.r8.internal.Cz:
     com.android.tools.r8.graph.DexItemFactory factory -> c
     java.util.Map typeInfo -> d
     java.util.Set missingClasses -> f
@@ -23177,7 +23322,7 @@
     1:1:boolean lambda$allImmediateImplementsSubtypes$4(com.android.tools.r8.graph.DexType):242:242 -> h
     1:1:java.util.Set lambda$populateSuperType$1(com.android.tools.r8.graph.DexType):76:76 -> i
     1:3:java.util.Set subtypes(com.android.tools.r8.graph.DexType):189:191 -> j
-com.android.tools.r8.graph.SubtypingInfo$TypeInfo -> com.android.tools.r8.internal.Az$a:
+com.android.tools.r8.graph.SubtypingInfo$TypeInfo -> com.android.tools.r8.internal.Cz$a:
     java.util.Set directSubtypes -> d
     com.android.tools.r8.graph.DexType type -> b
     boolean $assertionsDisabled -> a
@@ -23195,10 +23340,10 @@
     1:5:boolean equals(java.lang.Object):269:273 -> equals
     1:1:int hashCode():264:264 -> hashCode
     1:1:java.lang.String toString():278:278 -> toString
-com.android.tools.r8.graph.SuccessfulMemberResolutionResult -> com.android.tools.r8.internal.Bz:
+com.android.tools.r8.graph.SuccessfulMemberResolutionResult -> com.android.tools.r8.internal.Dz:
     com.android.tools.r8.graph.DexClass getInitialResolutionHolder() -> a
     com.android.tools.r8.graph.DexEncodedMember getResolvedMember() -> b
-com.android.tools.r8.graph.TopDownClassHierarchyTraversal -> com.android.tools.r8.internal.DA:
+com.android.tools.r8.graph.TopDownClassHierarchyTraversal -> com.android.tools.r8.internal.FA:
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ClassHierarchyTraversal$Scope):14:14 -> <init>
     1:1:com.android.tools.r8.graph.TopDownClassHierarchyTraversal forAllClasses(com.android.tools.r8.graph.AppView):23:23 -> a
     2:2:com.android.tools.r8.graph.ClassHierarchyTraversal com.android.tools.r8.graph.ClassHierarchyTraversal.excludeInterfaces():60:60 -> a
@@ -23366,7 +23511,7 @@
     82:91:boolean com.android.tools.r8.graph.analysis.ClassInitializerAssertionEnablingAnalysis.hasKotlincClinitAssertionCode(com.android.tools.r8.graph.ProgramMethod):159:168 -> a
     82:91:void processNewlyLiveMethod(com.android.tools.r8.graph.ProgramMethod):45 -> a
     92:92:void processNewlyLiveMethod(com.android.tools.r8.graph.ProgramMethod):46:46 -> a
-com.android.tools.r8.graph.analysis.DesugaredLibraryConversionWrapperAnalysis -> com.android.tools.r8.internal.i8:
+com.android.tools.r8.graph.analysis.DesugaredLibraryConversionWrapperAnalysis -> com.android.tools.r8.internal.j8:
     java.util.Map synthesizedWrappers -> b
     com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter converter -> a
     1:1:void <init>(com.android.tools.r8.graph.AppView):25:25 -> <init>
@@ -23384,7 +23529,7 @@
     1:1:void traceInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):57 -> d
     1:1:void com.android.tools.r8.graph.analysis.DesugaredLibraryConversionWrapperAnalysis.traceInvoke(com.android.tools.r8.graph.DexMethod):37:37 -> e
     1:1:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):62 -> e
-com.android.tools.r8.graph.analysis.EnqueuerAnalysis -> com.android.tools.r8.internal.o9:
+com.android.tools.r8.graph.analysis.EnqueuerAnalysis -> com.android.tools.r8.internal.p9:
     1:1:void <init>():14:14 -> <init>
     void done(com.android.tools.r8.shaking.Enqueuer) -> a
     void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.utils.Timing) -> a
@@ -23392,10 +23537,10 @@
     void processNewlyLiveClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerWorklist) -> a
     void processNewlyLiveField(com.android.tools.r8.graph.ProgramField) -> a
     void processNewlyLiveMethod(com.android.tools.r8.graph.ProgramMethod) -> a
-com.android.tools.r8.graph.analysis.EnqueuerCheckCastAnalysis -> com.android.tools.r8.internal.p9:
-com.android.tools.r8.graph.analysis.EnqueuerExceptionGuardAnalysis -> com.android.tools.r8.internal.q9:
-com.android.tools.r8.graph.analysis.EnqueuerInstanceOfAnalysis -> com.android.tools.r8.internal.r9:
-com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis -> com.android.tools.r8.internal.zd:
+com.android.tools.r8.graph.analysis.EnqueuerCheckCastAnalysis -> com.android.tools.r8.internal.q9:
+com.android.tools.r8.graph.analysis.EnqueuerExceptionGuardAnalysis -> com.android.tools.r8.internal.r9:
+com.android.tools.r8.graph.analysis.EnqueuerInstanceOfAnalysis -> com.android.tools.r8.internal.s9:
+com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis -> com.android.tools.r8.internal.Ad:
     java.util.Map mapping -> b
     com.android.tools.r8.graph.AppView appView -> a
     1:1:void <init>(com.android.tools.r8.graph.AppView):61:61 -> <init>
@@ -23403,8 +23548,8 @@
     1:17:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):67:83 -> a
     18:18:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):81:81 -> a
     19:19:void done(com.android.tools.r8.shaking.Enqueuer):89:89 -> a
-com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$1 -> com.android.tools.r8.internal.yd:
-com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$InitializedClassesInInstanceMethods -> com.android.tools.r8.internal.zd$a:
+com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$1 -> com.android.tools.r8.internal.zd:
+com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$InitializedClassesInInstanceMethods -> com.android.tools.r8.internal.Ad$a:
     java.util.Map mapping -> c
     com.android.tools.r8.graph.AppView appView -> b
     boolean $assertionsDisabled -> a
@@ -23412,17 +23557,17 @@
     1:1:void <init>(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$1):20:20 -> <init>
     2:4:void <init>(com.android.tools.r8.graph.AppView,java.util.Map):26:28 -> <init>
     1:18:boolean isClassDefinitelyLoadedInInstanceMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):33:50 -> a
-com.android.tools.r8.graph.classmerging.HorizontallyMergedLambdaClasses -> com.android.tools.r8.internal.jc:
+com.android.tools.r8.graph.classmerging.HorizontallyMergedLambdaClasses -> com.android.tools.r8.internal.kc:
     java.util.Set sources -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():13:13 -> <clinit>
     1:2:void <init>(java.util.Set):17:18 -> <init>
     1:4:boolean verifyAllSourcesPruned(com.android.tools.r8.graph.AppView):27:30 -> a
     5:5:boolean hasBeenMerged(com.android.tools.r8.graph.DexType):38:38 -> a
-com.android.tools.r8.graph.classmerging.MergedClasses -> com.android.tools.r8.internal.go:
+com.android.tools.r8.graph.classmerging.MergedClasses -> com.android.tools.r8.internal.ho:
     boolean hasBeenMerged(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.ho:
+com.android.tools.r8.graph.classmerging.MergedClassesCollection -> com.android.tools.r8.internal.io:
     java.util.List collection -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():13:13 -> <clinit>
@@ -23430,7 +23575,7 @@
     1:1:void add(com.android.tools.r8.graph.classmerging.MergedClasses):18:18 -> a
     2:3:boolean verifyAllSourcesPruned(com.android.tools.r8.graph.AppView):23:24 -> a
     4:5:boolean hasBeenMerged(com.android.tools.r8.graph.DexType):31:32 -> a
-com.android.tools.r8.graph.classmerging.VerticallyMergedClasses -> com.android.tools.r8.internal.HC:
+com.android.tools.r8.graph.classmerging.VerticallyMergedClasses -> com.android.tools.r8.internal.IC:
     java.util.Map mergedClasses -> b
     java.util.Map mergedClassesInverse -> c
     boolean $assertionsDisabled -> a
@@ -23447,88 +23592,100 @@
     2:2:boolean isTarget(com.android.tools.r8.graph.DexType):44:44 -> e
 com.android.tools.r8.horizontalclassmerging.ClassMerger -> com.android.tools.r8.internal.D5:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> d
-    com.android.tools.r8.graph.DexField classIdField -> k
+    com.android.tools.r8.graph.DexField classIdField -> l
+    com.android.tools.r8.horizontalclassmerging.ClassStaticFieldsMerger classStaticFieldsMerger -> i
     com.android.tools.r8.graph.DexProgramClass target -> b
     com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder lensBuilder -> e
     java.util.List toMergeGroup -> c
     com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses$Builder mergedClassesBuilder -> f
     com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder fieldAccessChangesBuilder -> g
+    java.util.Collection constructorMergers -> k
     boolean $assertionsDisabled -> a
-    java.util.Collection virtualMethodMergers -> i
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap classIdentifiers -> h
-    java.util.Collection constructorMergers -> j
+    java.util.Collection virtualMethodMergers -> j
     1:1:void <clinit>():41:41 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.graph.DexField,java.util.Collection,java.util.Collection,com.android.tools.r8.horizontalclassmerging.ClassMerger$1):41:41 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.graph.DexField,java.util.Collection,java.util.Collection):65:65 -> <init>
-    3:29:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.graph.DexField,java.util.Collection,java.util.Collection):51:77 -> <init>
-    1:3:void buildClassIdentifierMap():94:96 -> a
-    4:5:void merge(com.android.tools.r8.graph.DexProgramClass):101:102 -> a
+    2:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.graph.DexField,java.util.Collection,java.util.Collection):66:66 -> <init>
+    3:31:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.graph.DexField,java.util.Collection,java.util.Collection):51:79 -> <init>
+    1:3:void buildClassIdentifierMap():96:98 -> a
+    4:5:void merge(com.android.tools.r8.graph.DexProgramClass):103:104 -> a
     6:6:com.android.tools.r8.graph.ClassAccessFlags com.android.tools.r8.graph.DexClass.getAccessFlags():123:123 -> a
-    6:6:void merge(com.android.tools.r8.graph.DexProgramClass):102 -> a
-    7:10:void merge(com.android.tools.r8.graph.DexProgramClass):102:105 -> a
+    6:6:void merge(com.android.tools.r8.graph.DexProgramClass):104 -> a
+    7:10:void merge(com.android.tools.r8.graph.DexProgramClass):104:107 -> a
     11:11:void com.android.tools.r8.graph.DexProgramClass.forEachProgramDirectMethod(java.util.function.Consumer):175:175 -> a
-    11:11:void merge(com.android.tools.r8.graph.DexProgramClass):105 -> a
-    12:15:void merge(com.android.tools.r8.graph.DexProgramClass):119:122 -> a
-    16:23:void lambda$merge$0(com.android.tools.r8.graph.ProgramMethod):107:114 -> a
-    24:24:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getReference():375:375 -> a
-    24:24:void lambda$merge$0(com.android.tools.r8.graph.ProgramMethod):114 -> a
-    25:25:void lambda$merge$0(com.android.tools.r8.graph.ProgramMethod):114:114 -> a
-    26:26:boolean lambda$renameMethod$1(com.android.tools.r8.graph.DexMethod):136:136 -> a
-    27:33:void com.android.tools.r8.horizontalclassmerging.ClassMerger.appendClassIdField():153:159 -> a
-    27:33:void mergeGroup(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):165 -> a
-    34:34:void com.android.tools.r8.graph.DexEncodedField.<init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessFlags,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexValue):61:61 -> a
-    34:34:void com.android.tools.r8.horizontalclassmerging.ClassMerger.appendClassIdField():159 -> a
-    34:34:void mergeGroup(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):165 -> a
-    35:35:void com.android.tools.r8.horizontalclassmerging.ClassMerger.appendClassIdField():161:161 -> a
-    35:35:void mergeGroup(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):165 -> a
-    36:38:void mergeGroup(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):167:169 -> a
-    39:40:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeConstructors(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):140:141 -> a
-    39:40:void mergeGroup(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):172 -> a
-    41:42:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeVirtualMethods():147:148 -> a
-    41:42:void mergeGroup(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):173 -> a
-    1:1:java.lang.Iterable getClasses():90:90 -> b
-    2:2:java.lang.Iterable com.android.tools.r8.horizontalclassmerging.ClassMerger.getToMergeClasses():82:82 -> b
-    2:2:java.lang.Iterable getClasses():90 -> b
+    11:11:void merge(com.android.tools.r8.graph.DexProgramClass):107 -> a
+    12:18:void merge(com.android.tools.r8.graph.DexProgramClass):120:126 -> a
+    19:26:void lambda$merge$0(com.android.tools.r8.graph.ProgramMethod):109:116 -> a
+    27:27:boolean lambda$renameMethod$1(com.android.tools.r8.graph.DexMethod):140:140 -> a
+    28:34:void com.android.tools.r8.horizontalclassmerging.ClassMerger.appendClassIdField():157:163 -> a
+    28:34:void mergeGroup(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):173 -> a
+    35:35:void com.android.tools.r8.graph.DexEncodedField.<init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessFlags,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexValue):61:61 -> a
+    35:35:void com.android.tools.r8.horizontalclassmerging.ClassMerger.appendClassIdField():163 -> a
+    35:35:void mergeGroup(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):173 -> a
+    36:36:void com.android.tools.r8.horizontalclassmerging.ClassMerger.appendClassIdField():165:165 -> a
+    36:36:void mergeGroup(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):173 -> a
+    37:39:void mergeGroup(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):175:177 -> a
+    40:41:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeConstructors(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):144:145 -> a
+    40:41:void mergeGroup(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):180 -> a
+    42:43:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeVirtualMethods():151:152 -> a
+    42:43:void mergeGroup(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):181 -> a
+    44:44:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeStaticFields():169:169 -> a
+    44:44:void mergeGroup(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):182 -> a
+    1:1:java.lang.Iterable getClasses():92:92 -> b
+    2:2:java.lang.Iterable com.android.tools.r8.horizontalclassmerging.ClassMerger.getToMergeClasses():84:84 -> b
+    2:2:java.lang.Iterable getClasses():92 -> b
     3:3:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> b
-    3:3:java.lang.Iterable getClasses():90 -> b
-    4:7:com.android.tools.r8.graph.DexMethod renameMethod(com.android.tools.r8.graph.ProgramMethod):131:134 -> b
-    8:8:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexEncodedMethod.proto():383:383 -> b
-    8:8:com.android.tools.r8.graph.DexMethod renameMethod(com.android.tools.r8.graph.ProgramMethod):134 -> b
-    9:9:com.android.tools.r8.graph.DexMethod renameMethod(com.android.tools.r8.graph.ProgramMethod):134:134 -> b
-    10:10:com.android.tools.r8.graph.DexMethod renameMethod(com.android.tools.r8.graph.ProgramMethod):131:131 -> b
+    3:3:java.lang.Iterable getClasses():92 -> b
+    4:7:com.android.tools.r8.graph.DexMethod renameMethod(com.android.tools.r8.graph.ProgramMethod):135:138 -> b
+    8:8:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexEncodedMethod.proto():389:389 -> b
+    8:8:com.android.tools.r8.graph.DexMethod renameMethod(com.android.tools.r8.graph.ProgramMethod):138 -> b
+    9:9:com.android.tools.r8.graph.DexMethod renameMethod(com.android.tools.r8.graph.ProgramMethod):138:138 -> b
+    10:10:com.android.tools.r8.graph.DexMethod renameMethod(com.android.tools.r8.graph.ProgramMethod):135:135 -> b
 com.android.tools.r8.horizontalclassmerging.ClassMerger$1 -> com.android.tools.r8.internal.B5:
 com.android.tools.r8.horizontalclassmerging.ClassMerger$Builder -> com.android.tools.r8.internal.C5:
-    java.util.Map constructorMergerBuilders -> d
-    com.android.tools.r8.graph.DexProgramClass target -> b
-    java.util.List toMergeGroup -> c
+    com.android.tools.r8.graph.AppView appView -> b
+    java.util.List toMergeGroup -> d
+    com.android.tools.r8.graph.DexProgramClass target -> c
     boolean $assertionsDisabled -> a
-    java.util.Map virtualMethodMergerBuilders -> e
-    1:1:void <clinit>():176:176 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexProgramClass):184:184 -> <init>
-    2:10:void <init>(com.android.tools.r8.graph.DexProgramClass):178:186 -> <init>
-    1:2:com.android.tools.r8.horizontalclassmerging.ClassMerger$Builder mergeClass(com.android.tools.r8.graph.DexProgramClass):190:191 -> a
-    3:3:com.android.tools.r8.horizontalclassmerging.ClassMerger$Builder addClassesToMerge(java.util.List):196:196 -> a
-    4:7:void addConstructor(com.android.tools.r8.graph.ProgramMethod):215:218 -> a
-    8:8:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getReference():375:375 -> a
-    8:8:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexEncodedMethod.getProto():371 -> a
-    8:8:void addConstructor(com.android.tools.r8.graph.ProgramMethod):218 -> a
-    9:9:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexEncodedMethod.getProto():371:371 -> a
-    9:9:void addConstructor(com.android.tools.r8.graph.ProgramMethod):218 -> a
-    10:10:void addConstructor(com.android.tools.r8.graph.ProgramMethod):218:218 -> a
-    11:13:void addConstructor(com.android.tools.r8.graph.ProgramMethod):217:219 -> a
-    14:14:com.android.tools.r8.horizontalclassmerging.ConstructorMerger$Builder lambda$addConstructor$1(com.android.tools.r8.graph.DexProto):218:218 -> a
-    15:15:com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger$Builder lambda$addVirtualMethod$2(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):227:227 -> a
-    16:41:com.android.tools.r8.horizontalclassmerging.ClassMerger build(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses$Builder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder):236:261 -> a
-    1:1:void setupForMethodMerging(com.android.tools.r8.graph.DexProgramClass):201:201 -> b
+    java.util.Map constructorMergerBuilders -> e
+    java.util.Map virtualMethodMergerBuilders -> f
+    1:1:void <clinit>():185:185 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):194:194 -> <init>
+    2:11:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):188:197 -> <init>
+    1:2:com.android.tools.r8.horizontalclassmerging.ClassMerger$Builder mergeClass(com.android.tools.r8.graph.DexProgramClass):201:202 -> a
+    3:3:com.android.tools.r8.horizontalclassmerging.ClassMerger$Builder addClassesToMerge(java.util.List):207:207 -> a
+    4:7:void addConstructor(com.android.tools.r8.graph.ProgramMethod):226:229 -> a
+    8:10:void addConstructor(com.android.tools.r8.graph.ProgramMethod):228:230 -> a
+    11:11:com.android.tools.r8.horizontalclassmerging.ConstructorMerger$Builder lambda$addConstructor$1(com.android.tools.r8.graph.DexProto):229:229 -> a
+    12:12:com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger$Builder lambda$addVirtualMethod$2(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):238:238 -> a
+    13:38:com.android.tools.r8.horizontalclassmerging.ClassMerger build(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses$Builder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder):247:272 -> a
+    1:1:void setupForMethodMerging(com.android.tools.r8.graph.DexProgramClass):212:212 -> b
     2:2:void com.android.tools.r8.graph.DexProgramClass.forEachProgramDirectMethod(java.util.function.Consumer):175:175 -> b
-    2:2:void setupForMethodMerging(com.android.tools.r8.graph.DexProgramClass):201 -> b
-    3:3:void setupForMethodMerging(com.android.tools.r8.graph.DexProgramClass):211:211 -> b
+    2:2:void setupForMethodMerging(com.android.tools.r8.graph.DexProgramClass):212 -> b
+    3:3:void setupForMethodMerging(com.android.tools.r8.graph.DexProgramClass):222:222 -> b
     4:4:void com.android.tools.r8.graph.DexProgramClass.forEachProgramVirtualMethod(java.util.function.Consumer):185:185 -> b
-    4:4:void setupForMethodMerging(com.android.tools.r8.graph.DexProgramClass):211 -> b
-    5:8:void addVirtualMethod(com.android.tools.r8.graph.ProgramMethod):223:226 -> b
-    9:12:void addVirtualMethod(com.android.tools.r8.graph.ProgramMethod):225:228 -> b
-    1:5:void lambda$setupForMethodMerging$0(com.android.tools.r8.graph.ProgramMethod):203:207 -> c
-com.android.tools.r8.horizontalclassmerging.ConstructorEntryPoint -> com.android.tools.r8.internal.i7:
+    4:4:void setupForMethodMerging(com.android.tools.r8.graph.DexProgramClass):222 -> b
+    5:8:void addVirtualMethod(com.android.tools.r8.graph.ProgramMethod):234:237 -> b
+    9:12:void addVirtualMethod(com.android.tools.r8.graph.ProgramMethod):236:239 -> b
+    1:5:void lambda$setupForMethodMerging$0(com.android.tools.r8.graph.ProgramMethod):214:218 -> c
+com.android.tools.r8.horizontalclassmerging.ClassStaticFieldsMerger -> com.android.tools.r8.internal.V5:
+    java.util.Map targetFields -> c
+    com.android.tools.r8.graph.DexItemFactory dexItemFactory -> d
+    com.android.tools.r8.graph.DexProgramClass target -> b
+    com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder lensBuilder -> a
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.graph.DexProgramClass):26:26 -> <init>
+    2:17:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.graph.DexProgramClass):19:34 -> <init>
+    1:1:boolean isFresh(com.android.tools.r8.graph.DexField):38:38 -> a
+    2:2:void addFields(com.android.tools.r8.graph.DexProgramClass):54:54 -> a
+    3:3:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getReference():134:134 -> a
+    3:3:void addField(com.android.tools.r8.graph.DexEncodedField):42 -> a
+    4:11:void addField(com.android.tools.r8.graph.DexEncodedField):43:50 -> a
+    1:1:void lambda$new$0(com.android.tools.r8.graph.DexEncodedField):32:32 -> b
+    2:2:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getReference():134:134 -> b
+    2:2:void lambda$new$0(com.android.tools.r8.graph.DexEncodedField):32 -> b
+    3:3:void lambda$new$0(com.android.tools.r8.graph.DexEncodedField):32:32 -> b
+    4:4:void merge(com.android.tools.r8.graph.DexProgramClass):58:58 -> b
+com.android.tools.r8.horizontalclassmerging.ConstructorEntryPoint -> com.android.tools.r8.internal.j7:
     com.android.tools.r8.graph.DexField classIdField -> m
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap typeConstructors -> n
     1:4:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexMethod):46:49 -> <init>
@@ -23544,102 +23701,102 @@
     1:1:void addRegisterClassIdAssignment(int):69:69 -> j
     2:32:void prepareMultiConstructorInstructions():80:110 -> j
     1:4:void prepareSingleConstructorInstructions():117:120 -> k
-com.android.tools.r8.horizontalclassmerging.ConstructorEntryPointSynthesizedCode -> com.android.tools.r8.internal.j7:
+com.android.tools.r8.horizontalclassmerging.ConstructorEntryPointSynthesizedCode -> com.android.tools.r8.internal.k7:
     com.android.tools.r8.graph.DexField classIdField -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap typeConstructors -> f
     com.android.tools.r8.graph.DexMethod originalMethod -> d
     com.android.tools.r8.graph.DexMethod newConstructor -> c
     1:5:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexMethod):24:28 -> <init>
+    1:1:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():33:33 -> A
     1:1:com.android.tools.r8.ir.conversion.SourceCode lambda$getSourceCodeProvider$0(com.android.tools.r8.ir.code.Position):34:34 -> a
     2:3:void registerReachableDefinitions(com.android.tools.r8.graph.UseRegistry):44:45 -> a
-    1:1:java.util.function.Consumer getRegistryCallback():40:40 -> y
-    1:1:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():33:33 -> z
-com.android.tools.r8.horizontalclassmerging.ConstructorMerger -> com.android.tools.r8.internal.l7:
+    1:1:java.util.function.Consumer getRegistryCallback():40:40 -> z
+com.android.tools.r8.horizontalclassmerging.ConstructorMerger -> com.android.tools.r8.internal.m7:
     java.util.Collection constructors -> d
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> e
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.graph.DexField classIdField -> f
     com.android.tools.r8.graph.DexProgramClass target -> c
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():34:34 -> <clinit>
-    1:11:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,java.util.Collection,com.android.tools.r8.graph.DexField):45:55 -> <init>
-    1:1:int getArity():59:59 -> a
-    2:2:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getReference():375:375 -> a
-    2:2:int getArity():59 -> a
-    3:3:int getArity():59:59 -> a
-    4:4:boolean lambda$moveConstructor$1(com.android.tools.r8.graph.DexMethod):91:91 -> a
-    5:5:com.android.tools.r8.graph.DexProto com.android.tools.r8.horizontalclassmerging.ConstructorMerger.getNewConstructorProto(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):108:108 -> a
-    5:5:com.android.tools.r8.graph.DexMethod getNewConstructorReference(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):128 -> a
-    6:6:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getReference():375:375 -> a
-    6:6:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexEncodedMethod.getProto():371 -> a
-    6:6:com.android.tools.r8.graph.DexProto com.android.tools.r8.horizontalclassmerging.ConstructorMerger.getNewConstructorProto(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):109 -> a
-    6:6:com.android.tools.r8.graph.DexMethod getNewConstructorReference(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):128 -> a
-    7:7:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexEncodedMethod.getProto():371:371 -> a
-    7:7:com.android.tools.r8.graph.DexProto com.android.tools.r8.horizontalclassmerging.ConstructorMerger.getNewConstructorProto(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):109 -> a
-    7:7:com.android.tools.r8.graph.DexMethod getNewConstructorReference(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):128 -> a
-    8:21:com.android.tools.r8.graph.DexProto com.android.tools.r8.horizontalclassmerging.ConstructorMerger.getNewConstructorProto(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):111:124 -> a
-    8:21:com.android.tools.r8.graph.DexMethod getNewConstructorReference(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):128 -> a
-    22:22:com.android.tools.r8.graph.DexMethod getNewConstructorReference(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):129:129 -> a
-    23:33:void merge(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):145:155 -> a
-    34:34:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getReference():375:375 -> a
-    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedMethod.getHolderType():363 -> a
-    34:34:void merge(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):157 -> a
-    35:35:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedMethod.getHolderType():363:363 -> a
-    35:35:void merge(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):157 -> a
-    36:36:void merge(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):157:157 -> a
-    37:55:void merge(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):156:174 -> a
-    56:56:com.android.tools.r8.graph.MethodAccessFlags com.android.tools.r8.horizontalclassmerging.ConstructorMerger.getAccessFlags():134:134 -> a
-    56:56:void merge(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):177 -> a
-    57:59:void merge(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):178:180 -> a
-    60:60:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean,com.android.tools.r8.cf.CfVersion):277:277 -> a
-    60:60:void merge(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):180 -> a
-    61:75:void merge(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):185:199 -> a
-    76:76:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getReference():375:375 -> a
-    76:76:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedMethod.getHolderType():363 -> a
-    76:76:void merge(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):200 -> a
-    77:77:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedMethod.getHolderType():363:363 -> a
-    77:77:void merge(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):200 -> a
-    78:96:void merge(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):200:218 -> a
-    97:97:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexEncodedMethod.proto():383:383 -> a
-    97:97:com.android.tools.r8.graph.DexProto lambda$new$0(com.android.tools.r8.graph.DexEncodedMethod):53 -> a
-    1:1:boolean isTrivialMerge():81:81 -> b
-    2:5:com.android.tools.r8.graph.DexMethod moveConstructor(com.android.tools.r8.graph.DexEncodedMethod):85:88 -> b
-    6:6:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexEncodedMethod.proto():383:383 -> b
-    6:6:com.android.tools.r8.graph.DexMethod moveConstructor(com.android.tools.r8.graph.DexEncodedMethod):89 -> b
-    7:7:com.android.tools.r8.graph.DexMethod moveConstructor(com.android.tools.r8.graph.DexEncodedMethod):89:89 -> b
-    8:25:com.android.tools.r8.graph.DexMethod moveConstructor(com.android.tools.r8.graph.DexEncodedMethod):86:103 -> b
-com.android.tools.r8.horizontalclassmerging.ConstructorMerger$Builder -> com.android.tools.r8.internal.k7:
-    java.util.Collection constructors -> a
-    1:2:void <init>():65:66 -> <init>
-    1:1:com.android.tools.r8.horizontalclassmerging.ConstructorMerger$Builder add(com.android.tools.r8.graph.DexEncodedMethod):70:70 -> a
-    2:2:com.android.tools.r8.horizontalclassmerging.ConstructorMerger build(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField):76:76 -> a
-com.android.tools.r8.horizontalclassmerging.FieldMultiset -> com.android.tools.r8.internal.xa:
+    1:1:void <clinit>():35:35 -> <clinit>
+    1:11:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,java.util.Collection,com.android.tools.r8.graph.DexField):46:56 -> <init>
+    1:1:int getArity():72:72 -> a
+    2:14:void merge(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):154:166 -> a
+    15:15:void merge(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):165:165 -> a
+    16:16:com.android.tools.r8.graph.DexMethod com.android.tools.r8.horizontalclassmerging.ConstructorMerger.generateReferenceMethodTemplate():64:64 -> a
+    16:16:void merge(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):169 -> a
+    17:17:boolean com.android.tools.r8.horizontalclassmerging.ConstructorMerger.isTrivialMerge():115:115 -> a
+    17:17:com.android.tools.r8.graph.DexMethod com.android.tools.r8.horizontalclassmerging.ConstructorMerger.generateReferenceMethodTemplate():65 -> a
+    17:17:void merge(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):169 -> a
+    18:18:com.android.tools.r8.graph.DexMethod com.android.tools.r8.horizontalclassmerging.ConstructorMerger.generateReferenceMethodTemplate():66:66 -> a
+    18:18:void merge(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):169 -> a
+    19:20:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.appendTypeToMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):2040:2041 -> a
+    19:20:com.android.tools.r8.graph.DexMethod com.android.tools.r8.horizontalclassmerging.ConstructorMerger.generateReferenceMethodTemplate():66 -> a
+    19:20:void merge(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):169 -> a
+    21:24:void merge(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):170:173 -> a
+    25:38:void merge(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):171:184 -> a
+    39:39:com.android.tools.r8.graph.MethodAccessFlags com.android.tools.r8.horizontalclassmerging.ConstructorMerger.getAccessFlags():143:143 -> a
+    39:39:void merge(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):187 -> a
+    40:42:void merge(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):188:190 -> a
+    43:43:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean,com.android.tools.r8.cf.CfVersion):281:281 -> a
+    43:43:void merge(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):190 -> a
+    44:44:boolean com.android.tools.r8.horizontalclassmerging.ConstructorMerger.isTrivialMerge():115:115 -> a
+    44:44:void merge(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):195 -> a
+    45:73:void merge(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):198:226 -> a
+    74:74:boolean lambda$merge$2(com.android.tools.r8.graph.DexMethod):174:174 -> a
+    75:75:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexEncodedMethod.proto():389:389 -> a
+    75:75:com.android.tools.r8.graph.DexProto lambda$new$0(com.android.tools.r8.graph.DexEncodedMethod):54 -> a
+    1:4:com.android.tools.r8.graph.DexMethod moveConstructor(com.android.tools.r8.graph.DexEncodedMethod):119:122 -> b
+    5:5:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexEncodedMethod.proto():389:389 -> b
+    5:5:com.android.tools.r8.graph.DexMethod moveConstructor(com.android.tools.r8.graph.DexEncodedMethod):123 -> b
+    6:6:com.android.tools.r8.graph.DexMethod moveConstructor(com.android.tools.r8.graph.DexEncodedMethod):123:123 -> b
+    7:24:com.android.tools.r8.graph.DexMethod moveConstructor(com.android.tools.r8.graph.DexEncodedMethod):120:137 -> b
+    25:25:boolean lambda$moveConstructor$1(com.android.tools.r8.graph.DexMethod):125:125 -> b
+com.android.tools.r8.horizontalclassmerging.ConstructorMerger$Builder -> com.android.tools.r8.internal.l7:
+    com.android.tools.r8.graph.AppView appView -> d
+    java.util.List constructorGroups -> c
+    boolean $assertionsDisabled -> a
+    int estimatedDexCodeSize -> b
+    1:1:void <clinit>():75:75 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):80:80 -> <init>
+    2:8:void <init>(com.android.tools.r8.graph.AppView):77:83 -> <init>
+    1:2:void createNewGroup():87:88 -> a
+    3:6:com.android.tools.r8.horizontalclassmerging.ConstructorMerger$Builder add(com.android.tools.r8.graph.DexEncodedMethod):92:95 -> a
+    7:7:int com.android.tools.r8.utils.InternalOptions.minimumVerificationSizeLimitInBytes():279:279 -> a
+    7:7:com.android.tools.r8.horizontalclassmerging.ConstructorMerger$Builder add(com.android.tools.r8.graph.DexEncodedMethod):95 -> a
+    8:8:com.android.tools.r8.horizontalclassmerging.ConstructorMerger$Builder add(com.android.tools.r8.graph.DexEncodedMethod):95:95 -> a
+    9:10:void com.android.tools.r8.horizontalclassmerging.ConstructorMerger$Builder.createNewGroup():87:88 -> a
+    9:10:com.android.tools.r8.horizontalclassmerging.ConstructorMerger$Builder add(com.android.tools.r8.graph.DexEncodedMethod):97 -> a
+    11:12:com.android.tools.r8.horizontalclassmerging.ConstructorMerger$Builder add(com.android.tools.r8.graph.DexEncodedMethod):100:101 -> a
+    13:14:java.util.List build(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField):107:108 -> a
+    15:15:com.android.tools.r8.horizontalclassmerging.ConstructorMerger lambda$build$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField,java.util.List):110:110 -> a
+com.android.tools.r8.horizontalclassmerging.FieldMultiset -> com.android.tools.r8.internal.ya:
     com.android.tools.r8.com.google.common.collect.Multiset fields -> a
     1:1:void <init>(com.android.tools.r8.graph.DexProgramClass):17:17 -> <init>
     2:6:void <init>(com.android.tools.r8.graph.DexProgramClass):15:19 -> <init>
     1:3:boolean equals(java.lang.Object):30:32 -> equals
     1:1:int hashCode():25:25 -> hashCode
-com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger -> com.android.tools.r8.internal.ec:
+com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger -> com.android.tools.r8.internal.fc:
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.horizontalclassmerging.PolicyExecutor policyExecutor -> c
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():48:48 -> <clinit>
-    1:23:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.MainDexTracingResult,com.android.tools.r8.shaking.RuntimeTypeCheckInfo):55:77 -> <init>
-    24:57:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.MainDexTracingResult,com.android.tools.r8.shaking.RuntimeTypeCheckInfo):60:93 -> <init>
-    1:12:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder):98:109 -> a
+    1:1:void <clinit>():49:49 -> <clinit>
+    1:24:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.MainDexTracingResult,com.android.tools.r8.shaking.RuntimeTypeCheckInfo):56:79 -> <init>
+    25:59:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.MainDexTracingResult,com.android.tools.r8.shaking.RuntimeTypeCheckInfo):61:95 -> <init>
+    1:12:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder):100:111 -> a
     13:13:com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses.empty():26:26 -> a
-    13:13:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder):109 -> a
-    14:22:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder):109:117 -> a
-    23:36:java.util.List com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger.initializeClassMergers(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses$Builder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,java.util.Collection):148:161 -> a
-    23:36:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder):122 -> a
-    37:42:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder):124:129 -> a
-    43:44:void com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger.applyClassMergers(java.util.Collection,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):170:171 -> a
-    43:44:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder):130 -> a
-    45:46:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder):133:134 -> a
-    47:54:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger.createLens(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):185:192 -> a
-    47:54:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder):135 -> a
-    55:55:java.util.List lambda$run$0(com.android.tools.r8.horizontalclassmerging.FieldMultiset):102:102 -> a
-com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens -> com.android.tools.r8.internal.hc:
+    13:13:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder):111 -> a
+    14:22:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder):111:119 -> a
+    23:36:java.util.List com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger.initializeClassMergers(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses$Builder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,java.util.Collection):150:163 -> a
+    23:36:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder):124 -> a
+    37:42:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder):126:131 -> a
+    43:44:void com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger.applyClassMergers(java.util.Collection,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):172:173 -> a
+    43:44:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder):132 -> a
+    45:46:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder):135:136 -> a
+    47:54:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger.createLens(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):187:194 -> a
+    47:54:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder):137 -> a
+    55:55:java.util.List lambda$run$0(com.android.tools.r8.horizontalclassmerging.FieldMultiset):104:104 -> a
+com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens -> com.android.tools.r8.internal.ic:
     java.util.Map methodExtraParameters -> m
     java.util.Map originalConstructorSignatures -> n
     com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses mergedClasses -> o
@@ -23654,8 +23811,8 @@
     3:3:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> g
     3:3:java.lang.Iterable com.android.tools.r8.utils.IterableUtils.prependSingleton(java.lang.Object,java.lang.Iterable):65 -> g
     3:3:java.lang.Iterable internalGetOriginalTypes(com.android.tools.r8.graph.DexType):57 -> g
-com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$1 -> com.android.tools.r8.internal.fc:
-com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder -> com.android.tools.r8.internal.gc:
+com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$1 -> com.android.tools.r8.internal.gc:
+com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder -> com.android.tools.r8.internal.hc:
     com.android.tools.r8.horizontalclassmerging.ManyToOneMap methodMap -> c
     java.util.Map methodExtraParameters -> d
     com.android.tools.r8.com.google.common.collect.BiMap fieldMap -> b
@@ -23666,25 +23823,25 @@
     1:19:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens build(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses):100:118 -> a
     20:22:com.android.tools.r8.graph.DexMethod lambda$build$0(java.util.Set):104:104 -> a
     23:23:void remapMethods(com.android.tools.r8.com.google.common.collect.BiMap):122:122 -> a
-    24:24:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder mapField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):126:126 -> a
-    25:25:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder mapMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):139:139 -> a
-    26:26:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder.mapMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):139:139 -> a
-    26:26:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder.moveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):152 -> a
-    26:26:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder moveMergedConstructor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,java.util.List):164 -> a
-    27:27:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder.mapMethodInverse(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):146:146 -> a
-    27:27:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder.moveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):153 -> a
-    27:27:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder moveMergedConstructor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,java.util.List):164 -> a
-    28:28:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder moveMergedConstructor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,java.util.List):165:165 -> a
-    29:33:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder addExtraParameters(com.android.tools.r8.graph.DexMethod,java.util.List):170:174 -> a
-    34:34:java.util.List lambda$addExtraParameters$1(java.util.List,com.android.tools.r8.graph.DexMethod):177:177 -> a
-    1:1:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder mapMethodInverse(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):146:146 -> b
-    2:3:void lambda$addExtraParameters$2(java.util.List,com.android.tools.r8.graph.DexMethod):177:178 -> b
-    1:1:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder.mapMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):139:139 -> c
-    1:1:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder moveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):152 -> c
-    2:2:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder.mapMethodInverse(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):146:146 -> c
-    2:2:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder moveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):153 -> c
-    1:1:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder recordExtraOriginalSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):132:132 -> d
-com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses -> com.android.tools.r8.internal.ic:
+    24:28:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder mapField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):126:130 -> a
+    29:29:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder mapMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):143:143 -> a
+    30:30:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder.mapMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):143:143 -> a
+    30:30:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder.moveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):156 -> a
+    30:30:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder moveMergedConstructor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,java.util.List):168 -> a
+    31:31:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder.mapMethodInverse(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):150:150 -> a
+    31:31:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder.moveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):157 -> a
+    31:31:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder moveMergedConstructor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,java.util.List):168 -> a
+    32:32:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder moveMergedConstructor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,java.util.List):169:169 -> a
+    33:37:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder addExtraParameters(com.android.tools.r8.graph.DexMethod,java.util.List):174:178 -> a
+    38:38:java.util.List lambda$addExtraParameters$1(java.util.List,com.android.tools.r8.graph.DexMethod):181:181 -> a
+    1:1:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder mapMethodInverse(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):150:150 -> b
+    2:3:void lambda$addExtraParameters$2(java.util.List,com.android.tools.r8.graph.DexMethod):181:182 -> b
+    1:1:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder.mapMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):143:143 -> c
+    1:1:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder moveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):156 -> c
+    2:2:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder.mapMethodInverse(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):150:150 -> c
+    2:2:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder moveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):157 -> c
+    1:1:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder recordExtraOriginalSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):136:136 -> d
+com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses -> com.android.tools.r8.internal.jc:
     com.android.tools.r8.utils.collections.BidirectionalManyToOneMap mergedClasses -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():17:17 -> <clinit>
@@ -23700,18 +23857,18 @@
     2:2:boolean com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses.isMergeTarget(com.android.tools.r8.graph.DexType):51:51 -> e
     2:2:boolean hasBeenMergedOrIsMergeTarget(com.android.tools.r8.graph.DexType):55 -> e
     1:1:boolean isMergeTarget(com.android.tools.r8.graph.DexType):51:51 -> f
-com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses$Builder -> com.android.tools.r8.internal.ic$a:
+com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses$Builder -> com.android.tools.r8.internal.jc$a:
     com.android.tools.r8.utils.collections.BidirectionalManyToOneMap mergedClasses -> a
     1:2:void <init>():73:74 -> <init>
     1:1:com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses build():78:78 -> a
     2:3:void addMergeGroup(com.android.tools.r8.graph.DexProgramClass,java.util.Collection):82:83 -> a
-com.android.tools.r8.horizontalclassmerging.ManyToOneInverseMap -> com.android.tools.r8.internal.zn:
+com.android.tools.r8.horizontalclassmerging.ManyToOneInverseMap -> com.android.tools.r8.internal.An:
     java.util.Map extraMap -> b
     com.android.tools.r8.com.google.common.collect.BiMap biMap -> a
     1:3:void <init>(com.android.tools.r8.com.google.common.collect.BiMap,java.util.Map):15:17 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.BiMap getBiMap():21:21 -> a
     1:1:java.util.Map getExtraMap():25:25 -> b
-com.android.tools.r8.horizontalclassmerging.ManyToOneMap -> com.android.tools.r8.internal.An:
+com.android.tools.r8.horizontalclassmerging.ManyToOneMap -> com.android.tools.r8.internal.Bn:
     java.util.Map forwardMap -> b
     java.util.Map inverseMap -> c
     java.util.Map representativeMap -> d
@@ -23727,26 +23884,26 @@
     2:2:java.util.Set lambda$remap$1(java.lang.Object):104:104 -> b
     1:1:java.util.Set lookupReverse(java.lang.Object):35:35 -> c
     2:3:java.lang.Object setRepresentative(java.lang.Object,java.lang.Object):47:48 -> c
-com.android.tools.r8.horizontalclassmerging.MultiClassPolicy -> com.android.tools.r8.internal.Wo:
+com.android.tools.r8.horizontalclassmerging.MultiClassPolicy -> com.android.tools.r8.internal.Xo:
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():12:12 -> <clinit>
     1:1:void <init>():12:12 -> <init>
     java.util.Collection apply(java.util.List) -> a
     1:1:boolean isTrivial(java.util.Collection):16:16 -> a
     1:2:void removeTrivialGroups(java.util.Collection):23:24 -> b
-com.android.tools.r8.horizontalclassmerging.MultiClassSameReferencePolicy -> com.android.tools.r8.internal.Xo:
+com.android.tools.r8.horizontalclassmerging.MultiClassSameReferencePolicy -> com.android.tools.r8.internal.Yo:
     1:1:void <init>():14:14 -> <init>
     java.lang.Object getMergeKey(com.android.tools.r8.graph.DexProgramClass) -> a
     1:6:java.util.Collection apply(java.util.List):17:22 -> a
     7:7:java.util.List lambda$apply$0(java.lang.Object):19:19 -> a
-com.android.tools.r8.horizontalclassmerging.Policy -> com.android.tools.r8.internal.As:
+com.android.tools.r8.horizontalclassmerging.Policy -> com.android.tools.r8.internal.Cs:
     int numberOfRemovedClasses -> a
     1:1:void <init>():11:11 -> <init>
-com.android.tools.r8.horizontalclassmerging.PolicyExecutor -> com.android.tools.r8.internal.Bs:
+com.android.tools.r8.horizontalclassmerging.PolicyExecutor -> com.android.tools.r8.internal.Ds:
     java.util.Collection policies -> a
     1:2:void <init>(java.util.Collection):14:15 -> <init>
     java.util.Collection run(java.util.Collection) -> a
-com.android.tools.r8.horizontalclassmerging.SimplePolicyExecutor -> com.android.tools.r8.internal.Rx:
+com.android.tools.r8.horizontalclassmerging.SimplePolicyExecutor -> com.android.tools.r8.internal.Tx:
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():19:19 -> <clinit>
     1:1:void <init>(java.util.Collection):21:21 -> <init>
@@ -23756,10 +23913,10 @@
     13:13:java.util.stream.Stream lambda$applyMultiClassPolicy$1(com.android.tools.r8.horizontalclassmerging.MultiClassPolicy,java.util.List):44:44 -> a
     14:32:java.util.Collection run(java.util.Collection):52:70 -> a
     33:33:boolean lambda$run$2(java.util.List):70:70 -> a
-com.android.tools.r8.horizontalclassmerging.SingleClassPolicy -> com.android.tools.r8.internal.Sx:
+com.android.tools.r8.horizontalclassmerging.SingleClassPolicy -> com.android.tools.r8.internal.Ux:
     1:1:void <init>():9:9 -> <init>
     boolean canMerge(com.android.tools.r8.graph.DexProgramClass) -> a
-com.android.tools.r8.horizontalclassmerging.SubtypingForrestForClasses -> com.android.tools.r8.internal.zz:
+com.android.tools.r8.horizontalclassmerging.SubtypingForrestForClasses -> com.android.tools.r8.internal.Bz:
     java.util.Map subtypeMap -> c
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Collection roots -> b
@@ -23780,16 +23937,16 @@
     11:11:void traverseNodeDepthFirst(com.android.tools.r8.graph.DexProgramClass,java.lang.Object,java.util.function.BiFunction):75:75 -> a
     12:12:void lambda$traverseNodeDepthFirst$1(java.lang.Object,java.util.function.BiFunction,com.android.tools.r8.graph.DexProgramClass):75:75 -> a
     1:1:java.util.List lambda$calculateSubtyping$0(com.android.tools.r8.graph.DexProgramClass):60:60 -> b
-com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass -> com.android.tools.r8.internal.Vz:
+com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass -> com.android.tools.r8.internal.Xz:
     com.android.tools.r8.graph.DexType syntheticClassType -> a
     1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass$1):39:39 -> <init>
     2:3:void <init>(com.android.tools.r8.graph.DexType):44:45 -> <init>
     1:1:com.android.tools.r8.graph.DexType getArgumentClass():49:49 -> a
-com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass$1 -> com.android.tools.r8.internal.Tz:
-com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass$Builder -> com.android.tools.r8.internal.Uz:
+com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass$1 -> com.android.tools.r8.internal.Vz:
+com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass$Builder -> com.android.tools.r8.internal.Wz:
     1:1:void <init>():52:52 -> <init>
     1:32:com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass build(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication$Builder,java.lang.Iterable):60:91 -> a
-com.android.tools.r8.horizontalclassmerging.TreeFixer -> com.android.tools.r8.internal.MA:
+com.android.tools.r8.horizontalclassmerging.TreeFixer -> com.android.tools.r8.internal.NA:
     java.util.Map protoFixupCache -> b
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> g
     com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder lensBuilder -> d
@@ -23805,68 +23962,60 @@
     2:24:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):44:66 -> <init>
     1:16:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens fixupTypeReferences():123:138 -> a
     17:39:java.util.Map fixupProgramClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):148:170 -> a
-    40:50:void fixupInterfaceClass(com.android.tools.r8.graph.DexProgramClass):220:230 -> a
-    51:51:boolean lambda$fixupDirectMethod$3(java.util.Set,com.android.tools.r8.graph.DexMethod):270:270 -> a
-    52:56:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):370:374 -> a
-    57:59:com.android.tools.r8.graph.DexField com.android.tools.r8.horizontalclassmerging.TreeFixer.fixupFieldReference(com.android.tools.r8.graph.DexField):398:400 -> a
-    57:59:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):375 -> a
-    60:67:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):378:385 -> a
-    68:68:com.android.tools.r8.graph.DexMember com.android.tools.r8.graph.DexItemFactory.createFreshMember(java.util.function.Function,java.lang.String):1793:1793 -> a
-    68:68:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):381 -> a
-    69:80:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):381:392 -> a
-    81:81:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getReference():375:375 -> a
-    81:81:com.android.tools.r8.graph.DexEncodedMethod fixupDirectMethod(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):255 -> a
-    82:93:com.android.tools.r8.graph.DexEncodedMethod fixupDirectMethod(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):258:269 -> a
-    94:101:com.android.tools.r8.graph.DexEncodedMethod fixupDirectMethod(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):267:274 -> a
-    102:108:com.android.tools.r8.graph.DexEncodedMethod fixupDirectMethod(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):272:278 -> a
-    109:120:com.android.tools.r8.graph.DexEncodedMethod fixupDirectMethod(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):277:288 -> a
-    121:121:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getReference():375:375 -> a
-    121:121:com.android.tools.r8.graph.DexEncodedMethod fixupProgramMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):235 -> a
-    122:129:com.android.tools.r8.graph.DexEncodedMethod fixupProgramMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):241:248 -> a
-    130:130:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getReference():375:375 -> a
-    130:130:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):176 -> a
-    131:133:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):179:181 -> a
-    134:153:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):180:199 -> a
-    154:154:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexItemFactory.createGloballyFreshMemberString(java.lang.String):1817:1817 -> a
-    154:154:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):198 -> a
-    155:158:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):200:203 -> a
-    159:159:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):202:202 -> a
-    160:175:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):201:216 -> a
-    176:176:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getReference():375:375 -> a
-    176:176:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualMethod(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):321 -> a
-    177:177:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualMethod(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):323:323 -> a
-    178:194:com.android.tools.r8.graph.DexString com.android.tools.r8.horizontalclassmerging.TreeFixer.lookupReservedVirtualName(com.android.tools.r8.graph.DexMethod,java.util.Map):295:311 -> a
-    178:194:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualMethod(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):326 -> a
-    195:200:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualMethod(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):329:334 -> a
-    201:201:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory):274:274 -> a
-    201:201:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualMethod(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):334 -> a
-    202:219:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualMethod(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):336:353 -> a
-    220:224:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualMethod(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):352:356 -> a
-    225:227:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualMethod(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):342:344 -> a
-    228:230:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualMethod(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):343:345 -> a
-    231:231:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory):274:274 -> a
-    231:231:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualMethod(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):345 -> a
-    232:247:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualMethod(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):348:363 -> a
-    248:248:java.util.Optional lambda$fixupFields$5(com.android.tools.r8.graph.DexField,java.util.Set,com.android.tools.r8.graph.DexString):383:383 -> a
-    249:249:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexField.withName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory):179:179 -> a
-    249:249:java.util.Optional lambda$fixupFields$5(com.android.tools.r8.graph.DexField,java.util.Set,com.android.tools.r8.graph.DexString):383 -> a
-    250:251:java.util.Optional lambda$fixupFields$5(com.android.tools.r8.graph.DexField,java.util.Set,com.android.tools.r8.graph.DexString):383:384 -> a
-    252:252:boolean lambda$fixupFields$4(java.util.Set,com.android.tools.r8.graph.DexField):384:384 -> a
-    253:255:com.android.tools.r8.graph.DexMethod fixupMethodReference(com.android.tools.r8.graph.DexMethod):404:406 -> a
-    256:259:com.android.tools.r8.graph.DexProto com.android.tools.r8.horizontalclassmerging.TreeFixer.fixupProto(com.android.tools.r8.graph.DexProto):410:413 -> a
-    256:259:com.android.tools.r8.graph.DexMethod fixupMethodReference(com.android.tools.r8.graph.DexMethod):406 -> a
-    260:262:com.android.tools.r8.graph.DexType[] com.android.tools.r8.horizontalclassmerging.TreeFixer.fixupTypes(com.android.tools.r8.graph.DexType[]):436:438 -> a
-    260:262:com.android.tools.r8.graph.DexProto com.android.tools.r8.horizontalclassmerging.TreeFixer.fixupProto(com.android.tools.r8.graph.DexProto):413 -> a
-    260:262:com.android.tools.r8.graph.DexMethod fixupMethodReference(com.android.tools.r8.graph.DexMethod):406 -> a
-    263:264:com.android.tools.r8.graph.DexProto com.android.tools.r8.horizontalclassmerging.TreeFixer.fixupProto(com.android.tools.r8.graph.DexProto):414:415 -> a
-    263:264:com.android.tools.r8.graph.DexMethod fixupMethodReference(com.android.tools.r8.graph.DexMethod):406 -> a
-    265:265:com.android.tools.r8.graph.DexMethod fixupMethodReference(com.android.tools.r8.graph.DexMethod):406:406 -> a
-    266:275:com.android.tools.r8.graph.DexType fixupType(com.android.tools.r8.graph.DexType):421:430 -> a
+    40:45:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):176:181 -> a
+    46:65:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):180:199 -> a
+    66:66:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexItemFactory.createGloballyFreshMemberString(java.lang.String):1817:1817 -> a
+    66:66:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):198 -> a
+    67:70:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):200:203 -> a
+    71:71:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):202:202 -> a
+    72:87:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):201:216 -> a
+    88:98:void fixupInterfaceClass(com.android.tools.r8.graph.DexProgramClass):220:230 -> a
+    99:112:com.android.tools.r8.graph.DexEncodedMethod fixupProgramMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):235:248 -> a
+    113:127:com.android.tools.r8.graph.DexEncodedMethod fixupDirectMethod(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):255:269 -> a
+    128:135:com.android.tools.r8.graph.DexEncodedMethod fixupDirectMethod(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):267:274 -> a
+    136:142:com.android.tools.r8.graph.DexEncodedMethod fixupDirectMethod(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):272:278 -> a
+    143:154:com.android.tools.r8.graph.DexEncodedMethod fixupDirectMethod(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):277:288 -> a
+    155:155:boolean lambda$fixupDirectMethod$3(java.util.Set,com.android.tools.r8.graph.DexMethod):270:270 -> a
+    156:158:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualMethod(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):321:323 -> a
+    159:175:com.android.tools.r8.graph.DexString com.android.tools.r8.horizontalclassmerging.TreeFixer.lookupReservedVirtualName(com.android.tools.r8.graph.DexMethod,java.util.Map):295:311 -> a
+    159:175:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualMethod(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):326 -> a
+    176:181:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualMethod(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):329:334 -> a
+    182:182:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory):274:274 -> a
+    182:182:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualMethod(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):334 -> a
+    183:200:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualMethod(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):336:353 -> a
+    201:205:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualMethod(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):352:356 -> a
+    206:208:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualMethod(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):342:344 -> a
+    209:211:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualMethod(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):343:345 -> a
+    212:212:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory):274:274 -> a
+    212:212:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualMethod(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):345 -> a
+    213:228:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualMethod(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):348:363 -> a
+    229:233:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):370:374 -> a
+    234:236:com.android.tools.r8.graph.DexField com.android.tools.r8.horizontalclassmerging.TreeFixer.fixupFieldReference(com.android.tools.r8.graph.DexField):398:400 -> a
+    234:236:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):375 -> a
+    237:244:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):378:385 -> a
+    245:245:com.android.tools.r8.graph.DexMember com.android.tools.r8.graph.DexItemFactory.createFreshMember(java.util.function.Function,java.lang.String):1793:1793 -> a
+    245:245:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):381 -> a
+    246:257:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):381:392 -> a
+    258:258:java.util.Optional lambda$fixupFields$5(com.android.tools.r8.graph.DexField,java.util.Set,com.android.tools.r8.graph.DexString):383:383 -> a
+    259:259:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexField.withName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory):179:179 -> a
+    259:259:java.util.Optional lambda$fixupFields$5(com.android.tools.r8.graph.DexField,java.util.Set,com.android.tools.r8.graph.DexString):383 -> a
+    260:261:java.util.Optional lambda$fixupFields$5(com.android.tools.r8.graph.DexField,java.util.Set,com.android.tools.r8.graph.DexString):383:384 -> a
+    262:262:boolean lambda$fixupFields$4(java.util.Set,com.android.tools.r8.graph.DexField):384:384 -> a
+    263:265:com.android.tools.r8.graph.DexMethod fixupMethodReference(com.android.tools.r8.graph.DexMethod):404:406 -> a
+    266:269:com.android.tools.r8.graph.DexProto com.android.tools.r8.horizontalclassmerging.TreeFixer.fixupProto(com.android.tools.r8.graph.DexProto):410:413 -> a
+    266:269:com.android.tools.r8.graph.DexMethod fixupMethodReference(com.android.tools.r8.graph.DexMethod):406 -> a
+    270:272:com.android.tools.r8.graph.DexType[] com.android.tools.r8.horizontalclassmerging.TreeFixer.fixupTypes(com.android.tools.r8.graph.DexType[]):436:438 -> a
+    270:272:com.android.tools.r8.graph.DexProto com.android.tools.r8.horizontalclassmerging.TreeFixer.fixupProto(com.android.tools.r8.graph.DexProto):413 -> a
+    270:272:com.android.tools.r8.graph.DexMethod fixupMethodReference(com.android.tools.r8.graph.DexMethod):406 -> a
+    273:274:com.android.tools.r8.graph.DexProto com.android.tools.r8.horizontalclassmerging.TreeFixer.fixupProto(com.android.tools.r8.graph.DexProto):414:415 -> a
+    273:274:com.android.tools.r8.graph.DexMethod fixupMethodReference(com.android.tools.r8.graph.DexMethod):406 -> a
+    275:275:com.android.tools.r8.graph.DexMethod fixupMethodReference(com.android.tools.r8.graph.DexMethod):406:406 -> a
+    276:285:com.android.tools.r8.graph.DexType fixupType(com.android.tools.r8.graph.DexType):421:430 -> a
     1:1:void fixupProgramClassSuperType(com.android.tools.r8.graph.DexProgramClass):143:143 -> b
     2:2:com.android.tools.r8.graph.DexEncodedMethod lambda$fixupProgramClass$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):161:161 -> b
     3:3:com.android.tools.r8.graph.DexEncodedMethod lambda$fixupInterfaceClass$2(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):227:227 -> b
     1:1:com.android.tools.r8.graph.DexEncodedMethod lambda$fixupProgramClass$1(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):167:167 -> c
-com.android.tools.r8.horizontalclassmerging.VirtualMethodEntryPoint -> com.android.tools.r8.internal.JC:
+com.android.tools.r8.horizontalclassmerging.VirtualMethodEntryPoint -> com.android.tools.r8.internal.KC:
     boolean $assertionsDisabled -> m
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap mappedMethods -> n
     com.android.tools.r8.graph.DexField classIdField -> o
@@ -23884,13 +24033,13 @@
     1:5:void handleReturn(int):101:105 -> i
     6:55:void prepareInstructions():111:160 -> i
     1:3:void addInvokeSuper():87:89 -> j
-com.android.tools.r8.horizontalclassmerging.VirtualMethodEntryPointSynthesizedCode -> com.android.tools.r8.internal.KC:
+com.android.tools.r8.horizontalclassmerging.VirtualMethodEntryPointSynthesizedCode -> com.android.tools.r8.internal.LC:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap mappedMethods -> e
     1:6:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):24:29 -> <init>
     1:1:com.android.tools.r8.ir.conversion.SourceCode lambda$new$0(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):26:26 -> a
     1:2:void registerReachableDefinitions(com.android.tools.r8.graph.UseRegistry):39:40 -> b
-    1:1:java.util.function.Consumer getRegistryCallback():35:35 -> y
-com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger -> com.android.tools.r8.internal.MC:
+    1:1:java.util.function.Consumer getRegistryCallback():35:35 -> z
+com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger -> com.android.tools.r8.internal.NC:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
     java.util.Collection methods -> d
     com.android.tools.r8.graph.DexField classIdField -> e
@@ -23908,50 +24057,39 @@
     7:10:void merge(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):152:155 -> a
     11:18:void com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger.mergeTrivial(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder):136:143 -> a
     11:18:void merge(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):156 -> a
-    19:19:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getReference():375:375 -> a
-    19:19:void com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger.mergeTrivial(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder):143 -> a
-    19:19:void merge(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):156 -> a
-    20:20:void com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger.mergeTrivial(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder):143:143 -> a
-    20:20:void merge(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):156 -> a
-    21:44:void merge(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):160:183 -> a
-    45:67:void merge(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):179:201 -> a
-    68:68:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean,com.android.tools.r8.cf.CfVersion):277:277 -> a
-    68:68:void merge(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):201 -> a
-    69:76:void merge(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):207:214 -> a
-    77:77:boolean lambda$merge$2(com.android.tools.r8.graph.DexMethod):184:184 -> a
+    19:42:void merge(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):160:183 -> a
+    43:65:void merge(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):179:201 -> a
+    66:66:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean,com.android.tools.r8.cf.CfVersion):281:281 -> a
+    66:66:void merge(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):201 -> a
+    67:74:void merge(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):207:214 -> a
+    75:75:boolean lambda$merge$2(com.android.tools.r8.graph.DexMethod):184:184 -> a
     1:1:int getArity():94:94 -> b
     2:6:com.android.tools.r8.graph.DexMethod moveMethod(com.android.tools.r8.graph.ProgramMethod):98:102 -> b
     7:25:com.android.tools.r8.graph.DexMethod moveMethod(com.android.tools.r8.graph.ProgramMethod):100:118 -> b
     26:26:boolean lambda$moveMethod$0(com.android.tools.r8.graph.DexMethod):105:105 -> b
-com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger$Builder -> com.android.tools.r8.internal.LC:
+com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger$Builder -> com.android.tools.r8.internal.MC:
     java.util.Collection methods -> a
     1:2:void <init>():52:53 -> <init>
     1:1:com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger$Builder add(com.android.tools.r8.graph.ProgramMethod):56:56 -> a
     2:6:com.android.tools.r8.graph.DexMethod com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger$Builder.superMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):63:67 -> a
     2:6:com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger build(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField):88 -> a
-    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getSuperType():588:588 -> a
+    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getSuperType():592:592 -> a
     7:7: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):68 -> a
     7:7:com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger build(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField):88 -> a
-    8:19: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):68:79 -> a
-    8:19:com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger build(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField):88 -> a
-    20:20:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getReference():375:375 -> a
-    20:20: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):80 -> a
-    20:20:com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger build(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField):88 -> a
-    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getSuperType():588:588 -> a
+    8:20: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):68:80 -> a
+    8:20:com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger build(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField):88 -> a
+    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getSuperType():592:592 -> a
     21: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):81 -> a
     21:21:com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger build(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField):88 -> a
     22:24: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):81:83 -> a
     22:24:com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger build(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField):88 -> a
-    25:25:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getReference():375:375 -> a
-    25:25: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):83 -> a
-    25:25:com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger build(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField):88 -> a
-    26:26:com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger build(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField):89:89 -> a
+    25:25:com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger build(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField):89:89 -> a
 com.android.tools.r8.horizontalclassmerging.policies.AllInstantiatedOrUninstantiated -> com.android.tools.r8.internal.U0:
     com.android.tools.r8.graph.AppView appView -> c
     1:2:void <init>(com.android.tools.r8.graph.AppView):16:17 -> <init>
     1:1:java.lang.Boolean com.android.tools.r8.horizontalclassmerging.policies.AllInstantiatedOrUninstantiated.getMergeKey(com.android.tools.r8.graph.DexProgramClass):22:22 -> a
     1:1:java.lang.Object getMergeKey(com.android.tools.r8.graph.DexProgramClass):12 -> a
-com.android.tools.r8.horizontalclassmerging.policies.DontInlinePolicy -> com.android.tools.r8.internal.U8:
+com.android.tools.r8.horizontalclassmerging.policies.DontInlinePolicy -> com.android.tools.r8.internal.V8:
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.shaking.MainDexTracingResult mainDexTracingResult -> c
     1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.MainDexTracingResult):24:26 -> <init>
@@ -23962,13 +24100,13 @@
     4:23:boolean lambda$canMerge$0(com.android.tools.r8.graph.ProgramMethod):60 -> a
     24:24:boolean com.android.tools.r8.horizontalclassmerging.policies.DontInlinePolicy.disallowInlining(com.android.tools.r8.graph.ProgramMethod):48:48 -> a
     24:24:boolean lambda$canMerge$0(com.android.tools.r8.graph.ProgramMethod):60 -> a
-com.android.tools.r8.horizontalclassmerging.policies.DontMergeIntoLessVisible -> com.android.tools.r8.internal.V8:
+com.android.tools.r8.horizontalclassmerging.policies.DontMergeIntoLessVisible -> com.android.tools.r8.internal.W8:
     1:1:void <init>():15:15 -> <init>
     1:3:java.util.Collection apply(java.util.List):18:20 -> a
-    4:4:boolean com.android.tools.r8.graph.DexClass.isPublic():560:560 -> a
+    4:4:boolean com.android.tools.r8.graph.DexClass.isPublic():564:564 -> a
     4:4:java.util.Collection apply(java.util.List):21 -> a
     5:14:java.util.Collection apply(java.util.List):22:31 -> a
-com.android.tools.r8.horizontalclassmerging.policies.DontMergeSynchronizedClasses -> com.android.tools.r8.internal.W8:
+com.android.tools.r8.horizontalclassmerging.policies.DontMergeSynchronizedClasses -> com.android.tools.r8.internal.X8:
     com.android.tools.r8.graph.AppView appView -> c
     1:2:void <init>(com.android.tools.r8.graph.AppView):20:21 -> <init>
     1:1:boolean com.android.tools.r8.horizontalclassmerging.policies.DontMergeSynchronizedClasses.isSynchronizationClass(com.android.tools.r8.graph.DexProgramClass):25:25 -> a
@@ -23980,26 +24118,26 @@
     3:3:boolean lambda$apply$0(java.util.Collection,com.android.tools.r8.graph.DexProgramClass):34 -> a
     4:6:boolean lambda$apply$0(java.util.Collection,com.android.tools.r8.graph.DexProgramClass):36:38 -> a
     7:31:java.util.Collection apply(java.util.List):31:55 -> a
-com.android.tools.r8.horizontalclassmerging.policies.IgnoreSynthetics -> com.android.tools.r8.internal.wc:
+com.android.tools.r8.horizontalclassmerging.policies.IgnoreSynthetics -> com.android.tools.r8.internal.xc:
     com.android.tools.r8.graph.AppView appView -> b
     1:2:void <init>(com.android.tools.r8.graph.AppView):16:17 -> <init>
     1:1:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):22:22 -> a
     2:242:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):0:240 -> a
     2:242:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):22 -> a
-com.android.tools.r8.horizontalclassmerging.policies.NoAbstractClasses -> com.android.tools.r8.internal.Kp:
+com.android.tools.r8.horizontalclassmerging.policies.NoAbstractClasses -> com.android.tools.r8.internal.Lp:
     1:1:void <init>():12:12 -> <init>
     1:2:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):15:16 -> a
-com.android.tools.r8.horizontalclassmerging.policies.NoAnnotations -> com.android.tools.r8.internal.Lp:
+com.android.tools.r8.horizontalclassmerging.policies.NoAnnotations -> com.android.tools.r8.internal.Mp:
     1:1:void <init>():10:10 -> <init>
-    1:1:boolean com.android.tools.r8.graph.DexClass.isAnnotation():501:501 -> a
+    1:1:boolean com.android.tools.r8.graph.DexClass.isAnnotation():505:505 -> a
     1:1:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):13 -> a
-com.android.tools.r8.horizontalclassmerging.policies.NoClassesOrMembersWithAnnotations -> com.android.tools.r8.internal.Mp:
+com.android.tools.r8.horizontalclassmerging.policies.NoClassesOrMembersWithAnnotations -> com.android.tools.r8.internal.Np:
     1:1:void <init>():10:10 -> <init>
     1:1:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):13:13 -> a
-com.android.tools.r8.horizontalclassmerging.policies.NoClassesWithInterfaces -> com.android.tools.r8.internal.Np:
+com.android.tools.r8.horizontalclassmerging.policies.NoClassesWithInterfaces -> com.android.tools.r8.internal.Op:
     1:1:void <init>():10:10 -> <init>
     1:1:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):14:14 -> a
-com.android.tools.r8.horizontalclassmerging.policies.NoEnums -> com.android.tools.r8.internal.Op:
+com.android.tools.r8.horizontalclassmerging.policies.NoEnums -> com.android.tools.r8.internal.Pp:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap cache -> c
     com.android.tools.r8.graph.AppView appView -> b
     1:1:void <init>(com.android.tools.r8.graph.AppView):20:20 -> <init>
@@ -24009,16 +24147,16 @@
     12:12:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
     12:12:boolean isEnumSubtype(com.android.tools.r8.graph.DexClass):39 -> a
     13:15:boolean isEnumSubtype(com.android.tools.r8.graph.DexClass):40:42 -> a
-com.android.tools.r8.horizontalclassmerging.policies.NoFields -> com.android.tools.r8.internal.Pp:
-    1:1:void <init>():10:10 -> <init>
-    1:1:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):14:14 -> a
 com.android.tools.r8.horizontalclassmerging.policies.NoInnerClasses -> com.android.tools.r8.internal.Qp:
     1:1:void <init>():10:10 -> <init>
     1:1:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):14:14 -> a
-com.android.tools.r8.horizontalclassmerging.policies.NoInterfaces -> com.android.tools.r8.internal.Rp:
+com.android.tools.r8.horizontalclassmerging.policies.NoInstanceFields -> com.android.tools.r8.internal.Rp:
+    1:1:void <init>():10:10 -> <init>
+    1:1:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):13:13 -> a
+com.android.tools.r8.horizontalclassmerging.policies.NoInterfaces -> com.android.tools.r8.internal.Sp:
     1:1:void <init>():10:10 -> <init>
     1:1:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):14:14 -> a
-com.android.tools.r8.horizontalclassmerging.policies.NoKeepRules -> com.android.tools.r8.internal.Sp:
+com.android.tools.r8.horizontalclassmerging.policies.NoKeepRules -> com.android.tools.r8.internal.Tp:
     com.android.tools.r8.graph.AppView appView -> b
     java.util.Set dontMergeTypes -> c
     1:1:void <init>(com.android.tools.r8.graph.AppView):22:22 -> <init>
@@ -24027,55 +24165,57 @@
     1:11:void processClass(com.android.tools.r8.graph.DexProgramClass):29:39 -> b
     12:12:void processClass(com.android.tools.r8.graph.DexProgramClass):38:38 -> b
     13:21:void processClass(com.android.tools.r8.graph.DexProgramClass):36:44 -> b
-com.android.tools.r8.horizontalclassmerging.policies.NoNativeMethods -> com.android.tools.r8.internal.Tp:
+com.android.tools.r8.horizontalclassmerging.policies.NoNativeMethods -> com.android.tools.r8.internal.Up:
     1:1:void <init>():12:12 -> <init>
     1:1:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):15:15 -> a
-com.android.tools.r8.horizontalclassmerging.policies.NoRuntimeTypeChecks -> com.android.tools.r8.internal.Up:
+com.android.tools.r8.horizontalclassmerging.policies.NoRuntimeTypeChecks -> com.android.tools.r8.internal.Vp:
     com.android.tools.r8.shaking.RuntimeTypeCheckInfo runtimeTypeCheckInfo -> b
     1:2:void <init>(com.android.tools.r8.shaking.RuntimeTypeCheckInfo):14:15 -> <init>
     1:1:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):21:21 -> a
-com.android.tools.r8.horizontalclassmerging.policies.NoStaticClassInitializer -> com.android.tools.r8.internal.Vp:
+com.android.tools.r8.horizontalclassmerging.policies.NoServiceLoaders -> com.android.tools.r8.internal.Wp:
+    com.android.tools.r8.graph.AppView appView -> b
+    java.util.Set allServiceImplementations -> c
+    1:4:void <init>(com.android.tools.r8.graph.AppView):18:21 -> <init>
+    1:2:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):26:27 -> a
+com.android.tools.r8.horizontalclassmerging.policies.NoStaticClassInitializer -> com.android.tools.r8.internal.Xp:
     1:1:void <init>():15:15 -> <init>
     1:1:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):18:18 -> a
-com.android.tools.r8.horizontalclassmerging.policies.NotEntryPoint -> com.android.tools.r8.internal.fq:
+com.android.tools.r8.horizontalclassmerging.policies.NotEntryPoint -> com.android.tools.r8.internal.hq:
     com.android.tools.r8.graph.DexString main -> b
     1:2:void <init>(com.android.tools.r8.graph.DexItemFactory):16:17 -> <init>
     1:2:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):23:24 -> a
-com.android.tools.r8.horizontalclassmerging.policies.NotMatchedByNoHorizontalClassMerging -> com.android.tools.r8.internal.gq:
+com.android.tools.r8.horizontalclassmerging.policies.NotMatchedByNoHorizontalClassMerging -> com.android.tools.r8.internal.iq:
     java.util.Set neverMergeClassHorizontally -> b
     1:2:void <init>(com.android.tools.r8.graph.AppView):17:18 -> <init>
     1:1:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):23:23 -> a
-    2:2:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClass.toReference():524:524 -> a
+    2:2:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClass.getReference():528:528 -> a
     2:2:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):23 -> a
     3:3:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):23:23 -> a
-com.android.tools.r8.horizontalclassmerging.policies.NotVerticallyMergedIntoSubtype -> com.android.tools.r8.internal.hq:
+com.android.tools.r8.horizontalclassmerging.policies.NotVerticallyMergedIntoSubtype -> com.android.tools.r8.internal.jq:
     com.android.tools.r8.graph.AppView appView -> b
     1:2:void <init>(com.android.tools.r8.graph.AppView):15:16 -> <init>
     1:4:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):21:24 -> a
-com.android.tools.r8.horizontalclassmerging.policies.PreventChangingVisibility -> com.android.tools.r8.internal.Vs:
+com.android.tools.r8.horizontalclassmerging.policies.PreventChangingVisibility -> com.android.tools.r8.internal.Xs:
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():22:22 -> <clinit>
     1:1:void <init>():23:23 -> <init>
     1:16:java.util.Collection apply(java.util.List):57:72 -> a
     17:17:boolean lambda$apply$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.horizontalclassmerging.policies.PreventChangingVisibility$TargetGroup):60:60 -> a
-com.android.tools.r8.horizontalclassmerging.policies.PreventChangingVisibility$TargetGroup -> com.android.tools.r8.internal.Us:
+com.android.tools.r8.horizontalclassmerging.policies.PreventChangingVisibility$TargetGroup -> com.android.tools.r8.internal.Ws:
     java.util.List group -> a
     java.util.Map methodMap -> b
     1:3:void <init>():25:27 -> <init>
     1:1:java.util.List getGroup():30:30 -> a
-    2:5:boolean tryAdd(com.android.tools.r8.graph.DexProgramClass):34:37 -> a
-    6:6:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getReference():375:375 -> a
-    6:6:boolean tryAdd(com.android.tools.r8.graph.DexProgramClass):37 -> a
-    7:8:boolean tryAdd(com.android.tools.r8.graph.DexProgramClass):37:38 -> a
+    2:6:boolean tryAdd(com.android.tools.r8.graph.DexProgramClass):34:38 -> a
+    7:7:com.android.tools.r8.graph.MethodAccessFlags com.android.tools.r8.graph.DexEncodedMethod.getAccessFlags():201:201 -> a
+    7:7:boolean tryAdd(com.android.tools.r8.graph.DexProgramClass):41 -> a
+    8:8:boolean tryAdd(com.android.tools.r8.graph.DexProgramClass):41:41 -> a
     9:9:com.android.tools.r8.graph.MethodAccessFlags com.android.tools.r8.graph.DexEncodedMethod.getAccessFlags():201:201 -> a
-    9:9:boolean tryAdd(com.android.tools.r8.graph.DexProgramClass):41 -> a
-    10:10:boolean tryAdd(com.android.tools.r8.graph.DexProgramClass):41:41 -> a
-    11:11:com.android.tools.r8.graph.MethodAccessFlags com.android.tools.r8.graph.DexEncodedMethod.getAccessFlags():201:201 -> a
-    11:11:boolean tryAdd(com.android.tools.r8.graph.DexProgramClass):43 -> a
-    12:12:boolean com.android.tools.r8.graph.AccessFlags.isSameVisibility(com.android.tools.r8.graph.AccessFlags):105:105 -> a
-    12:12:boolean tryAdd(com.android.tools.r8.graph.DexProgramClass):43 -> a
-    13:14:boolean tryAdd(com.android.tools.r8.graph.DexProgramClass):49:50 -> a
-com.android.tools.r8.horizontalclassmerging.policies.PreventMergeIntoMainDex -> com.android.tools.r8.internal.Ws:
+    9:9:boolean tryAdd(com.android.tools.r8.graph.DexProgramClass):43 -> a
+    10:10:boolean com.android.tools.r8.graph.AccessFlags.isSameVisibility(com.android.tools.r8.graph.AccessFlags):105:105 -> a
+    10:10:boolean tryAdd(com.android.tools.r8.graph.DexProgramClass):43 -> a
+    11:12:boolean tryAdd(com.android.tools.r8.graph.DexProgramClass):49:50 -> a
+com.android.tools.r8.horizontalclassmerging.policies.PreventMergeIntoMainDex -> com.android.tools.r8.internal.Ys:
     com.android.tools.r8.shaking.MainDexTracingResult mainDexTracingResult -> d
     com.android.tools.r8.shaking.MainDexClasses mainDexClasses -> c
     1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.MainDexTracingResult):23:25 -> <init>
@@ -24083,7 +24223,7 @@
     5:5:boolean com.android.tools.r8.horizontalclassmerging.policies.PreventMergeIntoMainDex.isMainDexClass(com.android.tools.r8.graph.DexProgramClass):29:29 -> a
     5:5:java.util.Collection apply(java.util.List):38 -> a
     6:16:java.util.Collection apply(java.util.List):39:49 -> a
-com.android.tools.r8.horizontalclassmerging.policies.RespectPackageBoundaries -> com.android.tools.r8.internal.gx:
+com.android.tools.r8.horizontalclassmerging.policies.RespectPackageBoundaries -> com.android.tools.r8.internal.ix:
     com.android.tools.r8.graph.AppView appView -> c
     1:2:void <init>(com.android.tools.r8.graph.AppView):25:26 -> <init>
     1:6:com.android.tools.r8.utils.TraversalContinuation lambda$shouldRestrictMergingAcrossPackageBoundary$0(com.android.tools.r8.shaking.VerticalClassMerger$IllegalAccessDetector,com.android.tools.r8.graph.ProgramMethod):49:54 -> a
@@ -24092,22 +24232,22 @@
     18:25:java.util.Collection apply(java.util.List):91 -> a
     26:34:java.util.Collection apply(java.util.List):92:100 -> a
     35:35:java.util.List lambda$apply$1(java.lang.String):84:84 -> a
-    36:36:boolean com.android.tools.r8.graph.DexClass.isPublic():560:560 -> a
+    36:36:boolean com.android.tools.r8.graph.DexClass.isPublic():564:564 -> a
     36:36:boolean shouldRestrictMergingAcrossPackageBoundary(com.android.tools.r8.graph.DexProgramClass):31 -> a
     37:38:boolean shouldRestrictMergingAcrossPackageBoundary(com.android.tools.r8.graph.DexProgramClass):36:37 -> a
     39:39:boolean com.android.tools.r8.graph.AccessFlags.isPackagePrivateOrProtected():132:132 -> a
     39:39:boolean shouldRestrictMergingAcrossPackageBoundary(com.android.tools.r8.graph.DexProgramClass):37 -> a
     40:51:boolean shouldRestrictMergingAcrossPackageBoundary(com.android.tools.r8.graph.DexProgramClass):45:56 -> a
-com.android.tools.r8.horizontalclassmerging.policies.SameFeatureSplit -> com.android.tools.r8.internal.tx:
+com.android.tools.r8.horizontalclassmerging.policies.SameFeatureSplit -> com.android.tools.r8.internal.vx:
     com.android.tools.r8.graph.AppView appView -> c
     1:2:void <init>(com.android.tools.r8.graph.AppView):16:17 -> <init>
     1:1:com.android.tools.r8.FeatureSplit com.android.tools.r8.horizontalclassmerging.policies.SameFeatureSplit.getMergeKey(com.android.tools.r8.graph.DexProgramClass):22:22 -> a
     1:1:java.lang.Object getMergeKey(com.android.tools.r8.graph.DexProgramClass):13 -> a
-com.android.tools.r8.horizontalclassmerging.policies.SameNestHost -> com.android.tools.r8.internal.ux:
+com.android.tools.r8.horizontalclassmerging.policies.SameNestHost -> com.android.tools.r8.internal.wx:
     1:1:void <init>():11:11 -> <init>
     1:1:com.android.tools.r8.graph.DexType com.android.tools.r8.horizontalclassmerging.policies.SameNestHost.getMergeKey(com.android.tools.r8.graph.DexProgramClass):14:14 -> a
     1:1:java.lang.Object getMergeKey(com.android.tools.r8.graph.DexProgramClass):11 -> a
-com.android.tools.r8.horizontalclassmerging.policies.SameParentClass -> com.android.tools.r8.internal.vx:
+com.android.tools.r8.horizontalclassmerging.policies.SameParentClass -> com.android.tools.r8.internal.xx:
     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
@@ -24121,7 +24261,7 @@
     1:1:void forEachField(java.util.function.Consumer):33:33 -> forEachField
     1:1:void forEachMethod(java.util.function.Consumer):38:38 -> forEachMethod
     1:4:com.android.tools.r8.references.ClassReference getClassReference():25:28 -> getClassReference
-com.android.tools.r8.inspector.internal.FieldInspectorImpl -> com.android.tools.r8.internal.ua:
+com.android.tools.r8.inspector.internal.FieldInspectorImpl -> com.android.tools.r8.internal.va:
     com.android.tools.r8.graph.DexEncodedField field -> b
     com.android.tools.r8.inspector.internal.ClassInspectorImpl parent -> a
     com.android.tools.r8.references.FieldReference reference -> c
@@ -24135,14 +24275,14 @@
     3:6:java.util.Optional getInitialValue():47:50 -> getInitialValue
     1:1:boolean isFinal():42:42 -> isFinal
     1:1:boolean isStatic():37:37 -> isStatic
-com.android.tools.r8.inspector.internal.InspectorImpl -> com.android.tools.r8.internal.Nd:
+com.android.tools.r8.inspector.internal.InspectorImpl -> com.android.tools.r8.internal.Od:
     java.util.Collection classes -> a
     1:2:void <init>(java.util.Collection):43:44 -> <init>
     1:6:java.util.List wrapInspections(java.util.Collection):20:25 -> a
     7:7:java.util.List wrapInspections(java.util.Collection):21:21 -> a
     8:13:void runInspections(java.util.List,java.util.Collection):32:37 -> a
     1:2:void forEachClass(java.util.function.Consumer):49:50 -> forEachClass
-com.android.tools.r8.inspector.internal.MethodInspectorImpl -> com.android.tools.r8.internal.yo:
+com.android.tools.r8.inspector.internal.MethodInspectorImpl -> com.android.tools.r8.internal.zo:
     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
@@ -24152,7 +24292,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.sC:
+com.android.tools.r8.inspector.internal.ValueInspectorImpl -> com.android.tools.r8.internal.tC:
     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>
@@ -24304,7 +24444,7 @@
     com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query DIRECTLY -> a
     1:2:void <clinit>():62:63 -> <clinit>
     1:1:void <init>(java.lang.String,int):61:61 -> <init>
-com.android.tools.r8.ir.analysis.DeterminismAnalysis -> com.android.tools.r8.internal.p8:
+com.android.tools.r8.ir.analysis.DeterminismAnalysis -> com.android.tools.r8.internal.q8:
     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
@@ -24339,9 +24479,9 @@
     24:24:boolean returnValueOnlyDependsOnArguments(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):67 -> a
     25:27:boolean returnValueOnlyDependsOnArguments(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):68:70 -> a
     28:28:boolean returnValueOnlyDependsOnArguments(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):59:59 -> a
-com.android.tools.r8.ir.analysis.InitializedClassesOnNormalExitAnalysis -> com.android.tools.r8.internal.Bd:
+com.android.tools.r8.ir.analysis.InitializedClassesOnNormalExitAnalysis -> com.android.tools.r8.internal.Cd:
     1:15:java.util.Set computeInitializedClassesOnNormalExit(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):39:53 -> a
-com.android.tools.r8.ir.analysis.InitializedClassesOnNormalExitAnalysis$Visitor -> com.android.tools.r8.internal.Ad:
+com.android.tools.r8.ir.analysis.InitializedClassesOnNormalExitAnalysis$Visitor -> com.android.tools.r8.internal.Bd:
     com.android.tools.r8.graph.AppView appView -> b
     java.util.Set initializedClassesOnNormalExit -> d
     boolean $assertionsDisabled -> a
@@ -24363,7 +24503,7 @@
     56:62:java.lang.Object handleInvoke(com.android.tools.r8.ir.code.Invoke):56 -> a
     63:63:java.lang.Void com.android.tools.r8.ir.analysis.InitializedClassesOnNormalExitAnalysis$Visitor.visit(com.android.tools.r8.ir.code.NewInstance):153:153 -> a
     63:63:java.lang.Object visit(com.android.tools.r8.ir.code.NewInstance):56 -> a
-com.android.tools.r8.ir.analysis.TypeChecker -> com.android.tools.r8.internal.BB:
+com.android.tools.r8.ir.analysis.TypeChecker -> com.android.tools.r8.internal.CB:
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.ir.analysis.VerifyTypesHelper verifyTypesHelper -> c
     boolean $assertionsDisabled -> a
@@ -24392,7 +24532,7 @@
     47:47:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
     47:47:boolean checkFieldPut(com.android.tools.r8.ir.code.FieldInstruction):106 -> a
     48:48:boolean checkFieldPut(com.android.tools.r8.ir.code.FieldInstruction):107:107 -> a
-com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis -> com.android.tools.r8.internal.uC:
+com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis -> com.android.tools.r8.internal.vC:
     com.android.tools.r8.graph.AppView appView -> b
     boolean $assertionsDisabled -> a
     com.android.tools.r8.graph.ProgramMethod context -> c
@@ -24453,10 +24593,10 @@
     213:213:com.android.tools.r8.ir.code.InvokeDirect com.android.tools.r8.ir.code.NewInstance.getUniqueConstructorInvoke(com.android.tools.r8.graph.DexItemFactory):43:43 -> a
     213:213:boolean addNewInstanceValueToValueGraph(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph$Node,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph,java.util.Set,java.util.Set,com.android.tools.r8.utils.WorkList):259 -> a
     214:228:boolean addNewInstanceValueToValueGraph(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph$Node,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph,java.util.Set,java.util.Set,com.android.tools.r8.utils.WorkList):260:274 -> a
-    229:233:java.util.List com.android.tools.r8.graph.DexClass.getDirectAndIndirectInstanceFields(com.android.tools.r8.graph.AppView):891:895 -> a
+    229:233:java.util.List com.android.tools.r8.graph.DexClass.getDirectAndIndirectInstanceFields(com.android.tools.r8.graph.AppView):895:899 -> a
     229:233:boolean addNewInstanceValueToValueGraph(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph$Node,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph,java.util.Set,java.util.Set,com.android.tools.r8.utils.WorkList):274 -> a
     234:234:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    234:234:java.util.List com.android.tools.r8.graph.DexClass.getDirectAndIndirectInstanceFields(com.android.tools.r8.graph.AppView):895 -> a
+    234:234:java.util.List com.android.tools.r8.graph.DexClass.getDirectAndIndirectInstanceFields(com.android.tools.r8.graph.AppView):899 -> a
     234:234:boolean addNewInstanceValueToValueGraph(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph$Node,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph,java.util.Set,java.util.Set,com.android.tools.r8.utils.WorkList):274 -> a
     235:249:boolean addNewInstanceValueToValueGraph(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph$Node,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph,java.util.Set,java.util.Set,com.android.tools.r8.utils.WorkList):275:289 -> a
     250:250:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():166:166 -> a
@@ -24486,7 +24626,7 @@
     316:316:boolean anyValueMayBeMutatedBeforeMethodExit(java.util.Set,java.util.Set):352 -> a
     317:319:boolean anyValueMayBeMutatedBeforeMethodExit(java.util.Set,java.util.Set):355:357 -> a
     320:320:boolean lambda$anyValueMayBeMutatedBeforeMethodExit$1(com.android.tools.r8.graph.DexType):335:335 -> a
-com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis$TrackedValuesState -> com.android.tools.r8.internal.tC:
+com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis$TrackedValuesState -> com.android.tools.r8.internal.uC:
     java.util.Set trackedValues -> c
     com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis$TrackedValuesState EMPTY -> a
     boolean hasTrackedValueEscaped -> b
@@ -24494,7 +24634,7 @@
     1:6:void <init>():372:377 -> <init>
     1:1:com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis$TrackedValuesState empty():380:380 -> a
     2:2:boolean isTrackingValue(com.android.tools.r8.ir.code.Value):393:393 -> a
-com.android.tools.r8.ir.analysis.VerifyTypesHelper -> com.android.tools.r8.internal.yC:
+com.android.tools.r8.ir.analysis.VerifyTypesHelper -> com.android.tools.r8.internal.zC:
     com.android.tools.r8.graph.AppView appView -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():10:10 -> <clinit>
@@ -24507,7 +24647,7 @@
     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
-com.android.tools.r8.ir.analysis.constant.ConstLatticeElement -> com.android.tools.r8.internal.X6:
+com.android.tools.r8.ir.analysis.constant.ConstLatticeElement -> com.android.tools.r8.internal.Y6:
     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
@@ -24521,7 +24661,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.b7:
+com.android.tools.r8.ir.analysis.constant.ConstRangeLatticeElement -> com.android.tools.r8.internal.c7:
     com.android.tools.r8.ir.code.Value value -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():8:8 -> <clinit>
@@ -24542,12 +24682,12 @@
     com.android.tools.r8.ir.analysis.constant.ConstRangeLatticeElement asConstRange() -> b
     1:1:com.android.tools.r8.ir.code.Value getConstRange():44:44 -> c
     1:1:java.lang.String toString():40:40 -> toString
-com.android.tools.r8.ir.analysis.constant.LatticeElement -> com.android.tools.r8.internal.Pl:
+com.android.tools.r8.ir.analysis.constant.LatticeElement -> com.android.tools.r8.internal.Ql:
     1:1:void <init>():6:6 -> <init>
     com.android.tools.r8.ir.analysis.constant.ConstLatticeElement asConst() -> a
     com.android.tools.r8.ir.analysis.constant.LatticeElement meet(com.android.tools.r8.ir.analysis.constant.LatticeElement) -> a
     com.android.tools.r8.ir.analysis.constant.ConstRangeLatticeElement asConstRange() -> b
-com.android.tools.r8.ir.analysis.constant.SparseConditionalConstantPropagation -> com.android.tools.r8.internal.uy:
+com.android.tools.r8.ir.analysis.constant.SparseConditionalConstantPropagation -> com.android.tools.r8.internal.wy:
     java.util.BitSet visitedBlocks -> i
     java.util.Map mapping -> d
     com.android.tools.r8.graph.AppView appView -> b
@@ -24629,13 +24769,13 @@
     110:123:void com.android.tools.r8.ir.analysis.constant.SparseConditionalConstantPropagation.addFlowEdgesForJumpInstruction(com.android.tools.r8.ir.code.JumpInstruction):234:247 -> b
     110:123:void visitInstruction(com.android.tools.r8.ir.code.Instruction):180 -> b
     124:129:void setExecutableEdge(int,int):253:258 -> b
-com.android.tools.r8.ir.analysis.constant.Top -> com.android.tools.r8.internal.BA:
+com.android.tools.r8.ir.analysis.constant.Top -> com.android.tools.r8.internal.DA:
     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
-com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph -> com.android.tools.r8.internal.rC:
+com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph -> com.android.tools.r8.internal.sC:
     java.util.Map nodes -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():27:27 -> <clinit>
@@ -24647,7 +24787,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.qC:
+com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph$Node -> com.android.tools.r8.internal.rC:
     java.util.Set predecessors -> c
     java.util.Set successors -> d
     com.android.tools.r8.ir.code.Value value -> a
@@ -24718,7 +24858,7 @@
     1:1:boolean com.android.tools.r8.ir.analysis.equivalence.BasicBlockBehavioralSubsumption.definesBlockLocalValue(com.android.tools.r8.ir.code.Instruction):172:172 -> c
     1:1:boolean isBlockLocalInstructionWithoutSideEffects(com.android.tools.r8.ir.code.Instruction):155 -> c
     2:10:boolean isBlockLocalInstructionWithoutSideEffects(com.android.tools.r8.ir.code.Instruction):158:166 -> c
-com.android.tools.r8.ir.analysis.escape.EscapeAnalysis -> com.android.tools.r8.internal.Z9:
+com.android.tools.r8.ir.analysis.escape.EscapeAnalysis -> com.android.tools.r8.internal.aa:
     com.android.tools.r8.graph.AppView appView -> b
     java.util.Set trackedValues -> d
     java.util.Deque valuesToTrack -> e
@@ -24747,9 +24887,9 @@
     103:105:void addToWorklist(com.android.tools.r8.ir.code.Value):171:173 -> a
     1:9:boolean isEscaping(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):56:64 -> b
     10:10:boolean isValueOfInterestOrAlias(com.android.tools.r8.ir.code.Value):214:214 -> b
-com.android.tools.r8.ir.analysis.escape.EscapeAnalysisConfiguration -> com.android.tools.r8.internal.aa:
+com.android.tools.r8.ir.analysis.escape.EscapeAnalysisConfiguration -> com.android.tools.r8.internal.ba:
     boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.ProgramMethod) -> a
-com.android.tools.r8.ir.analysis.fieldaccess.FieldAccessAnalysis -> com.android.tools.r8.internal.la:
+com.android.tools.r8.ir.analysis.fieldaccess.FieldAccessAnalysis -> com.android.tools.r8.internal.ma:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker fieldAssignmentTracker -> b
     com.android.tools.r8.ir.analysis.fieldaccess.FieldBitAccessAnalysis fieldBitAccessAnalysis -> c
@@ -24764,7 +24904,7 @@
     39:39:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
     39:39:void recordFieldAccesses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):94 -> a
     40:43:void recordFieldAccesses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):94:97 -> a
-com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker -> com.android.tools.r8.internal.ra:
+com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker -> com.android.tools.r8.internal.sa:
     com.android.tools.r8.graph.AppView appView -> b
     java.util.Set nonZeroFields -> e
     com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker$FieldAccessGraph fieldAccessGraph -> c
@@ -24821,7 +24961,7 @@
     219:227:void waveDone(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):288:296 -> a
     228:228:void lambda$waveDone$4(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.DexProgramClass):293:293 -> a
     1:5:void initializeAbstractInstanceFieldValues():85:89 -> b
-com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker$FieldAccessGraph -> com.android.tools.r8.internal.ra$a:
+com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker$FieldAccessGraph -> com.android.tools.r8.internal.sa$a:
     java.util.Map fieldWrites -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap pendingFieldWrites -> b
     1:1:void <init>():309:309 -> <init>
@@ -24831,7 +24971,7 @@
     14:14:java.util.List lambda$initialize$0(com.android.tools.r8.graph.DexEncodedMethod):325:325 -> a
     15:16:void lambda$initialize$1(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.ProgramMethod):325:326 -> a
     17:24:void markProcessed(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):333:340 -> a
-com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker$ObjectAllocationGraph -> com.android.tools.r8.internal.ra$b:
+com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker$ObjectAllocationGraph -> com.android.tools.r8.internal.sa$b:
     java.util.Map objectAllocations -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap pendingObjectAllocations -> b
     1:1:void <init>():357:357 -> <init>
@@ -24840,7 +24980,7 @@
     3:6:void lambda$initialize$1(com.android.tools.r8.graph.DexProgramClass,java.util.Set):364:367 -> a
     7:7:java.util.List lambda$initialize$0(com.android.tools.r8.graph.DexEncodedMethod):365:365 -> a
     8:15:void markProcessed(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):373:380 -> a
-com.android.tools.r8.ir.analysis.fieldaccess.FieldBitAccessAnalysis -> com.android.tools.r8.internal.sa:
+com.android.tools.r8.ir.analysis.fieldaccess.FieldBitAccessAnalysis -> com.android.tools.r8.internal.ta:
     1:1:void <init>():16:16 -> <init>
     1:9:void recordFieldAccess(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):20:28 -> a
     10:18:int com.android.tools.r8.ir.analysis.fieldaccess.FieldBitAccessAnalysis.computeBitsRead(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField):34:42 -> a
@@ -24852,7 +24992,7 @@
     20:30:void recordFieldAccess(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):29 -> a
     31:31:void recordFieldAccess(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):29:29 -> a
     32:48:boolean isOnlyUsedToUpdateFieldValue(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexEncodedField):66:82 -> a
-com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor -> com.android.tools.r8.internal.SA:
+com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor -> com.android.tools.r8.internal.TA:
     com.android.tools.r8.graph.AppView appView -> b
     java.util.Set fieldsOfInterest -> d
     com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder postMethodProcessorBuilder -> c
@@ -24887,7 +25027,7 @@
     60:73:boolean canOptimizeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.AppView):130:143 -> a
     1:1:java.util.Set access$100(com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor):34:34 -> b
     1:1:com.android.tools.r8.utils.collections.ProgramMethodSet access$200(com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor):34:34 -> c
-com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor$TrivialFieldAccessUseRegistry -> com.android.tools.r8.internal.RA:
+com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor$TrivialFieldAccessUseRegistry -> com.android.tools.r8.internal.SA:
     com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor this$0 -> d
     com.android.tools.r8.graph.ProgramMethod method -> c
     1:3:void <init>(com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor,com.android.tools.r8.graph.ProgramMethod):164:166 -> <init>
@@ -24916,7 +25056,7 @@
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens) -> a
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.KnownFieldSet asKnownFieldSet() -> b
     boolean isKnownFieldSet() -> c
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.ConcreteMutableFieldSet -> com.android.tools.r8.internal.U6:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.ConcreteMutableFieldSet -> com.android.tools.r8.internal.V6:
     java.util.Set fields -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():18:18 -> <clinit>
@@ -24940,7 +25080,7 @@
     1:5:boolean equals(java.lang.Object):108:112 -> equals
     1:1:int hashCode():100:100 -> hashCode
     1:1:int size():95:95 -> size
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.EmptyFieldSet -> com.android.tools.r8.internal.d9:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.EmptyFieldSet -> com.android.tools.r8.internal.e9:
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.EmptyFieldSet INSTANCE -> a
     1:1:void <clinit>():13:13 -> <clinit>
     1:1:void <init>():15:15 -> <init>
@@ -24949,7 +25089,7 @@
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.KnownFieldSet asKnownFieldSet() -> b
     boolean isKnownFieldSet() -> c
     1:1:com.android.tools.r8.ir.analysis.fieldvalueanalysis.EmptyFieldSet getInstance():18:18 -> d
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.FieldValueAnalysis -> com.android.tools.r8.internal.Ia:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.FieldValueAnalysis -> com.android.tools.r8.internal.Ja:
     com.android.tools.r8.ir.optimize.info.OptimizationFeedback feedback -> e
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.ir.code.DominatorTree dominatorTree -> f
@@ -25033,13 +25173,13 @@
     51:51:java.util.Map createFieldsMaybeReadBeforeBlockInclusive():254 -> b
     52:76:java.util.Map createFieldsMaybeReadBeforeBlockInclusive():255:279 -> b
     1:4:com.android.tools.r8.ir.code.DominatorTree getOrCreateDominatorTree():67:70 -> c
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.FieldValueAnalysis$FieldInitializationInfo -> com.android.tools.r8.internal.Ha:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.FieldValueAnalysis$FieldInitializationInfo -> com.android.tools.r8.internal.Ia:
     com.android.tools.r8.ir.code.Instruction instruction -> a
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo instanceFieldInitializationInfo -> b
     1:3:void <init>(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):42:44 -> <init>
     1:1:com.android.tools.r8.ir.code.Instruction access$000(com.android.tools.r8.ir.analysis.fieldvalueanalysis.FieldValueAnalysis$FieldInitializationInfo):36:36 -> a
     1:1:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo access$100(com.android.tools.r8.ir.analysis.fieldvalueanalysis.FieldValueAnalysis$FieldInitializationInfo):36:36 -> b
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.InstanceFieldValueAnalysis -> com.android.tools.r8.internal.Vd:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.InstanceFieldValueAnalysis -> com.android.tools.r8.internal.Wd:
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection$Builder builder -> j
     com.android.tools.r8.graph.DexClassAndMethod parentConstructor -> l
     boolean $assertionsDisabled -> i
@@ -25098,10 +25238,10 @@
     3:54:void com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection$Builder.recordInitializationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):0:51 -> b
     3:54:void recordInstanceFieldIsInitializedWithInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):216 -> b
     1:11:void analyzeParentConstructorCall():164:174 -> d
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.KnownFieldSet -> com.android.tools.r8.internal.Qj:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.KnownFieldSet -> com.android.tools.r8.internal.Rj:
     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.Gy:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValueAnalysis -> com.android.tools.r8.internal.Iy:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():39:39 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):43:43 -> <init>
@@ -25143,7 +25283,7 @@
     87:87:com.android.tools.r8.ir.analysis.value.ObjectState computeObjectState(com.android.tools.r8.ir.code.Value):357 -> a
     88:111:com.android.tools.r8.ir.analysis.value.ObjectState computeObjectState(com.android.tools.r8.ir.code.Value):358:381 -> a
     112:113:void lambda$computeObjectState$1(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.analysis.value.ObjectState$Builder,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):367:368 -> a
-    114:114:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.toReference():134:134 -> a
+    114:114:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getReference():134:134 -> a
     114:114:void lambda$computeObjectState$1(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.analysis.value.ObjectState$Builder,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):368 -> a
     115:115:boolean com.android.tools.r8.graph.DexItemFactory$EnumMembers.isNameOrOrdinalField(com.android.tools.r8.graph.DexField):1312:1312 -> a
     115:115:void lambda$computeObjectState$1(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.analysis.value.ObjectState$Builder,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):368 -> a
@@ -25191,7 +25331,7 @@
     21:21:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> d
     21:21:boolean isEnumValuesArray(com.android.tools.r8.ir.code.Value):405 -> d
     22:22:boolean isEnumValuesArray(com.android.tools.r8.ir.code.Value):406:406 -> d
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.UnknownFieldSet -> com.android.tools.r8.internal.YB:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.UnknownFieldSet -> com.android.tools.r8.internal.ZB:
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.UnknownFieldSet INSTANCE -> a
     1:1:void <clinit>():13:13 -> <clinit>
     1:1:void <init>():15:15 -> <init>
@@ -25202,17 +25342,17 @@
     1:1:void <init>():10:10 -> <init>
     com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState join(com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState) -> a
     boolean isAbstractState() -> c
-com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult -> com.android.tools.r8.internal.v7:
+com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult -> com.android.tools.r8.internal.w7:
     1:1:void <init>():20:20 -> <init>
-com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult$FailedDataflowAnalysisResult -> com.android.tools.r8.internal.t7:
+com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult$FailedDataflowAnalysisResult -> com.android.tools.r8.internal.u7:
     1:1:void <init>():38:38 -> <init>
-com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult$SuccessfulDataflowAnalysisResult -> com.android.tools.r8.internal.u7:
+com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult$SuccessfulDataflowAnalysisResult -> com.android.tools.r8.internal.v7:
     1:1:void <init>():30:30 -> <init>
-com.android.tools.r8.ir.analysis.framework.intraprocedural.FailedTransferFunctionResult -> com.android.tools.r8.internal.ja:
+com.android.tools.r8.ir.analysis.framework.intraprocedural.FailedTransferFunctionResult -> com.android.tools.r8.internal.ka:
     1:1:void <init>():13:13 -> <init>
     1:1:com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState asAbstractState():17:17 -> a
     boolean isFailedTransferResult() -> b
-com.android.tools.r8.ir.analysis.framework.intraprocedural.IntraproceduralDataflowAnalysis -> com.android.tools.r8.internal.hg:
+com.android.tools.r8.ir.analysis.framework.intraprocedural.IntraproceduralDataflowAnalysis -> com.android.tools.r8.internal.ig:
     java.util.Map blockExitStates -> d
     com.android.tools.r8.ir.analysis.framework.intraprocedural.TransferFunction transfer -> c
     boolean $assertionsDisabled -> a
@@ -25233,20 +25373,20 @@
     15:16:com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult run(com.android.tools.r8.ir.code.BasicBlock):42 -> a
     17:20:com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult com.android.tools.r8.ir.analysis.framework.intraprocedural.IntraproceduralDataflowAnalysis.run(com.android.tools.r8.utils.WorkList):62:65 -> a
     17:20:com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult run(com.android.tools.r8.ir.code.BasicBlock):42 -> a
-com.android.tools.r8.ir.analysis.framework.intraprocedural.TransferFunction -> com.android.tools.r8.internal.GA:
+com.android.tools.r8.ir.analysis.framework.intraprocedural.TransferFunction -> com.android.tools.r8.internal.HA:
     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.TransferFunctionResult -> com.android.tools.r8.internal.HA:
+com.android.tools.r8.ir.analysis.framework.intraprocedural.TransferFunctionResult -> com.android.tools.r8.internal.IA:
     com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState asAbstractState() -> a
     boolean isFailedTransferResult() -> b
     boolean isAbstractState() -> c
-com.android.tools.r8.ir.analysis.modeling.LibraryMethodReadSetModeling -> com.android.tools.r8.internal.im:
+com.android.tools.r8.ir.analysis.modeling.LibraryMethodReadSetModeling -> com.android.tools.r8.internal.jm:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():16:16 -> <clinit>
     1:14:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet getModeledReadSetOrUnknown(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod):20:33 -> a
     15:15:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):1227:1227 -> a
     15:15:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet getModeledReadSetOrUnknown(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod):33 -> a
     16:24:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet getModeledReadSetOrUnknown(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod):33:41 -> a
-com.android.tools.r8.ir.analysis.proto.EnumLiteProtoShrinker -> com.android.tools.r8.internal.A9:
+com.android.tools.r8.ir.analysis.proto.EnumLiteProtoShrinker -> com.android.tools.r8.internal.B9:
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> b
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set deadEnumLiteMaps -> c
@@ -25257,7 +25397,7 @@
     4:4:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> b
     4:4:void verifyDeadEnumLiteMapsAreDead():141 -> b
     5:5:void verifyDeadEnumLiteMapsAreDead():141:141 -> b
-com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker -> com.android.tools.r8.internal.sb:
+com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker -> com.android.tools.r8.internal.tb:
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> c
     com.android.tools.r8.graph.AppView appView -> b
     java.util.Set classesWithRemovedExtensionFields -> d
@@ -25278,27 +25418,24 @@
     45:45:void lambda$postOptimizeGeneratedExtensionRegistry$1(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessingId):161:161 -> a
     46:46:void lambda$forEachFindLiteExtensionByNumberMethod$3(java.util.function.Consumer,com.android.tools.r8.graph.DexProgramClass):176:176 -> a
     47:47:boolean lambda$forEachFindLiteExtensionByNumberMethod$2(com.android.tools.r8.graph.DexEncodedMethod):178:178 -> a
-    48:48:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getReference():375:375 -> a
-    48:48:boolean lambda$forEachFindLiteExtensionByNumberMethod$2(com.android.tools.r8.graph.DexEncodedMethod):178 -> a
-    49:49:boolean lambda$forEachFindLiteExtensionByNumberMethod$2(com.android.tools.r8.graph.DexEncodedMethod):178:178 -> a
-    50:50:void lambda$forEachFindLiteExtensionByNumberMethod$4(com.android.tools.r8.ir.desugar.LambdaDescriptor):181:181 -> a
-    51:58:boolean isDeadProtoExtensionField(com.android.tools.r8.graph.DexField):186:193 -> a
-    59:59:boolean isDeadProtoExtensionField(com.android.tools.r8.graph.DexField):192:192 -> a
-    60:74:boolean isDeadProtoExtensionField(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.FieldAccessInfoCollection,com.android.tools.r8.shaking.KeepInfoCollection):202:216 -> a
-    75:244:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences.isFindLiteExtensionByNumberMethod(com.android.tools.r8.graph.ProgramMethod):0:169 -> a
-    75:244:boolean isDeadProtoExtensionField(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.FieldAccessInfoCollection,com.android.tools.r8.shaking.KeepInfoCollection):217 -> a
-    245:247:void forEachDeadProtoExtensionField(java.util.function.Consumer):221:223 -> a
-    248:250:void lambda$forEachDeadProtoExtensionField$5(java.util.function.Consumer,com.android.tools.r8.graph.FieldAccessInfo):225:227 -> a
+    48:48:void lambda$forEachFindLiteExtensionByNumberMethod$4(com.android.tools.r8.ir.desugar.LambdaDescriptor):181:181 -> a
+    49:56:boolean isDeadProtoExtensionField(com.android.tools.r8.graph.DexField):186:193 -> a
+    57:57:boolean isDeadProtoExtensionField(com.android.tools.r8.graph.DexField):192:192 -> a
+    58:72:boolean isDeadProtoExtensionField(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.FieldAccessInfoCollection,com.android.tools.r8.shaking.KeepInfoCollection):202:216 -> a
+    73:242:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences.isFindLiteExtensionByNumberMethod(com.android.tools.r8.graph.ProgramMethod):0:169 -> a
+    73:242:boolean isDeadProtoExtensionField(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.FieldAccessInfoCollection,com.android.tools.r8.shaking.KeepInfoCollection):217 -> a
+    243:245:void forEachDeadProtoExtensionField(java.util.function.Consumer):221:223 -> a
+    246:248:void lambda$forEachDeadProtoExtensionField$5(java.util.function.Consumer,com.android.tools.r8.graph.FieldAccessInfo):225:227 -> a
     1:2:void recordDeadProtoExtensionField(com.android.tools.r8.graph.DexField):101:102 -> b
     3:5:void forEachFindLiteExtensionByNumberMethod(java.util.function.Consumer):171:173 -> b
     1:1:boolean wasRemoved(com.android.tools.r8.graph.DexField):149:149 -> c
-com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker$1 -> com.android.tools.r8.internal.rb:
+com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker$1 -> com.android.tools.r8.internal.sb:
     com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker this$0 -> b
     1:1:void <init>(com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):107:107 -> <init>
     1:1:boolean isReachableOrReferencedField(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexEncodedField):112:112 -> a
     2:2:boolean com.android.tools.r8.shaking.DefaultTreePrunerConfiguration.isReachableOrReferencedField(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexEncodedField):22:22 -> a
     2:2:boolean isReachableOrReferencedField(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexEncodedField):112 -> a
-com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker -> com.android.tools.r8.internal.Cb:
+com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker -> com.android.tools.r8.internal.Db:
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> c
     com.android.tools.r8.graph.AppView appView -> b
     boolean $assertionsDisabled -> a
@@ -25372,7 +25509,7 @@
     2:2:boolean lambda$computeEnableAggressiveBuilderOptimization$1(com.android.tools.r8.graph.DexClass):111:111 -> b
     3:4:com.android.tools.r8.graph.analysis.EnqueuerAnalysis createEnqueuerAnalysis():127:128 -> b
     1:1:com.android.tools.r8.ir.analysis.proto.ProtoReferences access$200(com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):60:60 -> c
-com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker$1 -> com.android.tools.r8.internal.Ab:
+com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker$1 -> com.android.tools.r8.internal.Bb:
     com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker this$0 -> c
     java.util.Set val$seen -> b
     boolean $assertionsDisabled -> a
@@ -25388,7 +25525,7 @@
     31:34:void lambda$notifyFixpoint$0(java.util.Set,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):154:157 -> a
     35:40:void lambda$notifyFixpoint$0(java.util.Set,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):156:161 -> a
     41:41:void lambda$notifyFixpoint$0(java.util.Set,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):160:160 -> a
-com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker$RootSetExtension -> com.android.tools.r8.internal.Bb:
+com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker$RootSetExtension -> com.android.tools.r8.internal.Cb:
     java.util.Set alwaysInline -> g
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> b
     java.util.Set bypassClinitforInlining -> h
@@ -25416,7 +25553,7 @@
     6:7:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker$RootSetExtension.neverMergeGeneratedMessageLiteBuilder():468:469 -> b
     6:7:void extend(com.android.tools.r8.graph.SubtypingInfo):431 -> b
     8:10:void neverMergeClass(com.android.tools.r8.graph.DexType):479:481 -> b
-com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker -> com.android.tools.r8.internal.Db:
+com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker -> com.android.tools.r8.internal.Eb:
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder decoder -> c
     boolean $assertionsDisabled -> a
@@ -25518,7 +25655,7 @@
     67:72:void lambda$forEachDynamicMethod$1(com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer,com.android.tools.r8.graph.DexProgramClass):101:106 -> a
     73:73:void lambda$forEachDynamicMethod$2(com.android.tools.r8.ir.desugar.LambdaDescriptor):110:110 -> a
     74:77:com.android.tools.r8.ir.code.InvokeMethod getNewMessageInfoInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.ProtoReferences):198:201 -> a
-com.android.tools.r8.ir.analysis.proto.ProtoEnqueuerUseRegistry -> com.android.tools.r8.internal.Wu:
+com.android.tools.r8.ir.analysis.proto.ProtoEnqueuerUseRegistry -> com.android.tools.r8.internal.Yu:
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> f
     com.android.tools.r8.shaking.EnqueuerUseRegistryFactory FACTORY -> e
     1:1:void <clinit>():18:18 -> <clinit>
@@ -25526,7 +25663,7 @@
     1:1:com.android.tools.r8.shaking.EnqueuerUseRegistryFactory getFactory():29:29 -> b
     2:6:void registerConstClass(com.android.tools.r8.graph.DexType):41:45 -> b
     1:5:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):57:61 -> e
-com.android.tools.r8.ir.analysis.proto.ProtoInliningReasonStrategy -> com.android.tools.r8.internal.bv:
+com.android.tools.r8.ir.analysis.proto.ProtoInliningReasonStrategy -> com.android.tools.r8.internal.dv:
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> c
     com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy parent -> b
     boolean $assertionsDisabled -> a
@@ -25563,7 +25700,7 @@
     510:510:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):46 -> a
     511:514:com.android.tools.r8.ir.optimize.Inliner$Reason com.android.tools.r8.ir.analysis.proto.ProtoInliningReasonStrategy.computeInliningReasonForDynamicMethod(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):79:82 -> a
     511:514:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):46 -> a
-com.android.tools.r8.ir.analysis.proto.ProtoReferences -> com.android.tools.r8.internal.jv:
+com.android.tools.r8.ir.analysis.proto.ProtoReferences -> com.android.tools.r8.internal.lv:
     com.android.tools.r8.graph.DexType rawMessageInfoType -> l
     com.android.tools.r8.graph.DexType generatedMessageLiteExtendableBuilderType -> j
     com.android.tools.r8.graph.DexType methodToInvokeType -> n
@@ -25609,28 +25746,28 @@
     3:3:boolean isGeneratedMessageLiteBuilder(com.android.tools.r8.graph.DexProgramClass):175 -> b
     1:2:boolean isFindLiteExtensionByNumberMethod(com.android.tools.r8.graph.DexMethod):163:164 -> c
     1:1:boolean isMessageInfoConstructionMethod(com.android.tools.r8.graph.DexMethod):179:179 -> d
-com.android.tools.r8.ir.analysis.proto.ProtoReferences$1 -> com.android.tools.r8.internal.jv$a:
-com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedExtensionMethods -> com.android.tools.r8.internal.jv$b:
+com.android.tools.r8.ir.analysis.proto.ProtoReferences$1 -> com.android.tools.r8.internal.lv$a:
+com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedExtensionMethods -> com.android.tools.r8.internal.lv$b:
     com.android.tools.r8.graph.DexMethod constructorWithClass -> b
     com.android.tools.r8.graph.DexMethod constructor -> a
     1:1:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.analysis.proto.ProtoReferences$1):186:186 -> <init>
     2:6:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):191:195 -> <init>
     7:19:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):193:205 -> <init>
     20:20:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):203:203 -> <init>
-com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteBuilderMethods -> com.android.tools.r8.internal.jv$c:
+com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteBuilderMethods -> com.android.tools.r8.internal.lv$c:
     com.android.tools.r8.graph.DexMethod constructorMethod -> a
     1:1:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.analysis.proto.ProtoReferences$1):280:280 -> <init>
     2:6:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):285:289 -> <init>
     7:14:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):287:294 -> <init>
     15:15:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):292:292 -> <init>
-com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteExtendableBuilderMethods -> com.android.tools.r8.internal.jv$d:
+com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteExtendableBuilderMethods -> com.android.tools.r8.internal.lv$d:
     com.android.tools.r8.graph.DexMethod constructorMethod -> b
     com.android.tools.r8.graph.DexMethod buildPartialMethod -> a
     1:1:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.analysis.proto.ProtoReferences$1):299:299 -> <init>
     2:6:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):304:308 -> <init>
     7:14:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):306:313 -> <init>
     15:15:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):311:311 -> <init>
-com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteMethods -> com.android.tools.r8.internal.jv$e:
+com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteMethods -> com.android.tools.r8.internal.lv$e:
     com.android.tools.r8.graph.DexMethod newSingularGeneratedExtension -> e
     com.android.tools.r8.graph.DexMethod newRepeatedGeneratedExtension -> d
     com.android.tools.r8.graph.DexMethod dynamicMethodBridgeMethodWithObject -> c
@@ -25644,7 +25781,7 @@
     32:39:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):247:254 -> <init>
     40:55:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):252:267 -> <init>
     56:56:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):265:265 -> <init>
-com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers -> com.android.tools.r8.internal.jv$f:
+com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers -> com.android.tools.r8.internal.lv$f:
     com.android.tools.r8.graph.DexField newMutableInstanceField -> f
     com.android.tools.r8.graph.DexField newBuilderField -> e
     com.android.tools.r8.graph.DexField setMemoizedIsInitializedField -> g
@@ -25654,7 +25791,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):319:319 -> <init>
     2:19:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):329:346 -> <init>
-com.android.tools.r8.ir.analysis.proto.ProtoShrinker -> com.android.tools.r8.internal.kv:
+com.android.tools.r8.ir.analysis.proto.ProtoShrinker -> com.android.tools.r8.internal.mv:
     com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory factory -> c
     com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker generatedMessageLiteBuilderShrinker -> f
     java.util.Set deadProtoTypes -> i
@@ -25669,18 +25806,18 @@
     2:22:void <init>(com.android.tools.r8.graph.AppView):26:46 -> <init>
     1:1:java.util.Set getDeadProtoTypes():50:50 -> a
     2:4:boolean verifyDeadProtoTypesNotReferenced(com.android.tools.r8.dex.VirtualFile):60:62 -> a
-    5:5:void com.android.tools.r8.utils.InternalOptions.checkAssertionsEnabled():796:796 -> a
+    5:5:void com.android.tools.r8.utils.InternalOptions.checkAssertionsEnabled():803:803 -> a
     5:5:void setDeadProtoTypes(java.util.Set):55 -> a
     6:6:void setDeadProtoTypes(java.util.Set):56:56 -> a
-    7:7:void com.android.tools.r8.utils.InternalOptions.checkAssertionsEnabled():797:797 -> a
+    7:7:void com.android.tools.r8.utils.InternalOptions.checkAssertionsEnabled():804:804 -> a
     7:7:void setDeadProtoTypes(java.util.Set):55 -> a
-com.android.tools.r8.ir.analysis.proto.ProtoUtils -> com.android.tools.r8.internal.mv:
+com.android.tools.r8.ir.analysis.proto.ProtoUtils -> com.android.tools.r8.internal.ov:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():11:11 -> <clinit>
     boolean isProto2(int) -> a
     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.vv:
+com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder -> com.android.tools.r8.internal.xv:
     com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory factory -> b
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> c
     boolean $assertionsDisabled -> a
@@ -25708,7 +25845,7 @@
     161:161:boolean com.android.tools.r8.ir.code.Instruction.isConstString():0:0 -> a
     161:161:com.android.tools.r8.ir.analysis.proto.schema.ProtoObject createProtoObject(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):202 -> a
     162:164:com.android.tools.r8.ir.analysis.proto.schema.ProtoObject createProtoObject(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):203:205 -> a
-    165:166:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexClass.lookupUniqueInstanceFieldWithName(com.android.tools.r8.graph.DexString):399:400 -> a
+    165:166:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexClass.lookupUniqueInstanceFieldWithName(com.android.tools.r8.graph.DexString):403:404 -> a
     165:166:com.android.tools.r8.ir.analysis.proto.schema.ProtoObject createProtoObject(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):205 -> a
     167:171:com.android.tools.r8.ir.analysis.proto.schema.ProtoObject createProtoObject(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):207:211 -> a
     172:172:boolean com.android.tools.r8.ir.code.Instruction.isDexItemBasedConstString():0:0 -> a
@@ -25735,7 +25872,7 @@
     4:19:com.android.tools.r8.utils.ThrowingIterator createObjectIterator(com.android.tools.r8.ir.code.Value):310:325 -> b
     20:20:com.android.tools.r8.utils.ThrowingIterator createObjectIterator(com.android.tools.r8.ir.code.Value):318:318 -> b
     21:21:com.android.tools.r8.utils.ThrowingIterator createObjectIterator(com.android.tools.r8.ir.code.Value):307:307 -> b
-com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$1 -> com.android.tools.r8.internal.uv:
+com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$1 -> com.android.tools.r8.internal.wv:
     com.android.tools.r8.graph.DexString val$info -> b
     com.android.tools.r8.utils.ThrowingCharIterator charIterator -> a
     1:3:void <init>(com.android.tools.r8.graph.DexString):260:262 -> <init>
@@ -25748,7 +25885,7 @@
     9:9:int nextInt():292:292 -> b
     10:10:int nextInt():281:281 -> b
     11:11:int nextInt():272:272 -> b
-com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$2 -> com.android.tools.r8.internal.vv$a:
+com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$2 -> com.android.tools.r8.internal.xv$a:
     com.android.tools.r8.ir.code.Value val$objectsValue -> c
     com.android.tools.r8.ir.code.InstructionIterator val$instructionIterator -> b
     int expectedNextIndex -> a
@@ -25763,10 +25900,10 @@
     16:16:java.lang.Object next():325 -> b
     17:17:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$2.next():347:347 -> b
     17:17:java.lang.Object next():325 -> b
-com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$InvalidRawMessageInfoException -> com.android.tools.r8.internal.vv$b:
+com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$InvalidRawMessageInfoException -> com.android.tools.r8.internal.xv$b:
     1:1:void <init>():370:370 -> <init>
     2:2:void <init>(com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$1):370:370 -> <init>
-com.android.tools.r8.ir.analysis.proto.RawMessageInfoEncoder -> com.android.tools.r8.internal.wv:
+com.android.tools.r8.ir.analysis.proto.RawMessageInfoEncoder -> com.android.tools.r8.internal.yv:
     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
@@ -25779,13 +25916,13 @@
     55:70: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):81:96 -> a
     55:70: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.A7:
+com.android.tools.r8.ir.analysis.proto.schema.DeadProtoFieldObject -> com.android.tools.r8.internal.B7:
     com.android.tools.r8.graph.DexString name -> b
     com.android.tools.r8.graph.DexType holder -> a
     1:3:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):20:22 -> <init>
     1:1:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):27:27 -> a
     1:1:java.lang.String toString():37:37 -> toString
-com.android.tools.r8.ir.analysis.proto.schema.LiveProtoFieldObject -> com.android.tools.r8.internal.Mm:
+com.android.tools.r8.ir.analysis.proto.schema.LiveProtoFieldObject -> com.android.tools.r8.internal.Nm:
     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
@@ -25795,7 +25932,7 @@
     3:8:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):35:40 -> a
     1:1:com.android.tools.r8.graph.DexField getField():28:28 -> g
     1:1:java.lang.String toString():55:55 -> toString
-com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension -> com.android.tools.r8.internal.Vu:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension -> com.android.tools.r8.internal.Xu:
     com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory factory -> d
     java.util.Set dynamicMethodsWithTracedProtoObjects -> i
     com.android.tools.r8.graph.AppView appView -> b
@@ -25905,7 +26042,7 @@
     443:457:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo getOrCreateProtoMessageInfo(com.android.tools.r8.graph.DexType):658:672 -> a
     1:25:void populateExtensionGraph(com.android.tools.r8.shaking.Enqueuer):214:238 -> b
     26:26:java.util.Set lambda$populateExtensionGraphWithExtensionFieldDefinition$2(com.android.tools.r8.graph.DexType):341:341 -> b
-com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo -> com.android.tools.r8.internal.Xu:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo -> com.android.tools.r8.internal.Zu:
     java.util.List objects -> e
     com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType type -> c
     java.util.OptionalInt auxData -> d
@@ -25962,11 +26099,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.Yu:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldObject -> com.android.tools.r8.internal.av:
     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.Zu:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType -> com.android.tools.r8.internal.bv:
     boolean needsIsInitializedCheck -> e
     boolean isMapFieldWithProto2EnumValue -> f
     boolean hasHasBit -> g
@@ -25994,7 +26131,7 @@
     1:1:boolean isValid():127:127 -> k
     1:1:boolean needsIsInitializedCheck():132:132 -> l
     1:14:int serialize():152:165 -> m
-com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory -> com.android.tools.r8.internal.av:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory -> com.android.tools.r8.internal.cv:
     boolean $assertionsDisabled -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap fieldTypes -> b
     1:1:void <clinit>():10:10 -> <clinit>
@@ -26003,7 +26140,7 @@
     2:72:com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType.fromFieldIdWithExtraBits(int):0:70 -> a
     2:72:com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType createField(int):17 -> a
     73:74: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.dv:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo -> com.android.tools.r8.internal.fv:
     java.util.LinkedList hasBitsObjects -> d
     java.util.LinkedList oneOfObjects -> e
     int flags -> b
@@ -26024,8 +26161,8 @@
     1:1:int numberOfHasBitsObjects():235:235 -> j
     1:1:int numberOfOneOfObjects():239:239 -> k
     1:9:java.lang.String toString():244:252 -> toString
-com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo$1 -> com.android.tools.r8.internal.cv:
-com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo$Builder -> com.android.tools.r8.internal.dv$a:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo$1 -> com.android.tools.r8.internal.ev:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo$Builder -> com.android.tools.r8.internal.fv$a:
     java.util.LinkedList fields -> d
     java.util.LinkedList hasBitsObjects -> e
     java.util.LinkedList oneOfObjects -> f
@@ -26061,7 +26198,7 @@
     81:88:void removeUnusedSharedData():159:166 -> c
     89:89:void removeUnusedSharedData():165:165 -> c
     90:91:void removeUnusedSharedData():84:85 -> c
-com.android.tools.r8.ir.analysis.proto.schema.ProtoObject -> com.android.tools.r8.internal.ev:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoObject -> com.android.tools.r8.internal.gv:
     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
@@ -26070,14 +26207,14 @@
     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.fv:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoObjectFromInvokeStatic -> com.android.tools.r8.internal.hv:
     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:4:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):1105:1105 -> a
     4:4:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):28 -> a
     5:5:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):30:30 -> a
-com.android.tools.r8.ir.analysis.proto.schema.ProtoObjectFromStaticGet -> com.android.tools.r8.internal.gv:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoObjectFromStaticGet -> com.android.tools.r8.internal.iv:
     com.android.tools.r8.graph.DexField field -> a
     1:2:void <init>(com.android.tools.r8.graph.DexField):20:21 -> <init>
     1:2:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):30:31 -> a
@@ -26086,7 +26223,7 @@
     4:4:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):32: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.hv:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfFieldType -> com.android.tools.r8.internal.jv:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:void <init>(int,boolean,boolean,boolean,boolean,boolean):20:20 -> <init>
@@ -26098,7 +26235,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.iv:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair -> com.android.tools.r8.internal.kv:
     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>
@@ -26106,7 +26243,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.lv:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoTypeObject -> com.android.tools.r8.internal.nv:
     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
@@ -26182,7 +26319,7 @@
     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
-com.android.tools.r8.ir.analysis.type.ClassTypeElement -> com.android.tools.r8.internal.c6:
+com.android.tools.r8.ir.analysis.type.ClassTypeElement -> com.android.tools.r8.internal.d6:
     java.util.Set lazyInterfaces -> g
     com.android.tools.r8.graph.DexType type -> j
     boolean $assertionsDisabled -> f
@@ -26234,16 +26371,16 @@
     boolean isClassType() -> s
     1:11:java.lang.String toString():129:139 -> toString
     12:16:java.lang.String toString():138:142 -> toString
-com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker -> com.android.tools.r8.internal.c6$a:
+com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker -> com.android.tools.r8.internal.d6$a:
     com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker RIGHT -> b
     com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker LEFT -> a
     1:2:void <clinit>():232:233 -> <clinit>
     1:1:void <init>(java.lang.String,int):231:231 -> <init>
-com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceWithMarker -> com.android.tools.r8.internal.c6$b:
+com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceWithMarker -> com.android.tools.r8.internal.d6$b:
     com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker marker -> b
     com.android.tools.r8.graph.DexType itf -> a
     1:3:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker):240:242 -> <init>
-com.android.tools.r8.ir.analysis.type.DestructivePhiTypeUpdater -> com.android.tools.r8.internal.Y7:
+com.android.tools.r8.ir.analysis.type.DestructivePhiTypeUpdater -> com.android.tools.r8.internal.Z7:
     com.android.tools.r8.graph.AppView appView -> b
     java.util.function.Function mapping -> c
     boolean $assertionsDisabled -> a
@@ -26278,31 +26415,31 @@
     57:57:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> a
     57:57:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):73 -> a
     58:58:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):73:73 -> a
-com.android.tools.r8.ir.analysis.type.DoubleTypeElement -> com.android.tools.r8.internal.X8:
+com.android.tools.r8.ir.analysis.type.DoubleTypeElement -> com.android.tools.r8.internal.Y8:
     com.android.tools.r8.ir.analysis.type.DoubleTypeElement INSTANCE -> e
     1:1:void <clinit>():8:8 -> <clinit>
     1:1:void <init>():6:6 -> <init>
     1:1:com.android.tools.r8.ir.analysis.type.DoubleTypeElement getInstance():11:11 -> H
     1:1:int hashCode():26:26 -> hashCode
-com.android.tools.r8.ir.analysis.type.FloatTypeElement -> com.android.tools.r8.internal.Za:
+com.android.tools.r8.ir.analysis.type.FloatTypeElement -> com.android.tools.r8.internal.ab:
     com.android.tools.r8.ir.analysis.type.FloatTypeElement INSTANCE -> e
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>():6:6 -> <init>
     1:1:com.android.tools.r8.ir.analysis.type.FloatTypeElement getInstance():10:10 -> H
     1:1:int hashCode():25:25 -> hashCode
-com.android.tools.r8.ir.analysis.type.IntTypeElement -> com.android.tools.r8.internal.Vf:
+com.android.tools.r8.ir.analysis.type.IntTypeElement -> com.android.tools.r8.internal.Wf:
     com.android.tools.r8.ir.analysis.type.IntTypeElement INSTANCE -> e
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>():6:6 -> <init>
     1:1:com.android.tools.r8.ir.analysis.type.IntTypeElement getInstance():10:10 -> H
     1:1:int hashCode():25:25 -> hashCode
-com.android.tools.r8.ir.analysis.type.LongTypeElement -> com.android.tools.r8.internal.mn:
+com.android.tools.r8.ir.analysis.type.LongTypeElement -> com.android.tools.r8.internal.nn:
     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
-com.android.tools.r8.ir.analysis.type.Nullability -> com.android.tools.r8.internal.iq:
+com.android.tools.r8.ir.analysis.type.Nullability -> com.android.tools.r8.internal.kq:
     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
@@ -26323,7 +26460,7 @@
     2:2:boolean isNullable():45:45 -> g
     1:1:com.android.tools.r8.ir.analysis.type.Nullability maybeNull():87:87 -> h
     1:13:java.lang.String toString():96:108 -> toString
-com.android.tools.r8.ir.analysis.type.NullabilityVariants -> com.android.tools.r8.internal.jq:
+com.android.tools.r8.ir.analysis.type.NullabilityVariants -> com.android.tools.r8.internal.lq:
     boolean $assertionsDisabled -> a
     com.android.tools.r8.ir.analysis.type.ReferenceTypeElement definitelyNotNullVariant -> d
     com.android.tools.r8.ir.analysis.type.ReferenceTypeElement bottomVariant -> e
@@ -26335,7 +26472,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.Xs:
+com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement -> com.android.tools.r8.internal.Zs:
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():13:13 -> <clinit>
     1:1:void <init>():13:13 -> <init>
@@ -26382,7 +26519,7 @@
     87:87:com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement fromNumericType(com.android.tools.r8.ir.code.NumericType):120:120 -> a
     88:88:com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement fromNumericType(com.android.tools.r8.ir.code.NumericType):118:118 -> a
     com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement asPrimitiveType() -> c
-com.android.tools.r8.ir.analysis.type.ReferenceTypeElement -> com.android.tools.r8.internal.tw:
+com.android.tools.r8.ir.analysis.type.ReferenceTypeElement -> com.android.tools.r8.internal.vw:
     com.android.tools.r8.ir.analysis.type.ReferenceTypeElement NULL_BOTTOM_INSTANCE -> d
     com.android.tools.r8.ir.analysis.type.Nullability nullability -> e
     com.android.tools.r8.ir.analysis.type.ReferenceTypeElement NULL_INSTANCE -> c
@@ -26405,33 +26542,33 @@
     com.android.tools.r8.ir.analysis.type.ReferenceTypeElement asReferenceType() -> d
     1:1:boolean equals(java.lang.Object):101:101 -> equals
     1:1:int hashCode():106:106 -> hashCode
-com.android.tools.r8.ir.analysis.type.ReferenceTypeElement$NullElement -> com.android.tools.r8.internal.tw$a:
+com.android.tools.r8.ir.analysis.type.ReferenceTypeElement$NullElement -> com.android.tools.r8.internal.vw$a:
     1:1:void <init>(com.android.tools.r8.ir.analysis.type.Nullability):14:14 -> <init>
     1:1:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement getOrCreateVariant(com.android.tools.r8.ir.analysis.type.Nullability):19:19 -> a
     1:1:boolean equals(java.lang.Object):50:50 -> equals
     1:1:int hashCode():42:42 -> hashCode
     1:1:java.lang.String toString():37:37 -> toString
-com.android.tools.r8.ir.analysis.type.ShortTypeElement -> com.android.tools.r8.internal.Px:
+com.android.tools.r8.ir.analysis.type.ShortTypeElement -> com.android.tools.r8.internal.Rx:
     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
-com.android.tools.r8.ir.analysis.type.SinglePrimitiveTypeElement -> com.android.tools.r8.internal.Yx:
+com.android.tools.r8.ir.analysis.type.SinglePrimitiveTypeElement -> com.android.tools.r8.internal.ay:
     com.android.tools.r8.ir.analysis.type.SinglePrimitiveTypeElement INSTANCE -> d
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:void <init>():12:12 -> <init>
     boolean isSinglePrimitive() -> C
     1:1:com.android.tools.r8.ir.analysis.type.SinglePrimitiveTypeElement getInstance():16:16 -> G
     1:1:int hashCode():36:36 -> hashCode
-com.android.tools.r8.ir.analysis.type.TopTypeElement -> com.android.tools.r8.internal.EA:
+com.android.tools.r8.ir.analysis.type.TopTypeElement -> com.android.tools.r8.internal.GA:
     com.android.tools.r8.ir.analysis.type.TopTypeElement INSTANCE -> c
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>():6:6 -> <init>
     1:1:com.android.tools.r8.ir.analysis.type.Nullability nullability():11:11 -> E
     1:1:com.android.tools.r8.ir.analysis.type.TopTypeElement getInstance():15:15 -> G
     1:1:int hashCode():35:35 -> hashCode
-com.android.tools.r8.ir.analysis.type.TypeAnalysis -> com.android.tools.r8.internal.wB:
+com.android.tools.r8.ir.analysis.type.TypeAnalysis -> com.android.tools.r8.internal.xB:
     com.android.tools.r8.ir.analysis.type.TypeAnalysis$Mode mode -> d
     java.util.Deque worklist -> f
     com.android.tools.r8.graph.AppView appView -> e
@@ -26460,14 +26597,14 @@
     1:4:void widening(com.android.tools.r8.ir.code.IRCode):57:60 -> b
     5:5:boolean verifyValuesUpToDate(java.lang.Iterable):83:83 -> b
     1:1:void widening(java.lang.Iterable):64:64 -> c
-com.android.tools.r8.ir.analysis.type.TypeAnalysis$Mode -> com.android.tools.r8.internal.vB:
+com.android.tools.r8.ir.analysis.type.TypeAnalysis$Mode -> com.android.tools.r8.internal.wB:
     com.android.tools.r8.ir.analysis.type.TypeAnalysis$Mode NO_CHANGE -> d
     com.android.tools.r8.ir.analysis.type.TypeAnalysis$Mode UNSET -> a
     com.android.tools.r8.ir.analysis.type.TypeAnalysis$Mode WIDENING -> b
     com.android.tools.r8.ir.analysis.type.TypeAnalysis$Mode NARROWING -> c
     1:5:void <clinit>():26:30 -> <clinit>
     1:1:void <init>(java.lang.String,int):25:25 -> <init>
-com.android.tools.r8.ir.analysis.type.TypeElement -> com.android.tools.r8.internal.DB:
+com.android.tools.r8.ir.analysis.type.TypeElement -> com.android.tools.r8.internal.EB:
     boolean $assertionsDisabled -> a
     int $r8$clinit -> b
     1:1:void <clinit>():16:16 -> <clinit>
@@ -26570,7 +26707,7 @@
     7:7:boolean isPreciseType():332 -> z
     8:8:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isBottom():0:0 -> z
     8:8:boolean isPreciseType():333 -> z
-com.android.tools.r8.ir.analysis.type.WidePrimitiveTypeElement -> com.android.tools.r8.internal.TC:
+com.android.tools.r8.ir.analysis.type.WidePrimitiveTypeElement -> com.android.tools.r8.internal.UC:
     com.android.tools.r8.ir.analysis.type.WidePrimitiveTypeElement INSTANCE -> d
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:void <init>():12:12 -> <init>
@@ -26617,7 +26754,7 @@
     1:1:int hashCode():43:43 -> hashCode
     boolean isNonTrivial() -> k
     1:1:com.android.tools.r8.ir.analysis.value.BottomValue getInstance():18:18 -> q
-com.android.tools.r8.ir.analysis.value.EmptyObjectState -> com.android.tools.r8.internal.j9:
+com.android.tools.r8.ir.analysis.value.EmptyObjectState -> com.android.tools.r8.internal.k9:
     com.android.tools.r8.ir.analysis.value.EmptyObjectState INSTANCE -> a
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:void <init>():16:16 -> <init>
@@ -26626,7 +26763,7 @@
     boolean isEmpty() -> b
     1:1:com.android.tools.r8.ir.analysis.value.EmptyObjectState getInstance():19:19 -> c
     1:1:int hashCode():44:44 -> hashCode
-com.android.tools.r8.ir.analysis.value.EnumValuesObjectState -> com.android.tools.r8.internal.W9:
+com.android.tools.r8.ir.analysis.value.EnumValuesObjectState -> com.android.tools.r8.internal.X9:
     com.android.tools.r8.ir.analysis.value.ObjectState[] state -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():14:14 -> <clinit>
@@ -26640,7 +26777,7 @@
     boolean isEmpty() -> b
     1:9:boolean equals(java.lang.Object):63:71 -> equals
     1:1:int hashCode():80:80 -> hashCode
-com.android.tools.r8.ir.analysis.value.NonEmptyObjectState -> com.android.tools.r8.internal.Xp:
+com.android.tools.r8.ir.analysis.value.NonEmptyObjectState -> com.android.tools.r8.internal.Zp:
     java.util.Map state -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():15:15 -> <clinit>
@@ -26651,13 +26788,13 @@
     boolean isEmpty() -> b
     1:11:boolean equals(java.lang.Object):47:57 -> equals
     1:1:int hashCode():66:66 -> hashCode
-com.android.tools.r8.ir.analysis.value.ObjectState -> com.android.tools.r8.internal.Ar:
+com.android.tools.r8.ir.analysis.value.ObjectState -> com.android.tools.r8.internal.Cr:
     1:1:void <init>():15:15 -> <init>
     com.android.tools.r8.ir.analysis.value.EnumValuesObjectState asEnumValuesObjectState() -> a
     com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractFieldValue(com.android.tools.r8.graph.DexEncodedField) -> a
     com.android.tools.r8.ir.analysis.value.ObjectState rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens) -> a
     boolean isEmpty() -> b
-com.android.tools.r8.ir.analysis.value.ObjectState$Builder -> com.android.tools.r8.internal.zr:
+com.android.tools.r8.ir.analysis.value.ObjectState$Builder -> com.android.tools.r8.internal.Br:
     java.util.Map state -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():46:46 -> <clinit>
@@ -26667,7 +26804,7 @@
     5:5:com.android.tools.r8.ir.analysis.value.ObjectState com.android.tools.r8.ir.analysis.value.ObjectState.empty():22:22 -> a
     5:5:com.android.tools.r8.ir.analysis.value.ObjectState build():58 -> a
     6:6:com.android.tools.r8.ir.analysis.value.ObjectState build():58:58 -> a
-com.android.tools.r8.ir.analysis.value.SingleConstClassValue -> com.android.tools.r8.internal.Tx:
+com.android.tools.r8.ir.analysis.value.SingleConstClassValue -> com.android.tools.r8.internal.Vx:
     com.android.tools.r8.graph.DexType type -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():26:26 -> <clinit>
@@ -26692,7 +26829,7 @@
     413:415:boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView):98:100 -> a
     416:416:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
     416:416:boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView):100 -> a
-    417:417:boolean com.android.tools.r8.graph.DexClass.isPublic():560:560 -> a
+    417:417:boolean com.android.tools.r8.graph.DexClass.isPublic():564:564 -> a
     417:417:boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView):101 -> a
     418:420:boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView):101:103 -> a
     421:421:com.android.tools.r8.ir.analysis.value.SingleValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):109:109 -> a
@@ -26701,10 +26838,10 @@
     1:1:int hashCode():56:56 -> hashCode
     1:1:com.android.tools.r8.graph.DexType getType():46:46 -> q
     1:1:java.lang.String toString():61:61 -> toString
-com.android.tools.r8.ir.analysis.value.SingleConstValue -> com.android.tools.r8.internal.Ux:
+com.android.tools.r8.ir.analysis.value.SingleConstValue -> com.android.tools.r8.internal.Wx:
     1:1:void <init>():7:7 -> <init>
     boolean isSingleConstValue() -> m
-com.android.tools.r8.ir.analysis.value.SingleFieldValue -> com.android.tools.r8.internal.Wx:
+com.android.tools.r8.ir.analysis.value.SingleFieldValue -> com.android.tools.r8.internal.Yx:
     com.android.tools.r8.graph.DexField field -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():28:28 -> <clinit>
@@ -26719,7 +26856,7 @@
     13:13:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
     13:13:boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView):98 -> a
     14:14:boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView):100:100 -> a
-    15:15:boolean com.android.tools.r8.graph.DexClass.isPublic():560:560 -> a
+    15:15:boolean com.android.tools.r8.graph.DexClass.isPublic():564:564 -> a
     15:15:boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView):103 -> a
     1:1:com.android.tools.r8.ir.analysis.value.AbstractValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):28:28 -> b
     2:8:boolean mayHaveFinalizeMethodDirectlyOrIndirectly(com.android.tools.r8.graph.AppView):43:49 -> b
@@ -26730,7 +26867,7 @@
     boolean isSingleFieldValue() -> n
     1:1:com.android.tools.r8.graph.DexField getField():37:37 -> q
     com.android.tools.r8.ir.analysis.value.ObjectState getState() -> r
-com.android.tools.r8.ir.analysis.value.SingleNumberValue -> com.android.tools.r8.internal.Xx:
+com.android.tools.r8.ir.analysis.value.SingleNumberValue -> com.android.tools.r8.internal.Zx:
     long value -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():20:20 -> <clinit>
@@ -26751,7 +26888,7 @@
     1:1:int getIntValue():68:68 -> r
     1:1:long getValue():76:76 -> s
     1:1:java.lang.String toString():91:91 -> toString
-com.android.tools.r8.ir.analysis.value.SingleStatefulFieldValue -> com.android.tools.r8.internal.Zx:
+com.android.tools.r8.ir.analysis.value.SingleStatefulFieldValue -> com.android.tools.r8.internal.by:
     boolean $assertionsDisabled -> c
     com.android.tools.r8.ir.analysis.value.ObjectState state -> d
     1:1:void <clinit>():10:10 -> <clinit>
@@ -26760,14 +26897,14 @@
     1:1:int hashCode():42:42 -> hashCode
     1:1:com.android.tools.r8.ir.analysis.value.ObjectState getState():23:23 -> r
     1:1:java.lang.String toString():28:28 -> toString
-com.android.tools.r8.ir.analysis.value.SingleStatelessFieldValue -> com.android.tools.r8.internal.ay:
+com.android.tools.r8.ir.analysis.value.SingleStatelessFieldValue -> com.android.tools.r8.internal.cy:
     1:1:void <init>(com.android.tools.r8.graph.DexField):13:13 -> <init>
     1:5:boolean equals(java.lang.Object):28:32 -> equals
     1:1:int hashCode():37:37 -> hashCode
     1:1:com.android.tools.r8.ir.analysis.value.ObjectState com.android.tools.r8.ir.analysis.value.ObjectState.empty():22:22 -> r
     1:1:com.android.tools.r8.ir.analysis.value.ObjectState getState():18 -> r
     1:1:java.lang.String toString():23:23 -> toString
-com.android.tools.r8.ir.analysis.value.SingleStringValue -> com.android.tools.r8.internal.by:
+com.android.tools.r8.ir.analysis.value.SingleStringValue -> com.android.tools.r8.internal.dy:
     com.android.tools.r8.graph.DexString string -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():25:25 -> <clinit>
@@ -26784,7 +26921,7 @@
     1:1:com.android.tools.r8.graph.DexString getDexString():45:45 -> q
     com.android.tools.r8.ir.analysis.value.SingleValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens) -> r
     1:1:java.lang.String toString():60:60 -> toString
-com.android.tools.r8.ir.analysis.value.SingleValue -> com.android.tools.r8.internal.dy:
+com.android.tools.r8.ir.analysis.value.SingleValue -> com.android.tools.r8.internal.fy:
     1:1:void <init>():17:17 -> <init>
     com.android.tools.r8.ir.code.Instruction createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier) -> a
     boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView) -> a
@@ -26792,7 +26929,7 @@
     boolean isSingleValue() -> c
     com.android.tools.r8.ir.analysis.value.SingleValue asSingleValue() -> e
     boolean isNonTrivial() -> k
-com.android.tools.r8.ir.analysis.value.UnknownValue -> com.android.tools.r8.internal.aC:
+com.android.tools.r8.ir.analysis.value.UnknownValue -> com.android.tools.r8.internal.bC:
     com.android.tools.r8.ir.analysis.value.UnknownValue INSTANCE -> a
     1:1:void <clinit>():13:13 -> <clinit>
     1:1:void <init>():15:15 -> <init>
@@ -27213,9 +27350,6 @@
     1:1:void <clinit>():55:55 -> <clinit>
     1:125:void <init>():55:179 -> <init>
     1:2:com.android.tools.r8.ir.code.BasicBlock getUniqueNormalSuccessor():207:208 -> A
-    3:3:java.lang.Object com.android.tools.r8.utils.ListUtils.last(java.util.List):30:30 -> A
-    3:3:com.android.tools.r8.ir.code.BasicBlock getUniqueNormalSuccessor():208 -> A
-    4:4:com.android.tools.r8.ir.code.BasicBlock getUniqueNormalSuccessor():208:208 -> A
     1:2:com.android.tools.r8.ir.code.BasicBlock getUniquePredecessor():270:271 -> B
     1:2:boolean hasCatchHandlers():597:598 -> C
     1:1:boolean hasIncompletePhis():1194:1194 -> D
@@ -27511,7 +27645,7 @@
     com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo NO_THROW -> a
     1:2:void <clinit>():106:107 -> <clinit>
     1:1:void <init>(java.lang.String,int):105:105 -> <init>
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():425:425 -> a
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> a
     1:1:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo defaultForConstString(com.android.tools.r8.utils.InternalOptions):110 -> a
     2:2:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo defaultForConstString(com.android.tools.r8.utils.InternalOptions):110:110 -> a
 com.android.tools.r8.ir.code.BasicBlockInstructionIterator -> com.android.tools.r8.internal.Y1:
@@ -27715,7 +27849,7 @@
     1:90:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forBinop():0:89 -> a
     1:90:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):127 -> a
     91:98:boolean isTwoAddr(com.android.tools.r8.ir.regalloc.RegisterAllocator):51:58 -> a
-    99:99:boolean com.android.tools.r8.utils.InternalOptions.canHaveMul2AddrBug():1647:1647 -> a
+    99:99:boolean com.android.tools.r8.utils.InternalOptions.canHaveMul2AddrBug():1654:1654 -> a
     99:99:boolean isTwoAddr(com.android.tools.r8.ir.regalloc.RegisterAllocator):58 -> a
     100:100:boolean com.android.tools.r8.ir.code.Instruction.isMul():0:0 -> a
     100:100:boolean isTwoAddr(com.android.tools.r8.ir.regalloc.RegisterAllocator):58 -> a
@@ -27829,7 +27963,7 @@
     2:2:com.android.tools.r8.ir.code.Value object():56:56 -> f
     com.android.tools.r8.ir.code.CheckCast asCheckCast() -> s
     1:1:java.lang.String toString():154:154 -> toString
-com.android.tools.r8.ir.code.Cmp -> com.android.tools.r8.internal.v6:
+com.android.tools.r8.ir.code.Cmp -> com.android.tools.r8.internal.w6:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.ir.code.Cmp$Bias bias -> j
     1:1:void <clinit>():26:26 -> <clinit>
@@ -27877,7 +28011,7 @@
     18:18:java.lang.String toString():117:117 -> toString
     19:20:java.lang.String toString():113:114 -> toString
     21:43:java.lang.String toString():109:131 -> toString
-com.android.tools.r8.ir.code.Cmp$Bias -> com.android.tools.r8.internal.v6$a:
+com.android.tools.r8.ir.code.Cmp$Bias -> com.android.tools.r8.internal.w6$a:
     com.android.tools.r8.ir.code.Cmp$Bias LT -> c
     com.android.tools.r8.ir.code.Cmp$Bias NONE -> a
     com.android.tools.r8.ir.code.Cmp$Bias GT -> b
@@ -27886,7 +28020,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.V6:
+com.android.tools.r8.ir.code.ConstClass -> com.android.tools.r8.internal.W6:
     com.android.tools.r8.graph.DexType clazz -> k
     boolean $assertionsDisabled -> i
     int $r8$clinit -> j
@@ -27929,7 +28063,7 @@
     21:25:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):122:126 -> b
     1:1:java.lang.String toString():83:83 -> toString
     com.android.tools.r8.ir.code.ConstClass asConstClass() -> u
-com.android.tools.r8.ir.code.ConstInstruction -> com.android.tools.r8.internal.W6:
+com.android.tools.r8.ir.code.ConstInstruction -> com.android.tools.r8.internal.X6:
     int $r8$clinit -> h
     1:1:void <init>(com.android.tools.r8.ir.code.Value):33:33 -> <init>
     com.android.tools.r8.ir.code.ConstInstruction getOutConstantConstInstruction() -> I0
@@ -27939,7 +28073,7 @@
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
     boolean isConstInstruction() -> g1
     com.android.tools.r8.ir.code.ConstInstruction asConstInstruction() -> v
-com.android.tools.r8.ir.code.ConstMethodHandle -> com.android.tools.r8.internal.Y6:
+com.android.tools.r8.ir.code.ConstMethodHandle -> com.android.tools.r8.internal.Z6:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.graph.DexMethodHandle methodHandle -> j
     1:1:void <clinit>():21:21 -> <clinit>
@@ -27970,7 +28104,7 @@
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):71:71 -> b
     1:1:java.lang.String toString():93:93 -> toString
     com.android.tools.r8.ir.code.ConstMethodHandle asConstMethodHandle() -> w
-com.android.tools.r8.ir.code.ConstMethodType -> com.android.tools.r8.internal.Z6:
+com.android.tools.r8.ir.code.ConstMethodType -> com.android.tools.r8.internal.a7:
     com.android.tools.r8.graph.DexProto methodType -> j
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():21:21 -> <clinit>
@@ -28001,7 +28135,7 @@
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):71:71 -> b
     1:1:java.lang.String toString():87:87 -> toString
     com.android.tools.r8.ir.code.ConstMethodType asConstMethodType() -> x
-com.android.tools.r8.ir.code.ConstNumber -> com.android.tools.r8.internal.a7:
+com.android.tools.r8.ir.code.ConstNumber -> com.android.tools.r8.internal.b7:
     long value -> k
     boolean $assertionsDisabled -> i
     int $r8$clinit -> j
@@ -28066,7 +28200,7 @@
     1:1:boolean negativeIs8Bit():281:281 -> m2
     1:4:java.lang.String toString():257:260 -> toString
     com.android.tools.r8.ir.code.ConstNumber asConstNumber() -> y
-com.android.tools.r8.ir.code.ConstString -> com.android.tools.r8.internal.c7:
+com.android.tools.r8.ir.code.ConstString -> com.android.tools.r8.internal.d7:
     boolean $assertionsDisabled -> i
     int $r8$clinit -> j
     com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfo -> l
@@ -28089,7 +28223,7 @@
     6:6:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):74 -> a
     7:8:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):74:75 -> 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):140:140 -> a
-    10:10:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():425:425 -> a
+    10:10:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> a
     10:10:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):140 -> a
     11:14:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):140:143 -> a
     15:15:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):141:141 -> a
@@ -28105,7 +28239,7 @@
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):80:80 -> b
     1:1:java.lang.String toString():96:96 -> toString
     com.android.tools.r8.ir.code.ConstString asConstString() -> z
-com.android.tools.r8.ir.code.ConstantValueUtils -> com.android.tools.r8.internal.g7:
+com.android.tools.r8.ir.code.ConstantValueUtils -> com.android.tools.r8.internal.h7:
     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
@@ -28126,7 +28260,7 @@
     36:36:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> a
     36:36:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):55 -> a
     37:37: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.D7:
+com.android.tools.r8.ir.code.DebugLocalRead -> com.android.tools.r8.internal.E7:
     1:1:void <init>():20:20 -> <init>
     boolean hasInvariantOutType() -> N0
     1:1:int maxInValueRegister():60:60 -> U1
@@ -28142,11 +28276,11 @@
     1:1:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalRead():0:0 -> b
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):55 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
-com.android.tools.r8.ir.code.DebugLocalUninitialized -> com.android.tools.r8.internal.E7:
+com.android.tools.r8.ir.code.DebugLocalUninitialized -> com.android.tools.r8.internal.F7:
     1:1:void <init>(com.android.tools.r8.ir.code.Value):21:21 -> <init>
     boolean isAllowedAfterThrowingInstruction() -> V0
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):26:26 -> a
-com.android.tools.r8.ir.code.DebugLocalWrite -> com.android.tools.r8.internal.F7:
+com.android.tools.r8.ir.code.DebugLocalWrite -> com.android.tools.r8.internal.G7:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():27:27 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):30:31 -> <init>
@@ -28159,7 +28293,7 @@
     5:6:boolean verifyTypes(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.VerifyTypesHelper):82:83 -> a
     1:1:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalWrite():0:0 -> b
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):56 -> b
-com.android.tools.r8.ir.code.DebugLocalsChange -> com.android.tools.r8.internal.G7:
+com.android.tools.r8.ir.code.DebugLocalsChange -> com.android.tools.r8.internal.H7:
     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 -> h
@@ -28191,7 +28325,7 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getStarting():48:48 -> b2
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
     1:6:java.lang.String toString():93:98 -> toString
-com.android.tools.r8.ir.code.DebugPosition -> com.android.tools.r8.internal.H7:
+com.android.tools.r8.ir.code.DebugPosition -> com.android.tools.r8.internal.I7:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:void <init>():20:20 -> <init>
@@ -28211,7 +28345,7 @@
     1:1:boolean com.android.tools.r8.ir.code.Instruction.isDebugPosition():0:0 -> b
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):51 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
-com.android.tools.r8.ir.code.DefaultAliasedValueConfiguration -> com.android.tools.r8.internal.I7:
+com.android.tools.r8.ir.code.DefaultAliasedValueConfiguration -> com.android.tools.r8.internal.J7:
     com.android.tools.r8.ir.code.DefaultAliasedValueConfiguration INSTANCE -> a
     boolean $assertionsDisabled -> b
     1:3:void <clinit>():7:9 -> <clinit>
@@ -28223,7 +28357,7 @@
     4:5:com.android.tools.r8.ir.code.Value getAliasForOutValue(com.android.tools.r8.ir.code.Instruction):25:26 -> a
     1:1:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> b
     1:1:boolean isIntroducingAnAlias(com.android.tools.r8.ir.code.Instruction):20 -> b
-com.android.tools.r8.ir.code.DefaultInstructionVisitor -> com.android.tools.r8.internal.O7:
+com.android.tools.r8.ir.code.DefaultInstructionVisitor -> com.android.tools.r8.internal.P7:
     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
@@ -28239,7 +28373,7 @@
     2:2:java.lang.Object visit(com.android.tools.r8.ir.code.InstancePut):179:179 -> a
     3:3:java.lang.Object visit(com.android.tools.r8.ir.code.StaticGet):314:314 -> a
     4:4:java.lang.Object visit(com.android.tools.r8.ir.code.StaticPut):319:319 -> a
-com.android.tools.r8.ir.code.DexItemBasedConstString -> com.android.tools.r8.internal.H8:
+com.android.tools.r8.ir.code.DexItemBasedConstString -> com.android.tools.r8.internal.I8:
     com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo nameComputationInfo -> l
     boolean $assertionsDisabled -> i
     int $r8$clinit -> j
@@ -28274,7 +28408,7 @@
     2:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):97:98 -> b
     1:1:com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo getNameComputationInfo():68:68 -> b2
     1:1:java.lang.String toString():114:114 -> toString
-com.android.tools.r8.ir.code.Div -> com.android.tools.r8.internal.Q8:
+com.android.tools.r8.ir.code.Div -> com.android.tools.r8.internal.R8:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):24:24 -> <init>
     com.android.tools.r8.ir.code.Div asDiv() -> D
     1:1:boolean instructionTypeCanThrow():134:134 -> T0
@@ -28303,7 +28437,7 @@
     2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):94:94 -> e
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):59:59 -> f
     1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():148:148 -> f2
-com.android.tools.r8.ir.code.DominatorTree -> com.android.tools.r8.internal.S8:
+com.android.tools.r8.ir.code.DominatorTree -> com.android.tools.r8.internal.T8:
     com.android.tools.r8.ir.code.BasicBlock[] doms -> c
     com.android.tools.r8.ir.code.BasicBlock[] sorted -> b
     boolean obsolete -> f
@@ -28335,7 +28469,7 @@
     5:5:void onSuccessorsMayChange(com.android.tools.r8.ir.code.BasicBlock):328:328 -> c
     1:2:void numberBlocks():240:241 -> d
     1:9:java.lang.String toString():308:316 -> toString
-com.android.tools.r8.ir.code.DominatorTree$1 -> com.android.tools.r8.internal.R8:
+com.android.tools.r8.ir.code.DominatorTree$1 -> com.android.tools.r8.internal.S8:
     com.android.tools.r8.ir.code.DominatorTree this$0 -> d
     boolean $assertionsDisabled -> a
     com.android.tools.r8.ir.code.BasicBlock val$dominated -> c
@@ -28345,17 +28479,17 @@
     1:1:boolean hasNext():201:201 -> hasNext
     1:9:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.DominatorTree$1.next():206:214 -> next
     1:9:java.lang.Object next():196 -> next
-com.android.tools.r8.ir.code.DominatorTree$Assumption -> com.android.tools.r8.internal.S8$a:
+com.android.tools.r8.ir.code.DominatorTree$Assumption -> com.android.tools.r8.internal.T8$a:
     com.android.tools.r8.ir.code.DominatorTree$Assumption MAY_HAVE_UNREACHABLE_BLOCKS -> b
     com.android.tools.r8.ir.code.DominatorTree$Assumption NO_UNREACHABLE_BLOCKS -> a
     1:2:void <clinit>():19:20 -> <clinit>
     1:1:void <init>(java.lang.String,int):18:18 -> <init>
-com.android.tools.r8.ir.code.DominatorTree$Inclusive -> com.android.tools.r8.internal.T8:
+com.android.tools.r8.ir.code.DominatorTree$Inclusive -> com.android.tools.r8.internal.U8:
     com.android.tools.r8.ir.code.DominatorTree$Inclusive YES -> a
     com.android.tools.r8.ir.code.DominatorTree$Inclusive NO -> b
     1:2:void <clinit>():24:25 -> <clinit>
     1:1:void <init>(java.lang.String,int):23:23 -> <init>
-com.android.tools.r8.ir.code.Dup -> com.android.tools.r8.internal.Z8:
+com.android.tools.r8.ir.code.Dup -> com.android.tools.r8.internal.a9:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():18:18 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.Value):21:21 -> <init>
@@ -28382,7 +28516,7 @@
     1:1:com.android.tools.r8.ir.code.StackValue src():63:63 -> c2
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
     1:6:void setOutValue(com.android.tools.r8.ir.code.Value):41:46 -> e
-com.android.tools.r8.ir.code.Dup2 -> com.android.tools.r8.internal.Y8:
+com.android.tools.r8.ir.code.Dup2 -> com.android.tools.r8.internal.Z8:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():19:19 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):28:28 -> <init>
@@ -28401,7 +28535,7 @@
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):96 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
     1:6:void setOutValue(com.android.tools.r8.ir.code.Value):55:60 -> e
-com.android.tools.r8.ir.code.FieldInstruction -> com.android.tools.r8.internal.va:
+com.android.tools.r8.ir.code.FieldInstruction -> com.android.tools.r8.internal.wa:
     com.android.tools.r8.graph.DexField field -> i
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():27:27 -> <clinit>
@@ -28448,7 +28582,7 @@
     12:12:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):142 -> f
     13:23:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):144:154 -> f
     boolean isFieldInstruction() -> o1
-com.android.tools.r8.ir.code.FieldMemberType -> com.android.tools.r8.internal.wa:
+com.android.tools.r8.ir.code.FieldMemberType -> com.android.tools.r8.internal.xa:
     com.android.tools.r8.ir.code.FieldMemberType DOUBLE -> i
     com.android.tools.r8.ir.code.FieldMemberType[] $VALUES -> j
     com.android.tools.r8.ir.code.FieldMemberType LONG -> h
@@ -28477,7 +28611,7 @@
     43:43:com.android.tools.r8.ir.code.FieldMemberType fromDexType(com.android.tools.r8.graph.DexType):51 -> a
     44:44:com.android.tools.r8.ir.code.FieldMemberType com.android.tools.r8.ir.code.FieldMemberType.fromTypeDescriptorChar(char):30:30 -> a
     44:44:com.android.tools.r8.ir.code.FieldMemberType fromDexType(com.android.tools.r8.graph.DexType):51 -> a
-com.android.tools.r8.ir.code.FixedRegisterValue -> com.android.tools.r8.internal.Ra:
+com.android.tools.r8.ir.code.FixedRegisterValue -> com.android.tools.r8.internal.Sa:
     boolean $assertionsDisabled -> q
     int register -> r
     1:1:void <clinit>():12:12 -> <clinit>
@@ -28501,7 +28635,7 @@
     com.android.tools.r8.ir.code.FixedRegisterValue asFixedRegisterValue() -> e
     1:1:int getRegister():50:50 -> h0
     1:1:java.lang.String toString():75:75 -> toString
-com.android.tools.r8.ir.code.Goto -> com.android.tools.r8.internal.Jb:
+com.android.tools.r8.ir.code.Goto -> com.android.tools.r8.internal.Kb:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:void <init>():17:17 -> <init>
@@ -28519,7 +28653,7 @@
     1:4:com.android.tools.r8.ir.code.BasicBlock getTarget():36:39 -> b2
     boolean isGoto() -> q1
     1:4:java.lang.String toString():71:74 -> toString
-com.android.tools.r8.ir.code.IRCode -> com.android.tools.r8.internal.lc:
+com.android.tools.r8.ir.code.IRCode -> com.android.tools.r8.internal.mc:
     boolean allThrowingInstructionsHavePositions -> i
     int nextInstructionNumber -> h
     int usedMarkingColors -> f
@@ -28875,10 +29009,10 @@
     27:28:void prepareBlocksForCatchHandlers():356 -> y
     29:35:void prepareBlocksForCatchHandlers():357:363 -> y
     1:1:boolean removeAllDeadAndTrivialPhis():1193:1193 -> z
-com.android.tools.r8.ir.code.IRCode$BlockMarker -> com.android.tools.r8.internal.lc$a:
+com.android.tools.r8.ir.code.IRCode$BlockMarker -> com.android.tools.r8.internal.mc$a:
     com.android.tools.r8.ir.code.BasicBlock block -> a
     1:2:void <init>(com.android.tools.r8.ir.code.BasicBlock):99:100 -> <init>
-com.android.tools.r8.ir.code.IRCode$LiveAtEntrySets -> com.android.tools.r8.internal.lc$b:
+com.android.tools.r8.ir.code.IRCode$LiveAtEntrySets -> com.android.tools.r8.internal.mc$b:
     java.util.Deque liveStackValues -> d
     java.util.Set liveLocalValues -> c
     java.util.Set liveValues -> b
@@ -28887,7 +29021,7 @@
     1:5:void <init>(java.util.Set,java.util.Set,java.util.Deque):72:76 -> <init>
     1:2:boolean equals(java.lang.Object):86:87 -> equals
     1:1:int hashCode():81:81 -> hashCode
-com.android.tools.r8.ir.code.IRCodeInstructionIterator -> com.android.tools.r8.internal.mc:
+com.android.tools.r8.ir.code.IRCodeInstructionIterator -> com.android.tools.r8.internal.nc:
     java.util.ListIterator blockIterator -> b
     com.android.tools.r8.ir.code.IRCode code -> d
     com.android.tools.r8.ir.code.InstructionListIterator instructionIterator -> c
@@ -28902,7 +29036,7 @@
     10:10:java.lang.Object next():10 -> next
     1:10:com.android.tools.r8.ir.code.Instruction previous():48:57 -> previous
     11:11:com.android.tools.r8.ir.code.Instruction previous():52:52 -> previous
-com.android.tools.r8.ir.code.IRCodeInstructionListIterator -> com.android.tools.r8.internal.nc:
+com.android.tools.r8.ir.code.IRCodeInstructionListIterator -> com.android.tools.r8.internal.oc:
     java.util.ListIterator blockIterator -> b
     com.android.tools.r8.ir.code.IRCode code -> d
     com.android.tools.r8.ir.code.InstructionListIterator instructionIterator -> c
@@ -28940,7 +29074,7 @@
     1:1:void set(java.lang.Object):19:19 -> set
     2:2:void com.android.tools.r8.ir.code.IRCodeInstructionListIterator.set(com.android.tools.r8.ir.code.Instruction):151:151 -> set
     2:2:void set(java.lang.Object):19 -> set
-com.android.tools.r8.ir.code.IRCodeUtils -> com.android.tools.r8.internal.oc:
+com.android.tools.r8.ir.code.IRCodeUtils -> com.android.tools.r8.internal.pc:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():19:19 -> <clinit>
     1:7:com.android.tools.r8.ir.code.InvokeDirect getUniqueConstructorInvoke(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):24:30 -> a
@@ -28958,7 +29092,7 @@
     75:78:void internalRemoveInstructionAndTransitiveInputsIfNotUsed(com.android.tools.r8.ir.code.IRCode,java.util.Deque):148:151 -> a
     1:1:void removeInstructionAndTransitiveInputsIfNotUsed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):114:114 -> b
     2:2:void removeInstructionAndTransitiveInputsIfNotUsed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):113:113 -> b
-com.android.tools.r8.ir.code.IRMetadata -> com.android.tools.r8.internal.pc:
+com.android.tools.r8.ir.code.IRMetadata -> com.android.tools.r8.internal.qc:
     long first -> b
     long second -> c
     boolean $assertionsDisabled -> a
@@ -29078,7 +29212,7 @@
     1:1:boolean mayHaveInvokeSuper():202:202 -> x
     1:1:boolean mayHaveInvokeVirtual():206:206 -> y
     1:1:boolean mayHaveMonitorInstruction():210:210 -> z
-com.android.tools.r8.ir.code.If -> com.android.tools.r8.internal.vc:
+com.android.tools.r8.ir.code.If -> com.android.tools.r8.internal.wc:
     boolean $assertionsDisabled -> i
     int $r8$clinit -> j
     com.android.tools.r8.ir.code.If$Type type -> k
@@ -29124,7 +29258,7 @@
     1:3:com.android.tools.r8.ir.code.BasicBlock targetFromNonNullObject():222:224 -> h2
     boolean isIf() -> r1
     1:8:java.lang.String toString():169:176 -> toString
-com.android.tools.r8.ir.code.If$Type -> com.android.tools.r8.internal.vc$a:
+com.android.tools.r8.ir.code.If$Type -> com.android.tools.r8.internal.wc$a:
     com.android.tools.r8.ir.code.If$Type GT -> c
     com.android.tools.r8.ir.code.If$Type LE -> d
     com.android.tools.r8.ir.code.If$Type EQ -> a
@@ -29142,10 +29276,10 @@
     19:27:com.android.tools.r8.ir.code.If$Type inverted():49:57 -> a
     28:28:com.android.tools.r8.ir.code.If$Type inverted():47:47 -> a
     1:1:com.android.tools.r8.ir.code.If$Type[] values():22:22 -> b
-com.android.tools.r8.ir.code.ImpreciseMemberTypeInstruction -> com.android.tools.r8.internal.pd:
+com.android.tools.r8.ir.code.ImpreciseMemberTypeInstruction -> com.android.tools.r8.internal.qd:
     void constrainType(com.android.tools.r8.ir.conversion.TypeConstraintResolver) -> a
     com.android.tools.r8.ir.code.MemberType getMemberType() -> e
-com.android.tools.r8.ir.code.Inc -> com.android.tools.r8.internal.qd:
+com.android.tools.r8.ir.code.Inc -> com.android.tools.r8.internal.rd:
     int increment -> i
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():20:20 -> <clinit>
@@ -29161,7 +29295,7 @@
     1:2:void addInValue(com.android.tools.r8.ir.code.Value):43:44 -> b
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):54:54 -> b
     1:1:java.lang.String toString():102:102 -> toString
-com.android.tools.r8.ir.code.InitClass -> com.android.tools.r8.internal.wd:
+com.android.tools.r8.ir.code.InitClass -> com.android.tools.r8.internal.xd:
     com.android.tools.r8.graph.DexType clazz -> i
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():27:27 -> <clinit>
@@ -29194,9 +29328,9 @@
     1:8:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):128:135 -> d
     9:17:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):131:139 -> d
     1:1:java.lang.String toString():176:176 -> toString
-com.android.tools.r8.ir.code.InstanceFieldInstruction -> com.android.tools.r8.internal.Td:
+com.android.tools.r8.ir.code.InstanceFieldInstruction -> com.android.tools.r8.internal.Ud:
     com.android.tools.r8.ir.code.Value object() -> f
-com.android.tools.r8.ir.code.InstanceGet -> com.android.tools.r8.internal.Wd:
+com.android.tools.r8.ir.code.InstanceGet -> com.android.tools.r8.internal.Xd:
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():35:35 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):38:38 -> <init>
@@ -29236,7 +29370,7 @@
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
     1:2:com.android.tools.r8.ir.code.Value object():62:63 -> f
     1:1:java.lang.String toString():172:172 -> toString
-com.android.tools.r8.ir.code.InstanceOf -> com.android.tools.r8.internal.Yd:
+com.android.tools.r8.ir.code.InstanceOf -> com.android.tools.r8.internal.Zd:
     com.android.tools.r8.graph.DexType type -> h
     1:2:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):25:26 -> <init>
     com.android.tools.r8.ir.code.InstanceOf asInstanceOf() -> L
@@ -29260,7 +29394,7 @@
     1:1:com.android.tools.r8.ir.code.Value value():48:48 -> b2
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
     1:2:java.lang.String toString():127:128 -> toString
-com.android.tools.r8.ir.code.InstancePut -> com.android.tools.r8.internal.Zd:
+com.android.tools.r8.ir.code.InstancePut -> com.android.tools.r8.internal.ae:
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():34:34 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):37:37 -> <init>
@@ -29300,7 +29434,7 @@
     boolean isInstanceFieldInstruction() -> s1
     boolean isInstancePut() -> t1
     1:1:java.lang.String toString():212:212 -> toString
-com.android.tools.r8.ir.code.Instruction -> com.android.tools.r8.internal.ge:
+com.android.tools.r8.ir.code.Instruction -> com.android.tools.r8.internal.he:
     com.android.tools.r8.ir.code.Position position -> g
     java.util.List inValues -> c
     java.util.Set debugValues -> f
@@ -29572,7 +29706,7 @@
     1:1:boolean com.android.tools.r8.ir.code.Instruction.isInvokeInterface():0:0 -> z1
     1:1:boolean isInvokeMethodWithDynamicDispatch():1201 -> z1
     2:2:boolean isInvokeMethodWithDynamicDispatch():1201:1201 -> z1
-com.android.tools.r8.ir.code.Instruction$SideEffectAssumption -> com.android.tools.r8.internal.ge$a:
+com.android.tools.r8.ir.code.Instruction$SideEffectAssumption -> com.android.tools.r8.internal.he$a:
     com.android.tools.r8.ir.code.Instruction$SideEffectAssumption NONE -> a
     com.android.tools.r8.ir.code.Instruction$SideEffectAssumption CLASS_ALREADY_INITIALIZED -> b
     com.android.tools.r8.ir.code.Instruction$SideEffectAssumption INVOKED_METHOD_DOES_NOT_HAVE_SIDE_EFFECTS -> c
@@ -29583,24 +29717,24 @@
     1:1:com.android.tools.r8.ir.code.Instruction$SideEffectAssumption join(com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):1524:1524 -> a
     boolean canAssumeInvokedMethodDoesNotHaveSideEffects() -> b
     boolean canAssumeReceiverIsNotNull() -> c
-com.android.tools.r8.ir.code.Instruction$SideEffectAssumption$1 -> com.android.tools.r8.internal.ce:
+com.android.tools.r8.ir.code.Instruction$SideEffectAssumption$1 -> com.android.tools.r8.internal.de:
     1:1:void <init>():1485:1485 -> <init>
-com.android.tools.r8.ir.code.Instruction$SideEffectAssumption$2 -> com.android.tools.r8.internal.de:
+com.android.tools.r8.ir.code.Instruction$SideEffectAssumption$2 -> com.android.tools.r8.internal.ee:
     1:1:void <init>():1494:1494 -> <init>
-com.android.tools.r8.ir.code.Instruction$SideEffectAssumption$3 -> com.android.tools.r8.internal.ee:
+com.android.tools.r8.ir.code.Instruction$SideEffectAssumption$3 -> com.android.tools.r8.internal.fe:
     1:1:void <init>():1503:1503 -> <init>
-com.android.tools.r8.ir.code.Instruction$SideEffectAssumption$4 -> com.android.tools.r8.internal.fe:
+com.android.tools.r8.ir.code.Instruction$SideEffectAssumption$4 -> com.android.tools.r8.internal.ge:
     com.android.tools.r8.ir.code.Instruction$SideEffectAssumption val$other -> e
     com.android.tools.r8.ir.code.Instruction$SideEffectAssumption this$0 -> f
     1:1:void <init>(com.android.tools.r8.ir.code.Instruction$SideEffectAssumption,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):1524:1524 -> <init>
     1:2:boolean canAssumeClassIsAlreadyInitialized():1528:1529 -> a
     1:2:boolean canAssumeInvokedMethodDoesNotHaveSideEffects():1534:1535 -> b
     1:2:boolean canAssumeReceiverIsNotNull():1540:1541 -> c
-com.android.tools.r8.ir.code.InstructionIterator -> com.android.tools.r8.internal.ie:
+com.android.tools.r8.ir.code.InstructionIterator -> com.android.tools.r8.internal.je:
     1:3:com.android.tools.r8.ir.code.Instruction peekNext():30:32 -> d
     1:3:com.android.tools.r8.ir.code.Instruction peekPrevious():45:47 -> i
     1:1:void remove():15:15 -> remove
-com.android.tools.r8.ir.code.InstructionListIterator -> com.android.tools.r8.internal.je:
+com.android.tools.r8.ir.code.InstructionListIterator -> com.android.tools.r8.internal.ke:
     com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType) -> a
     com.android.tools.r8.ir.code.Value insertConstNumberInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,long,com.android.tools.r8.ir.analysis.type.TypeElement) -> a
     com.android.tools.r8.ir.code.Value insertConstStringInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString) -> a
@@ -29623,12 +29757,12 @@
     void unsetInsertionPosition() -> g
     void removeOrReplaceByDebugLocalRead() -> h
     1:1:void removeInstructionIgnoreOutValue():52:52 -> k
-com.android.tools.r8.ir.code.InstructionOrPhi -> com.android.tools.r8.internal.ke:
+com.android.tools.r8.ir.code.InstructionOrPhi -> com.android.tools.r8.internal.le:
     boolean isPhi() -> a
     com.android.tools.r8.ir.code.Instruction asInstruction() -> c
     com.android.tools.r8.ir.code.Phi asPhi() -> g
     com.android.tools.r8.ir.code.BasicBlock getBlock() -> h
-com.android.tools.r8.ir.code.IntSwitch -> com.android.tools.r8.internal.Uf:
+com.android.tools.r8.ir.code.IntSwitch -> com.android.tools.r8.internal.Vf:
     int $r8$clinit -> m
     boolean $assertionsDisabled -> l
     int[] keys -> n
@@ -29698,7 +29832,7 @@
     5:5:java.lang.String toString():274 -> toString
     6:11:java.lang.String toString():274:279 -> toString
     boolean isIntSwitch() -> u1
-com.android.tools.r8.ir.code.Invoke -> com.android.tools.r8.internal.mg:
+com.android.tools.r8.ir.code.Invoke -> com.android.tools.r8.internal.ng:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():32:32 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value,java.util.List):109:109 -> <init>
@@ -29788,7 +29922,7 @@
     2:2:int com.android.tools.r8.ir.code.Value.requiredRegisters():259:259 -> f2
     2:2:int requiredArgumentRegisters():162 -> f2
     boolean isInvoke() -> v1
-com.android.tools.r8.ir.code.Invoke$Type -> com.android.tools.r8.internal.mg$a:
+com.android.tools.r8.ir.code.Invoke$Type -> com.android.tools.r8.internal.ng$a:
     com.android.tools.r8.ir.code.Invoke$Type NEW_ARRAY -> f
     com.android.tools.r8.ir.code.Invoke$Type MULTI_NEW_ARRAY -> g
     com.android.tools.r8.ir.code.Invoke$Type CUSTOM -> h
@@ -29811,7 +29945,7 @@
     56:59:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType toMethodHandle(com.android.tools.r8.graph.DexMethod):92:95 -> a
     1:2:int getDexOpcode():76:77 -> b
     1:2:int getDexOpcodeRange():81:82 -> c
-com.android.tools.r8.ir.code.InvokeCustom -> com.android.tools.r8.internal.ng:
+com.android.tools.r8.ir.code.InvokeCustom -> com.android.tools.r8.internal.og:
     com.android.tools.r8.graph.DexCallSite callSite -> j
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():26:26 -> <clinit>
@@ -29856,7 +29990,7 @@
     java.lang.String getTypeString() -> e2
     1:1:com.android.tools.r8.graph.DexCallSite getCallSite():105:105 -> g2
     1:1:java.lang.String toString():120:120 -> toString
-com.android.tools.r8.ir.code.InvokeDirect -> com.android.tools.r8.internal.pg:
+com.android.tools.r8.ir.code.InvokeDirect -> com.android.tools.r8.internal.qg:
     boolean isInterface -> m
     boolean $assertionsDisabled -> l
     1:1:void <clinit>():33:33 -> <clinit>
@@ -29890,7 +30024,7 @@
     7:14:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):203:210 -> f
     1:1:boolean getInterfaceBit():56:56 -> g2
     boolean isInvokeDirect() -> x1
-com.android.tools.r8.ir.code.InvokeInterface -> com.android.tools.r8.internal.rg:
+com.android.tools.r8.ir.code.InvokeInterface -> com.android.tools.r8.internal.sg:
     boolean $assertionsDisabled -> l
     1:1:void <clinit>():29:29 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):32:32 -> <init>
@@ -29911,7 +30045,7 @@
     1:1:com.android.tools.r8.ir.code.Invoke$Type getType():52:52 -> d2
     java.lang.String getTypeString() -> e2
     boolean getInterfaceBit() -> g2
-com.android.tools.r8.ir.code.InvokeMethod -> com.android.tools.r8.internal.sg:
+com.android.tools.r8.ir.code.InvokeMethod -> com.android.tools.r8.internal.tg:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.graph.DexMethod method -> j
     1:1:void <clinit>():36:36 -> <clinit>
@@ -29967,7 +30101,7 @@
     com.android.tools.r8.graph.DexClassAndMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> i
     1:1:java.lang.String toString():63:63 -> toString
     boolean isInvokeMethod() -> y1
-com.android.tools.r8.ir.code.InvokeMethodWithReceiver -> com.android.tools.r8.internal.tg:
+com.android.tools.r8.ir.code.InvokeMethodWithReceiver -> com.android.tools.r8.internal.ug:
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():29:29 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):32:32 -> <init>
@@ -29984,20 +30118,17 @@
     181:181:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.analysis.type.TypeAnalysis.getRefinedReceiverType(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value):172:172 -> a
     181:181:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.analysis.type.TypeAnalysis.getRefinedReceiverType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethodWithReceiver):167 -> a
     181:181:boolean verifyTypes(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.VerifyTypesHelper):129 -> a
-    182:186:boolean verifyTypes(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.VerifyTypesHelper):130:134 -> a
-    187:187:boolean verifyTypes(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.VerifyTypesHelper):133:133 -> a
-    188:188:boolean verifyTypes(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.VerifyTypesHelper):130:130 -> a
-    189:213:boolean upperBoundAssumedByCallSiteOptimizationAndNoLongerInstantiated(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):147:171 -> a
-    214:214:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    214:214:boolean upperBoundAssumedByCallSiteOptimizationAndNoLongerInstantiated(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):174 -> a
-    215:215:boolean upperBoundAssumedByCallSiteOptimizationAndNoLongerInstantiated(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):175:175 -> a
-    216:267:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):181:232 -> a
-    268:268:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getReference():375:375 -> a
-    268:268:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):232 -> a
-    269:274:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):232:237 -> a
-    275:275:boolean com.android.tools.r8.graph.DexClassAndMethod.isLibraryMethod():0:0 -> a
-    275:275:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):242 -> a
-    276:295:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):244:263 -> a
+    182:187:boolean verifyTypes(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.VerifyTypesHelper):130:135 -> a
+    188:188:boolean verifyTypes(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.VerifyTypesHelper):134:134 -> a
+    189:189:boolean verifyTypes(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.VerifyTypesHelper):130:130 -> a
+    190:214:boolean upperBoundAssumedByCallSiteOptimizationAndNoLongerInstantiated(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):148:172 -> a
+    215:215:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    215:215:boolean upperBoundAssumedByCallSiteOptimizationAndNoLongerInstantiated(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):175 -> a
+    216:216:boolean upperBoundAssumedByCallSiteOptimizationAndNoLongerInstantiated(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):176:176 -> a
+    217:273:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):182:238 -> a
+    274:274:boolean com.android.tools.r8.graph.DexClassAndMethod.isLibraryMethod():0:0 -> a
+    274:274:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):243 -> a
+    275:294:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):245:264 -> a
     1:2:boolean hasRefinedReceiverLowerBoundType(com.android.tools.r8.graph.AppView):36:37 -> b
     1:2:boolean hasRefinedReceiverUpperBoundType(com.android.tools.r8.graph.AppView):41:42 -> c
     3:170:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.analysis.type.TypeAnalysis.getRefinedReceiverType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethodWithReceiver):0:167 -> c
@@ -30007,7 +30138,7 @@
     171:171:boolean hasRefinedReceiverUpperBoundType(com.android.tools.r8.graph.AppView):43 -> c
     1:6:com.android.tools.r8.graph.DexClassAndMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):77:82 -> i
     1:2:com.android.tools.r8.ir.code.Value getReceiver():58:59 -> i2
-com.android.tools.r8.ir.code.InvokeMultiNewArray -> com.android.tools.r8.internal.ug:
+com.android.tools.r8.ir.code.InvokeMultiNewArray -> com.android.tools.r8.internal.vg:
     com.android.tools.r8.graph.DexType type -> j
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():25:25 -> <clinit>
@@ -30044,7 +30175,7 @@
     1:1:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():152:152 -> h2
     1:1:boolean instructionInstanceCanThrowNegativeArraySizeException():162 -> h2
     2:8:boolean instructionInstanceCanThrowNegativeArraySizeException():162:168 -> h2
-com.android.tools.r8.ir.code.InvokeNewArray -> com.android.tools.r8.internal.vg:
+com.android.tools.r8.ir.code.InvokeNewArray -> com.android.tools.r8.internal.wg:
     com.android.tools.r8.graph.DexType type -> j
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():25:25 -> <clinit>
@@ -30077,7 +30208,7 @@
     1:1:com.android.tools.r8.errors.Unreachable cfUnsupported():139:139 -> g2
     1:1:com.android.tools.r8.graph.DexType getArrayType():50:50 -> h2
     1:1:java.lang.String toString():65:65 -> toString
-com.android.tools.r8.ir.code.InvokePolymorphic -> com.android.tools.r8.internal.wg:
+com.android.tools.r8.ir.code.InvokePolymorphic -> com.android.tools.r8.internal.xg:
     boolean $assertionsDisabled -> k
     com.android.tools.r8.graph.DexProto proto -> l
     1:1:void <clinit>():29:29 -> <clinit>
@@ -30111,7 +30242,7 @@
     boolean getInterfaceBit() -> g2
     com.android.tools.r8.graph.DexClassAndMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> i
     1:1:com.android.tools.r8.graph.DexProto getProto():69:69 -> i2
-com.android.tools.r8.ir.code.InvokeStatic -> com.android.tools.r8.internal.zg:
+com.android.tools.r8.ir.code.InvokeStatic -> com.android.tools.r8.internal.Ag:
     boolean $assertionsDisabled -> k
     boolean isInterface -> l
     1:1:void <clinit>():33:33 -> <clinit>
@@ -30125,14 +30256,11 @@
     21:21:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):148:148 -> a
     22:24:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):154:154 -> a
     25:25:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):165:165 -> a
-    26:70:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):172:216 -> a
-    71:71:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getReference():375:375 -> a
-    71:71:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):216 -> a
-    72:91:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):216:235 -> a
-    92:92:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):230:230 -> a
-    93:93:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeStatic):214:214 -> a
-    93:93:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):59 -> a
-    94:94:boolean lambda$instructionMayHaveSideEffects$0(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):234:234 -> a
+    26:89:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):172:235 -> a
+    90:90:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):230:230 -> a
+    91:91:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeStatic):214:214 -> a
+    91:91:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):59 -> a
+    92:92:boolean lambda$instructionMayHaveSideEffects$0(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):234:234 -> a
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):98:98 -> b
     1:1:com.android.tools.r8.ir.code.Invoke$Type getType():64:64 -> d2
     java.lang.String getTypeString() -> e2
@@ -30144,7 +30272,7 @@
     14:14:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> i
     14:14:com.android.tools.r8.graph.DexClassAndMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):124 -> i
     15:23:com.android.tools.r8.graph.DexClassAndMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):124:132 -> i
-com.android.tools.r8.ir.code.InvokeSuper -> com.android.tools.r8.internal.Ag:
+com.android.tools.r8.ir.code.InvokeSuper -> com.android.tools.r8.internal.Bg:
     boolean isInterface -> m
     boolean $assertionsDisabled -> l
     1:1:void <clinit>():28:28 -> <clinit>
@@ -30167,7 +30295,7 @@
     1:1:com.android.tools.r8.ir.code.Invoke$Type getType():54:54 -> d2
     java.lang.String getTypeString() -> e2
     1:1:boolean getInterfaceBit():39:39 -> g2
-com.android.tools.r8.ir.code.InvokeVirtual -> com.android.tools.r8.internal.Bg:
+com.android.tools.r8.ir.code.InvokeVirtual -> com.android.tools.r8.internal.Cg:
     boolean $assertionsDisabled -> l
     1:1:void <clinit>():30:30 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):33:33 -> <init>
@@ -30184,7 +30312,7 @@
     47:47:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
     47:47:com.android.tools.r8.graph.DexClassAndMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.graph.DexMethod):137 -> a
     48:51:com.android.tools.r8.graph.DexClassAndMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.graph.DexMethod):137:140 -> a
-    52:52:boolean com.android.tools.r8.graph.DexEncodedMethod.isFinal():470:470 -> a
+    52:52:boolean com.android.tools.r8.graph.DexEncodedMethod.isFinal():476:476 -> a
     52:52:com.android.tools.r8.graph.DexClassAndMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.graph.DexMethod):140 -> a
     53:53:com.android.tools.r8.graph.DexClassAndMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.graph.DexMethod):146:146 -> a
     54:54:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):152:152 -> a
@@ -30196,7 +30324,7 @@
     1:1:com.android.tools.r8.ir.code.Invoke$Type getType():53:53 -> d2
     java.lang.String getTypeString() -> e2
     boolean getInterfaceBit() -> g2
-com.android.tools.r8.ir.code.JumpInstruction -> com.android.tools.r8.internal.kh:
+com.android.tools.r8.ir.code.JumpInstruction -> com.android.tools.r8.internal.lh:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():13:13 -> <clinit>
     1:1:void <init>():16:16 -> <init>
@@ -30211,13 +30339,13 @@
     com.android.tools.r8.ir.code.BasicBlock fallthroughBlock() -> a2
     1:1:void setFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):32:32 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
-com.android.tools.r8.ir.code.LazyDominatorTree -> com.android.tools.r8.internal.Ul:
+com.android.tools.r8.ir.code.LazyDominatorTree -> com.android.tools.r8.internal.Vl:
     com.android.tools.r8.ir.code.IRCode code -> b
     1:2:void <init>(com.android.tools.r8.ir.code.IRCode):13:14 -> <init>
     1:1:java.lang.Object get():9:9 -> a
     1:1:com.android.tools.r8.ir.code.DominatorTree get():19:19 -> c
     1:1:com.android.tools.r8.ir.code.DominatorTree lambda$get$0():19:19 -> d
-com.android.tools.r8.ir.code.LinearFlowInstructionListIterator -> com.android.tools.r8.internal.xm:
+com.android.tools.r8.ir.code.LinearFlowInstructionListIterator -> com.android.tools.r8.internal.ym:
     com.android.tools.r8.ir.code.IRCode code -> b
     com.android.tools.r8.ir.code.InstructionListIterator currentBlockIterator -> d
     boolean $assertionsDisabled -> a
@@ -30252,7 +30380,7 @@
     1:1:void set(java.lang.Object):17:17 -> set
     2:2:void com.android.tools.r8.ir.code.LinearFlowInstructionListIterator.set(com.android.tools.r8.ir.code.Instruction):202:202 -> set
     2:2:void set(java.lang.Object):17 -> set
-com.android.tools.r8.ir.code.Load -> com.android.tools.r8.internal.Om:
+com.android.tools.r8.ir.code.Load -> com.android.tools.r8.internal.Pm:
     1:1:void <init>(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.Value):23:23 -> <init>
     boolean hasInvariantOutType() -> N0
     int maxInValueRegister() -> U1
@@ -30271,7 +30399,7 @@
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):52 -> b
     com.android.tools.r8.ir.code.Load asLoad() -> b0
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
-com.android.tools.r8.ir.code.LogicalBinop -> com.android.tools.r8.internal.Wm:
+com.android.tools.r8.ir.code.LogicalBinop -> com.android.tools.r8.internal.Xm:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):20:20 -> <init>
@@ -30301,7 +30429,7 @@
     com.android.tools.r8.ir.code.LogicalBinop asLogicalBinop() -> c0
     com.android.tools.r8.code.Instruction CreateLong(int,int,int) -> d
     com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode() -> f2
-com.android.tools.r8.ir.code.MemberType -> com.android.tools.r8.internal.co:
+com.android.tools.r8.ir.code.MemberType -> com.android.tools.r8.internal.do:
     com.android.tools.r8.ir.code.MemberType CHAR -> c
     com.android.tools.r8.ir.code.MemberType BOOLEAN_OR_BYTE -> b
     com.android.tools.r8.ir.code.MemberType INT -> e
@@ -30332,7 +30460,7 @@
     27:27:com.android.tools.r8.ir.code.MemberType fromDexType(com.android.tools.r8.graph.DexType):103 -> a
     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
-com.android.tools.r8.ir.code.Monitor -> com.android.tools.r8.internal.Po:
+com.android.tools.r8.ir.code.Monitor -> com.android.tools.r8.internal.Qo:
     com.android.tools.r8.ir.code.Monitor$Type type -> i
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():21:21 -> <clinit>
@@ -30361,14 +30489,14 @@
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
     com.android.tools.r8.ir.code.Monitor asMonitor() -> d0
     1:1:com.android.tools.r8.ir.code.Value object():45:45 -> f
-com.android.tools.r8.ir.code.Monitor$Type -> com.android.tools.r8.internal.Po$a:
+com.android.tools.r8.ir.code.Monitor$Type -> com.android.tools.r8.internal.Qo$a:
     com.android.tools.r8.ir.code.Monitor$Type ENTER -> a
     com.android.tools.r8.ir.code.Monitor$Type[] $VALUES -> c
     com.android.tools.r8.ir.code.Monitor$Type EXIT -> b
     1:1:void <clinit>():24:24 -> <clinit>
     2:2:void <clinit>():23:23 -> <clinit>
     1:1:void <init>(java.lang.String,int):23:23 -> <init>
-com.android.tools.r8.ir.code.Move -> com.android.tools.r8.internal.Qo:
+com.android.tools.r8.ir.code.Move -> com.android.tools.r8.internal.Ro:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():19:19 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):24:24 -> <init>
@@ -30397,7 +30525,7 @@
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
     com.android.tools.r8.ir.code.Move asMove() -> e0
     1:1:java.lang.String toString():77:77 -> toString
-com.android.tools.r8.ir.code.MoveException -> com.android.tools.r8.internal.So:
+com.android.tools.r8.ir.code.MoveException -> com.android.tools.r8.internal.To:
     com.android.tools.r8.graph.DexType exceptionType -> i
     boolean $assertionsDisabled -> h
     com.android.tools.r8.utils.InternalOptions options -> j
@@ -30415,7 +30543,7 @@
     282:282:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):47 -> a
     283:284:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):47:48 -> a
     285:287: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
-    288:288:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():425:425 -> a
+    288:288:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> a
     288:288:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):88 -> a
     289:289: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
     290:290: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
@@ -30426,12 +30554,12 @@
     1:1:boolean com.android.tools.r8.ir.code.Instruction.isMoveException():0:0 -> b
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):64 -> b
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):67:67 -> b
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.canHaveExceptionTypeBug():1784:1784 -> b
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.canHaveExceptionTypeBug():1791:1791 -> b
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):67 -> b
     4:4:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):68:68 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
     com.android.tools.r8.ir.code.MoveException asMoveException() -> f0
-com.android.tools.r8.ir.code.Mul -> com.android.tools.r8.internal.Uo:
+com.android.tools.r8.ir.code.Mul -> com.android.tools.r8.internal.Vo:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):22:22 -> <init>
     int opcode() -> W1
     double foldDouble(double,double) -> a
@@ -30455,7 +30583,7 @@
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):53:53 -> f
     1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():139:139 -> f2
     com.android.tools.r8.ir.code.Mul asMul() -> g0
-com.android.tools.r8.ir.code.Neg -> com.android.tools.r8.internal.xp:
+com.android.tools.r8.ir.code.Neg -> com.android.tools.r8.internal.yp:
     com.android.tools.r8.ir.code.NumericType type -> i
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():21:21 -> <clinit>
@@ -30478,7 +30606,7 @@
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):49 -> b
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):49:49 -> b
     com.android.tools.r8.ir.code.Neg asNeg() -> h0
-com.android.tools.r8.ir.code.NewArrayEmpty -> com.android.tools.r8.internal.Gp:
+com.android.tools.r8.ir.code.NewArrayEmpty -> com.android.tools.r8.internal.Hp:
     com.android.tools.r8.graph.DexType type -> i
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():22:22 -> <clinit>
@@ -30511,7 +30639,7 @@
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
     com.android.tools.r8.ir.code.NewArrayEmpty asNewArrayEmpty() -> i0
     1:1:java.lang.String toString():43:43 -> toString
-com.android.tools.r8.ir.code.NewArrayFilledData -> com.android.tools.r8.internal.Hp:
+com.android.tools.r8.ir.code.NewArrayFilledData -> com.android.tools.r8.internal.Ip:
     long size -> j
     short[] data -> k
     int element_width -> i
@@ -30540,7 +30668,7 @@
     6:6:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):119:119 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
     com.android.tools.r8.ir.code.NewArrayFilledData asNewArrayFilledData() -> j0
-com.android.tools.r8.ir.code.NewInstance -> com.android.tools.r8.internal.Ip:
+com.android.tools.r8.ir.code.NewInstance -> com.android.tools.r8.internal.Jp:
     com.android.tools.r8.graph.DexType clazz -> i
     boolean allowSpilling -> j
     boolean $assertionsDisabled -> h
@@ -30583,9 +30711,9 @@
     9:17:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):216:224 -> d
     com.android.tools.r8.ir.code.NewInstance asNewInstance() -> k0
     1:1:java.lang.String toString():68:68 -> toString
-com.android.tools.r8.ir.code.NextUntilIterator -> com.android.tools.r8.internal.Jp:
+com.android.tools.r8.ir.code.NextUntilIterator -> com.android.tools.r8.internal.Kp:
     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.eq:
+com.android.tools.r8.ir.code.Not -> com.android.tools.r8.internal.gq:
     com.android.tools.r8.ir.code.NumericType type -> i
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():19:19 -> <clinit>
@@ -30607,7 +30735,7 @@
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):83 -> b
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):83:83 -> b
     com.android.tools.r8.ir.code.Not asNot() -> l0
-com.android.tools.r8.ir.code.NumberConversion -> com.android.tools.r8.internal.kq:
+com.android.tools.r8.ir.code.NumberConversion -> com.android.tools.r8.internal.mq:
     com.android.tools.r8.ir.code.NumericType to -> i
     com.android.tools.r8.ir.code.NumericType from -> h
     1:3:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):36:38 -> <init>
@@ -30637,12 +30765,12 @@
     244:244:boolean outTypeKnownToBeBoolean(java.util.Set):167:167 -> a
     1:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):138:142 -> b
     com.android.tools.r8.ir.code.NumberConversion asNumberConversion() -> m0
-com.android.tools.r8.ir.code.NumberGenerator -> com.android.tools.r8.internal.lq:
+com.android.tools.r8.ir.code.NumberGenerator -> com.android.tools.r8.internal.nq:
     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.nq:
+com.android.tools.r8.ir.code.NumericType -> com.android.tools.r8.internal.pq:
     com.android.tools.r8.ir.code.NumericType DOUBLE -> g
     com.android.tools.r8.ir.code.NumericType FLOAT -> f
     com.android.tools.r8.ir.code.NumericType LONG -> e
@@ -30668,7 +30796,7 @@
     52:52:com.android.tools.r8.ir.code.NumericType fromDexType(com.android.tools.r8.graph.DexType):49:49 -> a
     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
-com.android.tools.r8.ir.code.Or -> com.android.tools.r8.internal.Or:
+com.android.tools.r8.ir.code.Or -> com.android.tools.r8.internal.Qr:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):18:18 -> <init>
     int opcode() -> W1
     int foldIntegers(int,int) -> a
@@ -30687,7 +30815,7 @@
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):53:53 -> d
     1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():93:93 -> f2
     com.android.tools.r8.ir.code.Or asOr() -> n0
-com.android.tools.r8.ir.code.Phi -> com.android.tools.r8.internal.ts:
+com.android.tools.r8.ir.code.Phi -> com.android.tools.r8.internal.vs:
     com.android.tools.r8.ir.code.Phi$RegisterReadType readType -> t
     java.util.List definitionUsers -> v
     java.util.List operands -> s
@@ -30770,18 +30898,18 @@
     5:5:void removeDeadPhi():324 -> l0
     6:6:void removeDeadPhi():324:324 -> l0
     1:1:boolean removeTrivialPhi():240:240 -> m0
-com.android.tools.r8.ir.code.Phi$RegisterReadType -> com.android.tools.r8.internal.ts$a:
+com.android.tools.r8.ir.code.Phi$RegisterReadType -> com.android.tools.r8.internal.vs$a:
     com.android.tools.r8.ir.code.Phi$RegisterReadType NORMAL -> a
     com.android.tools.r8.ir.code.Phi$RegisterReadType DEBUG -> b
     1:2:void <clinit>():39:40 -> <clinit>
     1:1:void <init>(java.lang.String,int):38:38 -> <init>
-com.android.tools.r8.ir.code.Phi$StackMapPhi -> com.android.tools.r8.internal.ts$b:
+com.android.tools.r8.ir.code.Phi$StackMapPhi -> com.android.tools.r8.internal.vs$b:
     boolean $assertionsDisabled -> w
     1:1:void <clinit>():455:455 -> <clinit>
     1:1:void <init>(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.ir.code.Phi$RegisterReadType):463:463 -> <init>
     1:8:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):468:475 -> a
     1:10:com.android.tools.r8.ir.analysis.type.TypeElement computePhiType(com.android.tools.r8.graph.AppView):481:490 -> d
-com.android.tools.r8.ir.code.Pop -> com.android.tools.r8.internal.Cs:
+com.android.tools.r8.ir.code.Pop -> com.android.tools.r8.internal.Es:
     1:1:void <init>(com.android.tools.r8.ir.code.StackValue):20:20 -> <init>
     boolean hasInvariantOutType() -> N0
     1:1:int maxInValueRegister():60:60 -> U1
@@ -30801,7 +30929,7 @@
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):55 -> b
     2:6:void addInValue(com.android.tools.r8.ir.code.Value):35:39 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
-com.android.tools.r8.ir.code.Position -> com.android.tools.r8.internal.Ds:
+com.android.tools.r8.ir.code.Position -> com.android.tools.r8.internal.Fs:
     com.android.tools.r8.ir.code.Position callerPosition -> i
     com.android.tools.r8.graph.DexString file -> f
     com.android.tools.r8.graph.DexMethod method -> h
@@ -30836,7 +30964,7 @@
     1:5:int hashCode():123:127 -> hashCode
     1:19:java.lang.String com.android.tools.r8.ir.code.Position.toString(boolean):145:163 -> toString
     1:19:java.lang.String toString():168 -> toString
-com.android.tools.r8.ir.code.Rem -> com.android.tools.r8.internal.Nw:
+com.android.tools.r8.ir.code.Rem -> com.android.tools.r8.internal.Pw:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):24:24 -> <init>
     1:1:boolean instructionTypeCanThrow():134:134 -> T0
     int opcode() -> W1
@@ -30865,7 +30993,7 @@
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):59:59 -> f
     1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():148:148 -> f2
     com.android.tools.r8.ir.code.Rem asRem() -> o0
-com.android.tools.r8.ir.code.Return -> com.android.tools.r8.internal.kx:
+com.android.tools.r8.ir.code.Return -> com.android.tools.r8.internal.mx:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():21:21 -> <clinit>
     1:1:void <init>():24:24 -> <init>
@@ -30889,7 +31017,7 @@
     1:1:boolean isReturnVoid():42:42 -> c2
     1:2:com.android.tools.r8.ir.code.Value returnValue():51:52 -> d2
     com.android.tools.r8.ir.code.Return asReturn() -> p0
-com.android.tools.r8.ir.code.Shl -> com.android.tools.r8.internal.Ox:
+com.android.tools.r8.ir.code.Shl -> com.android.tools.r8.internal.Qx:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):17:17 -> <init>
     int opcode() -> W1
     int foldIntegers(int,int) -> a
@@ -30908,7 +31036,7 @@
     1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():98:98 -> f2
     1:1:boolean fitsInDexInstruction(com.android.tools.r8.ir.code.Value):33:33 -> g
     com.android.tools.r8.ir.code.Shl asShl() -> q0
-com.android.tools.r8.ir.code.Shr -> com.android.tools.r8.internal.Qx:
+com.android.tools.r8.ir.code.Shr -> com.android.tools.r8.internal.Sx:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):17:17 -> <init>
     int opcode() -> W1
     int foldIntegers(int,int) -> a
@@ -30927,9 +31055,9 @@
     1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():98:98 -> f2
     1:1:boolean fitsInDexInstruction(com.android.tools.r8.ir.code.Value):33:33 -> g
     com.android.tools.r8.ir.code.Shr asShr() -> r0
-com.android.tools.r8.ir.code.SingleConstant -> com.android.tools.r8.internal.Vx:
+com.android.tools.r8.ir.code.SingleConstant -> com.android.tools.r8.internal.Xx:
     int decodedValue() -> a
-com.android.tools.r8.ir.code.StackValue -> com.android.tools.r8.internal.Ay:
+com.android.tools.r8.ir.code.StackValue -> com.android.tools.r8.internal.Cy:
     boolean $assertionsDisabled -> q
     int height -> r
     com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo typeInfo -> s
@@ -30942,7 +31070,7 @@
     1:1:int getHeight():31:31 -> h0
     1:1:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo getTypeInfo():35:35 -> i0
     1:1:java.lang.String toString():59:59 -> toString
-com.android.tools.r8.ir.code.StackValues -> com.android.tools.r8.internal.By:
+com.android.tools.r8.ir.code.StackValues -> com.android.tools.r8.internal.Dy:
     boolean $assertionsDisabled -> q
     com.android.tools.r8.ir.code.StackValue[] stackValues -> r
     1:1:void <clinit>():14:14 -> <clinit>
@@ -30953,7 +31081,7 @@
     1:1:com.android.tools.r8.ir.code.StackValue[] getStackValues():25:25 -> h0
     1:10:java.lang.String toString():40:49 -> toString
     1:1:com.android.tools.r8.ir.analysis.type.TypeElement getType():59:59 -> v
-com.android.tools.r8.ir.code.StaticGet -> com.android.tools.r8.internal.Hy:
+com.android.tools.r8.ir.code.StaticGet -> com.android.tools.r8.internal.Jy:
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():35:35 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):38:38 -> <init>
@@ -30999,7 +31127,7 @@
     1:1:com.android.tools.r8.ir.code.Value dest():63:63 -> d2
     com.android.tools.r8.ir.code.StaticGet asStaticGet() -> s0
     1:1:java.lang.String toString():178:178 -> toString
-com.android.tools.r8.ir.code.StaticPut -> com.android.tools.r8.internal.Jy:
+com.android.tools.r8.ir.code.StaticPut -> com.android.tools.r8.internal.Ly:
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():34:34 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):37:37 -> <init>
@@ -31036,7 +31164,7 @@
     10:18:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):235:243 -> d
     com.android.tools.r8.ir.code.StaticPut asStaticPut() -> t0
     1:1:java.lang.String toString():188:188 -> toString
-com.android.tools.r8.ir.code.Store -> com.android.tools.r8.internal.Ly:
+com.android.tools.r8.ir.code.Store -> com.android.tools.r8.internal.Ny:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():22:22 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.StackValue):25:25 -> <init>
@@ -31059,7 +31187,7 @@
     1:2:boolean needsValueInRegister(com.android.tools.r8.ir.code.Value):113:114 -> c
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
     com.android.tools.r8.ir.code.Store asStore() -> u0
-com.android.tools.r8.ir.code.StringSwitch -> com.android.tools.r8.internal.fz:
+com.android.tools.r8.ir.code.StringSwitch -> com.android.tools.r8.internal.hz:
     boolean $assertionsDisabled -> l
     com.android.tools.r8.graph.DexString[] keys -> m
     1:1:void <clinit>():17:17 -> <clinit>
@@ -31084,7 +31212,7 @@
     5:5:java.lang.String toString():89 -> toString
     6:11:java.lang.String toString():89:94 -> toString
     com.android.tools.r8.ir.code.StringSwitch asStringSwitch() -> v0
-com.android.tools.r8.ir.code.Sub -> com.android.tools.r8.internal.yz:
+com.android.tools.r8.ir.code.Sub -> com.android.tools.r8.internal.Az:
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():24:24 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):27:27 -> <init>
@@ -31118,7 +31246,7 @@
     1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():217:217 -> f2
     1:3:boolean negativeFitsInDexInstruction(com.android.tools.r8.ir.code.Value):123:125 -> i
     com.android.tools.r8.ir.code.Sub asSub() -> w0
-com.android.tools.r8.ir.code.Swap -> com.android.tools.r8.internal.Fz:
+com.android.tools.r8.ir.code.Swap -> com.android.tools.r8.internal.Hz:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():19:19 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):22:22 -> <init>
@@ -31137,7 +31265,7 @@
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):77 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
     1:6:void setOutValue(com.android.tools.r8.ir.code.Value):44:49 -> e
-com.android.tools.r8.ir.code.Switch -> com.android.tools.r8.internal.Gz:
+com.android.tools.r8.ir.code.Switch -> com.android.tools.r8.internal.Iz:
     boolean $assertionsDisabled -> i
     int fallthroughBlockIndex -> k
     int[] targetBlockIndices -> j
@@ -31163,7 +31291,7 @@
     5:5:boolean valid():29:29 -> e2
     1:1:com.android.tools.r8.ir.code.Value value():24:24 -> f2
     com.android.tools.r8.ir.code.Switch asSwitch() -> x0
-com.android.tools.r8.ir.code.Throw -> com.android.tools.r8.internal.kA:
+com.android.tools.r8.ir.code.Throw -> com.android.tools.r8.internal.mA:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value):20:20 -> <init>
@@ -31182,17 +31310,17 @@
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):60:60 -> b
     1:1:com.android.tools.r8.ir.code.Value exception():34:34 -> b2
     com.android.tools.r8.ir.code.Throw asThrow() -> y0
-com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier -> com.android.tools.r8.internal.yB:
+com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier -> com.android.tools.r8.internal.zB:
     1:1:com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier create(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DebugLocalInfo):16:16 -> a
     com.android.tools.r8.graph.DebugLocalInfo getLocalInfo() -> b
     com.android.tools.r8.ir.analysis.type.TypeElement getOutType() -> d
-com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier$1 -> com.android.tools.r8.internal.xB:
+com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier$1 -> com.android.tools.r8.internal.yB:
     com.android.tools.r8.ir.analysis.type.TypeElement val$type -> b
     com.android.tools.r8.graph.DebugLocalInfo val$local -> a
     1:1:void <init>(com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.ir.analysis.type.TypeElement):16:16 -> <init>
     1:1:com.android.tools.r8.graph.DebugLocalInfo getLocalInfo():20:20 -> b
     1:1:com.android.tools.r8.ir.analysis.type.TypeElement getOutType():25:25 -> d
-com.android.tools.r8.ir.code.Unop -> com.android.tools.r8.internal.dC:
+com.android.tools.r8.ir.code.Unop -> com.android.tools.r8.internal.eC:
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):17:17 -> <init>
     boolean hasInvariantOutType() -> N0
     boolean isUnop() -> T1
@@ -31204,7 +31332,7 @@
     331:331:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):62:62 -> a
     1:1:com.android.tools.r8.ir.code.Value source():25:25 -> a2
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
-com.android.tools.r8.ir.code.Ushr -> com.android.tools.r8.internal.mC:
+com.android.tools.r8.ir.code.Ushr -> com.android.tools.r8.internal.nC:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):17:17 -> <init>
     int opcode() -> W1
     int foldIntegers(int,int) -> a
@@ -31223,7 +31351,7 @@
     1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():98:98 -> f2
     1:1:boolean fitsInDexInstruction(com.android.tools.r8.ir.code.Value):33:33 -> g
     com.android.tools.r8.ir.code.Ushr asUshr() -> z0
-com.android.tools.r8.ir.code.Value -> com.android.tools.r8.internal.pC:
+com.android.tools.r8.ir.code.Value -> com.android.tools.r8.internal.qC:
     boolean isThis -> m
     com.android.tools.r8.ir.regalloc.LiveIntervals liveIntervals -> k
     int needsRegister -> l
@@ -31450,12 +31578,12 @@
     1:1:boolean hasAliasedValue():200:200 -> x
     1:1:boolean hasAnyUsers():399:399 -> y
     1:1:boolean hasDebugUsers():403:403 -> z
-com.android.tools.r8.ir.code.Value$DebugData -> com.android.tools.r8.internal.pC$a:
+com.android.tools.r8.ir.code.Value$DebugData -> com.android.tools.r8.internal.qC$a:
     com.android.tools.r8.graph.DebugLocalInfo local -> a
     java.util.Set users -> b
     1:1:void <init>(com.android.tools.r8.graph.DebugLocalInfo):155:155 -> <init>
     2:5:void <init>(com.android.tools.r8.graph.DebugLocalInfo):153:156 -> <init>
-com.android.tools.r8.ir.code.ValueType -> com.android.tools.r8.internal.vC:
+com.android.tools.r8.ir.code.ValueType -> com.android.tools.r8.internal.wC:
     com.android.tools.r8.ir.code.ValueType DOUBLE -> e
     com.android.tools.r8.ir.code.ValueType FLOAT -> c
     com.android.tools.r8.ir.code.ValueType LONG -> d
@@ -31502,7 +31630,7 @@
     13:13:com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement toPrimitiveType():131:131 -> d
     14:14:com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement toPrimitiveType():129:129 -> d
     15:15:com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement toPrimitiveType():127:127 -> d
-com.android.tools.r8.ir.code.ValueTypeConstraint -> com.android.tools.r8.internal.wC:
+com.android.tools.r8.ir.code.ValueTypeConstraint -> com.android.tools.r8.internal.xC:
     com.android.tools.r8.ir.code.ValueTypeConstraint FLOAT -> c
     com.android.tools.r8.ir.code.ValueTypeConstraint INT -> b
     com.android.tools.r8.ir.code.ValueTypeConstraint OBJECT -> a
@@ -31550,9 +31678,9 @@
     76:78:com.android.tools.r8.ir.code.ValueTypeConstraint fromTypeLattice(com.android.tools.r8.ir.analysis.type.TypeElement):155:157 -> a
     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
-com.android.tools.r8.ir.code.WideConstant -> com.android.tools.r8.internal.SC:
+com.android.tools.r8.ir.code.WideConstant -> com.android.tools.r8.internal.TC:
     long decodedValue() -> a
-com.android.tools.r8.ir.code.Xor -> com.android.tools.r8.internal.bE:
+com.android.tools.r8.ir.code.Xor -> com.android.tools.r8.internal.cE:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):18:18 -> <init>
     com.android.tools.r8.ir.code.Xor asXor() -> A0
     int opcode() -> W1
@@ -31813,12 +31941,12 @@
     2:2:void lambda$processInvokeWithDynamicDispatch$0(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexClassAndMethod):229:229 -> a
     3:5:void addClassInitializerTarget(com.android.tools.r8.graph.DexProgramClass):120:122 -> a
     6:13:void addCallEdge(com.android.tools.r8.graph.ProgramMethod,boolean):135:142 -> a
-    14:14:boolean com.android.tools.r8.graph.DexEncodedMethod.isNative():474:474 -> a
+    14:14:boolean com.android.tools.r8.graph.DexEncodedMethod.isNative():480:480 -> a
     14:14:void addCallEdge(com.android.tools.r8.graph.ProgramMethod,boolean):142 -> a
     15:21:void addCallEdge(com.android.tools.r8.graph.ProgramMethod,boolean):146:152 -> a
     22:26:void addFieldReadEdge(com.android.tools.r8.graph.ProgramMethod):160:164 -> a
     27:44:void processInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):168:185 -> a
-    45:45:boolean com.android.tools.r8.graph.DexEncodedMethod.isBridge():466:466 -> a
+    45:45:boolean com.android.tools.r8.graph.DexEncodedMethod.isBridge():472:472 -> a
     45:45:void processInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):185 -> a
     46:46:void processInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):186:186 -> a
     47:53:void processInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):185:191 -> a
@@ -32151,7 +32279,7 @@
     5:5:boolean com.android.tools.r8.ir.conversion.CfSourceCode.canThrowHelper(com.android.tools.r8.cf.code.CfInstruction,boolean):308:308 -> a
     5:5:boolean canThrowHelper(com.android.tools.r8.cf.code.CfInstruction):300 -> a
     6:8:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):313:315 -> a
-    9:9:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():425:425 -> a
+    9:9:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> a
     9:9:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):315 -> a
     10:12:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):315:315 -> a
     14:38:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):317:341 -> a
@@ -32173,7 +32301,7 @@
     151:179:com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList getTryHandlers(int,com.android.tools.r8.graph.DexItemFactory):350 -> a
     180:187:com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList getTryHandlers(int,com.android.tools.r8.graph.DexItemFactory):350:357 -> a
     188:200:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):398:410 -> a
-    201:201:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexEncodedMethod.proto():383:383 -> a
+    201:201:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexEncodedMethod.proto():389:389 -> a
     201:201:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):410 -> a
     202:214:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):410:422 -> a
     215:228:void com.android.tools.r8.ir.conversion.CfSourceCode.buildMethodEnterSynchronization(com.android.tools.r8.ir.conversion.IRBuilder):438:451 -> a
@@ -32460,9 +32588,9 @@
     2:3:void build(com.android.tools.r8.ir.conversion.CfState$BaseSnapshot):530:531 -> a
     1:1:int maxLocal():520:520 -> b
     1:1:java.lang.String toString():536:536 -> toString
-com.android.tools.r8.ir.conversion.CodeOptimization -> com.android.tools.r8.internal.w6:
+com.android.tools.r8.ir.conversion.CodeOptimization -> com.android.tools.r8.internal.x6:
     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.ir.conversion.MethodProcessingId) -> a
-com.android.tools.r8.ir.conversion.DexBuilder -> com.android.tools.r8.internal.B8:
+com.android.tools.r8.ir.conversion.DexBuilder -> com.android.tools.r8.internal.C8:
     boolean hasBackwardsBranch -> n
     int inRegisterCount -> l
     int outRegisterCount -> m
@@ -32539,7 +32667,7 @@
     195:198:void com.android.tools.r8.ir.conversion.DexBuilder.reset():165:168 -> a
     195:198:com.android.tools.r8.graph.DexCode build():191 -> a
     199:240:com.android.tools.r8.graph.DexCode build():196:237 -> a
-    241:241:boolean com.android.tools.r8.utils.InternalOptions.canHaveTracingPastInstructionsStreamBug():1720:1720 -> a
+    241:241:boolean com.android.tools.r8.utils.InternalOptions.canHaveTracingPastInstructionsStreamBug():1727:1727 -> a
     241:241:com.android.tools.r8.graph.DexCode build():237 -> a
     242:285:com.android.tools.r8.graph.DexCode build():238:281 -> a
     286:305:com.android.tools.r8.code.Nop com.android.tools.r8.ir.conversion.DexBuilder.createSwitchPayload(com.android.tools.r8.ir.conversion.DexBuilder$SwitchPayloadInfo,int):711:730 -> a
@@ -32593,7 +32721,7 @@
     4:4:com.android.tools.r8.ir.conversion.DexBuilder$Info getInfo(com.android.tools.r8.ir.code.Instruction):665:665 -> c
     5:5:com.android.tools.r8.ir.regalloc.RegisterAllocator getRegisterAllocator():878:878 -> c
     1:1:boolean isBuildingForComparison():156:156 -> d
-com.android.tools.r8.ir.conversion.DexBuilder$FallThroughInfo -> com.android.tools.r8.internal.r8:
+com.android.tools.r8.ir.conversion.DexBuilder$FallThroughInfo -> com.android.tools.r8.internal.s8:
     1:1:void <init>(com.android.tools.r8.ir.code.Instruction):1047:1047 -> <init>
     void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List) -> a
     int computeSize(com.android.tools.r8.ir.conversion.DexBuilder) -> a
@@ -32601,11 +32729,11 @@
     int getSize() -> d
     int maxSize() -> e
     int minSize() -> f
-com.android.tools.r8.ir.conversion.DexBuilder$FillArrayDataInfo -> com.android.tools.r8.internal.s8:
+com.android.tools.r8.ir.conversion.DexBuilder$FillArrayDataInfo -> com.android.tools.r8.internal.t8:
     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):1522:1524 -> <init>
-com.android.tools.r8.ir.conversion.DexBuilder$FixedSizeInfo -> com.android.tools.r8.internal.t8:
+com.android.tools.r8.ir.conversion.DexBuilder$FixedSizeInfo -> com.android.tools.r8.internal.u8:
     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):954:955 -> <init>
     1:2:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):975:976 -> a
@@ -32614,7 +32742,7 @@
     1:1:int getSize():960:960 -> d
     1:1:int maxSize():970:970 -> e
     1:1:int minSize():965:965 -> f
-com.android.tools.r8.ir.conversion.DexBuilder$GotoInfo -> com.android.tools.r8.internal.u8:
+com.android.tools.r8.ir.conversion.DexBuilder$GotoInfo -> com.android.tools.r8.internal.v8:
     boolean $assertionsDisabled -> e
     int size -> f
     1:1:void <clinit>():1080:1080 -> <clinit>
@@ -32633,7 +32761,7 @@
     1:2:int getSize():1094:1095 -> d
     1:1:int maxSize():1106:1106 -> e
     1:1:int minSize():1100:1100 -> f
-com.android.tools.r8.ir.conversion.DexBuilder$IfInfo -> com.android.tools.r8.internal.v8:
+com.android.tools.r8.ir.conversion.DexBuilder$IfInfo -> com.android.tools.r8.internal.w8:
     boolean $assertionsDisabled -> e
     int size -> f
     1:1:void <clinit>():1211:1211 -> <clinit>
@@ -32749,7 +32877,7 @@
     1:1:int getSize():1344:1344 -> d
     int maxSize() -> e
     int minSize() -> f
-com.android.tools.r8.ir.conversion.DexBuilder$Info -> com.android.tools.r8.internal.w8:
+com.android.tools.r8.ir.conversion.DexBuilder$Info -> com.android.tools.r8.internal.x8:
     com.android.tools.r8.ir.code.Instruction ir -> b
     int maxOffset -> d
     boolean $assertionsDisabled -> a
@@ -32769,7 +32897,7 @@
     int getSize() -> d
     int maxSize() -> e
     int minSize() -> f
-com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo -> com.android.tools.r8.internal.x8:
+com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo -> com.android.tools.r8.internal.y8:
     boolean $assertionsDisabled -> e
     int size -> f
     1:1:void <clinit>():1358:1358 -> <clinit>
@@ -32816,7 +32944,7 @@
     1:2:int getSize():1470:1471 -> d
     1:1:int maxSize():1464:1464 -> e
     1:1:int minSize():1458:1458 -> f
-com.android.tools.r8.ir.conversion.DexBuilder$MultiFixedSizeInfo -> com.android.tools.r8.internal.y8:
+com.android.tools.r8.ir.conversion.DexBuilder$MultiFixedSizeInfo -> com.android.tools.r8.internal.z8:
     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[]):998:1004 -> <init>
@@ -32826,11 +32954,11 @@
     1:1:int getSize():1034:1034 -> d
     1:1:int maxSize():1029:1029 -> e
     1:1:int minSize():1024:1024 -> f
-com.android.tools.r8.ir.conversion.DexBuilder$SwitchPayloadInfo -> com.android.tools.r8.internal.z8:
+com.android.tools.r8.ir.conversion.DexBuilder$SwitchPayloadInfo -> com.android.tools.r8.internal.A8:
     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):1511:1513 -> <init>
-com.android.tools.r8.ir.conversion.DexBuilder$TryItem -> com.android.tools.r8.internal.A8:
+com.android.tools.r8.ir.conversion.DexBuilder$TryItem -> com.android.tools.r8.internal.B8:
     com.android.tools.r8.ir.code.CatchHandlers handlers -> a
     int start -> b
     int end -> c
@@ -32839,7 +32967,7 @@
     1:1:int compareTo(java.lang.Object):1488:1488 -> compareTo
     2:2:int com.android.tools.r8.ir.conversion.DexBuilder$TryItem.compareTo(com.android.tools.r8.ir.conversion.DexBuilder$TryItem):1502:1502 -> compareTo
     2:2:int compareTo(java.lang.Object):1488 -> compareTo
-com.android.tools.r8.ir.conversion.DexSourceCode -> com.android.tools.r8.internal.J8:
+com.android.tools.r8.ir.conversion.DexSourceCode -> com.android.tools.r8.internal.K8:
     com.android.tools.r8.ir.code.CatchHandlers currentCatchHandlers -> h
     com.android.tools.r8.ir.code.Position currentPosition -> j
     com.android.tools.r8.graph.DexMethod originalMethod -> m
@@ -32911,31 +33039,31 @@
     1:1:com.android.tools.r8.graph.DexCode$Try getTryForOffset(int):392:392 -> i
     2:2:boolean com.android.tools.r8.ir.conversion.DexSourceCode.inTryRange(com.android.tools.r8.graph.DexCode$Try,int):387:387 -> i
     2:2:com.android.tools.r8.graph.DexCode$Try getTryForOffset(int):393 -> i
-com.android.tools.r8.ir.conversion.ExtraConstantIntParameter -> com.android.tools.r8.internal.ga:
+com.android.tools.r8.ir.conversion.ExtraConstantIntParameter -> com.android.tools.r8.internal.ha:
     long value -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():12:12 -> <clinit>
     1:2:void <init>(long):15:16 -> <init>
     1:2:com.android.tools.r8.ir.analysis.type.TypeElement getTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):21:22 -> a
     3:3:com.android.tools.r8.ir.analysis.value.SingleNumberValue getValue(com.android.tools.r8.graph.AppView):27:27 -> a
-com.android.tools.r8.ir.conversion.ExtraParameter -> com.android.tools.r8.internal.ha:
+com.android.tools.r8.ir.conversion.ExtraParameter -> com.android.tools.r8.internal.ia:
     1:1:void <init>():12:12 -> <init>
     com.android.tools.r8.ir.analysis.type.TypeElement getTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> a
     com.android.tools.r8.ir.analysis.value.SingleNumberValue getValue(com.android.tools.r8.graph.AppView) -> a
-com.android.tools.r8.ir.conversion.ExtraUnusedNullParameter -> com.android.tools.r8.internal.ia:
+com.android.tools.r8.ir.conversion.ExtraUnusedNullParameter -> com.android.tools.r8.internal.ja:
     1:1:void <init>():13:13 -> <init>
     1:1:com.android.tools.r8.ir.analysis.type.TypeElement getTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):17:17 -> a
     2:2:com.android.tools.r8.ir.analysis.value.SingleNumberValue getValue(com.android.tools.r8.graph.AppView):22:22 -> a
     3:3:com.android.tools.r8.ir.analysis.value.SingleNumberValue com.android.tools.r8.ir.analysis.value.AbstractValueFactory.createNullValue():35:35 -> a
     3:3:com.android.tools.r8.ir.analysis.value.SingleNumberValue getValue(com.android.tools.r8.graph.AppView):22 -> a
-com.android.tools.r8.ir.conversion.FieldOptimizationFeedback -> com.android.tools.r8.internal.za:
+com.android.tools.r8.ir.conversion.FieldOptimizationFeedback -> com.android.tools.r8.internal.Aa:
     void markFieldAsPropagated(com.android.tools.r8.graph.DexEncodedField) -> a
     void markFieldBitsRead(com.android.tools.r8.graph.DexEncodedField,int) -> a
     void markFieldHasDynamicLowerBoundType(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.type.ClassTypeElement) -> a
     void markFieldHasDynamicUpperBoundType(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.type.TypeElement) -> a
     void recordFieldHasAbstractValue(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.value.AbstractValue) -> a
     void markFieldCannotBeKept(com.android.tools.r8.graph.DexEncodedField) -> b
-com.android.tools.r8.ir.conversion.IRBuilder -> com.android.tools.r8.internal.kc:
+com.android.tools.r8.ir.conversion.IRBuilder -> com.android.tools.r8.internal.lc:
     com.android.tools.r8.ir.conversion.SourceCode source -> v
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap targets -> b
     java.util.List argumentValues -> t
@@ -33168,7 +33296,7 @@
     481:481:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):725 -> a
     482:482:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):725:725 -> a
     483:506:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):720:743 -> a
-    507:507:boolean com.android.tools.r8.utils.InternalOptions.isStringSwitchConversionEnabled():1467:1467 -> a
+    507:507:boolean com.android.tools.r8.utils.InternalOptions.isStringSwitchConversionEnabled():1474:1474 -> a
     507:507:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):743 -> a
     508:508:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):744:744 -> a
     509:520:java.util.List com.android.tools.r8.ir.conversion.StringSwitchConverter.getRewritingCandidates(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):127:138 -> a
@@ -33246,7 +33374,7 @@
     654:654:void addConstString(int,com.android.tools.r8.graph.DexString):1277:1277 -> a
     655:655:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo com.android.tools.r8.ir.conversion.IRBuilder.throwingInfoForConstStrings():1271:1271 -> a
     655:655:void addConstString(int,com.android.tools.r8.graph.DexString):1278 -> a
-    656:656:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():425:425 -> a
+    656:656:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> a
     656:656:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo com.android.tools.r8.ir.conversion.IRBuilder.throwingInfoForConstStrings():1271 -> a
     656:656:void addConstString(int,com.android.tools.r8.graph.DexString):1278 -> a
     657:658:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo com.android.tools.r8.ir.conversion.IRBuilder.throwingInfoForConstStrings():1272:1273 -> a
@@ -33255,7 +33383,7 @@
     660:660:void addDexItemBasedConstString(int,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):1284:1284 -> a
     661:661:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo com.android.tools.r8.ir.conversion.IRBuilder.throwingInfoForConstStrings():1271:1271 -> a
     661:661:void addDexItemBasedConstString(int,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):1285 -> a
-    662:662:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():425:425 -> a
+    662:662:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> a
     662:662:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo com.android.tools.r8.ir.conversion.IRBuilder.throwingInfoForConstStrings():1271 -> a
     662:662:void addDexItemBasedConstString(int,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):1285 -> a
     663:664:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo com.android.tools.r8.ir.conversion.IRBuilder.throwingInfoForConstStrings():1272:1273 -> a
@@ -33555,7 +33683,7 @@
     82:85:void addTrivialIf(int,int):1410:1413 -> b
     86:89:void addInstancePut(int,int,com.android.tools.r8.graph.DexField):1501:1504 -> b
     90:90:void addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1667:1667 -> b
-    91:91:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():425:425 -> b
+    91:91:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> b
     91:91:void addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1667 -> b
     92:98:void addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1667:1673 -> b
     99:103:void addNewArrayEmpty(int,int,com.android.tools.r8.graph.DexType):1800:1804 -> b
@@ -33883,8 +34011,8 @@
     11:13:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2104:2106 -> v
     14:14:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2409:2409 -> v
     14:14:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2107 -> v
-com.android.tools.r8.ir.conversion.IRBuilder$1 -> com.android.tools.r8.internal.kc$a:
-com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo -> com.android.tools.r8.internal.kc$b:
+com.android.tools.r8.ir.conversion.IRBuilder$1 -> com.android.tools.r8.internal.lc$a:
+com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo -> com.android.tools.r8.internal.lc$b:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet exceptionalPredecessors -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet exceptionalSuccessors -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet normalPredecessors -> b
@@ -33892,7 +34020,7 @@
     com.android.tools.r8.ir.code.BasicBlock block -> a
     1:7:void <init>():271:277 -> <init>
     1:25:java.lang.String toString():341:365 -> toString
-com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem -> com.android.tools.r8.internal.kc$c:
+com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem -> com.android.tools.r8.internal.lc$c:
     com.android.tools.r8.graph.DexType guard -> d
     int targetOffset -> f
     int sourceOffset -> e
@@ -33901,7 +34029,7 @@
     1:1:int access$600(com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem):195:195 -> a
     1:1:com.android.tools.r8.graph.DexType access$700(com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem):195:195 -> b
     1:1:int access$800(com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem):195:195 -> c
-com.android.tools.r8.ir.conversion.IRBuilder$SplitBlockWorklistItem -> com.android.tools.r8.internal.kc$d:
+com.android.tools.r8.ir.conversion.IRBuilder$SplitBlockWorklistItem -> com.android.tools.r8.internal.lc$d:
     int sourceOffset -> d
     int targetOffset -> e
     com.android.tools.r8.ir.code.Position position -> f
@@ -33909,13 +34037,13 @@
     1:1:int access$200(com.android.tools.r8.ir.conversion.IRBuilder$SplitBlockWorklistItem):210:210 -> a
     1:1:int access$300(com.android.tools.r8.ir.conversion.IRBuilder$SplitBlockWorklistItem):210:210 -> b
     1:1:com.android.tools.r8.ir.code.Position access$500(com.android.tools.r8.ir.conversion.IRBuilder$SplitBlockWorklistItem):210:210 -> c
-com.android.tools.r8.ir.conversion.IRBuilder$ValueList -> com.android.tools.r8.internal.kc$e:
+com.android.tools.r8.ir.conversion.IRBuilder$ValueList -> com.android.tools.r8.internal.lc$e:
     java.util.List values -> a
     1:3:void <init>():233:235 -> <init>
     1:3:com.android.tools.r8.ir.conversion.IRBuilder$ValueList fromPhis(java.util.List,int):241:243 -> a
     1:9:boolean equals(java.lang.Object):255:263 -> equals
     1:1:int hashCode():250:250 -> hashCode
-com.android.tools.r8.ir.conversion.IRBuilder$WorklistItem -> com.android.tools.r8.internal.kc$f:
+com.android.tools.r8.ir.conversion.IRBuilder$WorklistItem -> com.android.tools.r8.internal.lc$f:
     boolean $assertionsDisabled -> a
     int firstInstructionIndex -> c
     com.android.tools.r8.ir.code.BasicBlock block -> b
@@ -34020,18 +34148,18 @@
     459:459:void convertMethod(com.android.tools.r8.graph.ProgramMethod):537:537 -> a
     460:460:boolean needsIRConversion(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.ProgramMethod):554:554 -> a
     460:460:void convertMethod(com.android.tools.r8.graph.ProgramMethod):537 -> a
-    461:461:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():390:390 -> a
+    461:461:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():397:397 -> a
     461:461:boolean needsIRConversion(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.ProgramMethod):557 -> a
     461:461:void convertMethod(com.android.tools.r8.graph.ProgramMethod):537 -> a
     462:483:boolean needsIRConversion(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.ProgramMethod):561:582 -> a
     462:483:void convertMethod(com.android.tools.r8.graph.ProgramMethod):537 -> a
     484:484:void convertMethod(com.android.tools.r8.graph.ProgramMethod):540:540 -> a
-    485:485:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():425:425 -> a
+    485:485:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> a
     485:485:void convertMethod(com.android.tools.r8.graph.ProgramMethod):540 -> a
     486:492:void convertMethod(com.android.tools.r8.graph.ProgramMethod):540:546 -> a
     493:495:void convertMethod(com.android.tools.r8.graph.ProgramMethod):543:543 -> a
     500:500:void convertMethod(com.android.tools.r8.graph.ProgramMethod):548:548 -> a
-    501:501:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():425:425 -> a
+    501:501:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> a
     501:501:void convertMethod(com.android.tools.r8.graph.ProgramMethod):548 -> a
     502:506:void updateHighestSortingStrings(com.android.tools.r8.graph.DexEncodedMethod):1766:1770 -> a
     502:506:void convertMethod(com.android.tools.r8.graph.ProgramMethod):549 -> a
@@ -34076,7 +34204,7 @@
     638:643:void printC1VisualizerHeader(com.android.tools.r8.graph.DexEncodedMethod):1974:1979 -> a
     638:643:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1181 -> a
     644:650:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1182:1188 -> a
-    651:651:boolean com.android.tools.r8.utils.InternalOptions.canHaveArtStringNewInitBug():1672:1672 -> a
+    651:651:boolean com.android.tools.r8.utils.InternalOptions.canHaveArtStringNewInitBug():1679:1679 -> a
     651:651:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1188 -> a
     652:673:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1189:1210 -> a
     674:710:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1208:1244 -> a
@@ -34100,13 +34228,13 @@
     964:976:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1411:1423 -> a
     977:1025:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1422:1470 -> a
     1026:1122:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1460:1556 -> a
-    1123:1123:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():425:425 -> a
+    1123:1123:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> a
     1123:1123:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1556 -> a
     1124:1143:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1557:1576 -> a
-    1144:1149:boolean com.android.tools.r8.utils.InternalOptions.methodMatchesLogArgumentsFilter(com.android.tools.r8.graph.DexEncodedMethod):1111:1116 -> a
+    1144:1149:boolean com.android.tools.r8.utils.InternalOptions.methodMatchesLogArgumentsFilter(com.android.tools.r8.graph.DexEncodedMethod):1118:1123 -> a
     1144:1149:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1576 -> a
     1150:1192:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1577:1619 -> a
-    1193:1193:boolean com.android.tools.r8.utils.InternalOptions.canHaveNumberConversionRegisterAllocationBug():1680:1680 -> a
+    1193:1193:boolean com.android.tools.r8.utils.InternalOptions.canHaveNumberConversionRegisterAllocationBug():1687:1687 -> a
     1193:1193:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1619 -> a
     1194:1202:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1620:1628 -> a
     1203:1203:void lambda$optimize$15(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):1287:1287 -> a
@@ -34114,7 +34242,7 @@
     1205:1207:com.android.tools.r8.ir.optimize.InliningOracle lambda$optimize$17(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):1472:1472 -> a
     1208:1247:void collectOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1641:1680 -> a
     1248:1249:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1694:1695 -> a
-    1250:1250:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():425:425 -> a
+    1250:1250:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> a
     1250:1250:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1695 -> a
     1251:1256:void finalizeToCf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1711:1716 -> a
     1251:1256:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1696 -> a
@@ -34134,13 +34262,13 @@
     1276:1282:void finalizeToDex(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1730:1736 -> a
     1276:1282:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1699 -> a
     1283:1283:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1704:1704 -> a
-    1284:1284:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():425:425 -> a
+    1284:1284:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> a
     1284:1284:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1704 -> a
     1285:1286:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1704:1705 -> a
-    1287:1287:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():425:425 -> a
-    1287:1287:com.android.tools.r8.graph.Code com.android.tools.r8.graph.DexEncodedMethod.buildEmptyThrowingCode(com.android.tools.r8.utils.InternalOptions):944 -> a
+    1287:1287:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> a
+    1287:1287:com.android.tools.r8.graph.Code com.android.tools.r8.graph.DexEncodedMethod.buildEmptyThrowingCode(com.android.tools.r8.utils.InternalOptions):950 -> a
     1287:1287:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1705 -> a
-    1288:1289:com.android.tools.r8.graph.Code com.android.tools.r8.graph.DexEncodedMethod.buildEmptyThrowingCode(com.android.tools.r8.utils.InternalOptions):945:946 -> a
+    1288:1289:com.android.tools.r8.graph.Code com.android.tools.r8.graph.DexEncodedMethod.buildEmptyThrowingCode(com.android.tools.r8.utils.InternalOptions):951:952 -> a
     1288:1289:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1705 -> a
     1290:1291:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1706:1707 -> a
     1292:1292:void markProcessed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1741:1741 -> a
@@ -34148,7 +34276,7 @@
     1293:1302:void markProcessed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1743 -> a
     1303:1305:void markProcessed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1744:1746 -> a
     1306:1313:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Timing):1779:1786 -> a
-    1314:1314:boolean com.android.tools.r8.utils.InternalOptions.canHaveExceptionTargetingLoopHeaderBug():1705:1705 -> a
+    1314:1314:boolean com.android.tools.r8.utils.InternalOptions.canHaveExceptionTargetingLoopHeaderBug():1712:1712 -> a
     1314:1314:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Timing):1786 -> a
     1315:1315:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Timing):1787:1787 -> a
     1316:5023:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):0:3707 -> a
@@ -34177,7 +34305,7 @@
     26:27:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):648 -> b
     28:52:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):649:673 -> b
     53:124:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):672:743 -> b
-    125:125:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():425:425 -> b
+    125:125:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> b
     125:125:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):743 -> b
     126:126:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):744:744 -> b
     127:128:void staticizeClasses(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):420:421 -> b
@@ -34230,7 +34358,7 @@
     10:11:com.android.tools.r8.utils.Timing rewriteCode(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.ir.conversion.MethodProcessingId):1101:1102 -> c
     12:12:com.android.tools.r8.utils.Timing rewriteCode(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.ir.conversion.MethodProcessingId):1100:1100 -> c
     13:13:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1859:1859 -> c
-    14:14:boolean com.android.tools.r8.utils.InternalOptions.canHaveDex2OatLinkedListBug():1656:1656 -> c
+    14:14:boolean com.android.tools.r8.utils.InternalOptions.canHaveDex2OatLinkedListBug():1663:1663 -> c
     14:14:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1859 -> c
     15:26:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1862:1873 -> c
     27:27:boolean com.android.tools.r8.ir.code.Instruction.isMul():0:0 -> c
@@ -34257,7 +34385,7 @@
     1:5:void optimizeSynthesizedMethod(com.android.tools.r8.graph.ProgramMethod):1032:1036 -> d
     6:6:java.util.List getOptimizationsForPostIRProcessing():1066:1066 -> d
     7:7:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1808:1808 -> d
-    8:8:boolean com.android.tools.r8.utils.InternalOptions.canHaveForwardingInitInliningBug():1693:1693 -> d
+    8:8:boolean com.android.tools.r8.utils.InternalOptions.canHaveForwardingInitInliningBug():1700:1700 -> d
     8:8:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1808 -> d
     9:25:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1812:1828 -> d
     26:29:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1958:1961 -> d
@@ -34383,7 +34511,7 @@
     16:16:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction):754 -> a
     17:19:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction):754:756 -> a
     20:20:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction):752:752 -> a
-com.android.tools.r8.ir.conversion.LensCodeRewriterUtils -> com.android.tools.r8.internal.bm:
+com.android.tools.r8.ir.conversion.LensCodeRewriterUtils -> com.android.tools.r8.internal.cm:
     java.util.Map protoFixupCache -> d
     boolean $assertionsDisabled -> a
     com.android.tools.r8.graph.DexDefinitionSupplier definitions -> b
@@ -34421,7 +34549,7 @@
     44:90:com.android.tools.r8.graph.DexMethodHandle rewriteDexMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):74:120 -> a
     91:91:void com.android.tools.r8.graph.DexMethodHandle.<init>(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.DexMember,boolean):209:209 -> a
     91:91:com.android.tools.r8.graph.DexMethodHandle rewriteDexMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):120 -> a
-com.android.tools.r8.ir.conversion.MethodOptimizationFeedback -> com.android.tools.r8.internal.Do:
+com.android.tools.r8.ir.conversion.MethodOptimizationFeedback -> com.android.tools.r8.internal.Eo:
     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
@@ -34518,7 +34646,7 @@
     void registerStaticFieldWrite(com.android.tools.r8.graph.DexField) -> g
     void registerTypeReference(com.android.tools.r8.graph.DexType) -> g
     1:3:void registerInterfaceMethodRewriting(com.android.tools.r8.graph.DexMethod):77:79 -> g
-com.android.tools.r8.ir.conversion.OneTimeMethodProcessor -> com.android.tools.r8.internal.Gr:
+com.android.tools.r8.ir.conversion.OneTimeMethodProcessor -> com.android.tools.r8.internal.Ir:
     com.android.tools.r8.utils.collections.SortedProgramMethodSet wave -> b
     com.android.tools.r8.ir.conversion.MethodProcessingId$Factory methodProcessingIdFactory -> a
     1:3:void <init>(com.android.tools.r8.ir.conversion.MethodProcessingId$Factory,com.android.tools.r8.utils.collections.SortedProgramMethodSet):25:27 -> <init>
@@ -34596,7 +34724,7 @@
     134:134:void put(com.android.tools.r8.utils.collections.ProgramMethodSet):93:93 -> a
     134:134:com.android.tools.r8.ir.conversion.PostMethodProcessor build(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):138 -> a
     135:143:com.android.tools.r8.ir.conversion.PostMethodProcessor build(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):140:148 -> a
-com.android.tools.r8.ir.conversion.PostOptimization -> com.android.tools.r8.internal.Es:
+com.android.tools.r8.ir.conversion.PostOptimization -> com.android.tools.r8.internal.Gs:
     com.android.tools.r8.utils.collections.ProgramMethodSet methodsToRevisit() -> a
     java.util.Collection codeOptimizationsForPostProcessing() -> b
 com.android.tools.r8.ir.conversion.PrimaryMethodProcessor -> com.android.tools.r8.ir.conversion.q:
@@ -34623,7 +34751,7 @@
     1:1:com.android.tools.r8.ir.conversion.MethodProcessor$Phase getPhase():67:67 -> c
 com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$WaveStartAction -> com.android.tools.r8.ir.conversion.q$a:
     void notifyWaveStart(com.android.tools.r8.utils.collections.ProgramMethodSet) -> a
-com.android.tools.r8.ir.conversion.SourceCode -> com.android.tools.r8.internal.sy:
+com.android.tools.r8.ir.conversion.SourceCode -> com.android.tools.r8.internal.uy:
     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 buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder) -> a
@@ -34647,11 +34775,11 @@
     com.android.tools.r8.graph.DebugLocalInfo getIncomingLocal(int) -> e
     boolean verifyRegister(int) -> f
     int instructionIndex(int) -> g
-com.android.tools.r8.ir.conversion.StringSwitchConverter -> com.android.tools.r8.internal.oz:
+com.android.tools.r8.ir.conversion.StringSwitchConverter -> com.android.tools.r8.internal.qz:
     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.gz:
-com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping -> com.android.tools.r8.internal.iz:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$1 -> com.android.tools.r8.internal.iz:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping -> com.android.tools.r8.internal.kz:
     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
@@ -34662,7 +34790,7 @@
     2:2:com.android.tools.r8.ir.code.BasicBlock access$002(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.BasicBlock):619:619 -> a
     1:1:com.android.tools.r8.ir.code.Phi access$100(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping):619:619 -> b
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap access$300(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping):619:619 -> c
-com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping$Builder -> com.android.tools.r8.internal.hz:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping$Builder -> com.android.tools.r8.internal.jz:
     1:1:void <init>():621:621 -> <init>
     1:1:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping build(com.android.tools.r8.ir.code.BasicBlock):648:648 -> a
     2:2:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping extend(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.BasicBlock):660:660 -> a
@@ -34682,7 +34810,7 @@
     63:77:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping extendWithSwitch(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.code.BasicBlock):738:752 -> a
     78:78:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping$Builder.setFallthroughBlock(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.BasicBlock):654:654 -> a
     78:78:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping extendWithSwitch(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.code.BasicBlock):741 -> a
-com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo -> com.android.tools.r8.internal.kz:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo -> com.android.tools.r8.internal.mz:
     java.util.Map mapping -> c
     com.android.tools.r8.ir.code.Value value -> d
     com.android.tools.r8.ir.code.BasicBlock insertionBlock -> b
@@ -34694,7 +34822,7 @@
     31:31:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> a
     31:31:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):304 -> a
     31:31:void createAndInsertStringSwitch(com.android.tools.r8.ir.code.IRCode):304 -> a
-com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo$Builder -> com.android.tools.r8.internal.jz:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo$Builder -> com.android.tools.r8.internal.lz:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():198:198 -> <clinit>
@@ -34710,7 +34838,7 @@
     20:635:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping$Builder com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping.builder(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Value):0:615 -> a
     20:635:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo build(com.android.tools.r8.ir.code.BasicBlock):221 -> a
     636:660:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo build(com.android.tools.r8.ir.code.BasicBlock):223:247 -> a
-com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping -> com.android.tools.r8.internal.mz:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping -> com.android.tools.r8.internal.oz:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap mapping -> d
     com.android.tools.r8.ir.code.Value stringHashValue -> c
     boolean $assertionsDisabled -> a
@@ -34721,7 +34849,7 @@
     3:7:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):603:607 -> <init>
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap access$200(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping):308:308 -> a
     1:1:com.android.tools.r8.ir.code.Value access$500(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping):308:308 -> b
-com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping$Builder -> com.android.tools.r8.internal.lz:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping$Builder -> com.android.tools.r8.internal.nz:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
     com.android.tools.r8.ir.code.Value stringValue -> e
     com.android.tools.r8.ir.code.Phi idValue -> d
@@ -34774,7 +34902,7 @@
     28:1534:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlock.startOfGotoChain():0:1506 -> b
     28:1534:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping extendWithPredecessor(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping,com.android.tools.r8.ir.code.BasicBlock):402 -> b
     1535:1535:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping extendWithPredecessor(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping,com.android.tools.r8.ir.code.BasicBlock):403:403 -> b
-com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils -> com.android.tools.r8.internal.nz:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils -> com.android.tools.r8.internal.pz:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():769:769 -> <clinit>
     1:2:com.android.tools.r8.ir.code.BasicBlock getTrueTarget(com.android.tools.r8.ir.code.If):772:773 -> a
@@ -34892,7 +35020,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):156:156 -> <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):169:174 -> <init>
     void removeStringSwitch() -> a
-com.android.tools.r8.ir.conversion.SwitchPayloadResolver -> com.android.tools.r8.internal.Lz:
+com.android.tools.r8.ir.conversion.SwitchPayloadResolver -> com.android.tools.r8.internal.Nz:
     java.util.Map unresolvedPayload -> b
     java.util.Map payloadToData -> c
     boolean $assertionsDisabled -> a
@@ -34906,13 +35034,13 @@
     20:20:void clear():84:84 -> a
     1:6:void addPayloadUser(com.android.tools.r8.code.Instruction):35:40 -> b
     7:7:int[] getKeys(int):72:72 -> b
-com.android.tools.r8.ir.conversion.SwitchPayloadResolver$PayloadData -> com.android.tools.r8.internal.Kz:
+com.android.tools.r8.ir.conversion.SwitchPayloadResolver$PayloadData -> com.android.tools.r8.internal.Mz:
     int[] absoluteTargets -> b
     int[] keys -> c
     int userOffset -> a
     1:1:void <init>(int):26:26 -> <init>
     2:7:void <init>(int):22:27 -> <init>
-com.android.tools.r8.ir.conversion.TypeConstraintResolver -> com.android.tools.r8.internal.CB:
+com.android.tools.r8.ir.conversion.TypeConstraintResolver -> com.android.tools.r8.internal.DB:
     com.android.tools.r8.ir.conversion.IRBuilder builder -> c
     java.util.Map unificationParents -> d
     com.android.tools.r8.graph.AppView appView -> b
@@ -35010,7 +35138,7 @@
     87:112:boolean desugar(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.function.Consumer):122:147 -> a
     113:117:void processSynthesizedClasses(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):156:160 -> a
     118:127:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getMethodProviderOrNull(com.android.tools.r8.graph.DexMethod):166:175 -> a
-    128:128:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():390:390 -> a
+    128:128:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():397:397 -> a
     128:128:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getMethodProviderOrNull(com.android.tools.r8.graph.DexMethod):175 -> a
     129:143:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getMethodProviderOrNull(com.android.tools.r8.graph.DexMethod):175:189 -> a
     1:1:boolean needsDesugaring(com.android.tools.r8.graph.DexMethod):78:78 -> b
@@ -35139,7 +35267,7 @@
     124:126:boolean com.android.tools.r8.ir.desugar.ClassProcessor.isRetargetMethod(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexEncodedMethod):535:537 -> a
     124:126:void com.android.tools.r8.ir.desugar.ClassProcessor.resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):517 -> a
     124:126:void resolveForwardingMethods(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):460 -> a
-    127:127:boolean com.android.tools.r8.graph.DexEncodedMethod.isFinal():470:470 -> a
+    127:127:boolean com.android.tools.r8.graph.DexEncodedMethod.isFinal():476:476 -> a
     127:127:boolean com.android.tools.r8.ir.desugar.ClassProcessor.isRetargetMethod(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexEncodedMethod):538 -> a
     127:127:void com.android.tools.r8.ir.desugar.ClassProcessor.resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):517 -> a
     127:127:void resolveForwardingMethods(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):460 -> a
@@ -35153,7 +35281,7 @@
     143:168:void lambda$resolveForwardingMethods$1(com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):466 -> a
     169:169:void com.android.tools.r8.ir.desugar.ClassProcessor.addForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):586:586 -> a
     169:169:void lambda$resolveForwardingMethods$1(com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):466 -> a
-    170:170:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():580:580 -> a
+    170:170:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():584:584 -> a
     170:170:void com.android.tools.r8.ir.desugar.ClassProcessor.addForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):589 -> a
     170:170:void lambda$resolveForwardingMethods$1(com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):466 -> a
     171:172:void com.android.tools.r8.ir.desugar.ClassProcessor.addForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):589:590 -> a
@@ -35161,8 +35289,8 @@
     173:175:void addSyntheticMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):551:553 -> a
     176:176:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$addSyntheticMethod$2(com.android.tools.r8.graph.DexProgramClass):552:552 -> a
     177:187:void addICCEThrowingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):557:567 -> a
-    188:188:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean,com.android.tools.r8.cf.CfVersion):277:277 -> a
-    188:188:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):257 -> a
+    188:188:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean,com.android.tools.r8.cf.CfVersion):281:281 -> a
+    188:188:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):261 -> a
     188:188:void addICCEThrowingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):567 -> a
     189:189:void addICCEThrowingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):573:573 -> a
     190:190:com.android.tools.r8.ir.conversion.SourceCode lambda$addICCEThrowingMethod$3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):570:570 -> a
@@ -35322,7 +35450,7 @@
     14:14:boolean isEmpty():180 -> a
     15:15:boolean isEmpty():180:180 -> a
     16:20:com.android.tools.r8.ir.desugar.ClassProcessor$SignaturesInfo withEmulatedInterfaceInfo(com.android.tools.r8.ir.desugar.ClassProcessor$EmulatedInterfaceInfo):193:197 -> a
-com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer -> com.android.tools.r8.internal.q7:
+com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer -> com.android.tools.r8.internal.r7:
     com.android.tools.r8.graph.DexItemFactory factory -> d
     boolean $assertionsDisabled -> a
     int $r8$clinit -> b
@@ -35358,8 +35486,8 @@
     53:56:void lambda$buildCovariantReturnTypeMethodsForClass$1(java.util.List,java.util.List,com.android.tools.r8.graph.ProgramMethod):116 -> a
     57:58:boolean methodHasCovariantReturnTypeAnnotation(com.android.tools.r8.graph.DexEncodedMethod):122:123 -> a
     59:84:com.android.tools.r8.graph.DexEncodedMethod buildCovariantReturnTypeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):150:175 -> a
-    85:85:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean,com.android.tools.r8.cf.CfVersion):277:277 -> a
-    85:85:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):257 -> a
+    85:85:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean,com.android.tools.r8.cf.CfVersion):281:281 -> a
+    85:85:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):261 -> a
     85:85:com.android.tools.r8.graph.DexEncodedMethod buildCovariantReturnTypeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):175 -> a
     86:87:com.android.tools.r8.graph.DexEncodedMethod buildCovariantReturnTypeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):178:179 -> a
     88:88:boolean lambda$buildCovariantReturnTypeMethod$2(com.android.tools.r8.graph.DexAnnotation):173:173 -> a
@@ -35385,7 +35513,7 @@
     172:172:boolean com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer.isCovariantReturnTypeAnnotation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):264:264 -> a
     172:172:boolean isCovariantReturnTypeAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):260 -> a
     1:1:boolean lambda$updateClass$0(com.android.tools.r8.graph.DexAnnotation):99:99 -> b
-com.android.tools.r8.ir.desugar.D8NestBasedAccessDesugaring -> com.android.tools.r8.internal.s7:
+com.android.tools.r8.ir.desugar.D8NestBasedAccessDesugaring -> com.android.tools.r8.internal.t7:
     java.util.Map metNestHosts -> i
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():44:44 -> <clinit>
@@ -35429,7 +35557,7 @@
     252:256:void desugarNestBasedAccess(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):155 -> a
     257:257:void reportIncompleteNest(java.util.List):171:171 -> a
     1:1:void reportMissingNestHost(com.android.tools.r8.graph.DexClass):166:166 -> c
-com.android.tools.r8.ir.desugar.DefaultMethodsHelper -> com.android.tools.r8.internal.S7:
+com.android.tools.r8.ir.desugar.DefaultMethodsHelper -> com.android.tools.r8.internal.T7:
     java.util.Set candidates -> a
     java.util.Set hidden -> b
     1:5:void <init>():17:21 -> <init>
@@ -35440,8 +35568,8 @@
     219:220:void hideMatches(com.android.tools.r8.graph.DexMethod):69:70 -> a
     221:221:void addDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):76:76 -> a
     222:224:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection wrapInCollection():81:83 -> a
-com.android.tools.r8.ir.desugar.DefaultMethodsHelper$1 -> com.android.tools.r8.internal.R7:
-com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection -> com.android.tools.r8.internal.S7$a:
+com.android.tools.r8.ir.desugar.DefaultMethodsHelper$1 -> com.android.tools.r8.internal.S7:
+com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection -> com.android.tools.r8.internal.T7$a:
     java.util.List live -> b
     com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection EMPTY -> a
     java.util.List hidden -> c
@@ -35451,7 +35579,7 @@
     1:1:java.util.List access$000(com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection):28:28 -> a
     2:4:com.android.tools.r8.graph.DexMethod getSingleCandidate(com.android.tools.r8.graph.DexMethod):46:48 -> a
     1:1:java.util.List access$100(com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection):28:28 -> b
-com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter -> com.android.tools.r8.internal.f8:
+com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter -> com.android.tools.r8.internal.g8:
     com.android.tools.r8.graph.DexItemFactory factory -> d
     java.util.Set trackedCallBackAPIs -> i
     com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer wrapperSynthesizor -> f
@@ -35522,7 +35650,7 @@
     141:141:java.util.List lambda$addCallBackSignature$1(com.android.tools.r8.graph.DexProgramClass):268:268 -> a
     142:156:com.android.tools.r8.graph.DexMethod methodWithVivifiedTypeInSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):280:294 -> a
     157:162:void finalizeWrappers(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):302:307 -> a
-    163:163:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():390:390 -> a
+    163:163:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():397:397 -> a
     163:163:void finalizeWrappers(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):307 -> a
     164:164:void finalizeWrappers(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):308:308 -> a
     165:172:void lambda$generateCallbackMethods$3(com.android.tools.r8.utils.collections.SortedProgramMethodSet,com.android.tools.r8.graph.DexProgramClass,java.util.List):322:329 -> a
@@ -35532,7 +35660,7 @@
     187:188:void lambda$generateCallbackMethods$2(com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.utils.collections.SortedProgramMethodSet,com.android.tools.r8.graph.DexEncodedMethod):326:327 -> a
     189:195:void generateTrackDesugaredAPIWarnings(java.util.Set,java.lang.String):359:365 -> a
     196:208:void reportInvalidInvoke(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,java.lang.String):369:381 -> a
-    209:209:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():390:390 -> a
+    209:209:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():397:397 -> a
     209:209:void reportInvalidInvoke(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,java.lang.String):381 -> a
     210:210:void reportInvalidInvoke(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,java.lang.String):384:384 -> a
     211:211:void reportInvalidInvoke(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,java.lang.String):382:382 -> a
@@ -35557,7 +35685,7 @@
     24:24:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> b
     24:24:boolean overridesLibraryMethod(com.android.tools.r8.graph.ProgramMethod):216 -> b
     25:25:boolean overridesLibraryMethod(com.android.tools.r8.graph.ProgramMethod):216:216 -> b
-    26:26:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():390:390 -> b
+    26:26:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():397:397 -> b
     26:26:boolean overridesLibraryMethod(com.android.tools.r8.graph.ProgramMethod):216 -> b
     27:33:boolean com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter.shouldGenerateCallbacksForEmulateInterfaceAPIs(com.android.tools.r8.graph.DexClass):235:241 -> b
     27:33:boolean overridesLibraryMethod(com.android.tools.r8.graph.ProgramMethod):219 -> b
@@ -35566,146 +35694,135 @@
     1:1:void registerCallbackIfRequired(com.android.tools.r8.graph.ProgramMethod):162:162 -> c
     2:6:void com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter.registerCallback(com.android.tools.r8.graph.ProgramMethod):250:254 -> c
     2:6:void registerCallbackIfRequired(com.android.tools.r8.graph.ProgramMethod):163 -> c
-    7:7:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():390:390 -> c
+    7:7:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():397:397 -> c
     7:7:void com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter.registerCallback(com.android.tools.r8.graph.ProgramMethod):254 -> c
     7:7:void registerCallbackIfRequired(com.android.tools.r8.graph.ProgramMethod):163 -> c
     8:11:void com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter.registerCallback(com.android.tools.r8.graph.ProgramMethod):258:261 -> c
     8:11:void registerCallbackIfRequired(com.android.tools.r8.graph.ProgramMethod):163 -> c
     1:7:boolean shouldRegisterCallback(com.android.tools.r8.graph.ProgramMethod):175:181 -> d
-    8:8:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexEncodedMethod.proto():383:383 -> d
+    8:8:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexEncodedMethod.proto():389:389 -> d
     8:8:boolean shouldRegisterCallback(com.android.tools.r8.graph.ProgramMethod):181 -> d
     9:18:boolean shouldRegisterCallback(com.android.tools.r8.graph.ProgramMethod):181:190 -> d
-    19:19:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():390:390 -> d
+    19:19:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():397:397 -> d
     19:19:boolean shouldRegisterCallback(com.android.tools.r8.graph.ProgramMethod):190 -> d
     20:20:boolean shouldRegisterCallback(com.android.tools.r8.graph.ProgramMethod):193:193 -> d
-com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter$Mode -> com.android.tools.r8.internal.f8$a:
+com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter$Mode -> com.android.tools.r8.internal.g8$a:
     com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter$Mode GENERATE_CALLBACKS_AND_WRAPPERS -> a
     com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter$Mode ASSERT_CALLBACKS_AND_WRAPPERS_GENERATED -> b
     1:2:void <clinit>():82:83 -> <clinit>
     1:1:void <init>(java.lang.String,int):81:81 -> <init>
-com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration -> com.android.tools.r8.internal.g8:
+com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration -> com.android.tools.r8.internal.h8:
+    java.lang.String jsonSource -> f
     com.android.tools.r8.utils.AndroidApiLevel requiredCompilationAPILevel -> b
     com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration EMPTY_DESUGARED_LIBRARY_CONFIGURATION -> a
-    java.util.Map retargetCoreLibMember -> i
-    boolean supportAllCallbacksFromLibrary -> f
-    java.util.Map backportCoreLibraryMember -> j
-    java.util.Map customConversions -> k
-    java.util.List extraKeepRules -> m
+    java.util.Map emulateLibraryInterface -> i
+    java.util.Set wrapperConversions -> o
+    java.util.Map retargetCoreLibMember -> j
+    boolean supportAllCallbacksFromLibrary -> g
+    java.util.Map backportCoreLibraryMember -> k
+    java.util.Map customConversions -> l
+    java.util.List extraKeepRules -> n
+    java.util.List dontRewriteInvocation -> m
     boolean libraryCompilation -> c
     java.lang.String identifier -> e
-    java.util.Map rewritePrefix -> g
-    java.util.List dontRewriteInvocation -> l
     java.lang.String synthesizedLibraryClassesPackagePrefix -> d
-    java.util.Map emulateLibraryInterface -> h
-    java.util.Set wrapperConversions -> n
-    1:15:void <clinit>():41:55 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.utils.AndroidApiLevel,boolean,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.List,com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$1):36:36 -> <init>
-    2:15:void <init>(com.android.tools.r8.utils.AndroidApiLevel,boolean,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.List):117:130 -> <init>
-    1:14:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration withOnlyRewritePrefixForTesting(java.util.Map):84:97 -> a
-    15:15:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration empty():101:101 -> a
-    16:16:com.android.tools.r8.ir.desugar.PrefixRewritingMapper createPrefixRewritingMapper(com.android.tools.r8.utils.InternalOptions):134:134 -> a
-    17:17:com.android.tools.r8.ir.desugar.PrefixRewritingMapper com.android.tools.r8.ir.desugar.PrefixRewritingMapper.empty():26:26 -> a
-    17:17:com.android.tools.r8.ir.desugar.PrefixRewritingMapper createPrefixRewritingMapper(com.android.tools.r8.utils.InternalOptions):135 -> a
-    18:18:com.android.tools.r8.ir.desugar.PrefixRewritingMapper createPrefixRewritingMapper(com.android.tools.r8.utils.InternalOptions):136:136 -> a
-    19:19:com.android.tools.r8.graph.DexMethod retargetMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):165:165 -> a
-    20:20:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getReference():375:375 -> a
-    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedMethod.getHolderType():363 -> a
-    20:20:com.android.tools.r8.graph.DexMethod retargetMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):166 -> a
-    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedMethod.getHolderType():363:363 -> a
-    21:21:com.android.tools.r8.graph.DexMethod retargetMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):166 -> a
-    22:24:com.android.tools.r8.graph.DexMethod retargetMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):166:168 -> a
-    25:25:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getReference():375:375 -> a
-    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedMethod.getHolderType():363 -> a
-    25:25:com.android.tools.r8.graph.DexMethod retargetMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):170 -> a
-    26:26:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedMethod.getHolderType():363:363 -> a
-    26:26:com.android.tools.r8.graph.DexMethod retargetMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):170 -> a
-    27:28:com.android.tools.r8.graph.DexMethod retargetMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):170:171 -> a
-    29:29:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getReference():375:375 -> a
-    29:29:com.android.tools.r8.graph.DexMethod retargetMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):171 -> a
-    30:31:com.android.tools.r8.graph.DexMethod retargetMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):171:172 -> a
-    32:32:com.android.tools.r8.graph.DexMethod retargetMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):169:169 -> a
+    java.util.Map rewritePrefix -> h
+    1:16:void <clinit>():38:53 -> <clinit>
+    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.List,com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$1):35:35 -> <init>
+    2:16: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.List):117:131 -> <init>
+    1:15:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration withOnlyRewritePrefixForTesting(java.util.Map):82:96 -> a
+    16:16:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration empty():100:100 -> a
+    17:17:com.android.tools.r8.ir.desugar.PrefixRewritingMapper createPrefixRewritingMapper(com.android.tools.r8.utils.InternalOptions):135:135 -> a
+    18:18:com.android.tools.r8.ir.desugar.PrefixRewritingMapper com.android.tools.r8.ir.desugar.PrefixRewritingMapper.empty():26:26 -> a
+    18:18:com.android.tools.r8.ir.desugar.PrefixRewritingMapper createPrefixRewritingMapper(com.android.tools.r8.utils.InternalOptions):136 -> a
+    19:19:com.android.tools.r8.ir.desugar.PrefixRewritingMapper createPrefixRewritingMapper(com.android.tools.r8.utils.InternalOptions):137:137 -> a
+    20:27:com.android.tools.r8.graph.DexMethod retargetMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):165:172 -> a
+    28:28:com.android.tools.r8.graph.DexMethod retargetMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):169:169 -> a
     1:1:java.util.Map getBackportCoreLibraryMember():182:182 -> b
     1:1:java.util.Map getCustomConversions():186:186 -> c
     1:1:java.util.List getDontRewriteInvocation():194:194 -> d
-    1:1:java.util.Map getEmulateLibraryInterface():160:160 -> e
+    1:1:java.util.Map getEmulateLibraryInterface():161:161 -> e
     1:1:java.util.List getExtraKeepRules():198:198 -> f
-    1:1:java.lang.String getIdentifier():152:152 -> g
-    1:1:com.android.tools.r8.utils.AndroidApiLevel getRequiredCompilationApiLevel():140:140 -> h
-    1:1:java.util.Map getRetargetCoreLibMember():178:178 -> i
-    1:1:java.util.Map getRewritePrefix():156:156 -> j
-    1:1:java.lang.String getSynthesizedLibraryClassesPackagePrefix():148:148 -> k
-    1:1:java.util.Set getWrapperConversions():190:190 -> l
-    1:1:boolean isLibraryCompilation():144:144 -> m
-com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$1 -> com.android.tools.r8.internal.g8$a:
-com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder -> com.android.tools.r8.internal.g8$b:
+    1:1:java.lang.String getIdentifier():153:153 -> g
+    1:1:java.lang.String getJsonSource():202:202 -> h
+    1:1:com.android.tools.r8.utils.AndroidApiLevel getRequiredCompilationApiLevel():141:141 -> i
+    1:1:java.util.Map getRetargetCoreLibMember():178:178 -> j
+    1:1:java.util.Map getRewritePrefix():157:157 -> k
+    1:1:java.lang.String getSynthesizedLibraryClassesPackagePrefix():149:149 -> l
+    1:1:java.util.Set getWrapperConversions():190:190 -> m
+    1:1:boolean isLibraryCompilation():145:145 -> n
+com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$1 -> com.android.tools.r8.internal.h8$a:
+com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder -> com.android.tools.r8.internal.h8$b:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     java.lang.String synthesizedLibraryClassesPackagePrefix -> g
-    java.util.List extraKeepRules -> p
+    java.util.List extraKeepRules -> q
+    java.lang.String jsonSource -> i
+    java.util.List dontRewriteInvocation -> p
     java.lang.String identifier -> h
-    java.util.List dontRewriteInvocation -> o
-    java.util.Map customConversions -> m
-    boolean supportAllCallbacksFromLibrary -> q
+    java.util.Map backportCoreLibraryMember -> m
+    java.util.Map customConversions -> n
+    boolean supportAllCallbacksFromLibrary -> r
     com.android.tools.r8.utils.Reporter reporter -> c
     com.android.tools.r8.utils.AndroidApiLevel requiredCompilationAPILevel -> e
     com.android.tools.r8.origin.Origin origin -> d
-    java.util.Map rewritePrefix -> i
+    java.util.Set wrapperConversions -> o
     boolean libraryCompilation -> f
-    java.util.Map emulateLibraryInterface -> j
-    java.util.Map retargetCoreLibMember -> k
-    java.util.Map backportCoreLibraryMember -> l
+    java.util.Map rewritePrefix -> j
+    java.util.Map emulateLibraryInterface -> k
+    java.util.Map retargetCoreLibMember -> l
     boolean $assertionsDisabled -> a
-    java.util.Set wrapperConversions -> n
-    1:1:void <clinit>():201:201 -> <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.DesugaredLibraryConfiguration$1):201:201 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,com.android.tools.r8.origin.Origin):222:222 -> <init>
-    3:20:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,com.android.tools.r8.origin.Origin):208:225 -> <init>
-    1:12:void put(java.util.Map,java.lang.Object,java.lang.Object,java.lang.String):230:241 -> a
-    13:13:void put(java.util.Map,java.lang.Object,java.lang.Object,java.lang.String):231:231 -> a
-    14:14:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder setRequiredCompilationAPILevel(com.android.tools.r8.utils.AndroidApiLevel):255:255 -> a
-    15:15:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder setExtraKeepRules(java.util.List):270:270 -> a
-    16:20:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder addDontRewriteInvocation(java.lang.String):340:344 -> a
-    21:21:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder addDontRewriteInvocation(java.lang.String):341:341 -> a
-    22:22:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder.stringClassToDexType(java.lang.String):358:358 -> a
-    22:22:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putBackportCoreLibraryMember(java.lang.String,java.lang.String):329 -> a
-    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder.stringClassToDexType(java.lang.String):358:358 -> a
-    23:23:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putBackportCoreLibraryMember(java.lang.String,java.lang.String):330 -> a
-    24:24:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putBackportCoreLibraryMember(java.lang.String,java.lang.String):331:331 -> a
-    25:25:void setSupportAllCallbacksFromLibrary(boolean):362:362 -> a
-    26:40:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration build():366:380 -> a
-    1:1:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder setLibraryCompilation():265:265 -> b
-    2:2:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder.stringClassToDexType(java.lang.String):358:358 -> b
-    2:2:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder addWrapperConversion(java.lang.String):307 -> b
-    3:3:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder addWrapperConversion(java.lang.String):308:308 -> b
-    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder.stringClassToDexType(java.lang.String):358:358 -> b
-    4:4:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putCustomConversion(java.lang.String,java.lang.String):296 -> b
-    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder.stringClassToDexType(java.lang.String):358:358 -> b
-    5:5:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putCustomConversion(java.lang.String,java.lang.String):297 -> b
-    6:6:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putCustomConversion(java.lang.String,java.lang.String):298:298 -> b
-    1:1:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder setDesugaredLibraryIdentifier(java.lang.String):250:250 -> c
-    2:2:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder setProgramCompilation():260:260 -> c
-    3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder.stringClassToDexType(java.lang.String):358:358 -> c
-    3:3:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putEmulateLibraryInterface(java.lang.String,java.lang.String):285 -> c
-    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder.stringClassToDexType(java.lang.String):358:358 -> c
-    4:4:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putEmulateLibraryInterface(java.lang.String,java.lang.String):286 -> c
-    5:5:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putEmulateLibraryInterface(java.lang.String,java.lang.String):287:287 -> c
-    1:1:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder setSynthesizedLibraryClassesPackagePrefix(java.lang.String):245:245 -> d
-    2:6:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putRetargetCoreLibMember(java.lang.String,java.lang.String):313:317 -> d
-    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder.stringClassToDexType(java.lang.String):358:358 -> d
-    7:7:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putRetargetCoreLibMember(java.lang.String,java.lang.String):318 -> d
-    8:9:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putRetargetCoreLibMember(java.lang.String,java.lang.String):319:320 -> d
-    10:17:void validate():384:391 -> d
-    18:18:void validate():390:390 -> d
-    19:19:void validate():386:386 -> d
-    1:1:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putRewritePrefix(java.lang.String,java.lang.String):275:275 -> e
-    2:2:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):358:358 -> e
-    1:3:int sharpIndex(java.lang.String,java.lang.String):349:351 -> f
+    1:1:void <clinit>():205:205 -> <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.DesugaredLibraryConfiguration$1):205:205 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,com.android.tools.r8.origin.Origin):225:225 -> <init>
+    3:21:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,com.android.tools.r8.origin.Origin):210:228 -> <init>
+    1:12:void put(java.util.Map,java.lang.Object,java.lang.Object,java.lang.String):232:243 -> a
+    13:13:void put(java.util.Map,java.lang.Object,java.lang.Object,java.lang.String):233:233 -> a
+    14:14:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder setRequiredCompilationAPILevel(com.android.tools.r8.utils.AndroidApiLevel):262:262 -> a
+    15:15:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder setExtraKeepRules(java.util.List):277:277 -> a
+    16:20:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder addDontRewriteInvocation(java.lang.String):347:351 -> a
+    21:21:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder addDontRewriteInvocation(java.lang.String):348:348 -> a
+    22:22:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder.stringClassToDexType(java.lang.String):365:365 -> a
+    22:22:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putBackportCoreLibraryMember(java.lang.String,java.lang.String):336 -> a
+    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder.stringClassToDexType(java.lang.String):365:365 -> a
+    23:23:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putBackportCoreLibraryMember(java.lang.String,java.lang.String):337 -> a
+    24:24:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putBackportCoreLibraryMember(java.lang.String,java.lang.String):338:338 -> a
+    25:25:void setSupportAllCallbacksFromLibrary(boolean):369:369 -> a
+    26:41:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration build():373:388 -> a
+    1:1:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder setLibraryCompilation():272:272 -> b
+    2:2:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder.stringClassToDexType(java.lang.String):365:365 -> b
+    2:2:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder addWrapperConversion(java.lang.String):314 -> b
+    3:3:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder addWrapperConversion(java.lang.String):315:315 -> b
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder.stringClassToDexType(java.lang.String):365:365 -> b
+    4:4:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putCustomConversion(java.lang.String,java.lang.String):303 -> b
+    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder.stringClassToDexType(java.lang.String):365:365 -> b
+    5:5:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putCustomConversion(java.lang.String,java.lang.String):304 -> b
+    6:6:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putCustomConversion(java.lang.String,java.lang.String):305:305 -> b
+    1:1:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder setDesugaredLibraryIdentifier(java.lang.String):252:252 -> c
+    2:2:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder setProgramCompilation():267:267 -> c
+    3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder.stringClassToDexType(java.lang.String):365:365 -> c
+    3:3:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putEmulateLibraryInterface(java.lang.String,java.lang.String):292 -> c
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder.stringClassToDexType(java.lang.String):365:365 -> c
+    4:4:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putEmulateLibraryInterface(java.lang.String,java.lang.String):293 -> c
+    5:5:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putEmulateLibraryInterface(java.lang.String,java.lang.String):294:294 -> c
+    1:1:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder setJsonSource(java.lang.String):257:257 -> d
+    2:6:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putRetargetCoreLibMember(java.lang.String,java.lang.String):320:324 -> d
+    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder.stringClassToDexType(java.lang.String):365:365 -> d
+    7:7:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putRetargetCoreLibMember(java.lang.String,java.lang.String):325 -> d
+    8:9:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putRetargetCoreLibMember(java.lang.String,java.lang.String):326:327 -> d
+    10:17:void validate():392:399 -> d
+    18:18:void validate():398:398 -> d
+    19:19:void validate():394:394 -> d
+    1:1:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder setSynthesizedLibraryClassesPackagePrefix(java.lang.String):247:247 -> e
+    2:2:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putRewritePrefix(java.lang.String,java.lang.String):282:282 -> e
+    1:3:int sharpIndex(java.lang.String,java.lang.String):356:358 -> 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):351 -> f
+    4:4:int sharpIndex(java.lang.String,java.lang.String):358 -> 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):351 -> f
-    6:6:int sharpIndex(java.lang.String,java.lang.String):351:351 -> f
-com.android.tools.r8.ir.desugar.DesugaredLibraryConfigurationParser -> com.android.tools.r8.internal.h8:
+    5:5:int sharpIndex(java.lang.String,java.lang.String):358 -> f
+    6:6:int sharpIndex(java.lang.String,java.lang.String):358:358 -> f
+    7:7:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):365:365 -> f
+com.android.tools.r8.ir.desugar.DesugaredLibraryConfigurationParser -> com.android.tools.r8.internal.i8:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
     com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder configurationBuilder -> g
     com.android.tools.r8.utils.Reporter reporter -> d
@@ -35722,27 +35839,27 @@
     8:8:com.android.tools.r8.com.google.gson.JsonElement required(com.android.tools.r8.com.google.gson.JsonObject,java.lang.String):73:73 -> a
     9:9:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration parse(com.android.tools.r8.StringResource):82:82 -> a
     10:12:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration parse(com.android.tools.r8.StringResource,java.util.function.Consumer):88:90 -> a
-    13:92:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration.builder(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,com.android.tools.r8.origin.Origin):0:79 -> a
-    13:92:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration parse(com.android.tools.r8.StringResource,java.util.function.Consumer):90 -> a
-    93:136:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration parse(com.android.tools.r8.StringResource,java.util.function.Consumer):90:133 -> a
-    137:143:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration parse(com.android.tools.r8.StringResource,java.util.function.Consumer):132:138 -> a
-    144:151:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration parse(com.android.tools.r8.StringResource,java.util.function.Consumer):137:144 -> a
-    152:171:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration parse(com.android.tools.r8.StringResource,java.util.function.Consumer):143:162 -> a
-    172:172:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration parse(com.android.tools.r8.StringResource,java.util.function.Consumer):118:118 -> a
-    173:173:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration parse(com.android.tools.r8.StringResource,java.util.function.Consumer):108:108 -> a
-    174:174:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration parse(com.android.tools.r8.StringResource,java.util.function.Consumer):102:102 -> a
-    175:178:void parseFlagsList(com.android.tools.r8.com.google.gson.JsonArray):167:170 -> a
-    179:183:void com.android.tools.r8.ir.desugar.DesugaredLibraryConfigurationParser.parseFlags(com.android.tools.r8.com.google.gson.JsonObject):177:181 -> a
-    179:183:void parseFlagsList(com.android.tools.r8.com.google.gson.JsonArray):171 -> a
-    184:192:void com.android.tools.r8.ir.desugar.DesugaredLibraryConfigurationParser.parseFlags(com.android.tools.r8.com.google.gson.JsonObject):180:188 -> a
-    184:192:void parseFlagsList(com.android.tools.r8.com.google.gson.JsonArray):171 -> a
-    193:201:void com.android.tools.r8.ir.desugar.DesugaredLibraryConfigurationParser.parseFlags(com.android.tools.r8.com.google.gson.JsonObject):187:195 -> a
-    193:201:void parseFlagsList(com.android.tools.r8.com.google.gson.JsonArray):171 -> a
-    202:216:void com.android.tools.r8.ir.desugar.DesugaredLibraryConfigurationParser.parseFlags(com.android.tools.r8.com.google.gson.JsonObject):194:208 -> a
-    202:216:void parseFlagsList(com.android.tools.r8.com.google.gson.JsonArray):171 -> a
-    217:229:void com.android.tools.r8.ir.desugar.DesugaredLibraryConfigurationParser.parseFlags(com.android.tools.r8.com.google.gson.JsonObject):207:219 -> a
-    217:229:void parseFlagsList(com.android.tools.r8.com.google.gson.JsonArray):171 -> a
-com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter -> com.android.tools.r8.internal.n8:
+    13:90:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration.builder(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,com.android.tools.r8.origin.Origin):0:77 -> a
+    13:90:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration parse(com.android.tools.r8.StringResource,java.util.function.Consumer):90 -> a
+    91:137:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration parse(com.android.tools.r8.StringResource,java.util.function.Consumer):90:136 -> a
+    138:144:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration parse(com.android.tools.r8.StringResource,java.util.function.Consumer):135:141 -> a
+    145:152:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration parse(com.android.tools.r8.StringResource,java.util.function.Consumer):140:147 -> a
+    153:172:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration parse(com.android.tools.r8.StringResource,java.util.function.Consumer):146:165 -> a
+    173:173:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration parse(com.android.tools.r8.StringResource,java.util.function.Consumer):121:121 -> a
+    174:174:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration parse(com.android.tools.r8.StringResource,java.util.function.Consumer):111:111 -> a
+    175:175:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration parse(com.android.tools.r8.StringResource,java.util.function.Consumer):103:103 -> a
+    176:179:void parseFlagsList(com.android.tools.r8.com.google.gson.JsonArray):170:173 -> a
+    180:184:void com.android.tools.r8.ir.desugar.DesugaredLibraryConfigurationParser.parseFlags(com.android.tools.r8.com.google.gson.JsonObject) -> a
+    180:184:void parseFlagsList(com.android.tools.r8.com.google.gson.JsonArray):174 -> a
+    185:193:void com.android.tools.r8.ir.desugar.DesugaredLibraryConfigurationParser.parseFlags(com.android.tools.r8.com.google.gson.JsonObject):183:191 -> a
+    185:193:void parseFlagsList(com.android.tools.r8.com.google.gson.JsonArray):174 -> a
+    194:202:void com.android.tools.r8.ir.desugar.DesugaredLibraryConfigurationParser.parseFlags(com.android.tools.r8.com.google.gson.JsonObject):190:198 -> a
+    194:202:void parseFlagsList(com.android.tools.r8.com.google.gson.JsonArray):174 -> a
+    203:217:void com.android.tools.r8.ir.desugar.DesugaredLibraryConfigurationParser.parseFlags(com.android.tools.r8.com.google.gson.JsonObject):197:211 -> a
+    203:217:void parseFlagsList(com.android.tools.r8.com.google.gson.JsonArray):174 -> a
+    218:230:void com.android.tools.r8.ir.desugar.DesugaredLibraryConfigurationParser.parseFlags(com.android.tools.r8.com.google.gson.JsonObject):210:222 -> a
+    218:230:void parseFlagsList(com.android.tools.r8.com.google.gson.JsonArray):174 -> a
+com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter -> com.android.tools.r8.internal.o8:
     java.util.Map retargetLibraryMember -> c
     java.util.Map nonFinalHolderRewrites -> d
     com.android.tools.r8.graph.AppView appView -> b
@@ -35767,80 +35884,70 @@
     37:43:com.android.tools.r8.graph.DexLibraryClass lambda$synthesizeLibraryClassesForRetargetedMembers$1(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):144:150 -> a
     44:49:java.util.Map synthesizedMembersForRetargetClasses(com.android.tools.r8.graph.AppView,java.util.Map,java.util.Map):161:166 -> a
     50:50:boolean lambda$synthesizedMembersForRetargetClasses$2(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod):174:174 -> a
-    51:51:java.util.Set lambda$synthesizedMembersForRetargetClasses$4(com.android.tools.r8.graph.DexLibraryClass):183:183 -> a
-    52:79:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter.synthesizeClassWithUniqueMethod(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod,java.lang.String,com.android.tools.r8.graph.AppView):216:243 -> a
-    52:79:void access$900(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod,java.lang.String,com.android.tools.r8.graph.AppView):62 -> a
-    80:83:com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier getChecksumSupplier(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):247:250 -> a
-    84:84:long lambda$getChecksumSupplier$6(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):250:250 -> a
-    85:85:void visit(java.util.function.Consumer):255:255 -> a
-    86:86:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    86:86:void lambda$synthesizedMembersForRetargetClasses$5(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):168 -> a
-    87:92:void lambda$synthesizedMembersForRetargetClasses$5(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):169:174 -> a
-    93:93:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getReference():375:375 -> a
-    93:93:void lambda$synthesizedMembersForRetargetClasses$5(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):175 -> a
-    94:94:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withHolder(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):270:270 -> a
-    94:94:void lambda$synthesizedMembersForRetargetClasses$5(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):175 -> a
-    95:95:void lambda$synthesizedMembersForRetargetClasses$5(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):176:176 -> a
-    96:98:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withExtraArgumentPrepended(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):265:265 -> a
-    96:98:void lambda$synthesizedMembersForRetargetClasses$5(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):177 -> a
-    99:111:void lambda$synthesizedMembersForRetargetClasses$5(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):179:191 -> a
-    112:112:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):257:257 -> a
-    112:112:void lambda$synthesizedMembersForRetargetClasses$5(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):191 -> a
-    113:113:void lambda$synthesizedMembersForRetargetClasses$5(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):184:184 -> a
-    114:114:void desugar(com.android.tools.r8.ir.code.IRCode):259:259 -> a
-    115:115:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1024:1024 -> a
-    115:115:void desugar(com.android.tools.r8.ir.code.IRCode):263 -> a
-    116:126:void desugar(com.android.tools.r8.ir.code.IRCode):264:274 -> a
-    127:127:boolean com.android.tools.r8.ir.code.Instruction.isInvokeSuper():0:0 -> a
-    127:127:void desugar(com.android.tools.r8.ir.code.IRCode):281 -> a
-    128:132:void desugar(com.android.tools.r8.ir.code.IRCode):281:285 -> a
-    133:594:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppInfoWithClassHierarchy.lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):0:461 -> a
-    133:594:void desugar(com.android.tools.r8.ir.code.IRCode):285 -> a
-    595:595:boolean com.android.tools.r8.graph.DexEncodedMethod.isFinal():470:470 -> a
-    595:595:void desugar(com.android.tools.r8.ir.code.IRCode):287 -> a
-    596:603:void desugar(com.android.tools.r8.ir.code.IRCode):288:295 -> a
-    604:604:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> a
-    604:604:void desugar(com.android.tools.r8.ir.code.IRCode):294 -> a
-    605:606:void desugar(com.android.tools.r8.ir.code.IRCode):301:302 -> a
-    607:607:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> a
-    607:607:void desugar(com.android.tools.r8.ir.code.IRCode):301 -> a
-    608:615:com.android.tools.r8.graph.DexMethod getRetargetedMethod(com.android.tools.r8.graph.DexMethod,boolean):307:314 -> a
-    616:1125:com.android.tools.r8.graph.ResolutionResult com.android.tools.r8.graph.AppInfoWithClassHierarchy.resolveMethod(com.android.tools.r8.graph.DexMethod,boolean):0:509 -> a
-    616:1125:com.android.tools.r8.graph.DexMethod getRetargetedMethod(com.android.tools.r8.graph.DexMethod,boolean):314 -> a
-    1126:1131:com.android.tools.r8.graph.DexMethod getRetargetedMethod(com.android.tools.r8.graph.DexMethod,boolean):315:320 -> a
-    1132:1138:com.android.tools.r8.graph.DexMethod getRetargetLibraryMember(com.android.tools.r8.graph.DexMethod):329:335 -> a
-    1139:1140:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getReference():375:375 -> a
-    1139:1140:int lambda$synthesizedMembersForRetargetClasses$3(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):183 -> a
-    1141:1141:int lambda$synthesizedMembersForRetargetClasses$3(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):183:183 -> a
-    1142:1142:void synthesizeRetargetClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):421:421 -> a
-    1143:1143:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter.reportInvalidLibrarySupertype(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):616:616 -> a
+    51:51:int lambda$synthesizedMembersForRetargetClasses$3(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):183:183 -> a
+    52:52:java.util.Set lambda$synthesizedMembersForRetargetClasses$4(com.android.tools.r8.graph.DexLibraryClass):183:183 -> a
+    53:80:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter.synthesizeClassWithUniqueMethod(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod,java.lang.String,com.android.tools.r8.graph.AppView):216:243 -> a
+    53:80:void access$900(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod,java.lang.String,com.android.tools.r8.graph.AppView):62 -> a
+    81:84:com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier getChecksumSupplier(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):247:250 -> a
+    85:85:long lambda$getChecksumSupplier$6(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):250:250 -> a
+    86:86:void visit(java.util.function.Consumer):255:255 -> a
+    87:87:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    87:87:void lambda$synthesizedMembersForRetargetClasses$5(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):168 -> a
+    88:94:void lambda$synthesizedMembersForRetargetClasses$5(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):169:175 -> a
+    95:95:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withHolder(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):270:270 -> a
+    95:95:void lambda$synthesizedMembersForRetargetClasses$5(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):175 -> a
+    96:96:void lambda$synthesizedMembersForRetargetClasses$5(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):176:176 -> a
+    97:99:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withExtraArgumentPrepended(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):265:265 -> a
+    97:99:void lambda$synthesizedMembersForRetargetClasses$5(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):177 -> a
+    100:112:void lambda$synthesizedMembersForRetargetClasses$5(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):179:191 -> a
+    113:113:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):261:261 -> a
+    113:113:void lambda$synthesizedMembersForRetargetClasses$5(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):191 -> a
+    114:114:void lambda$synthesizedMembersForRetargetClasses$5(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):184:184 -> a
+    115:115:void desugar(com.android.tools.r8.ir.code.IRCode):259:259 -> a
+    116:116:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1024:1024 -> a
+    116:116:void desugar(com.android.tools.r8.ir.code.IRCode):263 -> a
+    117:127:void desugar(com.android.tools.r8.ir.code.IRCode):264:274 -> a
+    128:128:boolean com.android.tools.r8.ir.code.Instruction.isInvokeSuper():0:0 -> a
+    128:128:void desugar(com.android.tools.r8.ir.code.IRCode):281 -> a
+    129:133:void desugar(com.android.tools.r8.ir.code.IRCode):281:285 -> a
+    134:595:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppInfoWithClassHierarchy.lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):0:461 -> a
+    134:595:void desugar(com.android.tools.r8.ir.code.IRCode):285 -> a
+    596:596:boolean com.android.tools.r8.graph.DexEncodedMethod.isFinal():476:476 -> a
+    596:596:void desugar(com.android.tools.r8.ir.code.IRCode):287 -> a
+    597:604:void desugar(com.android.tools.r8.ir.code.IRCode):288:295 -> a
+    605:605:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> a
+    605:605:void desugar(com.android.tools.r8.ir.code.IRCode):294 -> a
+    606:607:void desugar(com.android.tools.r8.ir.code.IRCode):301:302 -> a
+    608:608:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> a
+    608:608:void desugar(com.android.tools.r8.ir.code.IRCode):301 -> a
+    609:616:com.android.tools.r8.graph.DexMethod getRetargetedMethod(com.android.tools.r8.graph.DexMethod,boolean):307:314 -> a
+    617:1126:com.android.tools.r8.graph.ResolutionResult com.android.tools.r8.graph.AppInfoWithClassHierarchy.resolveMethod(com.android.tools.r8.graph.DexMethod,boolean):0:509 -> a
+    617:1126:com.android.tools.r8.graph.DexMethod getRetargetedMethod(com.android.tools.r8.graph.DexMethod,boolean):314 -> a
+    1127:1132:com.android.tools.r8.graph.DexMethod getRetargetedMethod(com.android.tools.r8.graph.DexMethod,boolean):315:320 -> a
+    1133:1139:com.android.tools.r8.graph.DexMethod getRetargetLibraryMember(com.android.tools.r8.graph.DexMethod):329:335 -> a
+    1140:1140:void synthesizeRetargetClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):421:421 -> a
+    1141:1141:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter.reportInvalidLibrarySupertype(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):616:616 -> a
+    1141:1141:void access$800(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter,com.android.tools.r8.graph.DexLibraryClass,java.util.Set):62 -> a
+    1142:1142:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    1142:1142:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter.reportInvalidLibrarySupertype(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):616 -> a
+    1142:1142:void access$800(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter,com.android.tools.r8.graph.DexLibraryClass,java.util.Set):62 -> a
+    1143:1143:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> a
+    1143:1143:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter.reportInvalidLibrarySupertype(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):620 -> a
     1143:1143:void access$800(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter,com.android.tools.r8.graph.DexLibraryClass,java.util.Set):62 -> a
-    1144:1144:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    1144:1144:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter.reportInvalidLibrarySupertype(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):616 -> a
-    1144:1144:void access$800(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter,com.android.tools.r8.graph.DexLibraryClass,java.util.Set):62 -> a
-    1145:1145:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> a
-    1145:1145:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter.reportInvalidLibrarySupertype(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):620 -> a
-    1145:1145:void access$800(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter,com.android.tools.r8.graph.DexLibraryClass,java.util.Set):62 -> a
-    1146:1149:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter.reportInvalidLibrarySupertype(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):624:627 -> a
-    1146:1149:void access$800(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter,com.android.tools.r8.graph.DexLibraryClass,java.util.Set):62 -> a
-    1150:1150:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():580:580 -> a
-    1150:1150:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter.reportInvalidLibrarySupertype(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):629 -> a
+    1144:1147:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter.reportInvalidLibrarySupertype(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):624:627 -> a
+    1144:1147:void access$800(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter,com.android.tools.r8.graph.DexLibraryClass,java.util.Set):62 -> a
+    1148:1148:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():584:584 -> a
+    1148:1148:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter.reportInvalidLibrarySupertype(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):629 -> a
+    1148:1148:void access$800(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter,com.android.tools.r8.graph.DexLibraryClass,java.util.Set):62 -> a
+    1149:1149:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter.reportInvalidLibrarySupertype(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):629:629 -> a
+    1149:1149:void access$800(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter,com.android.tools.r8.graph.DexLibraryClass,java.util.Set):62 -> a
+    1150:1150:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter.reportInvalidLibrarySupertype(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):628:628 -> a
     1150:1150:void access$800(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter,com.android.tools.r8.graph.DexLibraryClass,java.util.Set):62 -> a
-    1151:1151:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter.reportInvalidLibrarySupertype(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):629:629 -> a
+    1151:1151:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter.reportInvalidLibrarySupertype(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):624:624 -> a
     1151:1151:void access$800(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter,com.android.tools.r8.graph.DexLibraryClass,java.util.Set):62 -> a
-    1152:1152:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter.reportInvalidLibrarySupertype(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):628:628 -> a
-    1152:1152:void access$800(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter,com.android.tools.r8.graph.DexLibraryClass,java.util.Set):62 -> a
-    1153:1153:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter.reportInvalidLibrarySupertype(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):624:624 -> a
-    1153:1153:void access$800(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter,com.android.tools.r8.graph.DexLibraryClass,java.util.Set):62 -> a
-    1154:1154:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter.dispatchHolderTypeFor(com.android.tools.r8.graph.DexEncodedMethod):641:641 -> a
-    1154:1154:com.android.tools.r8.graph.DexType access$400(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter,com.android.tools.r8.graph.DexEncodedMethod):62 -> a
-    1155:1160:com.android.tools.r8.graph.DexType dispatchTypeFor(com.android.tools.r8.graph.DexEncodedMethod,java.lang.String):645:650 -> a
-    1161:1161:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getReference():375:375 -> a
-    1161:1161:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedMethod.getHolderType():363 -> a
-    1161:1161:com.android.tools.r8.graph.DexType dispatchTypeFor(com.android.tools.r8.graph.DexEncodedMethod,java.lang.String):653 -> a
-    1162:1162:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedMethod.getHolderType():363:363 -> a
-    1162:1162:com.android.tools.r8.graph.DexType dispatchTypeFor(com.android.tools.r8.graph.DexEncodedMethod,java.lang.String):653 -> a
-    1163:1169:com.android.tools.r8.graph.DexType dispatchTypeFor(com.android.tools.r8.graph.DexEncodedMethod,java.lang.String):653:659 -> a
+    1152:1152:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter.dispatchHolderTypeFor(com.android.tools.r8.graph.DexEncodedMethod):641:641 -> a
+    1152:1152:com.android.tools.r8.graph.DexType access$400(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter,com.android.tools.r8.graph.DexEncodedMethod):62 -> a
+    1153:1167:com.android.tools.r8.graph.DexType dispatchTypeFor(com.android.tools.r8.graph.DexEncodedMethod,java.lang.String):645:659 -> a
     1:1:java.util.Map access$300(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter):62:62 -> b
     2:4:void checkForAssumedLibraryTypes(com.android.tools.r8.graph.AppView):86:88 -> b
     5:5:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> b
@@ -35852,88 +35959,52 @@
     18:18:com.android.tools.r8.graph.DexType access$700(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter,com.android.tools.r8.graph.DexEncodedMethod):62 -> b
     1:1:java.util.Map access$500(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter):62:62 -> c
     1:1:java.util.Set access$600(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter):62:62 -> d
-com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$1 -> com.android.tools.r8.internal.k8:
-com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer -> com.android.tools.r8.internal.l8:
+com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$1 -> com.android.tools.r8.internal.l8:
+com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer -> com.android.tools.r8.internal.m8:
     com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter this$0 -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():427:427 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter):427:427 -> <init>
     1:1:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):432:432 -> a
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():390:390 -> a
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():397:397 -> a
     2:2:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):432 -> a
     3:3:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):523:523 -> a
     3:3:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):433 -> a
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():390:390 -> a
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():397:397 -> a
     4:4:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):523 -> a
     4:4:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):433 -> a
     5:19:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):523:537 -> a
     5:19:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):433 -> a
-    20:24:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.generateInterfaceDispatchMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):564:568 -> a
-    20:24:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):539 -> a
-    20:24:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):433 -> a
-    25:25:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getReference():375:375 -> a
-    25:25:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexEncodedMethod.getProto():371 -> a
-    25:25:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.generateInterfaceDispatchMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):571 -> a
-    25:25:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):539 -> a
-    25:25:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):433 -> a
-    26:26:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexEncodedMethod.getProto():371:371 -> a
-    26:26:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.generateInterfaceDispatchMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):571 -> a
-    26:26:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):539 -> a
-    26:26:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):433 -> a
-    27:27:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.generateInterfaceDispatchMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):572:572 -> a
-    27:27:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):539 -> a
-    27:27:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):433 -> a
-    28:37:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.generateInterfaceDispatchMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):569:578 -> a
-    28:37:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):539 -> a
-    28:37:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):433 -> a
-    38:38:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):257:257 -> a
-    38:38:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.generateInterfaceDispatchMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):578 -> a
-    38:38:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):539 -> a
-    38:38:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):433 -> a
-    39:46:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):540:540 -> a
-    39:46:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):433 -> a
-    54:55:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):548:549 -> a
-    54:55:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):433 -> a
-    56:65:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.generateHolderDispatchMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):594:603 -> a
-    56:65:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):550 -> a
-    56:65:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):433 -> a
-    66:66:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getReference():375:375 -> a
-    66:66:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedMethod.getHolderType():363 -> a
-    66:66:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.generateHolderDispatchMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):605 -> a
-    66:66:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):550 -> a
-    66:66:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):433 -> a
-    67:67:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedMethod.getHolderType():363:363 -> a
-    67:67:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.generateHolderDispatchMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):605 -> a
-    67:67:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):550 -> a
-    67:67:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):433 -> a
-    68:69:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.generateHolderDispatchMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):609:610 -> a
-    68:69:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):550 -> a
-    68:69:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):433 -> a
-    70:70:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.generateHolderDispatchMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):604:604 -> a
-    70:70:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):550 -> a
-    70:70:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):433 -> a
-    71:78:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):551:551 -> a
-    71:78:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):433 -> a
-    79:79:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):435:435 -> a
-    80:80:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):441:441 -> a
-    81:81:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():390:390 -> a
-    81:81:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):441 -> a
-    82:82:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):441:441 -> a
-    83:83:java.util.IdentityHashMap com.android.tools.r8.com.google.common.collect.Maps.newIdentityHashMap():511:511 -> a
-    83:83:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):442 -> a
-    84:84:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):443:443 -> a
-    85:85:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getReference():375:375 -> a
-    85:85:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedMethod.getHolderType():363 -> a
-    85:85:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):444 -> a
-    86:86:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedMethod.getHolderType():363:363 -> a
-    86:86:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):444 -> a
-    87:87:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):444:444 -> a
-    88:88:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getReference():375:375 -> a
-    88:88:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedMethod.getHolderType():363 -> a
-    88:88:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):445 -> a
-    89:89:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedMethod.getHolderType():363:363 -> a
-    89:89:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):445 -> a
-    90:98:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):445:453 -> a
+    20:28:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.generateInterfaceDispatchMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):564:572 -> a
+    20:28:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):539 -> a
+    20:28:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):433 -> a
+    29:38:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.generateInterfaceDispatchMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):569:578 -> a
+    29:38:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):539 -> a
+    29:38:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):433 -> a
+    39:39:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):261:261 -> a
+    39:39:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.generateInterfaceDispatchMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):578 -> a
+    39:39:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):539 -> a
+    39:39:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):433 -> a
+    40:47:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):540:540 -> a
+    40:47:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):433 -> a
+    55:56:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):548:549 -> a
+    55:56:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):433 -> a
+    57:73:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.generateHolderDispatchMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):594:610 -> a
+    57:73:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):550 -> a
+    57:73:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):433 -> a
+    74:74:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.generateHolderDispatchMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):604:604 -> a
+    74:74:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):550 -> a
+    74:74:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):433 -> a
+    75:82:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):551:551 -> a
+    75:82:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):433 -> a
+    83:83:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):435:435 -> a
+    84:84:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):441:441 -> a
+    85:85:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():397:397 -> a
+    85:85:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):441 -> a
+    86:86:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):441:441 -> a
+    87:87:java.util.IdentityHashMap com.android.tools.r8.com.google.common.collect.Maps.newIdentityHashMap():511:511 -> a
+    87:87:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):442 -> a
+    88:98:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):443:453 -> a
     99:99:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
     99:99:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):453 -> a
     100:100:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
@@ -35955,30 +36026,18 @@
     127:127:void lambda$addInterfacesAndForwardingMethods$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.SortedProgramMethodSet,com.android.tools.r8.graph.DexType,java.util.List):462:462 -> a
     128:130:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.addInterfacesAndForwardingMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List,java.util.function.Consumer):499:501 -> a
     128:130:void lambda$addInterfacesAndForwardingMethods$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.SortedProgramMethodSet,com.android.tools.r8.graph.DexType,java.util.List):462 -> a
-    131:131:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.addInterfacesAndForwardingMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List,java.util.function.Consumer):500:500 -> a
-    131:131:void lambda$addInterfacesAndForwardingMethods$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.SortedProgramMethodSet,com.android.tools.r8.graph.DexType,java.util.List):462 -> a
-    132:132:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getReference():375:375 -> a
-    132:132:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.addInterfacesAndForwardingMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List,java.util.function.Consumer):502 -> a
-    132:132:void lambda$addInterfacesAndForwardingMethods$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.SortedProgramMethodSet,com.android.tools.r8.graph.DexType,java.util.List):462 -> a
-    133:133:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.addInterfacesAndForwardingMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List,java.util.function.Consumer):502:502 -> a
-    133:133:void lambda$addInterfacesAndForwardingMethods$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.SortedProgramMethodSet,com.android.tools.r8.graph.DexType,java.util.List):462 -> a
-    134:136:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.createForwardingMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):515:517 -> a
-    134:136:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.addInterfacesAndForwardingMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List,java.util.function.Consumer):503 -> a
-    134:136:void lambda$addInterfacesAndForwardingMethods$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.SortedProgramMethodSet,com.android.tools.r8.graph.DexType,java.util.List):462 -> a
-    137:137:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getReference():375:375 -> a
-    137:137:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.createForwardingMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):517 -> a
-    137:137:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.addInterfacesAndForwardingMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List,java.util.function.Consumer):503 -> a
-    137:137:void lambda$addInterfacesAndForwardingMethods$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.SortedProgramMethodSet,com.android.tools.r8.graph.DexType,java.util.List):462 -> a
-    138:140:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.createForwardingMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):517:519 -> a
-    138:140:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.addInterfacesAndForwardingMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List,java.util.function.Consumer):503 -> a
-    138:140:void lambda$addInterfacesAndForwardingMethods$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.SortedProgramMethodSet,com.android.tools.r8.graph.DexType,java.util.List):462 -> a
-    141:141:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.createForwardingMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):518:518 -> a
-    141:141:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.addInterfacesAndForwardingMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List,java.util.function.Consumer):503 -> a
-    141:141:void lambda$addInterfacesAndForwardingMethods$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.SortedProgramMethodSet,com.android.tools.r8.graph.DexType,java.util.List):462 -> a
-    142:143:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.addInterfacesAndForwardingMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List,java.util.function.Consumer):504:505 -> a
-    142:143:void lambda$addInterfacesAndForwardingMethods$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.SortedProgramMethodSet,com.android.tools.r8.graph.DexType,java.util.List):462 -> a
-    144:144:void lambda$addInterfacesAndForwardingMethods$0(com.android.tools.r8.utils.collections.SortedProgramMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):463:463 -> a
-com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup -> com.android.tools.r8.internal.m8:
+    131:133:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.addInterfacesAndForwardingMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List,java.util.function.Consumer):500:502 -> a
+    131:133:void lambda$addInterfacesAndForwardingMethods$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.SortedProgramMethodSet,com.android.tools.r8.graph.DexType,java.util.List):462 -> a
+    134:138:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.createForwardingMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):515:519 -> a
+    134:138:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.addInterfacesAndForwardingMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List,java.util.function.Consumer):503 -> a
+    134:138:void lambda$addInterfacesAndForwardingMethods$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.SortedProgramMethodSet,com.android.tools.r8.graph.DexType,java.util.List):462 -> a
+    139:139:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.createForwardingMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):518:518 -> a
+    139:139:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.addInterfacesAndForwardingMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List,java.util.function.Consumer):503 -> a
+    139:139:void lambda$addInterfacesAndForwardingMethods$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.SortedProgramMethodSet,com.android.tools.r8.graph.DexType,java.util.List):462 -> a
+    140:141:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.addInterfacesAndForwardingMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List,java.util.function.Consumer):504:505 -> a
+    140:141:void lambda$addInterfacesAndForwardingMethods$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.SortedProgramMethodSet,com.android.tools.r8.graph.DexType,java.util.List):462 -> a
+    142:142:void lambda$addInterfacesAndForwardingMethods$0(com.android.tools.r8.utils.collections.SortedProgramMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):463:463 -> a
+com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup -> com.android.tools.r8.internal.n8:
     com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter this$0 -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():351:351 -> <clinit>
@@ -35996,39 +36055,39 @@
     8:14:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):351 -> a
     15:20:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.setUpRetargeting():362:367 -> a
     15:20:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):351 -> a
-    21:1122:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.isEmulatedInterfaceDispatch(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):0:1101 -> a
-    21:1122:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.setUpRetargeting():367 -> a
-    21:1122:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):351 -> a
-    1123:1123:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    1123:1123:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.isEmulatedInterfaceDispatch(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):1102 -> a
-    1123:1123:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.setUpRetargeting():367 -> a
-    1123:1123:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):351 -> a
-    1124:1133:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.isEmulatedInterfaceDispatch(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):1103:1112 -> a
-    1124:1133:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.setUpRetargeting():367 -> a
-    1124:1133:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):351 -> a
-    1134:1134:boolean com.android.tools.r8.graph.DexEncodedMethod.isFinal():470:470 -> a
-    1134:1134:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.setUpRetargeting():370 -> a
-    1134:1134:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):351 -> a
-    1135:1135:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.setUpRetargeting():373:373 -> a
+    21:1123:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.isEmulatedInterfaceDispatch(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):0:1102 -> a
+    21:1123:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.setUpRetargeting():367 -> a
+    21:1123:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):351 -> a
+    1124:1124:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    1124:1124:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.isEmulatedInterfaceDispatch(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):1103 -> a
+    1124:1124:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.setUpRetargeting():367 -> a
+    1124:1124:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):351 -> a
+    1125:1134:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.isEmulatedInterfaceDispatch(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):1104:1113 -> a
+    1125:1134:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.setUpRetargeting():367 -> a
+    1125:1134:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):351 -> a
+    1135:1135:boolean com.android.tools.r8.graph.DexEncodedMethod.isFinal():476:476 -> a
+    1135:1135:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.setUpRetargeting():370 -> a
     1135:1135:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):351 -> a
-    1136:1137:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.handleEmulateDispatch(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):407:408 -> a
-    1136:1137:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.setUpRetargeting():373 -> a
-    1136:1137:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):351 -> a
-    1138:1138:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():390:390 -> a
-    1138:1138:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.handleEmulateDispatch(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):408 -> a
-    1138:1138:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.setUpRetargeting():373 -> a
-    1138:1138:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):351 -> a
-    1139:1142:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.handleEmulateDispatch(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):410:413 -> a
-    1139:1142:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.setUpRetargeting():373 -> a
-    1139:1142:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):351 -> a
-    1143:1150:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.setUpRetargeting():374:381 -> a
-    1143:1150:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):351 -> a
-    1151:1153:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.computeRetargetMethod(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexType):389:391 -> a
-    1151:1153:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.setUpRetargeting():381 -> a
-    1151:1153:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):351 -> a
-    1154:1154:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.setUpRetargeting():380:380 -> a
-    1154:1154:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):351 -> a
-com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer -> com.android.tools.r8.internal.o8:
+    1136:1136:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.setUpRetargeting():373:373 -> a
+    1136:1136:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):351 -> a
+    1137:1138:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.handleEmulateDispatch(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):407:408 -> a
+    1137:1138:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.setUpRetargeting():373 -> a
+    1137:1138:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):351 -> a
+    1139:1139:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():397:397 -> a
+    1139:1139:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.handleEmulateDispatch(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):408 -> a
+    1139:1139:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.setUpRetargeting():373 -> a
+    1139:1139:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):351 -> a
+    1140:1143:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.handleEmulateDispatch(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):410:413 -> a
+    1140:1143:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.setUpRetargeting():373 -> a
+    1140:1143:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):351 -> a
+    1144:1151:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.setUpRetargeting():374:381 -> a
+    1144:1151:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):351 -> a
+    1152:1154:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.computeRetargetMethod(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexType):389:391 -> a
+    1152:1154:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.setUpRetargeting():381 -> a
+    1152:1154:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):351 -> a
+    1155:1155:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.setUpRetargeting():380:380 -> a
+    1155:1155:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):351 -> a
+com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer -> com.android.tools.r8.internal.p8:
     java.util.Set invalidWrappers -> g
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.graph.DexString dexWrapperPrefixDexString -> d
@@ -36063,8 +36122,8 @@
     46:52:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.newSynthesizedMethod(com.android.tools.r8.graph.DexMethod,int,boolean,com.android.tools.r8.graph.Code):452:458 -> a
     46:52:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.synthesizeConstructor(com.android.tools.r8.graph.DexField):443 -> a
     46:52:com.android.tools.r8.graph.DexClass synthesizeWrapper(com.android.tools.r8.graph.ClassKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedField):240 -> a
-    53:53:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean,com.android.tools.r8.cf.CfVersion):277:277 -> a
-    53:53:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):257 -> a
+    53:53:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean,com.android.tools.r8.cf.CfVersion):281:281 -> a
+    53:53:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):261 -> a
     53:53:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.newSynthesizedMethod(com.android.tools.r8.graph.DexMethod,int,boolean,com.android.tools.r8.graph.Code):458 -> a
     53:53:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.synthesizeConstructor(com.android.tools.r8.graph.DexField):443 -> a
     53:53:com.android.tools.r8.graph.DexClass synthesizeWrapper(com.android.tools.r8.graph.ClassKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedField):240 -> a
@@ -36075,14 +36134,14 @@
     60:69:void reportFinalMethodsInWrapper(java.util.Set):350:359 -> a
     70:70:void reportFinalMethodsInWrapper(java.util.Set):354:354 -> a
     71:86: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):365:380 -> a
-    87:87:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean,com.android.tools.r8.cf.CfVersion):277:277 -> a
-    87:87:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):257 -> a
+    87:87:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean,com.android.tools.r8.cf.CfVersion):281:281 -> a
+    87:87:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):261 -> a
     87:87: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):380 -> a
     88:110:java.util.List allImplementedMethods(com.android.tools.r8.graph.DexClass):386:408 -> a
     111:111:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
     111:111:java.util.List allImplementedMethods(com.android.tools.r8.graph.DexClass):408 -> a
     112:112:java.util.List allImplementedMethods(com.android.tools.r8.graph.DexClass):410:410 -> a
-    113:113:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():390:390 -> a
+    113:113:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():397:397 -> a
     113:113:java.util.List allImplementedMethods(com.android.tools.r8.graph.DexClass):410 -> a
     114:120:java.util.List allImplementedMethods(com.android.tools.r8.graph.DexClass):410:416 -> a
     121:121:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
@@ -36117,7 +36176,7 @@
     188:188:com.android.tools.r8.graph.DexEncodedMethod[] com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):315:315 -> a
     188:188:com.android.tools.r8.graph.DexClass com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.generateTypeWrapper(com.android.tools.r8.graph.ClassKind,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):193 -> a
     188:188:void generateWrappers(com.android.tools.r8.graph.ClassKind,java.util.Set,java.util.function.BiConsumer):512 -> a
-    189:189:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():390:390 -> a
+    189:189:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():397:397 -> a
     189:189:com.android.tools.r8.graph.DexEncodedMethod[] com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):315 -> a
     189:189:com.android.tools.r8.graph.DexClass com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.generateTypeWrapper(com.android.tools.r8.graph.ClassKind,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):193 -> a
     189:189:void generateWrappers(com.android.tools.r8.graph.ClassKind,java.util.Set,java.util.function.BiConsumer):512 -> a
@@ -36127,7 +36186,7 @@
     195:195:com.android.tools.r8.graph.DexEncodedMethod[] com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):318:318 -> a
     195:195:com.android.tools.r8.graph.DexClass com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.generateTypeWrapper(com.android.tools.r8.graph.ClassKind,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):193 -> a
     195:195:void generateWrappers(com.android.tools.r8.graph.ClassKind,java.util.Set,java.util.function.BiConsumer):512 -> a
-    196:196:boolean com.android.tools.r8.graph.DexEncodedMethod.isFinal():470:470 -> a
+    196:196:boolean com.android.tools.r8.graph.DexEncodedMethod.isFinal():476:476 -> a
     196:196:com.android.tools.r8.graph.DexEncodedMethod[] com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):321 -> a
     196:196:com.android.tools.r8.graph.DexClass com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.generateTypeWrapper(com.android.tools.r8.graph.ClassKind,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):193 -> a
     196:196:void generateWrappers(com.android.tools.r8.graph.ClassKind,java.util.Set,java.util.function.BiConsumer):512 -> a
@@ -36181,7 +36240,7 @@
     266:266:com.android.tools.r8.graph.DexEncodedMethod[] com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.synthesizeVirtualMethodsForVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):274:274 -> a
     266:266:com.android.tools.r8.graph.DexClass com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.generateVivifiedTypeWrapper(com.android.tools.r8.graph.ClassKind,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):207 -> a
     266:266:void generateWrappers(com.android.tools.r8.graph.ClassKind,java.util.Set,java.util.function.BiConsumer):520 -> a
-    267:267:boolean com.android.tools.r8.graph.DexEncodedMethod.isFinal():470:470 -> a
+    267:267:boolean com.android.tools.r8.graph.DexEncodedMethod.isFinal():476:476 -> a
     267:267:com.android.tools.r8.graph.DexEncodedMethod[] com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.synthesizeVirtualMethodsForVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):277 -> a
     267:267:com.android.tools.r8.graph.DexClass com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.generateVivifiedTypeWrapper(com.android.tools.r8.graph.ClassKind,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):207 -> a
     267:267:void generateWrappers(com.android.tools.r8.graph.ClassKind,java.util.Set,java.util.function.BiConsumer):520 -> a
@@ -36212,8 +36271,8 @@
     300:320:com.android.tools.r8.graph.DexEncodedMethod synthesizeConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):571:591 -> a
     321:327:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.newSynthesizedMethod(com.android.tools.r8.graph.DexMethod,int,boolean,com.android.tools.r8.graph.Code):452:458 -> a
     321:327:com.android.tools.r8.graph.DexEncodedMethod synthesizeConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):593 -> a
-    328:328:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean,com.android.tools.r8.cf.CfVersion):277:277 -> a
-    328:328:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):257 -> a
+    328:328:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean,com.android.tools.r8.cf.CfVersion):281:281 -> a
+    328:328:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):261 -> a
     328:328:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.newSynthesizedMethod(com.android.tools.r8.graph.DexMethod,int,boolean,com.android.tools.r8.graph.Code):458 -> a
     328:328:com.android.tools.r8.graph.DexEncodedMethod synthesizeConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):593 -> a
     1:2:com.android.tools.r8.graph.DexType getTypeWrapper(com.android.tools.r8.graph.DexType):143:144 -> b
@@ -36225,12 +36284,12 @@
     4:4:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> c
     4:4:com.android.tools.r8.graph.DexClass getValidClassToWrap(com.android.tools.r8.graph.DexType):176 -> c
     5:5:com.android.tools.r8.graph.DexClass getValidClassToWrap(com.android.tools.r8.graph.DexType):176:176 -> c
-    6:6:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():390:390 -> c
+    6:6:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():397:397 -> c
     6:6:com.android.tools.r8.graph.DexClass getValidClassToWrap(com.android.tools.r8.graph.DexType):176 -> c
     7:8:com.android.tools.r8.graph.DexClass getValidClassToWrap(com.android.tools.r8.graph.DexType):176:177 -> c
     1:2:com.android.tools.r8.graph.DexType getVivifiedTypeWrapper(com.android.tools.r8.graph.DexType):149:150 -> d
     1:1:boolean hasSynthesized(com.android.tools.r8.graph.DexType):134:134 -> e
-com.android.tools.r8.ir.desugar.InterfaceMethodRewriter -> com.android.tools.r8.internal.Wf:
+com.android.tools.r8.ir.desugar.InterfaceMethodRewriter -> com.android.tools.r8.internal.Xf:
     com.android.tools.r8.ir.conversion.IRConverter converter -> d
     java.util.Set emulatedMethods -> h
     com.android.tools.r8.utils.collections.SortedProgramMethodSet synthesizedMethods -> i
@@ -36244,356 +36303,354 @@
     java.util.Map emulatedInterfaces -> g
     1:1:void <clinit>():99:99 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):141:141 -> <init>
-    2:37:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):112:147 -> <init>
-    1:5:void checkForAssumedLibraryTypes(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions):151:155 -> a
-    6:6:void lambda$checkForAssumedLibraryTypes$0(java.util.function.BiConsumer,com.android.tools.r8.graph.DexString,java.util.Map):155:155 -> a
-    7:7:java.util.function.BiConsumer registerMapEntry(com.android.tools.r8.graph.AppInfo):159:159 -> a
-    8:9:void lambda$registerMapEntry$1(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):160:161 -> a
-    10:11:void registerType(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.DexType):166:167 -> a
+    2:36:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):114:148 -> <init>
+    1:5:void checkForAssumedLibraryTypes(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions):152:156 -> a
+    6:6:void lambda$checkForAssumedLibraryTypes$0(java.util.function.BiConsumer,com.android.tools.r8.graph.DexString,java.util.Map):156:156 -> a
+    7:7:java.util.function.BiConsumer registerMapEntry(com.android.tools.r8.graph.AppInfo):160:160 -> a
+    8:9:void lambda$registerMapEntry$1(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):161:162 -> a
+    10:11:void registerType(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.DexType):167:168 -> a
     12:12:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    12:12:void registerType(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.DexType):168 -> a
-    13:14:void registerType(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.DexType):168:169 -> a
-    15:18:void lambda$registerType$2(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.DexEncodedMethod):171:174 -> a
-    19:24:void initializeEmulatedInterfaceVariables():182:187 -> a
-    25:25:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    25:25:void initializeEmulatedInterfaceVariables():187 -> a
-    26:27:void initializeEmulatedInterfaceVariables():190:191 -> a
-    28:28:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):198:198 -> a
-    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.getCompanionClassType(com.android.tools.r8.graph.DexType):782:782 -> a
-    29:29:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):199 -> a
-    30:32:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):199:201 -> a
-    33:33:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):200:200 -> a
-    34:41:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):198:205 -> a
-    42:42:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):204:204 -> a
-    43:43:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):202:202 -> a
-    44:54:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):224:234 -> a
-    55:55:boolean com.android.tools.r8.ir.code.Instruction.isInvokeCustom():0:0 -> a
-    55:55:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):236 -> a
-    56:58:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):239:241 -> a
-    59:59:boolean com.android.tools.r8.graph.DexValue.isDexValueMethodHandle():0:0 -> a
-    59:59:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):242 -> a
-    60:62:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):243:243 -> a
-    69:82:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):250:263 -> a
-    83:83:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    83:83:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.isNonDesugaredLibraryClass(com.android.tools.r8.graph.DexClass):514 -> a
+    12:12:void registerType(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.DexType):169 -> a
+    13:14:void registerType(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.DexType):169:170 -> a
+    15:18:void lambda$registerType$2(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.DexEncodedMethod):172:175 -> a
+    19:23:void initializeEmulatedInterfaceVariables():183:187 -> a
+    24:24:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    24:24:void initializeEmulatedInterfaceVariables():187 -> a
+    25:26:void initializeEmulatedInterfaceVariables():190:191 -> a
+    27:27:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):198:198 -> a
+    28:28:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.getCompanionClassType(com.android.tools.r8.graph.DexType):783:783 -> a
+    28:28:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):199 -> a
+    29:31:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):199:201 -> a
+    32:32:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):200:200 -> a
+    33:40:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):198:205 -> a
+    41:41:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):204:204 -> a
+    42:42:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):202:202 -> a
+    43:53:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):224:234 -> a
+    54:54:boolean com.android.tools.r8.ir.code.Instruction.isInvokeCustom():0:0 -> a
+    54:54:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):236 -> a
+    55:57:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):239:241 -> a
+    58:58:boolean com.android.tools.r8.graph.DexValue.isDexValueMethodHandle():0:0 -> a
+    58:58:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):242 -> a
+    59:61:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):243:243 -> a
+    68:81:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):250:263 -> a
+    82:82:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    82:82:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.isNonDesugaredLibraryClass(com.android.tools.r8.graph.DexClass):514 -> a
+    82:82:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):264 -> a
+    83:83:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.isNonDesugaredLibraryClass(com.android.tools.r8.graph.DexClass):514:514 -> a
     83:83:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):264 -> a
-    84:84:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.isNonDesugaredLibraryClass(com.android.tools.r8.graph.DexClass):514:514 -> a
-    84:84:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):264 -> a
-    85:91:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):275:281 -> a
-    92:92:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.staticAsMethodOfDispatchClass(com.android.tools.r8.graph.DexMethod):825:825 -> a
-    92:92:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):283 -> a
-    93:94:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):284:285 -> a
-    95:105:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):281:291 -> a
-    106:106:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):820:820 -> a
+    84:90:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):275:281 -> a
+    91:91:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.staticAsMethodOfDispatchClass(com.android.tools.r8.graph.DexMethod):826:826 -> a
+    91:91:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):283 -> a
+    92:93:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):284:285 -> a
+    94:104:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):281:291 -> a
+    105:105:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):821:821 -> a
+    105:105:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):292 -> a
+    106:106:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.getCompanionClassType(com.android.tools.r8.graph.DexType):783:783 -> a
+    106:106:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):821 -> a
     106:106:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):292 -> a
-    107:107:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.getCompanionClassType(com.android.tools.r8.graph.DexType):782:782 -> a
-    107:107:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):820 -> a
+    107:107:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):821:821 -> a
     107:107:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):292 -> a
-    108:108:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):820:820 -> a
-    108:108:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):292 -> a
-    109:109:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):293:293 -> a
-    110:110:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):291:291 -> a
-    111:111:boolean com.android.tools.r8.ir.code.Instruction.isInvokeSuper():0:0 -> a
-    111:111:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):299 -> a
-    112:120:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):300:308 -> a
-    121:121:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    121:121:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):308 -> a
-    122:122:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):319:319 -> a
-    123:124:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.amendDefaultMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):852:853 -> a
-    123:124:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):319 -> a
-    125:125:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):320:320 -> a
-    126:126:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):864:864 -> a
+    108:108:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):293:293 -> a
+    109:109:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):291:291 -> a
+    110:110:boolean com.android.tools.r8.ir.code.Instruction.isInvokeSuper():0:0 -> a
+    110:110:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):299 -> a
+    111:119:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):300:308 -> a
+    120:120:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    120:120:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):308 -> a
+    121:121:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):319:319 -> a
+    122:123:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.amendDefaultMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):853:854 -> a
+    122:123:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):319 -> a
+    124:124:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):320:320 -> a
+    125:125:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):865:865 -> a
+    125:125:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):321 -> a
+    126:126:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):861:861 -> a
+    126:126:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):865 -> a
     126:126:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):321 -> a
-    127:127:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):860:860 -> a
-    127:127:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):864 -> a
-    127:127:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):321 -> a
-    128:128:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):322:322 -> a
-    129:138:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):320:329 -> a
-    139:600:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppInfoWithClassHierarchy.lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):0:461 -> a
-    139:600:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):329 -> a
-    601:602:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):330:331 -> a
-    603:603:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    603:603:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):331 -> a
-    604:604:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    604:604:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):332 -> a
-    605:606:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):332:333 -> a
-    607:607:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):860:860 -> a
-    607:607:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):335 -> a
-    608:609:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):336:337 -> a
-    610:626:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):333:349 -> a
-    627:1088:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppInfoWithClassHierarchy.lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):0:461 -> a
-    627:1088:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):349 -> a
-    1089:1089:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):351:351 -> a
-    1090:1090:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    1090:1090:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):351 -> a
-    1091:1091:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    1091:1091:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):352 -> a
-    1092:1099:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):356:363 -> a
-    1100:1100:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.getCompanionClassType(com.android.tools.r8.graph.DexType):782:782 -> a
-    1100:1100:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):365 -> a
-    1101:1102:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):365:366 -> a
-    1103:1110:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):364:371 -> a
-    1111:1117:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):369:375 -> a
-    1118:1132:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):373:387 -> a
-    1133:1222:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):0:89 -> a
-    1133:1222:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):391 -> a
-    1223:1224:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):394:395 -> a
-    1225:1225:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    1225:1225:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):396 -> a
-    1226:1232:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):401:407 -> a
-    1233:1233:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):874:874 -> a
+    127:127:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):322:322 -> a
+    128:137:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):320:329 -> a
+    138:599:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppInfoWithClassHierarchy.lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):0:461 -> a
+    138:599:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):329 -> a
+    600:601:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):330:331 -> a
+    602:602:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    602:602:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):331 -> a
+    603:603:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    603:603:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):332 -> a
+    604:605:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):332:333 -> a
+    606:606:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):861:861 -> a
+    606:606:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):335 -> a
+    607:608:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):336:337 -> a
+    609:625:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):333:349 -> a
+    626:1087:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppInfoWithClassHierarchy.lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):0:461 -> a
+    626:1087:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):349 -> a
+    1088:1088:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):351:351 -> a
+    1089:1089:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    1089:1089:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):351 -> a
+    1090:1090:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    1090:1090:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):352 -> a
+    1091:1098:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):356:363 -> a
+    1099:1099:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.getCompanionClassType(com.android.tools.r8.graph.DexType):783:783 -> a
+    1099:1099:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):365 -> a
+    1100:1101:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):365:366 -> a
+    1102:1109:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):364:371 -> a
+    1110:1116:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):369:375 -> a
+    1117:1131:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):373:387 -> a
+    1132:1221:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):0:89 -> a
+    1132:1221:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):391 -> a
+    1222:1223:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):394:395 -> a
+    1224:1224:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    1224:1224:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):396 -> a
+    1225:1231:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):401:407 -> a
+    1232:1232:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):875:875 -> a
+    1232:1232:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):409 -> a
+    1233:1233:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):871:871 -> a
+    1233:1233:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):875 -> a
     1233:1233:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):409 -> a
-    1234:1234:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):870:870 -> a
-    1234:1234:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):874 -> a
-    1234:1234:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):409 -> a
-    1235:1236:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):410:411 -> a
-    1237:1243:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):407:413 -> a
-    1244:1244:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):864:864 -> a
+    1234:1235:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):410:411 -> a
+    1236:1242:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):407:413 -> a
+    1243:1243:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):865:865 -> a
+    1243:1243:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):415 -> a
+    1244:1244:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):861:861 -> a
+    1244:1244:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):865 -> a
     1244:1244:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):415 -> a
-    1245:1245:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):860:860 -> a
-    1245:1245:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):864 -> a
-    1245:1245:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):415 -> a
-    1246:1247:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):416:417 -> a
-    1248:1264:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):413:429 -> a
-    1265:1273:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):425:433 -> a
-    1274:1276:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):397:399 -> a
-    1277:1277:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
-    1277:1277:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
-    1277:1277:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):399 -> a
-    1278:1318:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):399:439 -> a
-    1319:1319:boolean com.android.tools.r8.ir.code.Instruction.isInvokeInterface():0:0 -> a
-    1319:1319:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):439 -> a
-    1320:1332:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):440:452 -> a
-    1333:1333:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    1333:1333:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):452 -> a
-    1334:1335:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):452:453 -> a
-    1336:1336:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():390:390 -> a
-    1336:1336:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):453 -> a
-    1337:1337:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):502:502 -> a
+    1245:1246:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):416:417 -> a
+    1247:1263:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):413:429 -> a
+    1264:1272:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):425:433 -> a
+    1273:1275:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):397:399 -> a
+    1276:1276:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
+    1276:1276:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
+    1276:1276:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):399 -> a
+    1277:1317:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):399:439 -> a
+    1318:1318:boolean com.android.tools.r8.ir.code.Instruction.isInvokeInterface():0:0 -> a
+    1318:1318:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):439 -> a
+    1319:1331:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):440:452 -> a
+    1332:1332:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    1332:1332:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):452 -> a
+    1333:1334:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):452:453 -> a
+    1335:1335:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():397:397 -> a
+    1335:1335:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):453 -> a
+    1336:1336:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):502:502 -> a
+    1336:1336:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):454 -> a
+    1337:1337:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    1337:1337:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):502 -> a
     1337:1337:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):454 -> a
-    1338:1338:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    1338:1338:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):502 -> a
-    1338:1338:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):454 -> a
-    1339:1342:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):502:505 -> a
-    1339:1342:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):454 -> a
-    1343:1345:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.emulateInterfaceLibraryMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):623:625 -> a
-    1343:1345:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):507 -> a
-    1343:1345:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):454 -> a
-    1346:1346:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.emulateInterfaceLibraryMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):622:622 -> a
-    1346:1346:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):507 -> a
-    1346:1346:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):454 -> a
-    1347:1348:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):508:509 -> a
-    1347:1348:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):454 -> a
-    1349:1349:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):505:505 -> a
-    1349:1349:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):454 -> a
-    1350:1350:java.util.Set lambda$rewriteMethodReferences$3(com.android.tools.r8.graph.DexLibraryClass):287:287 -> a
-    1351:1351:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):518:518 -> a
-    1352:1352:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    1352:1352:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):518 -> a
-    1353:1353:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):518:518 -> a
-    1354:1354:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():390:390 -> a
-    1354:1354:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):518 -> a
-    1355:1359:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):518:522 -> a
-    1360:1365:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Map):581:586 -> a
-    1366:1366:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    1366:1366:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Map):586 -> a
-    1367:1376:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Map):588:597 -> a
-    1377:1377:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    1377:1377:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Map):597 -> a
-    1378:1378:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Map):599:599 -> a
-    1379:1384:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):630:635 -> a
-    1385:1391:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):634:640 -> a
-    1392:1392:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.getCompanionClassType(com.android.tools.r8.graph.DexType):782:782 -> a
-    1392:1392:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):642 -> a
-    1393:1393:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):642:642 -> a
-    1394:1412:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):641:659 -> a
-    1413:1413:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    1413:1413:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):659 -> a
-    1414:1414:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):660:660 -> a
-    1415:1421:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.implementsInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):606:612 -> a
-    1415:1421:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):660 -> a
-    1422:1422:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    1422:1422:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.implementsInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):612 -> a
-    1422:1422:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):660 -> a
-    1423:1423:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.implementsInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):614:614 -> a
-    1423:1423:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):660 -> a
-    1424:1429:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):661:666 -> a
-    1430:1430:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):664:664 -> a
-    1431:1445:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):661:675 -> a
-    1446:1446:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    1446:1446:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):675 -> a
-    1447:1451:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):676:680 -> a
-    1452:1452:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.getCompanionClassType(com.android.tools.r8.graph.DexType):782:782 -> a
-    1452:1452:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):684 -> a
-    1453:1454:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):684:685 -> a
-    1455:1455:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):683:683 -> a
-    1456:1470:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):680:694 -> a
-    1471:1473:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.emulateInterfaceLibraryMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):623:625 -> a
-    1471:1473:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):694 -> a
-    1474:1474:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.emulateInterfaceLibraryMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):622:622 -> a
-    1474:1474:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):694 -> a
-    1475:1475:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):694:694 -> a
-    1476:1476:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):692:692 -> a
-    1477:1522:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):691:736 -> a
-    1523:1524:void reportStaticInterfaceMethodHandle(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethodHandle):754:755 -> a
-    1525:1525:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    1525:1525:void reportStaticInterfaceMethodHandle(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethodHandle):755 -> a
-    1526:1530:void reportStaticInterfaceMethodHandle(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethodHandle):759:763 -> a
-    1531:1531:java.lang.String getCompanionClassDescriptor(java.lang.String):770:770 -> a
-    1532:1535:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):775:778 -> a
-    1536:1540:com.android.tools.r8.graph.DexType getDispatchClassType(com.android.tools.r8.graph.DexType):787:791 -> a
-    1541:1550:com.android.tools.r8.graph.DexMethod instanceAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.graph.DexItemFactory):836:845 -> a
-    1551:1551:com.android.tools.r8.graph.DexMethod instanceAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.graph.DexItemFactory):842:842 -> a
-    1552:1552:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):860:860 -> a
-    1553:1553:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):864:864 -> a
-    1554:1554:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):860:860 -> a
-    1554:1554:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):864 -> a
-    1555:1555:com.android.tools.r8.graph.DexEncodedMethod[] renameHolder(java.lang.Iterable,com.android.tools.r8.graph.DexType):925:925 -> a
-    1556:1558:com.android.tools.r8.graph.DexEncodedMethod[] com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.renameHolder(java.util.List,com.android.tools.r8.graph.DexType):929:931 -> a
-    1556:1558:com.android.tools.r8.graph.DexEncodedMethod[] renameHolder(java.lang.Iterable,com.android.tools.r8.graph.DexType):925 -> a
-    1559:1559:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):945:945 -> a
-    1560:1560:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():390:390 -> a
-    1560:1560:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):945 -> a
-    1561:1564:java.util.Map com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.processEmulatedInterfaceHierarchy():569:572 -> a
-    1561:1564:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):546 -> a
-    1561:1564:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):946 -> a
-    1565:1579:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):547:561 -> a
-    1565:1579:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):946 -> a
-    1580:1580:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):560:560 -> a
-    1580:1580:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):946 -> a
-    1581:1581:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):951:951 -> a
-    1582:1584:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.processClasses(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.function.Consumer):1056:1058 -> a
-    1582:1584:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):951 -> a
-    1585:1586:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.shouldProcess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,boolean):1033:1034 -> a
-    1585:1586:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.processClasses(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.function.Consumer):1059 -> a
-    1585:1586:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):951 -> a
-    1587:1591:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.processClasses(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.function.Consumer):1060:1064 -> a
-    1587:1591:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):951 -> a
-    1592:1593:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.transformEmulatedInterfaces():991:992 -> a
-    1592:1593:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):952 -> a
-    1594:1594:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    1594:1594:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.transformEmulatedInterfaces():992 -> a
-    1594:1594:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):952 -> a
-    1595:1596:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.transformEmulatedInterfaces():993:994 -> a
-    1595:1596:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):952 -> a
-    1597:1612:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.transformEmulatedInterfaces(com.android.tools.r8.graph.DexProgramClass):1004:1019 -> a
-    1597:1612:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.transformEmulatedInterfaces():994 -> a
-    1597:1612:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):952 -> a
-    1613:1617:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.transformEmulatedInterfaces(com.android.tools.r8.graph.DexProgramClass):1018:1022 -> a
-    1613:1617:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.transformEmulatedInterfaces():994 -> a
-    1613:1617:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):952 -> a
-    1618:1619:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):958:959 -> a
-    1620:1620:com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens.builder():475:475 -> a
-    1620:1620:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):961 -> a
-    1621:1638:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):963:980 -> a
-    1639:1639:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():390:390 -> a
-    1639:1639:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):980 -> a
-    1640:1641:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.renameEmulatedInterfaces():880:881 -> a
-    1640:1641:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):981 -> a
-    1642:1650:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):893:901 -> a
-    1642:1650:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.renameEmulatedInterfaces():882 -> a
-    1642:1650:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):981 -> a
-    1651:1654:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.inferEmulatedInterfaceName(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):912:915 -> a
-    1651:1654:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):901 -> a
-    1651:1654:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.renameEmulatedInterfaces():882 -> a
-    1651:1654:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):981 -> a
-    1655:1655:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):903:903 -> a
-    1655:1655:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.renameEmulatedInterfaces():882 -> a
-    1655:1655:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):981 -> a
-    1656:1656:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    1656:1656:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):903 -> a
-    1656:1656:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.renameEmulatedInterfaces():882 -> a
-    1656:1656:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):981 -> a
-    1657:1657:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):905:905 -> a
-    1657:1657:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.renameEmulatedInterfaces():882 -> a
-    1657:1657:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):981 -> a
-    1658:1660:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.renameEmulatedInterfaces():883:885 -> a
-    1658:1660:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):981 -> a
-    1661:1663:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.renameEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):919:921 -> a
-    1661:1663:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.renameEmulatedInterfaces():886 -> a
-    1661:1663:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):981 -> a
-    1664:1664:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):984:984 -> a
-    1665:1667:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.clear():1026:1028 -> a
-    1665:1667:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
-    1668:1672:void lambda$desugarInterfaceMethods$4(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.shaking.MainDexClasses,com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass):973:977 -> a
-    1673:1674:java.util.Map processInterfaces(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):1041:1042 -> a
-    1675:1676:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.shouldProcess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,boolean):1033:1034 -> a
-    1675:1676:java.util.Map processInterfaces(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):1043 -> a
-    1677:1684:java.util.Map processInterfaces(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):1044:1051 -> a
-    1685:1699:boolean isDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):1068:1082 -> a
-    1700:1700:boolean isDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):1075:1075 -> a
-    1701:1701:boolean lambda$shouldIgnoreFromReports$5(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardConfiguration):1125:1125 -> a
-    1702:1708:void warnMissingType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1142:1148 -> a
-    1709:1709:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1164:1164 -> a
-    1710:1711:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1177:1178 -> a
-    1710:1711:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1168 -> a
-    1712:1712:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    1712:1712:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1178 -> a
-    1712:1712:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1168 -> a
-    1713:1716:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.warnMissingInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1133:1136 -> a
-    1713:1716:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1180 -> a
-    1713:1716:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1168 -> a
-    1717:1719:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1181:1183 -> a
-    1717:1719:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1168 -> a
-    1720:1720:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    1720:1720:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.isNonDesugaredLibraryClass(com.android.tools.r8.graph.DexClass):514 -> a
-    1720:1720:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1189 -> a
-    1720:1720:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1168 -> a
-    1721:1721:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.isNonDesugaredLibraryClass(com.android.tools.r8.graph.DexClass):514:514 -> a
-    1721:1721:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1189 -> a
-    1721:1721:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1168 -> a
-    1722:1748:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1194:1220 -> a
-    1722:1748:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1168 -> a
-    1749:1749:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1169:1169 -> a
-    1750:1752:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1184:1186 -> a
-    1750:1752:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1168 -> a
-    1753:1753:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    1753:1753:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1186 -> a
-    1753:1753:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1168 -> a
-    1754:1754:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1186:1186 -> a
-    1754:1754:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1168 -> a
-    1755:1755:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1225:1225 -> a
-    1756:1756:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    1756:1756:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1225 -> a
-    1757:1757:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1225:1225 -> a
-    1758:1758:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    1758:1758:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1226 -> a
-    1759:1760:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1226:1227 -> a
-    1761:1761:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():580:580 -> a
-    1761:1761:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1229 -> a
-    1762:1766:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1231:1235 -> a
-    1767:1767:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():580:580 -> a
-    1767:1767:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.reportDependencyEdge(com.android.tools.r8.DesugarGraphConsumer,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexClass):1244 -> a
-    1767:1767:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1236 -> a
-    1768:1768:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.reportDependencyEdge(com.android.tools.r8.DesugarGraphConsumer,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexClass):1246:1246 -> a
-    1768:1768:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1236 -> a
-    1769:1769:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():580:580 -> a
-    1769:1769:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.reportDependencyEdge(com.android.tools.r8.DesugarGraphConsumer,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexClass):1244 -> a
-    1769:1769:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1233 -> a
-    1770:1770:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.reportDependencyEdge(com.android.tools.r8.DesugarGraphConsumer,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexClass):1246:1246 -> a
-    1770:1770:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1233 -> a
+    1338:1341:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):502:505 -> a
+    1338:1341:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):454 -> a
+    1342:1344:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.emulateInterfaceLibraryMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):624:626 -> a
+    1342:1344:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):507 -> a
+    1342:1344:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):454 -> a
+    1345:1345:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.emulateInterfaceLibraryMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):623:623 -> a
+    1345:1345:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):507 -> a
+    1345:1345:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):454 -> a
+    1346:1347:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):508:509 -> a
+    1346:1347:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):454 -> a
+    1348:1348:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):505:505 -> a
+    1348:1348:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):454 -> a
+    1349:1349:java.util.Set lambda$rewriteMethodReferences$3(com.android.tools.r8.graph.DexLibraryClass):287:287 -> a
+    1350:1350:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):518:518 -> a
+    1351:1351:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    1351:1351:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):518 -> a
+    1352:1352:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):518:518 -> a
+    1353:1353:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():397:397 -> a
+    1353:1353:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):518 -> a
+    1354:1358:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):518:522 -> a
+    1359:1364:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Map):582:587 -> a
+    1365:1365:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    1365:1365:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Map):587 -> a
+    1366:1375:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Map):589:598 -> a
+    1376:1376:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    1376:1376:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Map):598 -> a
+    1377:1377:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Map):600:600 -> a
+    1378:1383:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):631:636 -> a
+    1384:1390:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):635:641 -> a
+    1391:1391:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.getCompanionClassType(com.android.tools.r8.graph.DexType):783:783 -> a
+    1391:1391:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):643 -> a
+    1392:1392:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):643:643 -> a
+    1393:1411:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):642:660 -> a
+    1412:1412:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    1412:1412:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):660 -> a
+    1413:1413:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):661:661 -> a
+    1414:1420:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.implementsInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):607:613 -> a
+    1414:1420:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):661 -> a
+    1421:1421:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    1421:1421:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.implementsInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):613 -> a
+    1421:1421:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):661 -> a
+    1422:1422:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.implementsInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):615:615 -> a
+    1422:1422:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):661 -> a
+    1423:1428:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):662:667 -> a
+    1429:1429:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):665:665 -> a
+    1430:1444:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):662:676 -> a
+    1445:1445:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    1445:1445:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):676 -> a
+    1446:1450:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):677:681 -> a
+    1451:1451:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.getCompanionClassType(com.android.tools.r8.graph.DexType):783:783 -> a
+    1451:1451:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):685 -> a
+    1452:1453:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):685:686 -> a
+    1454:1454:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):684:684 -> a
+    1455:1469:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):681:695 -> a
+    1470:1472:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.emulateInterfaceLibraryMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):624:626 -> a
+    1470:1472:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):695 -> a
+    1473:1473:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.emulateInterfaceLibraryMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):623:623 -> a
+    1473:1473:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):695 -> a
+    1474:1474:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):695:695 -> a
+    1475:1475:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):693:693 -> a
+    1476:1521:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):692:737 -> a
+    1522:1523:void reportStaticInterfaceMethodHandle(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethodHandle):755:756 -> a
+    1524:1524:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    1524:1524:void reportStaticInterfaceMethodHandle(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethodHandle):756 -> a
+    1525:1529:void reportStaticInterfaceMethodHandle(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethodHandle):760:764 -> a
+    1530:1530:java.lang.String getCompanionClassDescriptor(java.lang.String):771:771 -> a
+    1531:1534:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):776:779 -> a
+    1535:1539:com.android.tools.r8.graph.DexType getDispatchClassType(com.android.tools.r8.graph.DexType):788:792 -> a
+    1540:1549:com.android.tools.r8.graph.DexMethod instanceAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.graph.DexItemFactory):837:846 -> a
+    1550:1550:com.android.tools.r8.graph.DexMethod instanceAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.graph.DexItemFactory):843:843 -> a
+    1551:1551:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):861:861 -> a
+    1552:1552:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):865:865 -> a
+    1553:1553:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):861:861 -> a
+    1553:1553:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):865 -> a
+    1554:1554:com.android.tools.r8.graph.DexEncodedMethod[] renameHolder(java.lang.Iterable,com.android.tools.r8.graph.DexType):926:926 -> a
+    1555:1557:com.android.tools.r8.graph.DexEncodedMethod[] com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.renameHolder(java.util.List,com.android.tools.r8.graph.DexType):930:932 -> a
+    1555:1557:com.android.tools.r8.graph.DexEncodedMethod[] renameHolder(java.lang.Iterable,com.android.tools.r8.graph.DexType):926 -> a
+    1558:1558:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):946:946 -> a
+    1559:1559:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():397:397 -> a
+    1559:1559:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):946 -> a
+    1560:1575:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):546:561 -> a
+    1560:1575:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):947 -> a
+    1576:1576:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):560:560 -> a
+    1576:1576:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):947 -> a
+    1577:1577:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):952:952 -> a
+    1578:1580:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.processClasses(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.function.Consumer):1057:1059 -> a
+    1578:1580:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):952 -> a
+    1581:1582:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.shouldProcess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,boolean):1034:1035 -> a
+    1581:1582:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.processClasses(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.function.Consumer):1060 -> a
+    1581:1582:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):952 -> a
+    1583:1587:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.processClasses(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.function.Consumer):1061:1065 -> a
+    1583:1587:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):952 -> a
+    1588:1589:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.transformEmulatedInterfaces():992:993 -> a
+    1588:1589:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):953 -> a
+    1590:1590:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    1590:1590:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.transformEmulatedInterfaces():993 -> a
+    1590:1590:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):953 -> a
+    1591:1592:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.transformEmulatedInterfaces():994:995 -> a
+    1591:1592:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):953 -> a
+    1593:1608:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.transformEmulatedInterfaces(com.android.tools.r8.graph.DexProgramClass):1005:1020 -> a
+    1593:1608:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.transformEmulatedInterfaces():995 -> a
+    1593:1608:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):953 -> a
+    1609:1613:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.transformEmulatedInterfaces(com.android.tools.r8.graph.DexProgramClass):1019:1023 -> a
+    1609:1613:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.transformEmulatedInterfaces():995 -> a
+    1609:1613:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):953 -> a
+    1614:1615:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):959:960 -> a
+    1616:1616:com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens.builder():475:475 -> a
+    1616:1616:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):962 -> a
+    1617:1634:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):964:981 -> a
+    1635:1635:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():397:397 -> a
+    1635:1635:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):981 -> a
+    1636:1637:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.renameEmulatedInterfaces():881:882 -> a
+    1636:1637:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):982 -> a
+    1638:1646:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):894:902 -> a
+    1638:1646:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.renameEmulatedInterfaces():883 -> a
+    1638:1646:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):982 -> a
+    1647:1650:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.inferEmulatedInterfaceName(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):913:916 -> a
+    1647:1650:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):902 -> a
+    1647:1650:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.renameEmulatedInterfaces():883 -> a
+    1647:1650:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):982 -> a
+    1651:1651:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):904:904 -> a
+    1651:1651:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.renameEmulatedInterfaces():883 -> a
+    1651:1651:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):982 -> a
+    1652:1652:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    1652:1652:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):904 -> a
+    1652:1652:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.renameEmulatedInterfaces():883 -> a
+    1652:1652:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):982 -> a
+    1653:1653:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):906:906 -> a
+    1653:1653:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.renameEmulatedInterfaces():883 -> a
+    1653:1653:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):982 -> a
+    1654:1656:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.renameEmulatedInterfaces():884:886 -> a
+    1654:1656:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):982 -> a
+    1657:1659:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.renameEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):920:922 -> a
+    1657:1659:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.renameEmulatedInterfaces():887 -> a
+    1657:1659:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):982 -> a
+    1660:1660:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):985:985 -> a
+    1661:1663:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.clear():1027:1029 -> a
+    1661:1663:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):988 -> a
+    1664:1668:void lambda$desugarInterfaceMethods$4(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.shaking.MainDexClasses,com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass):974:978 -> a
+    1669:1670:java.util.Map processInterfaces(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):1042:1043 -> a
+    1671:1672:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.shouldProcess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,boolean):1034:1035 -> a
+    1671:1672:java.util.Map processInterfaces(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):1044 -> a
+    1673:1680:java.util.Map processInterfaces(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):1045:1052 -> a
+    1681:1695:boolean isDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):1069:1083 -> a
+    1696:1696:boolean isDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):1076:1076 -> a
+    1697:1697:boolean lambda$shouldIgnoreFromReports$5(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardConfiguration):1126:1126 -> a
+    1698:1704:void warnMissingType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1143:1149 -> a
+    1705:1705:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1165:1165 -> a
+    1706:1707:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1178:1179 -> a
+    1706:1707:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1169 -> a
+    1708:1708:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    1708:1708:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1179 -> a
+    1708:1708:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1169 -> a
+    1709:1712:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.warnMissingInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1134:1137 -> a
+    1709:1712:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1181 -> a
+    1709:1712:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1169 -> a
+    1713:1715:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1182:1184 -> a
+    1713:1715:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1169 -> a
+    1716:1716:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    1716:1716:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.isNonDesugaredLibraryClass(com.android.tools.r8.graph.DexClass):514 -> a
+    1716:1716:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1190 -> a
+    1716:1716:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1169 -> a
+    1717:1717:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.isNonDesugaredLibraryClass(com.android.tools.r8.graph.DexClass):514:514 -> a
+    1717:1717:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1190 -> a
+    1717:1717:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1169 -> a
+    1718:1744:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1195:1221 -> a
+    1718:1744:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1169 -> a
+    1745:1745:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1170:1170 -> a
+    1746:1748:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1185:1187 -> a
+    1746:1748:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1169 -> a
+    1749:1749:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    1749:1749:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1187 -> a
+    1749:1749:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1169 -> a
+    1750:1750:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1187:1187 -> a
+    1750:1750:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1169 -> a
+    1751:1751:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1226:1226 -> a
+    1752:1752:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    1752:1752:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1226 -> a
+    1753:1753:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1226:1226 -> a
+    1754:1754:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    1754:1754:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1227 -> a
+    1755:1756:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1227:1228 -> a
+    1757:1757:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():584:584 -> a
+    1757:1757:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1230 -> a
+    1758:1762:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1232:1236 -> a
+    1763:1763:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():584:584 -> a
+    1763:1763:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.reportDependencyEdge(com.android.tools.r8.DesugarGraphConsumer,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexClass):1245 -> a
+    1763:1763:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1237 -> a
+    1764:1764:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.reportDependencyEdge(com.android.tools.r8.DesugarGraphConsumer,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexClass):1247:1247 -> a
+    1764:1764:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1237 -> a
+    1765:1765:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():584:584 -> a
+    1765:1765:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.reportDependencyEdge(com.android.tools.r8.DesugarGraphConsumer,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexClass):1245 -> a
+    1765:1765:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1234 -> a
+    1766:1766:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.reportDependencyEdge(com.android.tools.r8.DesugarGraphConsumer,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexClass):1247:1247 -> a
+    1766:1766:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1234 -> a
     1:1:com.android.tools.r8.graph.DexType getEmulatedInterface(com.android.tools.r8.graph.DexType):218:218 -> b
     2:3:boolean dontRewrite(com.android.tools.r8.graph.DexMethod):527:528 -> b
-    4:5:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):747:748 -> b
-    6:6:java.lang.String com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.getEmulateLibraryInterfaceClassDescriptor(java.lang.String):741:741 -> b
-    6:6:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):749 -> b
-    7:7:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):750:750 -> b
-    8:11:void warnMissingInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1133:1136 -> b
-    1:1:boolean isCompanionClassType(com.android.tools.r8.graph.DexType):796:796 -> c
-    2:2:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):810:810 -> c
-    3:3:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.isCompanionClassType(com.android.tools.r8.graph.DexType):796:796 -> c
-    3:3:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):810 -> c
-    4:7:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):810:813 -> c
-    8:10:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):812:814 -> c
-    11:12:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1152:1153 -> c
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.getInterfaceClassType(com.android.tools.r8.graph.DexType):805:805 -> c
-    13:13:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1154 -> c
-    14:14:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1156:1156 -> c
+    4:9:java.util.Map processEmulatedInterfaceHierarchy():568:573 -> b
+    10:11:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):748:749 -> b
+    12:12:java.lang.String com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.getEmulateLibraryInterfaceClassDescriptor(java.lang.String):742:742 -> b
+    12:12:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):750 -> b
+    13:13:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):751:751 -> b
+    14:17:void warnMissingInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1134:1137 -> b
+    1:1:boolean isCompanionClassType(com.android.tools.r8.graph.DexType):797:797 -> c
+    2:2:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):811:811 -> c
+    3:3:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.isCompanionClassType(com.android.tools.r8.graph.DexType):797:797 -> c
+    3:3:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):811 -> c
+    4:7:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):811:814 -> c
+    8:10:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):813:815 -> c
+    11:12:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1153:1154 -> c
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.getInterfaceClassType(com.android.tools.r8.graph.DexType):806:806 -> c
+    13:13:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1155 -> c
+    14:14:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1157:1157 -> c
     15:15:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> c
-    15:15:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1156 -> c
-    16:16:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1157:1157 -> c
-    17:17:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():580:580 -> c
-    17:17:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1157 -> c
+    15:15:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1157 -> c
+    16:16:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1158:1158 -> c
+    17:17:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():584:584 -> c
+    17:17:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1158 -> c
     1:1:boolean isEmulatedInterface(com.android.tools.r8.graph.DexType):210:210 -> d
     2:5:com.android.tools.r8.graph.DexType maximallySpecificEmulatedInterfaceOrNull(com.android.tools.r8.graph.DexMethod):465:468 -> d
     6:6:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> d
@@ -36603,28 +36660,28 @@
     25:25:com.android.tools.r8.graph.DexType maximallySpecificEmulatedInterfaceOrNull(com.android.tools.r8.graph.DexMethod):491 -> d
     26:26:com.android.tools.r8.graph.DexType maximallySpecificEmulatedInterfaceOrNull(com.android.tools.r8.graph.DexMethod):492:492 -> d
     1:1:boolean needsRewriting(com.android.tools.r8.graph.DexMethod):214:214 -> e
-    2:2:boolean shouldIgnoreFromReports(com.android.tools.r8.graph.DexType):1119:1119 -> e
+    2:2:boolean shouldIgnoreFromReports(com.android.tools.r8.graph.DexType):1120:1120 -> e
     3:3:boolean com.android.tools.r8.ir.desugar.PrefixRewritingMapper.hasRewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):34:34 -> e
-    3:3:boolean shouldIgnoreFromReports(com.android.tools.r8.graph.DexType):1119 -> e
-    4:4:boolean shouldIgnoreFromReports(com.android.tools.r8.graph.DexType):1120:1120 -> e
-    5:5:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.isCompanionClassType(com.android.tools.r8.graph.DexType):796:796 -> e
-    5:5:boolean shouldIgnoreFromReports(com.android.tools.r8.graph.DexType):1121 -> e
-    6:9:boolean shouldIgnoreFromReports(com.android.tools.r8.graph.DexType):1121:1124 -> e
-    10:14:boolean shouldIgnoreFromReports(com.android.tools.r8.graph.DexType):1123:1127 -> e
+    3:3:boolean shouldIgnoreFromReports(com.android.tools.r8.graph.DexType):1120 -> e
+    4:4:boolean shouldIgnoreFromReports(com.android.tools.r8.graph.DexType):1121:1121 -> e
+    5:5:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.isCompanionClassType(com.android.tools.r8.graph.DexType):797:797 -> e
+    5:5:boolean shouldIgnoreFromReports(com.android.tools.r8.graph.DexType):1122 -> e
+    6:9:boolean shouldIgnoreFromReports(com.android.tools.r8.graph.DexType):1122:1125 -> e
+    10:14:boolean shouldIgnoreFromReports(com.android.tools.r8.graph.DexType):1124:1128 -> e
     1:6:void warnMissingEmulatedInterface(com.android.tools.r8.graph.DexType):536:541 -> f
-    7:7:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):874:874 -> f
-    8:8:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):870:870 -> f
-    8:8:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):874 -> f
-    1:1:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):820:820 -> g
-    2:2:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.getCompanionClassType(com.android.tools.r8.graph.DexType):782:782 -> g
-    2:2:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):820 -> g
-    3:3:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):820:820 -> g
-com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor -> com.android.tools.r8.internal.Wf$a:
+    7:7:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):875:875 -> f
+    8:8:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):871:871 -> f
+    8:8:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):875 -> f
+    1:1:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):821:821 -> g
+    2:2:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.getCompanionClassType(com.android.tools.r8.graph.DexType):783:783 -> g
+    2:2:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):821 -> g
+    3:3:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):821:821 -> g
+com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor -> com.android.tools.r8.internal.Xf$a:
     com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor ExcludeDexResources -> b
     com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor IncludeAllResources -> a
     1:5:void <clinit>():134:138 -> <clinit>
     1:1:void <init>(java.lang.String,int):130:130 -> <init>
-com.android.tools.r8.ir.desugar.InterfaceMethodRewriterFixup -> com.android.tools.r8.internal.Xf:
+com.android.tools.r8.ir.desugar.InterfaceMethodRewriterFixup -> com.android.tools.r8.internal.Yf:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens graphLens -> b
     1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens):17:19 -> <init>
@@ -36641,7 +36698,7 @@
     23:23:com.android.tools.r8.graph.EnclosingMethodAttribute com.android.tools.r8.ir.desugar.InterfaceMethodRewriterFixup.fixupEnclosingMethodAttribute(com.android.tools.r8.graph.EnclosingMethodAttribute):47:47 -> a
     23:23:void run():36 -> a
     24:24:void run():35:35 -> a
-com.android.tools.r8.ir.desugar.InterfaceProcessor -> com.android.tools.r8.internal.Yf:
+com.android.tools.r8.ir.desugar.InterfaceProcessor -> com.android.tools.r8.internal.Zf:
     java.util.Map syntheticClasses -> d
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.ir.desugar.InterfaceMethodRewriter rewriter -> c
@@ -36655,8 +36712,8 @@
     9:20:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):80 -> a
     21:33:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):86:98 -> a
     34:41:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):97:104 -> a
-    42:42:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean,com.android.tools.r8.cf.CfVersion):277:277 -> a
-    42:42:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):257 -> a
+    42:42:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean,com.android.tools.r8.cf.CfVersion):281:281 -> a
+    42:42:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):261 -> a
     42:42:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):104 -> a
     43:46:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):108:111 -> a
     47:48:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):90:91 -> a
@@ -36684,13 +36741,13 @@
     97:100:boolean com.android.tools.r8.ir.desugar.InterfaceProcessor.isStaticMethod(com.android.tools.r8.graph.DexEncodedMethod):384:387 -> a
     97:100:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):135 -> a
     101:112:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):136:147 -> a
-    113:113:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean,com.android.tools.r8.cf.CfVersion):277:277 -> a
-    113:113:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):257 -> a
+    113:113:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean,com.android.tools.r8.cf.CfVersion):281:281 -> a
+    113:113:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):261 -> a
     113:113:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):147 -> a
     114:132:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):149:167 -> a
     133:140:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):166:173 -> a
-    141:141:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean,com.android.tools.r8.cf.CfVersion):277:277 -> a
-    141:141:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):257 -> a
+    141:141:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean,com.android.tools.r8.cf.CfVersion):281:281 -> a
+    141:141:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):261 -> a
     141:141:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):173 -> a
     142:144:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):177:179 -> a
     145:146:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):163:164 -> a
@@ -36701,21 +36758,21 @@
     169:169:boolean com.android.tools.r8.ir.desugar.InterfaceProcessor.isStaticMethod(com.android.tools.r8.graph.DexEncodedMethod):385:385 -> a
     169:169:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):135 -> a
     170:188:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):188:206 -> a
-    189:189:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.getCompanionClassType(com.android.tools.r8.graph.DexType):782:782 -> a
+    189:189:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.getCompanionClassType(com.android.tools.r8.graph.DexType):783:783 -> a
     189:189:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):206 -> a
     190:212:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):207:229 -> a
     213:217:com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier getChecksumSupplier(com.android.tools.r8.graph.DexProgramClass):233:237 -> a
     218:242:com.android.tools.r8.graph.DexProgramClass process(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):241:265 -> a
-    243:243:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.staticAsMethodOfDispatchClass(com.android.tools.r8.graph.DexMethod):825:825 -> a
+    243:243:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.staticAsMethodOfDispatchClass(com.android.tools.r8.graph.DexMethod):826:826 -> a
     243:243:com.android.tools.r8.graph.DexProgramClass process(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):265 -> a
     244:256:com.android.tools.r8.graph.DexProgramClass process(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):269:281 -> a
-    257:257:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean,com.android.tools.r8.cf.CfVersion):277:277 -> a
-    257:257:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):257 -> a
+    257:257:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean,com.android.tools.r8.cf.CfVersion):281:281 -> a
+    257:257:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):261 -> a
     257:257:com.android.tools.r8.graph.DexProgramClass process(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):281 -> a
     258:259:com.android.tools.r8.graph.DexProgramClass process(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):283:284 -> a
     260:317:com.android.tools.r8.graph.DexProgramClass process(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):258:315 -> a
     318:322:void addSuperTypes(com.android.tools.r8.graph.DexClass,java.util.Deque):375:379 -> a
-com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens -> com.android.tools.r8.internal.Yf$a:
+com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens -> com.android.tools.r8.internal.Zf$a:
     boolean $assertionsDisabled -> m
     com.android.tools.r8.com.google.common.collect.BiMap extraOriginalMethodSignatures -> n
     1:1:void <clinit>():392:392 -> <clinit>
@@ -36730,7 +36787,7 @@
     5:5:com.android.tools.r8.graph.DexMethod internalGetNextMethodSignature(com.android.tools.r8.graph.DexMethod):465:465 -> g
     1:1:com.android.tools.r8.com.google.common.collect.BiMap getExtraOriginalMethodSignatures():437:437 -> l
     1:3:void toggleMappingToExtraMethods():431:433 -> m
-com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder -> com.android.tools.r8.internal.Yf$a$a:
+com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder -> com.android.tools.r8.internal.Zf$a$a:
     boolean $assertionsDisabled -> f
     com.android.tools.r8.com.google.common.collect.BiMap extraOriginalMethodSignatures -> g
     1:1:void <clinit>():478:478 -> <clinit>
@@ -36738,7 +36795,7 @@
     1:1:com.android.tools.r8.graph.GraphLens build(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens):478:478 -> a
     1:6:com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens build(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens):491:496 -> b
     1:3:void recordCodeMovedToCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):483:485 -> c
-com.android.tools.r8.ir.desugar.LambdaClass -> com.android.tools.r8.internal.tl:
+com.android.tools.r8.ir.desugar.LambdaClass -> com.android.tools.r8.internal.ul:
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.ir.desugar.LambdaDescriptor descriptor -> e
     com.android.tools.r8.ir.desugar.LambdaRewriter rewriter -> c
@@ -36819,7 +36876,7 @@
     109:133:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.LambdaConstructorSourceCode.build(com.android.tools.r8.ir.desugar.LambdaClass):31:55 -> d
     109:133:com.android.tools.r8.graph.DexEncodedMethod[] com.android.tools.r8.ir.desugar.LambdaClass.synthesizeDirectMethods():281 -> d
     109:133:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():170 -> d
-    134:134:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):257:257 -> d
+    134:134:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):261:261 -> d
     134:134:com.android.tools.r8.graph.DexEncodedMethod[] com.android.tools.r8.ir.desugar.LambdaClass.synthesizeDirectMethods():281 -> d
     134:134:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():170 -> d
     135:147:com.android.tools.r8.graph.DexEncodedMethod[] com.android.tools.r8.ir.desugar.LambdaClass.synthesizeDirectMethods():281:293 -> d
@@ -36827,14 +36884,14 @@
     148:159:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.LambdaClassConstructorSourceCode.build(com.android.tools.r8.ir.desugar.LambdaClass):24:35 -> d
     148:159:com.android.tools.r8.graph.DexEncodedMethod[] com.android.tools.r8.ir.desugar.LambdaClass.synthesizeDirectMethods():294 -> d
     148:159:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():170 -> d
-    160:160:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):257:257 -> d
+    160:160:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):261:261 -> d
     160:160:com.android.tools.r8.graph.DexEncodedMethod[] com.android.tools.r8.ir.desugar.LambdaClass.synthesizeDirectMethods():294 -> d
     160:160:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():170 -> d
     161:161:com.android.tools.r8.graph.DexEncodedMethod[] com.android.tools.r8.ir.desugar.LambdaClass.synthesizeDirectMethods():294:294 -> d
     161:161:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():170 -> d
     162:174:com.android.tools.r8.graph.DexEncodedMethod[] com.android.tools.r8.ir.desugar.LambdaClass.synthesizeVirtualMethods(com.android.tools.r8.graph.DexMethod):228:240 -> d
     162:174:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():171 -> d
-    175:175:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):257:257 -> d
+    175:175:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):261:261 -> d
     175:175:com.android.tools.r8.graph.DexEncodedMethod[] com.android.tools.r8.ir.desugar.LambdaClass.synthesizeVirtualMethods(com.android.tools.r8.graph.DexMethod):240 -> d
     175:175:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():171 -> d
     176:194:com.android.tools.r8.graph.DexEncodedMethod[] com.android.tools.r8.ir.desugar.LambdaClass.synthesizeVirtualMethods(com.android.tools.r8.graph.DexMethod):240:258 -> d
@@ -36842,13 +36899,13 @@
     195:200:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.LambdaBridgeMethodSourceCode.build(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):17:22 -> d
     195:200:com.android.tools.r8.graph.DexEncodedMethod[] com.android.tools.r8.ir.desugar.LambdaClass.synthesizeVirtualMethods(com.android.tools.r8.graph.DexMethod):259 -> d
     195:200:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():171 -> d
-    201:201:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):257:257 -> d
+    201:201:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):261:261 -> d
     201:201:com.android.tools.r8.graph.DexEncodedMethod[] com.android.tools.r8.ir.desugar.LambdaClass.synthesizeVirtualMethods(com.android.tools.r8.graph.DexMethod):259 -> d
     201:201:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():171 -> d
     202:202:com.android.tools.r8.graph.DexEncodedMethod[] com.android.tools.r8.ir.desugar.LambdaClass.synthesizeVirtualMethods(com.android.tools.r8.graph.DexMethod):259:259 -> d
     202:202:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():171 -> d
     203:212:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():171:180 -> d
-com.android.tools.r8.ir.desugar.LambdaClass$ClassMethodWithAccessorTarget -> com.android.tools.r8.internal.nl:
+com.android.tools.r8.ir.desugar.LambdaClass$ClassMethodWithAccessorTarget -> com.android.tools.r8.internal.ol:
     boolean $assertionsDisabled -> g
     com.android.tools.r8.ir.desugar.LambdaClass this$0 -> h
     1:1:void <clinit>():748:748 -> <clinit>
@@ -36862,11 +36919,11 @@
     47:52:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(boolean):774 -> a
     53:76:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.AccessorMethodSourceCode.build(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):22:45 -> a
     53:76:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(boolean):774 -> a
-    77:77:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):257:257 -> a
+    77:77:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):261:261 -> a
     77:77:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(boolean):774 -> a
     78:82:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(boolean):778:782 -> a
     83:83:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(boolean):780:780 -> a
-com.android.tools.r8.ir.desugar.LambdaClass$InstanceLambdaImplTarget -> com.android.tools.r8.internal.ol:
+com.android.tools.r8.ir.desugar.LambdaClass$InstanceLambdaImplTarget -> com.android.tools.r8.internal.pl:
     boolean $assertionsDisabled -> g
     com.android.tools.r8.ir.desugar.LambdaClass this$0 -> h
     1:1:void <clinit>():665:665 -> <clinit>
@@ -36876,20 +36933,20 @@
     6:6:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(boolean):678 -> a
     7:10:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(boolean):678:681 -> a
     11:24:com.android.tools.r8.graph.DexEncodedMethod lambda$modifyLambdaImplementationMethod$0(com.android.tools.r8.graph.DexEncodedMethod):692:705 -> a
-    25:25:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):257:257 -> a
+    25:25:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):261:261 -> a
     25:25:com.android.tools.r8.graph.DexEncodedMethod lambda$modifyLambdaImplementationMethod$0(com.android.tools.r8.graph.DexEncodedMethod):705 -> a
     26:27:com.android.tools.r8.graph.DexEncodedMethod lambda$modifyLambdaImplementationMethod$0(com.android.tools.r8.graph.DexEncodedMethod):707:708 -> a
     28:31:com.android.tools.r8.graph.ProgramMethod createSyntheticAccessor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass):717:720 -> a
     32:56:com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode.builder(com.android.tools.r8.graph.DexMethod):0:24 -> a
     32:56:com.android.tools.r8.graph.ProgramMethod createSyntheticAccessor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass):721 -> a
     57:70:com.android.tools.r8.graph.ProgramMethod createSyntheticAccessor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass):721:734 -> a
-    71:71:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean,com.android.tools.r8.cf.CfVersion):277:277 -> a
-    71:71:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):257 -> a
+    71:71:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean,com.android.tools.r8.cf.CfVersion):281:281 -> a
+    71:71:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):261 -> a
     71:71:com.android.tools.r8.graph.ProgramMethod createSyntheticAccessor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass):734 -> a
     72:75:com.android.tools.r8.graph.ProgramMethod createSyntheticAccessor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass):739:742 -> a
     76:76:void lambda$createSyntheticAccessor$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.UseRegistry):737:737 -> a
     1:24:com.android.tools.r8.graph.ProgramMethod modifyLambdaImplementationMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass):688:711 -> b
-com.android.tools.r8.ir.desugar.LambdaClass$InterfaceLambdaImplTarget -> com.android.tools.r8.internal.pl:
+com.android.tools.r8.ir.desugar.LambdaClass$InterfaceLambdaImplTarget -> com.android.tools.r8.internal.ql:
     boolean $assertionsDisabled -> g
     com.android.tools.r8.ir.desugar.LambdaClass this$0 -> h
     1:1:void <clinit>():597:597 -> <clinit>
@@ -36899,22 +36956,22 @@
     3:3:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(boolean):608 -> a
     4:41:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(boolean):608:645 -> a
     42:56:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureAccessibility$0(com.android.tools.r8.graph.DexEncodedMethod):618:632 -> a
-    57:57:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):257:257 -> a
+    57:57:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):261:261 -> a
     57:57:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureAccessibility$0(com.android.tools.r8.graph.DexEncodedMethod):632 -> a
     58:62:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureAccessibility$0(com.android.tools.r8.graph.DexEncodedMethod):634:638 -> a
     63:63:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureAccessibility$0(com.android.tools.r8.graph.DexEncodedMethod):637:637 -> a
-com.android.tools.r8.ir.desugar.LambdaClass$InvalidLambdaImplTarget -> com.android.tools.r8.internal.ql:
+com.android.tools.r8.ir.desugar.LambdaClass$InvalidLambdaImplTarget -> com.android.tools.r8.internal.rl:
     com.android.tools.r8.graph.DexType exceptionType -> g
     1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexType):654:655 -> <init>
     com.android.tools.r8.graph.ProgramMethod ensureAccessibility(boolean) -> a
-com.android.tools.r8.ir.desugar.LambdaClass$NoAccessorMethodTarget -> com.android.tools.r8.internal.rl:
+com.android.tools.r8.ir.desugar.LambdaClass$NoAccessorMethodTarget -> com.android.tools.r8.internal.sl:
     1:1:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.Invoke$Type):565:565 -> <init>
     com.android.tools.r8.graph.ProgramMethod ensureAccessibility(boolean) -> a
-com.android.tools.r8.ir.desugar.LambdaClass$StaticLambdaImplTarget -> com.android.tools.r8.internal.sl:
+com.android.tools.r8.ir.desugar.LambdaClass$StaticLambdaImplTarget -> com.android.tools.r8.internal.tl:
     com.android.tools.r8.graph.ProgramMethod target -> g
     1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.ProgramMethod):580:581 -> <init>
     1:3:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(boolean):587:589 -> a
-com.android.tools.r8.ir.desugar.LambdaClass$Target -> com.android.tools.r8.internal.tl$a:
+com.android.tools.r8.ir.desugar.LambdaClass$Target -> com.android.tools.r8.internal.ul$a:
     com.android.tools.r8.graph.ProgramMethod accessibilityBridge -> e
     com.android.tools.r8.ir.code.Invoke$Type invokeType -> c
     com.android.tools.r8.ir.desugar.LambdaClass this$0 -> f
@@ -36925,10 +36982,10 @@
     1:5:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):537:541 -> <init>
     com.android.tools.r8.graph.ProgramMethod ensureAccessibility(boolean) -> a
     1:5:com.android.tools.r8.graph.ProgramMethod ensureAccessibilityIfNeeded(boolean):549:553 -> b
-com.android.tools.r8.ir.desugar.LambdaConstructorSourceCode -> com.android.tools.r8.internal.ul:
+com.android.tools.r8.ir.desugar.LambdaConstructorSourceCode -> com.android.tools.r8.internal.vl:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():22:22 -> <clinit>
-com.android.tools.r8.ir.desugar.LambdaDescriptor -> com.android.tools.r8.internal.vl:
+com.android.tools.r8.ir.desugar.LambdaDescriptor -> com.android.tools.r8.internal.wl:
     com.android.tools.r8.graph.MethodAccessFlags targetAccessFlags -> l
     com.android.tools.r8.graph.DexMethodHandle implHandle -> h
     com.android.tools.r8.graph.DexType targetHolder -> m
@@ -36980,7 +37037,7 @@
     1:4:com.android.tools.r8.graph.DexType getImplReceiverType():109:112 -> b
     5:6:com.android.tools.r8.ir.desugar.LambdaDescriptor tryInfer(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod):259:260 -> b
     1:1:com.android.tools.r8.graph.DexMethod getMainMethod():66:66 -> c
-com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode -> com.android.tools.r8.internal.Al:
+com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode -> com.android.tools.r8.internal.Bl:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():39:39 -> <clinit>
     1:12:com.android.tools.r8.graph.DexType getBoxedForPrimitiveType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):71:82 -> a
@@ -37061,7 +37118,7 @@
     356:359:void addPrimitiveWideningConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):477:480 -> a
     360:360:void addPrimitiveWideningConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):471:471 -> a
     361:404:void addPrimitiveWideningConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):463:506 -> a
-com.android.tools.r8.ir.desugar.LambdaRewriter -> com.android.tools.r8.internal.Ll:
+com.android.tools.r8.ir.desugar.LambdaRewriter -> com.android.tools.r8.internal.Ml:
     com.android.tools.r8.graph.DexString instanceFieldName -> c
     com.android.tools.r8.graph.AppView appView -> b
     java.util.Set forcefullyMovedMethods -> e
@@ -37092,7 +37149,7 @@
     237:243:java.lang.Object com.android.tools.r8.ir.desugar.LambdaRewriter.putIfAbsent(java.util.Map,java.lang.Object,java.lang.Object):318:324 -> a
     237:243:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):262 -> a
     244:248:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):262:266 -> a
-    249:249:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():390:390 -> a
+    249:249:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():397:397 -> a
     249:249:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):266 -> a
     250:258:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):267:275 -> a
     259:271:void com.android.tools.r8.ir.desugar.LambdaRewriter.addRewritingPrefix(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):296:308 -> a
@@ -37114,18 +37171,18 @@
     283:307:com.android.tools.r8.graph.GraphLens$NestedGraphLens fixup():409:433 -> a
     1:1:java.util.Set getForcefullyMovedMethods():106:106 -> b
     1:1:java.util.Map getKnownLambdaClasses():405:405 -> c
-com.android.tools.r8.ir.desugar.LambdaRewriter$LambdaRewriterLens -> com.android.tools.r8.internal.Kl:
+com.android.tools.r8.ir.desugar.LambdaRewriter$LambdaRewriterLens -> com.android.tools.r8.internal.Ll:
     1:1:void <init>(java.util.Map,java.util.Map,java.util.Map,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexItemFactory):446:446 -> <init>
     1:1:com.android.tools.r8.ir.desugar.LambdaRewriter$LambdaRewriterLens com.android.tools.r8.ir.desugar.LambdaRewriter$LambdaRewriterLens.withoutMethodMap():462:462 -> a
     1:1:com.android.tools.r8.ir.desugar.LambdaRewriter$LambdaRewriterLens access$000(com.android.tools.r8.ir.desugar.LambdaRewriter$LambdaRewriterLens):436 -> a
     boolean isLegitimateToHaveEmptyMappings() -> k
     1:1:com.android.tools.r8.ir.desugar.LambdaRewriter$LambdaRewriterLens$Builder builder():467:467 -> l
-com.android.tools.r8.ir.desugar.LambdaRewriter$LambdaRewriterLens$Builder -> com.android.tools.r8.internal.Jl:
+com.android.tools.r8.ir.desugar.LambdaRewriter$LambdaRewriterLens$Builder -> com.android.tools.r8.internal.Kl:
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():470:470 -> <clinit>
     1:1:void <init>():470:470 -> <init>
     1:6:com.android.tools.r8.ir.desugar.LambdaRewriter$LambdaRewriterLens build(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexItemFactory):472:477 -> a
-com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring -> com.android.tools.r8.internal.yp:
+com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring -> com.android.tools.r8.internal.zp:
     java.util.Map bridges -> c
     java.util.Map getFieldBridges -> d
     com.android.tools.r8.graph.AppView appView -> b
@@ -37225,7 +37282,7 @@
     18:20:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):333 -> b
     21:29:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):335:343 -> b
     void reportMissingNestHost(com.android.tools.r8.graph.DexClass) -> c
-com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess -> com.android.tools.r8.internal.yp$a:
+com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess -> com.android.tools.r8.internal.zp$a:
     com.android.tools.r8.graph.DexEncodedField field -> a
     boolean isGet -> b
     1:3:void <init>(com.android.tools.r8.graph.DexEncodedField,boolean):461:463 -> <init>
@@ -37244,7 +37301,7 @@
     2:2:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isGet():484:484 -> g
     2:2:boolean isStaticGet():500 -> g
     1:1:int hashCode():468:468 -> hashCode
-com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$NestBasedAccessDesugaringUseRegistry -> com.android.tools.r8.internal.zp:
+com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$NestBasedAccessDesugaringUseRegistry -> com.android.tools.r8.internal.Ap:
     com.android.tools.r8.graph.DexClassAndMethod context -> c
     com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring this$0 -> d
     1:3:void <init>(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring,com.android.tools.r8.graph.DexClassAndMethod):357:359 -> <init>
@@ -37285,7 +37342,7 @@
     void registerNewInstance(com.android.tools.r8.graph.DexType) -> f
     void registerTypeReference(com.android.tools.r8.graph.DexType) -> g
     1:1:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):442:442 -> g
-com.android.tools.r8.ir.desugar.NestedPrivateMethodLens -> com.android.tools.r8.internal.Fp:
+com.android.tools.r8.ir.desugar.NestedPrivateMethodLens -> com.android.tools.r8.internal.Gp:
     boolean $assertionsDisabled -> m
     com.android.tools.r8.graph.DexType nestConstructorType -> n
     java.util.Map getFieldMap -> o
@@ -37308,7 +37365,7 @@
     2:2:boolean verifyIsContextFreeForMethod(com.android.tools.r8.graph.DexMethod):79:79 -> e
     1:6:boolean isConstructorBridge(com.android.tools.r8.graph.DexMethod):90:95 -> h
     boolean isLegitimateToHaveEmptyMappings() -> k
-com.android.tools.r8.ir.desugar.NestedPrivateMethodLens$Builder -> com.android.tools.r8.internal.Ep:
+com.android.tools.r8.ir.desugar.NestedPrivateMethodLens$Builder -> com.android.tools.r8.internal.Fp:
     boolean $assertionsDisabled -> f
     java.util.Map getFieldMap -> g
     java.util.Map putFieldMap -> h
@@ -37317,7 +37374,7 @@
     1:1:void mapGetField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexMethod):145:145 -> a
     2:8:com.android.tools.r8.ir.desugar.NestedPrivateMethodLens build(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):153:159 -> a
     1:1:void mapPutField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexMethod):149:149 -> b
-com.android.tools.r8.ir.desugar.PrefixRewritingMapper -> com.android.tools.r8.internal.Qs:
+com.android.tools.r8.ir.desugar.PrefixRewritingMapper -> com.android.tools.r8.internal.Ss:
     1:1:void <init>():23:23 -> <init>
     void forAllRewrittenTypes(java.util.function.Consumer) -> a
     boolean isRewriting() -> a
@@ -37325,7 +37382,7 @@
     1:1:boolean hasRewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):34:34 -> a
     2:6:boolean hasRewrittenTypeInSignature(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.AppView):38:42 -> a
     com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView) -> b
-com.android.tools.r8.ir.desugar.PrefixRewritingMapper$DesugarPrefixRewritingMapper -> com.android.tools.r8.internal.Qs$a:
+com.android.tools.r8.ir.desugar.PrefixRewritingMapper$DesugarPrefixRewritingMapper -> com.android.tools.r8.internal.Ss$a:
     java.util.Map rewritten -> c
     java.util.Map initialPrefixes -> d
     com.android.tools.r8.graph.DexItemFactory factory -> e
@@ -37373,13 +37430,13 @@
     25:29:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):121 -> b
     30:30: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):165:165 -> b
     30:30:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):121 -> b
-com.android.tools.r8.ir.desugar.PrefixRewritingMapper$EmptyPrefixRewritingMapper -> com.android.tools.r8.internal.Rs:
+com.android.tools.r8.ir.desugar.PrefixRewritingMapper$EmptyPrefixRewritingMapper -> com.android.tools.r8.internal.Ts:
     1:1:void <init>():189:189 -> <init>
     void forAllRewrittenTypes(java.util.function.Consumer) -> a
     boolean isRewriting() -> a
     void rewriteType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType) -> a
     com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView) -> b
-com.android.tools.r8.ir.desugar.R8NestBasedAccessDesugaring -> com.android.tools.r8.internal.qv:
+com.android.tools.r8.ir.desugar.R8NestBasedAccessDesugaring -> com.android.tools.r8.internal.sv:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():30:30 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView):33:33 -> <init>
@@ -37397,7 +37454,7 @@
     31:36:void addDeferredBridgesAndMapMethods(java.util.Map,java.util.function.BiConsumer):58:63 -> a
     37:40:void reportIncompleteNest(java.util.List):113:116 -> a
     1:4:void reportMissingNestHost(com.android.tools.r8.graph.DexClass):104:107 -> c
-com.android.tools.r8.ir.desugar.StringConcatRewriter -> com.android.tools.r8.internal.az:
+com.android.tools.r8.ir.desugar.StringConcatRewriter -> com.android.tools.r8.internal.cz:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.DexMethod defaultAppendMethod -> h
@@ -37465,8 +37522,8 @@
     162:162:com.android.tools.r8.errors.CompilationError error(com.android.tools.r8.graph.DexMethod,java.lang.String):457 -> a
     1:1:com.android.tools.r8.graph.DexMethod access$200(com.android.tools.r8.ir.desugar.StringConcatRewriter):40:40 -> b
     1:1:com.android.tools.r8.graph.DexMethod access$300(com.android.tools.r8.ir.desugar.StringConcatRewriter):40:40 -> c
-com.android.tools.r8.ir.desugar.StringConcatRewriter$1 -> com.android.tools.r8.internal.Vy:
-com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder -> com.android.tools.r8.internal.Zy:
+com.android.tools.r8.ir.desugar.StringConcatRewriter$1 -> com.android.tools.r8.internal.Xy:
+com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder -> com.android.tools.r8.internal.bz:
     com.android.tools.r8.ir.code.Instruction invokeCustom -> f
     java.util.ListIterator blocks -> d
     com.android.tools.r8.ir.code.BasicBlock currentBlock -> g
@@ -37505,16 +37562,16 @@
     36:38:void desugar():369:369 -> a
     41:68:void desugar():372:399 -> a
     1:1:com.android.tools.r8.ir.code.IRCode access$600(com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder):284:284 -> b
-com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder$ArgumentChunk -> com.android.tools.r8.internal.Wy:
+com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder$ArgumentChunk -> com.android.tools.r8.internal.Yy:
     com.android.tools.r8.ir.code.Value value -> c
     1:2:void <init>(com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMethod):423:424 -> <init>
     1:1:com.android.tools.r8.ir.code.Value getOrCreateValue():429:429 -> a
-com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder$Chunk -> com.android.tools.r8.internal.Xy:
+com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder$Chunk -> com.android.tools.r8.internal.Zy:
     com.android.tools.r8.graph.DexMethod method -> a
     com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder this$1 -> b
     1:2:void <init>(com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder,com.android.tools.r8.graph.DexMethod):406:407 -> <init>
     com.android.tools.r8.ir.code.Value getOrCreateValue() -> a
-com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder$ConstantChunk -> com.android.tools.r8.internal.Yy:
+com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder$ConstantChunk -> com.android.tools.r8.internal.az:
     com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder this$1 -> d
     java.lang.String str -> c
     1:3:void <init>(com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder,java.lang.String,com.android.tools.r8.graph.DexMethod):436:438 -> <init>
@@ -37522,7 +37579,7 @@
     2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):1105:1105 -> a
     2:2:com.android.tools.r8.ir.code.Value getOrCreateValue():443 -> a
     3:8:com.android.tools.r8.ir.code.Value getOrCreateValue():444:444 -> a
-com.android.tools.r8.ir.desugar.TwrCloseResourceRewriter -> com.android.tools.r8.internal.UA:
+com.android.tools.r8.ir.desugar.TwrCloseResourceRewriter -> com.android.tools.r8.internal.VA:
     com.android.tools.r8.ir.conversion.IRConverter converter -> d
     com.android.tools.r8.graph.AppView appView -> c
     java.util.Set referencingClasses -> f
@@ -37642,7 +37699,7 @@
     780:822:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):800:842 -> a
     780:822:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):135 -> a
     823:831:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):137:145 -> a
-    832:832:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):257:257 -> a
+    832:832:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):261:261 -> a
     832:832:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):145 -> a
     833:862:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):150:179 -> a
     863:863:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1024:1024 -> a
@@ -38736,10 +38793,10 @@
     1:1:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter com.android.tools.r8.ir.desugar.backports.NumericMethodRewrites.rewriteToAddInstruction():27:27 -> o
     1:1:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter com.android.tools.r8.ir.desugar.backports.ObjectsMethodRewrites.rewriteToArraysHashCode():21:21 -> p
     1:1:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter com.android.tools.r8.ir.desugar.backports.NumericMethodRewrites.rewriteToInvokeMath():17:17 -> q
-com.android.tools.r8.ir.desugar.backports.NumericMethodRewrites$1 -> com.android.tools.r8.internal.mq:
+com.android.tools.r8.ir.desugar.backports.NumericMethodRewrites$1 -> com.android.tools.r8.internal.oq:
     1:1:void <init>():34:34 -> <init>
     1:1:void rewrite(com.android.tools.r8.cf.code.CfInvoke,java.util.ListIterator,com.android.tools.r8.graph.DexItemFactory):39:39 -> a
-com.android.tools.r8.ir.desugar.backports.ObjectsMethodRewrites$1 -> com.android.tools.r8.internal.Dr:
+com.android.tools.r8.ir.desugar.backports.ObjectsMethodRewrites$1 -> com.android.tools.r8.internal.Fr:
     1:1:void <init>():31:31 -> <init>
     1:5:void rewrite(com.android.tools.r8.cf.code.CfInvoke,java.util.ListIterator,com.android.tools.r8.graph.DexItemFactory):36:40 -> a
 com.android.tools.r8.ir.optimize.ArgumentRemovalUtils -> com.android.tools.r8.internal.l1:
@@ -39428,7 +39485,7 @@
     2:5:void <init>(java.util.Map):96:99 -> <init>
     1:1:void join(java.util.Map):103:103 -> a
     2:2:void execute():109:109 -> a
-com.android.tools.r8.ir.optimize.CodeRewriter -> com.android.tools.r8.internal.A6:
+com.android.tools.r8.ir.optimize.CodeRewriter -> com.android.tools.r8.internal.B6:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.utils.InternalOptions options -> d
@@ -39439,7 +39496,7 @@
     1:1:boolean lambda$removedTrivialGotos$0(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):237:237 -> a
     2:25:void collapseTrivialGoto(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,java.util.List):423:446 -> a
     26:26:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):513:513 -> a
-    27:27:boolean com.android.tools.r8.utils.InternalOptions.canHaveDex2OatInliningIssue():1664:1664 -> a
+    27:27:boolean com.android.tools.r8.utils.InternalOptions.canHaveDex2OatInliningIssue():1671:1671 -> a
     27:27:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):513 -> a
     28:29:boolean com.android.tools.r8.ir.code.IRCode.hasCatchHandlers():661:662 -> a
     28:29:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):513 -> a
@@ -39596,7 +39653,7 @@
     1126:1126:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):1105:1105 -> a
     1126:1126:com.android.tools.r8.ir.code.Value addConstString(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,java.lang.String):3435 -> a
     1127:1127:com.android.tools.r8.ir.code.Value addConstString(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,java.lang.String):3437:3437 -> a
-    1128:1128:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():425:425 -> a
+    1128:1128:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> a
     1128:1128:com.android.tools.r8.ir.code.Value addConstString(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,java.lang.String):3437 -> a
     1129:1130:com.android.tools.r8.ir.code.Value addConstString(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,java.lang.String):3437:3438 -> a
     1131:1151:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3448:3468 -> a
@@ -39778,7 +39835,7 @@
     24:24:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3182 -> j
     25:25:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3186:3186 -> j
     1:1:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1233:1233 -> k
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():425:425 -> k
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> k
     2:2:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1233 -> k
     3:34:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1233:1264 -> k
     35:35:boolean com.android.tools.r8.ir.optimize.CodeRewriter.checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1213:1213 -> k
@@ -39837,7 +39894,7 @@
     56:56:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):31:31 -> o
     56:56:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1818 -> o
     57:71:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1819:1833 -> o
-    72:72:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpIfFloatBug():1625:1625 -> o
+    72:72:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpIfFloatBug():1632:1632 -> o
     72:72:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1834 -> o
     73:73:boolean com.android.tools.r8.ir.code.Instruction.isCmp():0:0 -> o
     73:73:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1834 -> o
@@ -39846,7 +39903,7 @@
     75:76:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1837 -> o
     77:86:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1851:1860 -> o
     1:1:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2088:2088 -> p
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():425:425 -> p
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> p
     2:2:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2088 -> p
     3:11:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2091:2099 -> p
     12:28:boolean com.android.tools.r8.ir.optimize.CodeRewriter.allowNewFilledArrayConstruction(com.android.tools.r8.ir.code.Instruction):2064:2080 -> p
@@ -40006,8 +40063,8 @@
     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):3650 -> u
     9:41:void workaroundNumberConversionRegisterAllocationBug(com.android.tools.r8.ir.code.IRCode):3651:3683 -> u
-com.android.tools.r8.ir.optimize.CodeRewriter$1 -> com.android.tools.r8.internal.A6$a:
-com.android.tools.r8.ir.optimize.CodeRewriter$CSEExpressionEquivalence -> com.android.tools.r8.internal.A6$b:
+com.android.tools.r8.ir.optimize.CodeRewriter$1 -> com.android.tools.r8.internal.B6$a:
+com.android.tools.r8.ir.optimize.CodeRewriter$CSEExpressionEquivalence -> com.android.tools.r8.internal.B6$b:
     com.android.tools.r8.utils.InternalOptions options -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():2255:2255 -> <clinit>
@@ -40019,7 +40076,7 @@
     2:2:boolean doEquivalent(java.lang.Object,java.lang.Object):2255 -> a
     3:3:boolean com.android.tools.r8.ir.optimize.CodeRewriter$CSEExpressionEquivalence.doEquivalent(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2268:2268 -> a
     3:3:boolean doEquivalent(java.lang.Object,java.lang.Object):2255 -> a
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():1597:1597 -> a
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():1604:1604 -> a
     4:4:boolean com.android.tools.r8.ir.optimize.CodeRewriter$CSEExpressionEquivalence.doEquivalent(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2268 -> a
     4:4:boolean doEquivalent(java.lang.Object,java.lang.Object):2255 -> a
     5:20:boolean com.android.tools.r8.ir.optimize.CodeRewriter$CSEExpressionEquivalence.doEquivalent(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2272:2287 -> a
@@ -40029,7 +40086,7 @@
     22:36:int doHash(java.lang.Object):2255 -> a
     37:42:boolean identicalValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):2319:2324 -> a
     43:47:int getHashCode(com.android.tools.r8.ir.code.Value):2330:2334 -> a
-com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder -> com.android.tools.r8.internal.A6$c:
+com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder -> com.android.tools.r8.internal.B6$c:
     com.android.tools.r8.ir.code.BasicBlock fallthrough -> h
     com.android.tools.r8.ir.code.BasicBlock target -> g
     com.android.tools.r8.ir.code.IRCode code -> d
@@ -40049,17 +40106,17 @@
     17:20:com.android.tools.r8.ir.code.BasicBlock build():669 -> a
     21:23:com.android.tools.r8.ir.code.BasicBlock build():671:673 -> a
     1:1:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setTarget(com.android.tools.r8.ir.code.BasicBlock):648:648 -> b
-com.android.tools.r8.ir.optimize.CodeRewriter$InstanceOfResult -> com.android.tools.r8.internal.A6$d:
+com.android.tools.r8.ir.optimize.CodeRewriter$InstanceOfResult -> com.android.tools.r8.internal.B6$d:
     com.android.tools.r8.ir.optimize.CodeRewriter$InstanceOfResult FALSE -> c
     com.android.tools.r8.ir.optimize.CodeRewriter$InstanceOfResult TRUE -> b
     com.android.tools.r8.ir.optimize.CodeRewriter$InstanceOfResult UNKNOWN -> a
     1:3:void <clinit>():143:145 -> <clinit>
     1:1:void <init>(java.lang.String,int):142:142 -> <init>
-com.android.tools.r8.ir.optimize.CodeRewriter$InstructionBuilder -> com.android.tools.r8.internal.A6$e:
+com.android.tools.r8.ir.optimize.CodeRewriter$InstructionBuilder -> com.android.tools.r8.internal.B6$e:
     com.android.tools.r8.ir.code.Position position -> b
     int blockNumber -> a
     1:2:void <init>(com.android.tools.r8.ir.code.Position):548:549 -> <init>
-com.android.tools.r8.ir.optimize.CodeRewriter$Interval -> com.android.tools.r8.internal.A6$f:
+com.android.tools.r8.ir.optimize.CodeRewriter$Interval -> com.android.tools.r8.internal.B6$f:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList keys -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():754:754 -> <clinit>
@@ -40084,12 +40141,12 @@
     10:10:int com.android.tools.r8.ir.optimize.CodeRewriter$Interval.getMin():767:767 -> b
     10:10:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):775 -> b
     11:12:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):775:776 -> b
-com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult -> com.android.tools.r8.internal.A6$g:
+com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult -> com.android.tools.r8.internal.B6$g:
     com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult NO_REMOVALS -> a
     com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult REMOVED_CAST_DO_NARROW -> b
     1:2:void <clinit>():1301:1302 -> <clinit>
     1:1:void <init>(java.lang.String,int):1300:1300 -> <init>
-com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder -> com.android.tools.r8.internal.A6$h:
+com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder -> com.android.tools.r8.internal.B6$h:
     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
@@ -40104,7 +40161,7 @@
     30:31:com.android.tools.r8.ir.code.BasicBlock build(com.android.tools.r8.ir.code.IRMetadata):613:614 -> 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):603:603 -> 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):609:609 -> b
-com.android.tools.r8.ir.optimize.ConstantCanonicalizer -> com.android.tools.r8.internal.e7:
+com.android.tools.r8.ir.optimize.ConstantCanonicalizer -> com.android.tools.r8.internal.f7:
     com.android.tools.r8.ir.optimize.CodeRewriter codeRewriter -> b
     int numberOfConstClassCanonicalization -> f
     int numberOfEffectivelyFinalFieldCanonicalization -> g
@@ -40171,7 +40228,7 @@
     348:348:boolean lambda$canonicalize$2(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):199:199 -> a
     349:349: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.d7:
+com.android.tools.r8.ir.optimize.ConstantCanonicalizer$1 -> com.android.tools.r8.internal.e7:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():95:95 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.optimize.ConstantCanonicalizer):95:95 -> <init>
@@ -40187,7 +40244,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.z7:
+com.android.tools.r8.ir.optimize.DeadCodeRemover -> com.android.tools.r8.internal.A7:
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.ir.optimize.CodeRewriter codeRewriter -> c
     boolean $assertionsDisabled -> a
@@ -40228,7 +40285,7 @@
     15:15:boolean verifyNoDeadCode(com.android.tools.r8.ir.code.IRCode):73 -> b
     16:16:boolean verifyNoDeadCode(com.android.tools.r8.ir.code.IRCode):74:74 -> b
     17:17:boolean verifyNoDeadCode(com.android.tools.r8.ir.code.IRCode):73:73 -> b
-com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult -> com.android.tools.r8.internal.z7$a:
+com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult -> com.android.tools.r8.internal.A7$a:
     com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult DEFINITELY_DEAD_INSTANCE -> a
     com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult DEFINITELY_NOT_DEAD_INSTANCE -> b
     1:9:void <clinit>():226:234 -> <clinit>
@@ -40239,11 +40296,11 @@
     boolean isMaybeDead() -> c
     boolean isNotDead() -> d
     1:1:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult notDead():247:247 -> e
-com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult$1 -> com.android.tools.r8.internal.w7:
+com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult$1 -> com.android.tools.r8.internal.x7:
     1:1:void <init>():227:227 -> <init>
-com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult$2 -> com.android.tools.r8.internal.x7:
+com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult$2 -> com.android.tools.r8.internal.y7:
     1:1:void <init>():235:235 -> <init>
-com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult$3 -> com.android.tools.r8.internal.y7:
+com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult$3 -> com.android.tools.r8.internal.z7:
     com.android.tools.r8.ir.code.Value val$inValueRequiredToBeDead -> c
     1:1:void <init>(com.android.tools.r8.ir.code.Value):251:251 -> <init>
     1:1:java.lang.Iterable getValuesRequiredToBeDead():264:264 -> b
@@ -40267,7 +40324,7 @@
     40:42:boolean isSingleTargetInvalid(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):92:94 -> a
     40:42:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):263 -> a
     43:52:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):122:131 -> a
-    53:53:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():425:425 -> a
+    53:53:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> a
     53:53:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):131 -> a
     54:79:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):131:156 -> a
     80:185:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInSameFeatureOrBothInBase(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):0:105 -> a
@@ -40309,7 +40366,7 @@
     2:13:int computeInstructionLimit(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):230:241 -> b
     2:13:boolean satisfiesRequirementsForSimpleInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):222 -> b
     14:14:boolean satisfiesRequirementsForSimpleInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):223:223 -> b
-com.android.tools.r8.ir.optimize.Devirtualizer -> com.android.tools.r8.internal.q8:
+com.android.tools.r8.ir.optimize.Devirtualizer -> com.android.tools.r8.internal.r8:
     com.android.tools.r8.graph.AppView appView -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():47:47 -> <clinit>
@@ -40340,46 +40397,39 @@
     99:560:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):147 -> a
     561:561:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.ir.optimize.Devirtualizer.rebindSuperInvokeToMostSpecific(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):301:301 -> a
     561:561:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):147 -> a
-    562:562:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getReference():375:375 -> a
-    562:562:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedMethod.getHolderType():363 -> a
+    562:562:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
     562:562:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.ir.optimize.Devirtualizer.rebindSuperInvokeToMostSpecific(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):301 -> a
     562:562:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):147 -> a
-    563:563:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedMethod.getHolderType():363:363 -> a
-    563:563:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.ir.optimize.Devirtualizer.rebindSuperInvokeToMostSpecific(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):301 -> a
-    563:563:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):147 -> a
-    564:564:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    564:564:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.ir.optimize.Devirtualizer.rebindSuperInvokeToMostSpecific(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):301 -> a
-    564:564:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):147 -> a
-    565:575:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.ir.optimize.Devirtualizer.rebindSuperInvokeToMostSpecific(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):303:313 -> a
-    565:575:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):147 -> a
-    576:576:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.graph.AccessControl.isMemberAccessible(com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView):54:54 -> a
-    576:576:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.ir.optimize.Devirtualizer.rebindSuperInvokeToMostSpecific(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):313 -> a
-    576:576:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):147 -> a
-    577:577:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.ir.optimize.Devirtualizer.rebindSuperInvokeToMostSpecific(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):313:313 -> a
-    577:577:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):147 -> a
-    578:584:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):148:154 -> a
-    585:599:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):149:163 -> a
-    600:636:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.optimize.Devirtualizer.rebindVirtualInvokeToMostSpecific(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):332:368 -> a
-    600:636:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):163 -> a
-    637:639:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):165:165 -> a
-    640:640:boolean com.android.tools.r8.ir.code.Instruction.isInvokeInterface():0:0 -> a
-    640:640:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):171 -> a
-    641:677:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):174:210 -> a
-    678:697:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):209:228 -> a
-    698:698:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):1105:1105 -> a
-    698:698:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):235 -> a
-    699:721:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):237:259 -> a
-    722:722:void com.android.tools.r8.ir.code.DominatorTree.<init>(com.android.tools.r8.ir.code.IRCode):37:37 -> a
-    722:722:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):259 -> a
-    723:738:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):261:276 -> a
-    739:743:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):275:279 -> a
-    744:744:com.android.tools.r8.ir.optimize.AssumeRemover com.android.tools.r8.ir.optimize.AssumeRemover.removeMarkedInstructions():90:90 -> a
-    744:744:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):285 -> a
-    745:747:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):286:288 -> a
-    748:748:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> a
-    748:748:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):288 -> a
-    749:751:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):288:290 -> a
-com.android.tools.r8.ir.optimize.DynamicTypeOptimization -> com.android.tools.r8.internal.b9:
+    563:573:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.ir.optimize.Devirtualizer.rebindSuperInvokeToMostSpecific(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):303:313 -> a
+    563:573:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):147 -> a
+    574:574:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.graph.AccessControl.isMemberAccessible(com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView):54:54 -> a
+    574:574:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.ir.optimize.Devirtualizer.rebindSuperInvokeToMostSpecific(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):313 -> a
+    574:574:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):147 -> a
+    575:575:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.ir.optimize.Devirtualizer.rebindSuperInvokeToMostSpecific(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):313:313 -> a
+    575:575:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):147 -> a
+    576:582:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):148:154 -> a
+    583:597:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):149:163 -> a
+    598:634:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.optimize.Devirtualizer.rebindVirtualInvokeToMostSpecific(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):332:368 -> a
+    598:634:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):163 -> a
+    635:637:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):165:165 -> a
+    638:638:boolean com.android.tools.r8.ir.code.Instruction.isInvokeInterface():0:0 -> a
+    638:638:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):171 -> a
+    639:675:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):174:210 -> a
+    676:695:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):209:228 -> a
+    696:696:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):1105:1105 -> a
+    696:696:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):235 -> a
+    697:719:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):237:259 -> a
+    720:720:void com.android.tools.r8.ir.code.DominatorTree.<init>(com.android.tools.r8.ir.code.IRCode):37:37 -> a
+    720:720:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):259 -> a
+    721:736:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):261:276 -> a
+    737:741:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):275:279 -> a
+    742:742:com.android.tools.r8.ir.optimize.AssumeRemover com.android.tools.r8.ir.optimize.AssumeRemover.removeMarkedInstructions():90:90 -> a
+    742:742:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):285 -> a
+    743:745:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):286:288 -> a
+    746:746:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> a
+    746:746:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):288 -> a
+    747:749:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):288:290 -> a
+com.android.tools.r8.ir.optimize.DynamicTypeOptimization -> com.android.tools.r8.internal.c9:
     com.android.tools.r8.graph.AppView appView -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():19:19 -> <clinit>
@@ -40405,7 +40455,7 @@
     6:18:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):77:89 -> a
     6:18:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):70 -> a
     19:22:com.android.tools.r8.graph.DexType getReceiverTypeIfKnown(com.android.tools.r8.ir.code.InvokeMethod):135:138 -> a
-com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer -> com.android.tools.r8.internal.sc:
+com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer -> com.android.tools.r8.internal.tc:
     com.android.tools.r8.graph.DexItemFactory factory -> c
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap histogramOfCanonicalizationCandidatesPerMethod -> f
@@ -40444,7 +40494,7 @@
     221:243:void insertCanonicalizedInvokeWithInValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Invoke):287:309 -> a
     244:244:boolean lambda$insertCanonicalizedInvokeWithInValues$6(com.android.tools.r8.ir.code.Instruction):304:304 -> a
     1:1:boolean lambda$canonicalize$3(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):214:214 -> b
-com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer$1 -> com.android.tools.r8.internal.rc:
+com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer$1 -> com.android.tools.r8.internal.sc:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():97:97 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer):97:97 -> <init>
@@ -40471,73 +40521,70 @@
     2:27:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.MainDexTracingResult,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):93:118 -> <init>
     boolean lambda$performInliningImpl$1(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock) -> a
     1:14:boolean neverInline(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):126:139 -> a
-    15:29:boolean neverInline(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):138:152 -> a
-    30:30:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getReference():375:375 -> a
-    30:30:boolean neverInline(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):152 -> a
-    31:32:boolean neverInline(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):152:153 -> a
-    33:33:boolean neverInline(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):142:142 -> a
-    34:40:boolean returnsIntAsBoolean(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):201:207 -> a
-    41:41:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():869:869 -> a
-    41:41:boolean returnsIntAsBoolean(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):207 -> a
-    42:42:boolean isDoubleInlineSelectedTarget(com.android.tools.r8.graph.ProgramMethod):217:217 -> a
-    43:55:void recordDoubleInliningCandidate(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):233:245 -> a
-    56:57:com.android.tools.r8.utils.collections.ProgramMethodSet methodsToRevisit():251:252 -> a
-    58:64:void performForcedInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,java.util.Map,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):865:871 -> a
-    65:65:void performForcedInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,java.util.Map,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):866:866 -> a
-    66:72:void performInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing,com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy):898:904 -> a
-    73:73:com.android.tools.r8.ir.optimize.DefaultInliningOracle createDefaultOracle(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,int,int,com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy):940:940 -> a
-    73:73:void performInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing,com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy):900 -> a
-    74:77:void performInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing,com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy):906:909 -> a
-    78:80:com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy createDefaultInliningReasonStrategy(com.android.tools.r8.ir.conversion.MethodProcessor):914:916 -> a
-    81:81:com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy lambda$createDefaultInliningReasonStrategy$0(com.android.tools.r8.ir.optimize.inliner.DefaultInliningReasonStrategy,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):917:917 -> a
-    82:82:com.android.tools.r8.ir.optimize.DefaultInliningOracle createDefaultOracle(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,int,int):931:931 -> a
-    83:83:com.android.tools.r8.ir.optimize.DefaultInliningOracle createDefaultOracle(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,int,int,com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy):940:940 -> a
-    83:83:com.android.tools.r8.ir.optimize.DefaultInliningOracle createDefaultOracle(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,int,int):926 -> a
-    84:137:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):958:1011 -> a
-    138:148:com.android.tools.r8.graph.DexType getDowncastTypeIfNeeded(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):1138:1148 -> a
-    138:148:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):1015 -> a
-    149:149:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):1017:1017 -> a
-    150:185:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):0:35 -> a
-    150:185:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):1017 -> a
-    186:195:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):1018:1027 -> a
-    196:249:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):1026:1079 -> a
-    250:264:void postProcessInlineeBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.Timing):1161:1175 -> a
-    250:264:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):1079 -> a
+    15:30:boolean neverInline(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):138:153 -> a
+    31:31:boolean neverInline(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):142:142 -> a
+    32:38:boolean returnsIntAsBoolean(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):201:207 -> a
+    39:39:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():869:869 -> a
+    39:39:boolean returnsIntAsBoolean(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):207 -> a
+    40:40:boolean isDoubleInlineSelectedTarget(com.android.tools.r8.graph.ProgramMethod):217:217 -> a
+    41:53:void recordDoubleInliningCandidate(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):233:245 -> a
+    54:55:com.android.tools.r8.utils.collections.ProgramMethodSet methodsToRevisit():251:252 -> a
+    56:62:void performForcedInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,java.util.Map,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):865:871 -> a
+    63:63:void performForcedInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,java.util.Map,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):866:866 -> a
+    64:70:void performInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing,com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy):898:904 -> a
+    71:71:com.android.tools.r8.ir.optimize.DefaultInliningOracle createDefaultOracle(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,int,int,com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy):940:940 -> a
+    71:71:void performInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing,com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy):900 -> a
+    72:75:void performInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing,com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy):906:909 -> a
+    76:78:com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy createDefaultInliningReasonStrategy(com.android.tools.r8.ir.conversion.MethodProcessor):914:916 -> a
+    79:79:com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy lambda$createDefaultInliningReasonStrategy$0(com.android.tools.r8.ir.optimize.inliner.DefaultInliningReasonStrategy,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):917:917 -> a
+    80:80:com.android.tools.r8.ir.optimize.DefaultInliningOracle createDefaultOracle(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,int,int):931:931 -> a
+    81:81:com.android.tools.r8.ir.optimize.DefaultInliningOracle createDefaultOracle(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,int,int,com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy):940:940 -> a
+    81:81:com.android.tools.r8.ir.optimize.DefaultInliningOracle createDefaultOracle(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,int,int):926 -> a
+    82:135:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):958:1011 -> a
+    136:146:com.android.tools.r8.graph.DexType getDowncastTypeIfNeeded(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):1138:1148 -> a
+    136:146:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):1015 -> a
+    147:147:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):1017:1017 -> a
+    148:183:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):0:35 -> a
+    148:183:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):1017 -> a
+    184:193:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):1018:1027 -> a
+    194:247:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):1026:1079 -> a
+    248:262:void postProcessInlineeBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.Timing):1161:1175 -> a
+    248:262:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):1079 -> a
+    263:263:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):1082:1082 -> a
+    264:264:boolean com.android.tools.r8.graph.DexEncodedMethod.isBridge():472:472 -> a
+    264:264:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):1082 -> a
     265:265:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):1082:1082 -> a
-    266:266:boolean com.android.tools.r8.graph.DexEncodedMethod.isBridge():466:466 -> a
+    266:266:boolean com.android.tools.r8.graph.DexEncodedMethod.isBridge():472:472 -> a
     266:266:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):1082 -> a
-    267:267:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):1082:1082 -> a
-    268:268:boolean com.android.tools.r8.graph.DexEncodedMethod.isBridge():466:466 -> a
-    268:268:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):1082 -> a
-    269:288:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):1083:1102 -> a
-    289:291:java.lang.Object com.android.tools.r8.utils.IteratorUtils.previousUntil(java.util.ListIterator,java.util.function.Predicate):71:73 -> a
-    289:291:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):1102 -> a
-    292:292:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):1103:1103 -> a
-    293:293:java.lang.Object com.android.tools.r8.utils.IteratorUtils.previousUntil(java.util.ListIterator,java.util.function.Predicate):77:77 -> a
-    293:293:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):1102 -> a
-    294:294:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> a
-    294:294:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):1105 -> a
-    295:305:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):1106:1116 -> a
-    306:312:boolean containsPotentialCatchHandlerVerificationError(com.android.tools.r8.ir.code.IRCode):1120:1126 -> a
-    306:312:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):174 -> a
-    313:313:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    313:313:boolean containsPotentialCatchHandlerVerificationError(com.android.tools.r8.ir.code.IRCode):1126 -> a
-    313:313:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):174 -> a
-    314:314:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    314:314:boolean containsPotentialCatchHandlerVerificationError(com.android.tools.r8.ir.code.IRCode):1127 -> a
-    314:314:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):174 -> a
-    315:316:boolean containsPotentialCatchHandlerVerificationError(com.android.tools.r8.ir.code.IRCode):1127:1128 -> a
-    315:316:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):174 -> a
-    317:329:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):175:187 -> a
-    330:332:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget instructionAllowedForInlining(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):166:168 -> a
-    330:332:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):189 -> a
-    333:333:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):195:195 -> a
-    334:337:void insertAssumeInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,java.util.Set,com.android.tools.r8.utils.Timing):1185:1188 -> a
-    338:343:void applyMemberValuePropagationToInlinee(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,java.util.Set):1196:1201 -> a
-    344:344:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> a
-    344:344:void applyMemberValuePropagationToInlinee(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,java.util.Set):1201 -> a
-    345:347:void applyMemberValuePropagationToInlinee(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,java.util.Set):1201:1203 -> a
-    348:351:void rewindBlockIteratorToFirstInlineeBlock(java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):1209:1212 -> a
+    267:286:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):1083:1102 -> a
+    287:289:java.lang.Object com.android.tools.r8.utils.IteratorUtils.previousUntil(java.util.ListIterator,java.util.function.Predicate):71:73 -> a
+    287:289:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):1102 -> a
+    290:290:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):1103:1103 -> a
+    291:291:java.lang.Object com.android.tools.r8.utils.IteratorUtils.previousUntil(java.util.ListIterator,java.util.function.Predicate):77:77 -> a
+    291:291:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):1102 -> a
+    292:292:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> a
+    292:292:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):1105 -> a
+    293:303:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):1106:1116 -> a
+    304:310:boolean containsPotentialCatchHandlerVerificationError(com.android.tools.r8.ir.code.IRCode):1120:1126 -> a
+    304:310:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):174 -> a
+    311:311:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    311:311:boolean containsPotentialCatchHandlerVerificationError(com.android.tools.r8.ir.code.IRCode):1126 -> a
+    311:311:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):174 -> a
+    312:312:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    312:312:boolean containsPotentialCatchHandlerVerificationError(com.android.tools.r8.ir.code.IRCode):1127 -> a
+    312:312:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):174 -> a
+    313:314:boolean containsPotentialCatchHandlerVerificationError(com.android.tools.r8.ir.code.IRCode):1127:1128 -> a
+    313:314:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):174 -> a
+    315:327:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):175:187 -> a
+    328:330:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget instructionAllowedForInlining(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):166:168 -> a
+    328:330:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):189 -> a
+    331:331:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):195:195 -> a
+    332:335:void insertAssumeInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,java.util.Set,com.android.tools.r8.utils.Timing):1185:1188 -> a
+    336:341:void applyMemberValuePropagationToInlinee(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,java.util.Set):1196:1201 -> a
+    342:342:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> a
+    342:342:void applyMemberValuePropagationToInlinee(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,java.util.Set):1201 -> a
+    343:345:void applyMemberValuePropagationToInlinee(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,java.util.Set):1201:1203 -> a
+    346:349:void rewindBlockIteratorToFirstInlineeBlock(java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):1209:1212 -> a
     java.util.Collection codeOptimizationsForPostProcessing() -> b
     1:7:boolean satisfiesRequirementsForDoubleInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):222:228 -> b
     8:13:int numberOfInstructions(com.android.tools.r8.ir.code.IRCode):815:820 -> b
@@ -40621,9 +40668,9 @@
     25:25:void synthesizeInitClass(com.android.tools.r8.ir.code.IRCode):770:770 -> a
     25:25:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):618 -> a
     26:27:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):628:629 -> a
-    28:28:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():486:486 -> a
+    28:28:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():492:492 -> a
     28:28:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):629 -> a
-    29:29:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():425:425 -> a
+    29:29:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> a
     29:29:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):629 -> a
     30: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.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):630:632 -> a
     33:56:void synthesizeNullCheckForReceiver(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):774:797 -> a
@@ -40656,7 +40703,7 @@
     com.android.tools.r8.ir.optimize.Inliner$Reason reason -> a
     com.android.tools.r8.ir.code.IRCode code -> b
     1:3:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.Inliner$Reason):807:809 -> <init>
-com.android.tools.r8.ir.optimize.Inliner$InliningInfo -> com.android.tools.r8.internal.Fd:
+com.android.tools.r8.ir.optimize.Inliner$InliningInfo -> com.android.tools.r8.internal.Gd:
     com.android.tools.r8.graph.DexType receiverType -> b
     com.android.tools.r8.graph.ProgramMethod target -> a
     1:3:void <init>(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):853:855 -> <init>
@@ -40736,7 +40783,7 @@
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeNewArray(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):194:194 -> f
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forNewArrayEmpty(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):283:283 -> g
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):291:291 -> h
-com.android.tools.r8.ir.optimize.InliningOracle -> com.android.tools.r8.internal.Id:
+com.android.tools.r8.ir.optimize.InliningOracle -> com.android.tools.r8.internal.Jd:
     com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
     boolean isForcedInliningOracle() -> a
     com.android.tools.r8.graph.ProgramMethod lookupSingleTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod) -> a
@@ -40749,7 +40796,7 @@
     void markInlined(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason) -> a
     boolean stillHasBudget(com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
     boolean willExceedBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
-com.android.tools.r8.ir.optimize.InstructionEquivalence -> com.android.tools.r8.internal.he:
+com.android.tools.r8.ir.optimize.InstructionEquivalence -> com.android.tools.r8.internal.ie:
     com.android.tools.r8.ir.regalloc.RegisterAllocator allocator -> a
     1:2:void <init>(com.android.tools.r8.ir.regalloc.RegisterAllocator):14:15 -> <init>
     1:1:boolean doEquivalent(java.lang.Object,java.lang.Object):11:11 -> a
@@ -40757,7 +40804,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.Qn:
+com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool -> com.android.tools.r8.internal.Rn:
     com.android.tools.r8.com.google.common.base.Equivalence equivalence -> b
     java.util.Set interfaces -> d
     java.util.Set subTypes -> e
@@ -40787,7 +40834,7 @@
     4:4:boolean lambda$hasSeenBelow$2(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):225:225 -> c
     1:1:boolean hasSeenStrictlyBelow(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):216:216 -> d
     1:2:void seen(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):191:192 -> e
-com.android.tools.r8.ir.optimize.MemberValuePropagation -> com.android.tools.r8.internal.fo:
+com.android.tools.r8.ir.optimize.MemberValuePropagation -> com.android.tools.r8.internal.go:
     com.android.tools.r8.ir.optimize.info.OptimizationFeedback feedback -> a
     com.android.tools.r8.graph.AppView appView -> c
     java.util.Set warnedFields -> e
@@ -40846,64 +40893,64 @@
     220:227:void run(com.android.tools.r8.ir.code.IRCode):521:528 -> a
     228:228:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> a
     228:228:void run(com.android.tools.r8.ir.code.IRCode):528 -> a
-    229:231:void run(com.android.tools.r8.ir.code.IRCode):528:530 -> a
-    232:243:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):538:549 -> a
-    244:258:void com.android.tools.r8.ir.optimize.MemberValuePropagation.rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):239:253 -> a
-    244:258:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):548 -> a
-    259:259:com.android.tools.r8.ir.optimize.MemberValuePropagation$ProguardMemberRuleLookup com.android.tools.r8.ir.optimize.MemberValuePropagation.lookupMemberRule(com.android.tools.r8.graph.DexClassAndMethod):116:116 -> a
-    259:259:void com.android.tools.r8.ir.optimize.MemberValuePropagation.rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):254 -> a
-    259:259:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):548 -> a
-    260:278:void com.android.tools.r8.ir.optimize.MemberValuePropagation.rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):259:277 -> a
-    260:278:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):548 -> a
-    279:279:boolean com.android.tools.r8.graph.DexClassAndMethod.isProgramMethod():0:0 -> a
-    279:279:boolean com.android.tools.r8.ir.optimize.MemberValuePropagation.mayPropagateValueFor(com.android.tools.r8.graph.DexClassAndMethod):108 -> a
-    279:279:void com.android.tools.r8.ir.optimize.MemberValuePropagation.rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):284 -> a
-    279:279:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):548 -> a
-    280:283:boolean com.android.tools.r8.ir.optimize.MemberValuePropagation.mayPropagateValueFor(com.android.tools.r8.graph.DexClassAndMethod):109:112 -> a
-    280:283:void com.android.tools.r8.ir.optimize.MemberValuePropagation.rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):284 -> a
-    280:283:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):548 -> a
-    284:303:void com.android.tools.r8.ir.optimize.MemberValuePropagation.rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):289:308 -> a
-    284:303:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):548 -> a
-    304:315:void com.android.tools.r8.ir.optimize.MemberValuePropagation.rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):307:318 -> a
-    304:315:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):548 -> a
-    316:318:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):550:552 -> a
-    319:322:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):551:554 -> a
-    323:323:void com.android.tools.r8.ir.optimize.MemberValuePropagation.replaceInstancePutByNullCheckIfNeverRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstancePut):482:482 -> a
-    323:323:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):554 -> a
-    324:324:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():171:171 -> a
-    324:324:void com.android.tools.r8.ir.optimize.MemberValuePropagation.replaceInstancePutByNullCheckIfNeverRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstancePut):483 -> a
-    324:324:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):554 -> a
-    325:325:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedField.type():65:65 -> a
-    325:325:void com.android.tools.r8.ir.optimize.MemberValuePropagation.replaceInstancePutByNullCheckIfNeverRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstancePut):490 -> a
-    325:325:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):554 -> a
-    326:330:void com.android.tools.r8.ir.optimize.MemberValuePropagation.replaceInstancePutByNullCheckIfNeverRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstancePut):490:494 -> a
-    326:330:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):554 -> a
-    331:332:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):555:556 -> a
-    333:333: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):499:499 -> a
-    333:333:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):556 -> a
-    334:334:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():171:171 -> a
-    334:334: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):500 -> a
-    334:334:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):556 -> a
-    335:335:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedField.type():65:65 -> a
-    335:335: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):507 -> a
-    335:335:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):556 -> a
-    336:341: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):507:512 -> a
-    336:341:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):556 -> a
-    342:342: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):511:511 -> a
-    342:342:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):556 -> a
-com.android.tools.r8.ir.optimize.MemberValuePropagation$ProguardMemberRuleLookup -> com.android.tools.r8.internal.do:
+    229:232:void run(com.android.tools.r8.ir.code.IRCode):528:531 -> a
+    233:244:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):539:550 -> a
+    245:259:void com.android.tools.r8.ir.optimize.MemberValuePropagation.rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):239:253 -> a
+    245:259:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):549 -> a
+    260:260:com.android.tools.r8.ir.optimize.MemberValuePropagation$ProguardMemberRuleLookup com.android.tools.r8.ir.optimize.MemberValuePropagation.lookupMemberRule(com.android.tools.r8.graph.DexClassAndMethod):116:116 -> a
+    260:260:void com.android.tools.r8.ir.optimize.MemberValuePropagation.rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):254 -> a
+    260:260:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):549 -> a
+    261:279:void com.android.tools.r8.ir.optimize.MemberValuePropagation.rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):259:277 -> a
+    261:279:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):549 -> a
+    280:280:boolean com.android.tools.r8.graph.DexClassAndMethod.isProgramMethod():0:0 -> a
+    280:280:boolean com.android.tools.r8.ir.optimize.MemberValuePropagation.mayPropagateValueFor(com.android.tools.r8.graph.DexClassAndMethod):108 -> a
+    280:280:void com.android.tools.r8.ir.optimize.MemberValuePropagation.rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):284 -> a
+    280:280:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):549 -> a
+    281:284:boolean com.android.tools.r8.ir.optimize.MemberValuePropagation.mayPropagateValueFor(com.android.tools.r8.graph.DexClassAndMethod):109:112 -> a
+    281:284:void com.android.tools.r8.ir.optimize.MemberValuePropagation.rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):284 -> a
+    281:284:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):549 -> a
+    285:304:void com.android.tools.r8.ir.optimize.MemberValuePropagation.rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):289:308 -> a
+    285:304:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):549 -> a
+    305:316:void com.android.tools.r8.ir.optimize.MemberValuePropagation.rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):307:318 -> a
+    305:316:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):549 -> a
+    317:319:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):551:553 -> a
+    320:323:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):552:555 -> a
+    324:324:void com.android.tools.r8.ir.optimize.MemberValuePropagation.replaceInstancePutByNullCheckIfNeverRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstancePut):482:482 -> a
+    324:324:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):555 -> a
+    325:325:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():171:171 -> a
+    325:325:void com.android.tools.r8.ir.optimize.MemberValuePropagation.replaceInstancePutByNullCheckIfNeverRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstancePut):483 -> a
+    325:325:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):555 -> a
+    326:326:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedField.type():65:65 -> a
+    326:326:void com.android.tools.r8.ir.optimize.MemberValuePropagation.replaceInstancePutByNullCheckIfNeverRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstancePut):490 -> a
+    326:326:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):555 -> a
+    327:331:void com.android.tools.r8.ir.optimize.MemberValuePropagation.replaceInstancePutByNullCheckIfNeverRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstancePut):490:494 -> a
+    327:331:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):555 -> a
+    332:333:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):556:557 -> a
+    334:334: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):499:499 -> a
+    334:334:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):557 -> a
+    335:335:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():171:171 -> a
+    335:335: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):500 -> a
+    335:335:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):557 -> a
+    336:336:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedField.type():65:65 -> a
+    336:336: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):507 -> a
+    336:336:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):557 -> a
+    337:342: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):507:512 -> a
+    337:342:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):557 -> a
+    343:343: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):511:511 -> a
+    343:343:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):557 -> a
+com.android.tools.r8.ir.optimize.MemberValuePropagation$ProguardMemberRuleLookup -> com.android.tools.r8.internal.eo:
     com.android.tools.r8.shaking.ProguardMemberRule rule -> b
     com.android.tools.r8.ir.optimize.MemberValuePropagation$RuleType type -> a
     1:3:void <init>(com.android.tools.r8.ir.optimize.MemberValuePropagation$RuleType,com.android.tools.r8.shaking.ProguardMemberRule):74:76 -> <init>
     1:5:boolean equals(java.lang.Object):81:85 -> equals
     1:1:int hashCode():90:90 -> hashCode
-com.android.tools.r8.ir.optimize.MemberValuePropagation$RuleType -> com.android.tools.r8.internal.eo:
+com.android.tools.r8.ir.optimize.MemberValuePropagation$RuleType -> com.android.tools.r8.internal.fo:
     com.android.tools.r8.ir.optimize.MemberValuePropagation$RuleType ASSUME_VALUES -> c
     com.android.tools.r8.ir.optimize.MemberValuePropagation$RuleType NONE -> a
     com.android.tools.r8.ir.optimize.MemberValuePropagation$RuleType ASSUME_NO_SIDE_EFFECTS -> b
     1:3:void <clinit>():64:66 -> <clinit>
     1:1:void <init>(java.lang.String,int):63:63 -> <init>
-com.android.tools.r8.ir.optimize.MethodPoolCollection -> com.android.tools.r8.internal.Ho:
+com.android.tools.r8.ir.optimize.MethodPoolCollection -> com.android.tools.r8.internal.Io:
     com.android.tools.r8.com.google.common.base.Equivalence com.android.tools.r8.ir.optimize.MemberPoolCollection.equivalence -> b
     com.android.tools.r8.graph.AppView com.android.tools.r8.ir.optimize.MemberPoolCollection.appView -> c
     com.android.tools.r8.graph.SubtypingInfo com.android.tools.r8.ir.optimize.MemberPoolCollection.subtypingInfo -> d
@@ -40992,7 +41039,7 @@
     21:21:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> f
     21:21:void lambda$computeMemberPoolForClass$4(com.android.tools.r8.graph.DexClass):75 -> f
     22:25:void lambda$computeMemberPoolForClass$4(com.android.tools.r8.graph.DexClass):77:80 -> f
-com.android.tools.r8.ir.optimize.MoveEliminator -> com.android.tools.r8.internal.Ro:
+com.android.tools.r8.ir.optimize.MoveEliminator -> com.android.tools.r8.internal.So:
     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>
@@ -41000,7 +41047,7 @@
     1:12:boolean shouldBeEliminated(com.android.tools.r8.ir.code.Instruction):22:33 -> a
     13:51:boolean shouldBeEliminated(com.android.tools.r8.ir.code.Instruction):32:70 -> a
     52:56:boolean lambda$shouldBeEliminated$0(com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.code.Move):55:59 -> a
-com.android.tools.r8.ir.optimize.NestReducer -> com.android.tools.r8.internal.Cp:
+com.android.tools.r8.ir.optimize.NestReducer -> com.android.tools.r8.internal.Dp:
     com.android.tools.r8.graph.AppView appView -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():29:29 -> <clinit>
@@ -41038,7 +41085,7 @@
     55:55:void com.android.tools.r8.ir.optimize.NestReducer.processNestFrom(com.android.tools.r8.graph.DexClass):88 -> a
     55:55:java.lang.Object lambda$run$0(com.android.tools.r8.graph.DexProgramClass):56 -> a
     56:62:boolean hasPrivateMembers(com.android.tools.r8.graph.DexClass):122:128 -> a
-com.android.tools.r8.ir.optimize.NestUtils -> com.android.tools.r8.internal.Dp:
+com.android.tools.r8.ir.optimize.NestUtils -> com.android.tools.r8.internal.Ep:
     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
@@ -41067,7 +41114,7 @@
     221:231:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):73:83 -> a
     232:232:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> a
     232:232:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):78 -> a
-com.android.tools.r8.ir.optimize.Outliner -> com.android.tools.r8.internal.Vr:
+com.android.tools.r8.ir.optimize.Outliner -> com.android.tools.r8.internal.Xr:
     java.util.List candidateMethodLists -> b
     java.util.Map outlineSites -> c
     java.util.Map generatedOutlines -> d
@@ -41090,10 +41137,10 @@
     27:27:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.optimize.Outliner$Outline.buildMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):585:585 -> a
     27:27:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1358 -> a
     28:36:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1359:1367 -> a
-    37:37:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):257:257 -> a
+    37:37:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):261:261 -> a
     37:37:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1367 -> a
     38:41:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1367:1370 -> a
-    42:42:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():425:425 -> a
+    42:42:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> a
     42:42:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1370 -> a
     43:75:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1371:1403 -> a
     76:76:void applyOutliningCandidate(com.android.tools.r8.ir.code.IRCode):1420:1420 -> a
@@ -41112,7 +41159,7 @@
     1:1:java.util.Map access$300(com.android.tools.r8.ir.optimize.Outliner):111:111 -> d
     2:27:com.android.tools.r8.utils.collections.ProgramMethodSet selectMethodsForOutlining():1315:1340 -> d
     1:1:java.util.Map access$400(com.android.tools.r8.ir.optimize.Outliner):111:111 -> e
-com.android.tools.r8.ir.optimize.Outliner$BinOpOutlineInstruction -> com.android.tools.r8.internal.Rr:
+com.android.tools.r8.ir.optimize.Outliner$BinOpOutlineInstruction -> com.android.tools.r8.internal.Tr:
     com.android.tools.r8.ir.code.NumericType numericType -> c
     1:2:void <init>(com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType,com.android.tools.r8.ir.code.NumericType):213:214 -> <init>
     java.lang.String getDetailsString() -> a
@@ -41166,7 +41213,7 @@
     1:1:int com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction.hashCode():185:185 -> hashCode
     1:1:int hashCode():225 -> hashCode
     2:2:int hashCode():225:225 -> hashCode
-com.android.tools.r8.ir.optimize.Outliner$InvokeOutlineInstruction -> com.android.tools.r8.internal.Sr:
+com.android.tools.r8.ir.optimize.Outliner$InvokeOutlineInstruction -> com.android.tools.r8.internal.Ur:
     com.android.tools.r8.graph.DexProto proto -> g
     com.android.tools.r8.ir.code.Invoke$Type invokeType -> e
     boolean hasOutValue -> f
@@ -41203,7 +41250,7 @@
     1:1:int com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction.hashCode():185:185 -> hashCode
     1:1:int hashCode():413 -> hashCode
     2:6:int hashCode():413:417 -> hashCode
-com.android.tools.r8.ir.optimize.Outliner$NewInstanceOutlineInstruction -> com.android.tools.r8.internal.Tr:
+com.android.tools.r8.ir.optimize.Outliner$NewInstanceOutlineInstruction -> com.android.tools.r8.internal.Vr:
     com.android.tools.r8.graph.DexType clazz -> c
     1:2:void <init>(com.android.tools.r8.graph.DexType):315:316 -> <init>
     1:1:int compareTo(com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction):336:336 -> a
@@ -41222,7 +41269,7 @@
     1:1:int com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction.hashCode():185:185 -> hashCode
     1:1:int hashCode():331 -> hashCode
     2:2:int hashCode():331:331 -> hashCode
-com.android.tools.r8.ir.optimize.Outliner$Outline -> com.android.tools.r8.internal.Ur:
+com.android.tools.r8.ir.optimize.Outliner$Outline -> com.android.tools.r8.internal.Wr:
     java.util.List argumentTypes -> b
     java.util.List templateInstructions -> d
     java.util.List argumentMap -> c
@@ -41246,20 +41293,21 @@
     1:18:boolean equals(java.lang.Object):590:607 -> equals
     1:6:int hashCode():615:620 -> hashCode
     1:37:java.lang.String toString():676:712 -> toString
-com.android.tools.r8.ir.optimize.Outliner$OutlineCode -> com.android.tools.r8.internal.Vr$a:
+com.android.tools.r8.ir.optimize.Outliner$OutlineCode -> com.android.tools.r8.internal.Xr$a:
     com.android.tools.r8.ir.optimize.Outliner this$0 -> d
     com.android.tools.r8.ir.optimize.Outliner$Outline outline -> c
     1:2:void <init>(com.android.tools.r8.ir.optimize.Outliner,com.android.tools.r8.ir.optimize.Outliner$Outline):1592:1593 -> <init>
     java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.ClassNameMapper) -> a
-    1:2:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):1619:1620 -> a
-    3:3:void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry):1630:1630 -> a
-    4:4:void registerCodeReferencesForDesugaring(com.android.tools.r8.graph.ClasspathMethod,com.android.tools.r8.graph.UseRegistry):1635:1635 -> a
-    1:1:boolean computeEquals(java.lang.Object):1645:1645 -> c
-    1:1:int computeHashCode():1640:1640 -> p
-    int estimatedSizeForInlining() -> t
-    1:1:java.lang.String toString():1625:1625 -> toString
-    boolean isEmptyVoidMethod() -> w
-com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction -> com.android.tools.r8.internal.Xr:
+    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):1624:1625 -> a
+    3:3:void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry):1635:1635 -> a
+    4:4:void registerCodeReferencesForDesugaring(com.android.tools.r8.graph.ClasspathMethod,com.android.tools.r8.graph.UseRegistry):1640:1640 -> a
+    1:1:boolean computeEquals(java.lang.Object):1650:1650 -> c
+    1:1:int computeHashCode():1645:1645 -> p
+    int estimatedDexCodeSizeUpperBoundInBytes() -> t
+    1:1:java.lang.String toString():1630:1630 -> toString
+    int estimatedSizeForInlining() -> u
+    boolean isEmptyVoidMethod() -> x
+com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction -> com.android.tools.r8.internal.Zr:
     com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType type -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():126:126 -> <clinit>
@@ -41271,7 +41319,7 @@
     java.lang.String getInstructionName() -> b
     boolean hasOutValue() -> c
     int numberOfInputs() -> d
-com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType -> com.android.tools.r8.internal.Wr:
+com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType -> com.android.tools.r8.internal.Yr:
     com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType[] $VALUES -> h
     com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType ADD -> a
     com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType SUB -> b
@@ -41283,13 +41331,13 @@
     1:7:void <clinit>():132:138 -> <clinit>
     8:8:void <clinit>():131:131 -> <clinit>
     1:1:void <init>(java.lang.String,int):131:131 -> <init>
-com.android.tools.r8.ir.optimize.Outliner$OutlineMethodIdentifier -> com.android.tools.r8.internal.Yr:
+com.android.tools.r8.ir.optimize.Outliner$OutlineMethodIdentifier -> com.android.tools.r8.internal.as:
     java.util.Map candidateMap -> q
     com.android.tools.r8.ir.optimize.Outliner this$0 -> r
     1:3:void <init>(com.android.tools.r8.ir.optimize.Outliner,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.BasicBlock,java.util.Map):1143:1145 -> <init>
     1:3:void handle(int,int,com.android.tools.r8.ir.optimize.Outliner$Outline):1150:1152 -> a
     4:5:com.android.tools.r8.utils.collections.LongLivedProgramMethodMultisetBuilder addOutlineMethodList(com.android.tools.r8.ir.optimize.Outliner$Outline):1156:1157 -> a
-com.android.tools.r8.ir.optimize.Outliner$OutlineRewriter -> com.android.tools.r8.internal.Zr:
+com.android.tools.r8.ir.optimize.Outliner$OutlineRewriter -> com.android.tools.r8.internal.bs:
     java.util.ListIterator blocksIterator -> s
     java.util.List toRemove -> t
     com.android.tools.r8.ir.optimize.Outliner this$0 -> v
@@ -41307,12 +41355,12 @@
     66:66:boolean removeMethodFromOutlineList(com.android.tools.r8.ir.optimize.Outliner$Outline):1264 -> a
     67:70:boolean removeMethodFromOutlineList(com.android.tools.r8.ir.optimize.Outliner$Outline):1264:1267 -> a
     71:71:boolean lambda$removeMethodFromOutlineList$0(com.android.tools.r8.graph.ProgramMethod):1266:1266 -> a
-com.android.tools.r8.ir.optimize.Outliner$OutlineSiteIdentifier -> com.android.tools.r8.internal.as:
+com.android.tools.r8.ir.optimize.Outliner$OutlineSiteIdentifier -> com.android.tools.r8.internal.cs:
     com.android.tools.r8.ir.optimize.Outliner this$0 -> q
     1:2:void <init>(com.android.tools.r8.ir.optimize.Outliner,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.BasicBlock):1164:1165 -> <init>
     1:3:void handle(int,int,com.android.tools.r8.ir.optimize.Outliner$Outline):1170:1172 -> a
     4:4:java.util.List lambda$handle$0(com.android.tools.r8.ir.optimize.Outliner$Outline):1171:1171 -> a
-com.android.tools.r8.ir.optimize.Outliner$OutlineSourceCode -> com.android.tools.r8.internal.bs:
+com.android.tools.r8.ir.optimize.Outliner$OutlineSourceCode -> com.android.tools.r8.internal.ds:
     com.android.tools.r8.ir.optimize.Outliner this$0 -> e
     int argumentMapIndex -> d
     boolean $assertionsDisabled -> a
@@ -41345,7 +41393,7 @@
     1:1:com.android.tools.r8.ir.code.Position getCurrentPosition():1568:1568 -> e
     boolean verifyRegister(int) -> f
     int instructionIndex(int) -> g
-com.android.tools.r8.ir.optimize.Outliner$OutlineSpotter -> com.android.tools.r8.internal.cs:
+com.android.tools.r8.ir.optimize.Outliner$OutlineSpotter -> com.android.tools.r8.internal.es:
     com.android.tools.r8.graph.DexType returnType -> l
     int returnValueUsersLeft -> n
     int pendingNewInstanceIndex -> o
@@ -41376,7 +41424,7 @@
     14:14:com.android.tools.r8.graph.DexType argumentTypeFromInvoke(com.android.tools.r8.ir.code.InvokeMethod,int):926 -> a
     15:20:com.android.tools.r8.graph.DexType argumentTypeFromInvoke(com.android.tools.r8.ir.code.InvokeMethod,int):928:933 -> a
     21:27:boolean supportedArgumentType(com.android.tools.r8.ir.code.Value):938:944 -> a
-    28:28:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():425:425 -> a
+    28:28:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> a
     28:28:boolean supportedArgumentType(com.android.tools.r8.ir.code.Value):944 -> a
     29:35:boolean supportedArgumentType(com.android.tools.r8.ir.code.Value):947:953 -> a
     36:59:com.android.tools.r8.graph.DexType argumentTypeFromValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.InvokeMethod,int):959:982 -> a
@@ -41456,7 +41504,7 @@
     181:181:void process():764 -> c
     182:192:void com.android.tools.r8.ir.optimize.Outliner$OutlineSpotter.processInstruction(com.android.tools.r8.ir.code.Instruction):813:823 -> c
     182:192:void process():764 -> c
-com.android.tools.r8.ir.optimize.PeepholeOptimizer -> com.android.tools.r8.internal.ss:
+com.android.tools.r8.ir.optimize.PeepholeOptimizer -> com.android.tools.r8.internal.us:
     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
@@ -41530,7 +41578,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.us:
+com.android.tools.r8.ir.optimize.PhiOptimizations -> com.android.tools.r8.internal.ws:
     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
@@ -41557,7 +41605,7 @@
     38:49:boolean tryMovePhisToStack(com.android.tools.r8.ir.code.IRCode):118 -> b
     50:63:boolean com.android.tools.r8.ir.optimize.PhiOptimizations.tryMovePhiToStack(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Phi,java.util.Set):160:173 -> b
     50:63:boolean tryMovePhisToStack(com.android.tools.r8.ir.code.IRCode):118 -> b
-com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination -> com.android.tools.r8.internal.Iv:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination -> com.android.tools.r8.internal.Kv:
     com.android.tools.r8.ir.code.IRCode code -> e
     com.android.tools.r8.graph.AppView appView -> c
     com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState activeState -> h
@@ -41685,8 +41733,8 @@
     220:222:void run():341:343 -> b
     1:1:com.android.tools.r8.graph.ProgramMethod access$200(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination):53:53 -> c
     1:1:com.android.tools.r8.ir.code.IRCode access$300(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination):53:53 -> d
-com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$1 -> com.android.tools.r8.internal.Bv:
-com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState -> com.android.tools.r8.internal.Cv:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$1 -> com.android.tools.r8.internal.Dv:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState -> com.android.tools.r8.internal.Ev:
     java.util.LinkedHashSet initializedClasses -> d
     java.util.LinkedHashMap nonFinalInstanceFieldValues -> e
     java.util.LinkedHashMap finalInstanceFieldValues -> b
@@ -41747,7 +41795,7 @@
     3:3:int com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState.size(java.util.Set):831:831 -> e
     3:3:int size():825 -> e
     4:6:int size():825:827 -> e
-com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockStates -> com.android.tools.r8.internal.Dv:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockStates -> com.android.tools.r8.internal.Fv:
     java.util.LinkedHashMap activeStateAtExit -> b
     boolean $assertionsDisabled -> a
     int capacity -> c
@@ -41770,14 +41818,14 @@
     70:70:com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState computeActiveStateOnBlockEntry(com.android.tools.r8.ir.code.BasicBlock):472 -> a
     71:71:com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState computeActiveStateOnBlockEntry(com.android.tools.r8.ir.code.BasicBlock):473:473 -> a
     1:5:void removeState(com.android.tools.r8.ir.code.BasicBlock):541:545 -> b
-com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$ExistingValue -> com.android.tools.r8.internal.Ev:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$ExistingValue -> com.android.tools.r8.internal.Gv:
     com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination this$0 -> b
     com.android.tools.r8.ir.code.Value value -> a
     1:1:void <init>(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$1):88:88 -> <init>
     2:3:void <init>(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination,com.android.tools.r8.ir.code.Value):92:93 -> <init>
     1:4:void eliminateRedundantRead(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):98:101 -> a
     1:1:java.lang.String toString():106:106 -> toString
-com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldAndObject -> com.android.tools.r8.internal.Fv:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldAndObject -> com.android.tools.r8.internal.Hv:
     com.android.tools.r8.graph.DexField field -> b
     com.android.tools.r8.ir.code.Value object -> c
     boolean $assertionsDisabled -> a
@@ -41787,9 +41835,9 @@
     1:1:com.android.tools.r8.graph.DexField access$700(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldAndObject):127:127 -> a
     1:5:boolean equals(java.lang.Object):144:148 -> equals
     1:1:int hashCode():139:139 -> hashCode
-com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldValue -> com.android.tools.r8.internal.Gv:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldValue -> com.android.tools.r8.internal.Iv:
     void eliminateRedundantRead(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction) -> a
-com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$MaterializableValue -> com.android.tools.r8.internal.Hv:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$MaterializableValue -> com.android.tools.r8.internal.Jv:
     com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination this$0 -> c
     com.android.tools.r8.ir.analysis.value.SingleValue value -> b
     boolean $assertionsDisabled -> a
@@ -41798,7 +41846,7 @@
     2:4:void <init>(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination,com.android.tools.r8.ir.analysis.value.SingleValue):114:116 -> <init>
     1:3:void eliminateRedundantRead(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):121:123 -> a
     4:4:void eliminateRedundantRead(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):122:122 -> a
-com.android.tools.r8.ir.optimize.ReflectionOptimizer -> com.android.tools.r8.internal.ww:
+com.android.tools.r8.ir.optimize.ReflectionOptimizer -> com.android.tools.r8.internal.yw:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():33:33 -> <clinit>
     1:22:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):39:60 -> a
@@ -41831,14 +41879,14 @@
     142:142:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.TypeElement.classClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):385:385 -> a
     142:142:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):67 -> a
     143:146:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):68:71 -> a
-    147:147:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():425:425 -> a
+    147:147:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> a
     147:147:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):71 -> a
     148:150:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):72:74 -> a
     151:160:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):73:82 -> a
     161:161:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> a
     161:161:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):82 -> a
     162:164:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):82:84 -> a
-com.android.tools.r8.ir.optimize.ServiceLoaderRewriter -> com.android.tools.r8.internal.Ax:
+com.android.tools.r8.ir.optimize.ServiceLoaderRewriter -> com.android.tools.r8.internal.Cx:
     com.android.tools.r8.graph.AppView appView -> c
     java.util.concurrent.atomic.AtomicReference synthesizedClass -> b
     boolean $assertionsDisabled -> a
@@ -41860,13 +41908,13 @@
     105:117:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.conversion.MethodProcessingId,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):189 -> a
     118:131:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.ServiceLoaderRewriter.createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.ir.conversion.MethodProcessingId):212:225 -> a
     118:131:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.conversion.MethodProcessingId,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):189 -> a
-    132:132:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):257:257 -> a
+    132:132:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):261:261 -> a
     132:132:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.ServiceLoaderRewriter.createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.ir.conversion.MethodProcessingId):225 -> a
     132:132:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.conversion.MethodProcessingId,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):189 -> a
     133:134:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.ServiceLoaderRewriter.createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.ir.conversion.MethodProcessingId):227:228 -> a
     133:134:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.conversion.MethodProcessingId,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):189 -> a
     135:135:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.conversion.MethodProcessingId,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):190:190 -> a
-    136:136:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():425:425 -> a
+    136:136:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> a
     136:136:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.conversion.MethodProcessingId,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):190 -> a
     137:137:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.conversion.MethodProcessingId,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):191:191 -> a
     138:138:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.ServiceLoaderRewriter.createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.ir.conversion.MethodProcessingId):229:229 -> a
@@ -41874,7 +41922,7 @@
     139:175:com.android.tools.r8.graph.DexProgramClass getOrSetSynthesizedClass():233:269 -> a
     176:198:com.android.tools.r8.graph.DexProgramClass lambda$getOrSetSynthesizedClass$1(com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier,com.android.tools.r8.graph.DexProgramClass):244:266 -> a
     1:1:com.android.tools.r8.graph.DexProgramClass getSynthesizedClass():86:86 -> b
-com.android.tools.r8.ir.optimize.ServiceLoaderRewriter$Rewriter -> com.android.tools.r8.internal.zx:
+com.android.tools.r8.ir.optimize.ServiceLoaderRewriter$Rewriter -> com.android.tools.r8.internal.Bx:
     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
@@ -41884,7 +41932,7 @@
     2:5:void com.android.tools.r8.ir.optimize.ServiceLoaderRewriter$Rewriter.clearGetClassLoader(com.android.tools.r8.ir.code.InvokeVirtual):329:332 -> a
     2:5:void perform(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexMethod):312 -> a
     6:18:void perform(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexMethod):313:325 -> a
-com.android.tools.r8.ir.optimize.SwitchCaseEliminator -> com.android.tools.r8.internal.Iz:
+com.android.tools.r8.ir.optimize.SwitchCaseEliminator -> com.android.tools.r8.internal.Kz:
     com.android.tools.r8.ir.code.BasicBlock alwaysHitTarget -> g
     int alwaysHitCase -> f
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet switchCasesToBeRemoved -> i
@@ -41931,7 +41979,7 @@
     87:88:boolean optimize():89 -> d
     89:89:void com.android.tools.r8.ir.optimize.SwitchCaseEliminator.replaceSwitchByGoto():136:136 -> d
     89:89:boolean optimize():89 -> d
-com.android.tools.r8.ir.optimize.SwitchMapCollector -> com.android.tools.r8.internal.Jz:
+com.android.tools.r8.ir.optimize.SwitchMapCollector -> com.android.tools.r8.internal.Lz:
     com.android.tools.r8.graph.DexString switchMapPrefix -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.DexString kotlinSwitchMapPrefix -> c
@@ -41959,7 +42007,7 @@
     65:65:void extractSwitchMap(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.IRCode):149 -> a
     66:77:void extractSwitchMap(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.IRCode):149:160 -> a
     78:80:boolean maybeIsSwitchMap(com.android.tools.r8.graph.DexEncodedField):165:167 -> a
-com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization -> com.android.tools.r8.internal.WB:
+com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization -> com.android.tools.r8.internal.XB:
     com.android.tools.r8.graph.AppView appView -> c
     com.android.tools.r8.utils.MethodSignatureEquivalence equivalence -> a
     boolean $assertionsDisabled -> b
@@ -41991,12 +42039,12 @@
     257:257:com.android.tools.r8.graph.RewrittenPrototypeDescription getPrototypeChanges(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy):309:309 -> a
     258:262:com.android.tools.r8.graph.DexMethod getNewMethodSignature(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription):337:341 -> a
     1:16:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection getRemovedArgumentsInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy):317:332 -> b
-com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy -> com.android.tools.r8.internal.VB:
+com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy -> com.android.tools.r8.internal.WB:
     com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy ALLOW_ARGUMENT_REMOVAL -> a
     com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy DISALLOW_ARGUMENT_REMOVAL -> b
     1:2:void <clinit>():47:48 -> <clinit>
     1:1:void <init>(java.lang.String,int):46:46 -> <init>
-com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$UninstantiatedTypeOptimizationGraphLens -> com.android.tools.r8.internal.WB$a:
+com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$UninstantiatedTypeOptimizationGraphLens -> com.android.tools.r8.internal.XB$a:
     boolean $assertionsDisabled -> m
     com.android.tools.r8.graph.AppView appView -> n
     java.util.Map removedArgumentsInfoPerMethod -> o
@@ -42005,7 +42053,7 @@
     8:17:void <init>(com.android.tools.r8.com.google.common.collect.BiMap,java.util.Map,com.android.tools.r8.graph.AppView):60:69 -> <init>
     1:10:com.android.tools.r8.graph.RewrittenPrototypeDescription internalDescribePrototypeChanges(com.android.tools.r8.graph.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexMethod):75:84 -> a
     11:11:com.android.tools.r8.graph.RewrittenPrototypeDescription internalDescribePrototypeChanges(com.android.tools.r8.graph.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexMethod):83:83 -> a
-com.android.tools.r8.ir.optimize.UnusedArgumentsCollector -> com.android.tools.r8.internal.jC:
+com.android.tools.r8.ir.optimize.UnusedArgumentsCollector -> com.android.tools.r8.internal.kC:
     com.android.tools.r8.ir.optimize.MethodPoolCollection methodPoolCollection -> d
     com.android.tools.r8.graph.AppView appView -> c
     com.android.tools.r8.com.google.common.collect.BiMap methodMapping -> e
@@ -42039,25 +42087,25 @@
     1:8:void processDirectMethods(com.android.tools.r8.graph.DexProgramClass):215:222 -> b
     1:6:void processVirtualMethods(com.android.tools.r8.graph.DexProgramClass):252:257 -> c
     1:1:java.lang.Runnable runnableForClass(com.android.tools.r8.graph.DexProgramClass):211:211 -> d
-com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$1 -> com.android.tools.r8.internal.gC:
-com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$CollectUsedArguments -> com.android.tools.r8.internal.hC:
+com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$1 -> com.android.tools.r8.internal.hC:
+com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$CollectUsedArguments -> com.android.tools.r8.internal.iC:
     java.util.BitSet used -> a
     1:3:void <init>():336:338 -> <init>
     4:4:void <init>(com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$1):336:336 -> <init>
     1:1:java.util.BitSet getUsedArguments():341:341 -> a
     2:2:boolean register(int):346:346 -> a
-com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$GloballyUsedSignatures -> com.android.tools.r8.internal.iC:
+com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$GloballyUsedSignatures -> com.android.tools.r8.internal.jC:
     com.android.tools.r8.ir.optimize.UnusedArgumentsCollector this$0 -> b
     com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool methodPool -> a
     1:2:void <init>(com.android.tools.r8.ir.optimize.UnusedArgumentsCollector,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):178:179 -> <init>
     1:11:com.android.tools.r8.graph.DexMethod getNewSignature(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProto):188:198 -> a
     12:14:com.android.tools.r8.graph.DexEncodedMethod removeArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):204:206 -> a
     15:15:com.android.tools.r8.graph.DexEncodedMethod removeArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):205:205 -> a
-com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$UnusedArgumentsGraphLens -> com.android.tools.r8.internal.jC$a:
+com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$UnusedArgumentsGraphLens -> com.android.tools.r8.internal.kC$a:
     java.util.Map removedArguments -> m
     1:9:void <init>(java.util.Map,java.util.Map,java.util.Map,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexItemFactory,java.util.Map):67:75 -> <init>
     1:3:com.android.tools.r8.graph.RewrittenPrototypeDescription internalDescribePrototypeChanges(com.android.tools.r8.graph.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexMethod):81:81 -> a
-com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$UsedSignatures -> com.android.tools.r8.internal.kC:
+com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$UsedSignatures -> com.android.tools.r8.internal.lC:
     java.util.Set usedSignatures -> c
     com.android.tools.r8.utils.MethodSignatureEquivalence equivalence -> b
     com.android.tools.r8.ir.optimize.UnusedArgumentsCollector this$0 -> d
@@ -42106,11 +42154,11 @@
     134:145: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):287:298 -> a
     134:145: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):272 -> a
     134:145:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus lambda$processMethodCode$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):158 -> a
-    146:146:boolean com.android.tools.r8.graph.DexClass.initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppView):715:715 -> a
+    146:146:boolean com.android.tools.r8.graph.DexClass.initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppView):719:719 -> a
     146:146: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):303 -> a
     146:146: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):272 -> a
     146:146:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus lambda$processMethodCode$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):158 -> a
-    147:147:boolean com.android.tools.r8.graph.DexClass.initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppView):714:714 -> a
+    147:147:boolean com.android.tools.r8.graph.DexClass.initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppView):718:718 -> a
     147:147: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):303 -> a
     147:147: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):272 -> a
     147:147:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus lambda$processMethodCode$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):158 -> a
@@ -42204,7 +42252,7 @@
     5:5:boolean verifyReceiverSetsAreDisjoint():124 -> c
     6:6:boolean verifyReceiverSetsAreDisjoint():124:124 -> c
     1:1:java.util.List lambda$addDeferredAliasValidityCheck$0(com.android.tools.r8.ir.code.Value):84:84 -> d
-com.android.tools.r8.ir.optimize.classinliner.FieldValueHelper -> com.android.tools.r8.internal.Ja:
+com.android.tools.r8.ir.optimize.classinliner.FieldValueHelper -> com.android.tools.r8.internal.Ka:
     com.android.tools.r8.ir.code.Instruction root -> d
     com.android.tools.r8.ir.code.Value defaultValue -> f
     com.android.tools.r8.graph.AppView appView -> e
@@ -42227,7 +42275,7 @@
     82:85:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):162:165 -> a
     1:3:com.android.tools.r8.ir.code.Value getValueForFieldRead(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):63:65 -> b
     4:16:com.android.tools.r8.ir.code.Value getOrCreateOutValue(com.android.tools.r8.ir.code.BasicBlock):69:81 -> b
-com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor -> com.android.tools.r8.internal.Ed:
+com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor -> com.android.tools.r8.internal.Fd:
     com.android.tools.r8.graph.DexProgramClass eligibleClass -> l
     java.util.Map directInlinees -> q
     java.util.List indirectInlinees -> r
@@ -42463,21 +42511,21 @@
     1133:1140:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):1261 -> a
     1141:1143:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleIndirectVirtualMethodCall(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):1006:1008 -> a
     1141:1143:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):1257 -> a
-    1144:1597:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.graph.DexEncodedMethod.asProgramMethodOrNull(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier):0:453 -> a
-    1144:1597:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleIndirectVirtualMethodCall(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):1007 -> a
-    1144:1597:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):1257 -> a
-    1598:1598:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleIndirectVirtualMethodCall(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):1010:1010 -> a
-    1598:1598:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):1257 -> a
-    1599:1623:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):1270:1294 -> a
-    1624:1624:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):1288:1288 -> a
-    1625:1625:void markSizeForInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):1322:1322 -> a
-    1626:1627:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.exemptFromInstructionLimit(com.android.tools.r8.graph.ProgramMethod):1317:1318 -> a
-    1626:1627:void markSizeForInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):1323 -> a
-    1628:1630:void markSizeForInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):1325:1327 -> a
-    1631:1640:boolean isEligibleSingleTarget(com.android.tools.r8.graph.ProgramMethod):1336:1345 -> a
-    1641:1641:boolean isEligibleSingleTarget(com.android.tools.r8.graph.ProgramMethod):1341:1341 -> a
-    1642:1642:void lambda$removeInstruction$6(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):1359:1359 -> a
-    1643:1644:void removeInstruction(com.android.tools.r8.ir.code.Instruction):1359:1360 -> a
+    1144:1603:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.graph.DexEncodedMethod.asProgramMethodOrNull(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier):0:459 -> a
+    1144:1603:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleIndirectVirtualMethodCall(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):1007 -> a
+    1144:1603:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):1257 -> a
+    1604:1604:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleIndirectVirtualMethodCall(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):1010:1010 -> a
+    1604:1604:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):1257 -> a
+    1605:1629:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):1270:1294 -> a
+    1630:1630:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):1288:1288 -> a
+    1631:1631:void markSizeForInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):1322:1322 -> a
+    1632:1633:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.exemptFromInstructionLimit(com.android.tools.r8.graph.ProgramMethod):1317:1318 -> a
+    1632:1633:void markSizeForInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):1323 -> a
+    1634:1636:void markSizeForInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):1325:1327 -> a
+    1637:1646:boolean isEligibleSingleTarget(com.android.tools.r8.graph.ProgramMethod):1336:1345 -> a
+    1647:1647:boolean isEligibleSingleTarget(com.android.tools.r8.graph.ProgramMethod):1341:1341 -> a
+    1648:1648:void lambda$removeInstruction$6(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):1359:1359 -> a
+    1649:1650:void removeInstruction(com.android.tools.r8.ir.code.Instruction):1359:1360 -> a
     1:1:com.android.tools.r8.graph.DexProgramClass getEligibleClass():140:140 -> b
     2:2:boolean lambda$isEligibleParameterUsages$5(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):1206:1206 -> b
     1:1:java.util.List getIndirectInlinees():148:148 -> c
@@ -42505,14 +42553,14 @@
     17:17:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):219:219 -> g
     17:17:void removeAliasIntroducingInstructionsLinkedToEligibleInstance():599 -> g
     18:44:void removeAliasIntroducingInstructionsLinkedToEligibleInstance():600:626 -> g
-com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor$AliasKind -> com.android.tools.r8.internal.Cd:
+com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor$AliasKind -> com.android.tools.r8.internal.Dd:
     com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor$AliasKind MAYBE -> b
     com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor$AliasKind DEFINITE -> a
     1:2:void <clinit>():86:87 -> <clinit>
     1:1:void <init>(java.lang.String,int):85:85 -> <init>
-com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor$IllegalClassInlinerStateException -> com.android.tools.r8.internal.Dd:
+com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor$IllegalClassInlinerStateException -> com.android.tools.r8.internal.Ed:
     1:1:void <init>():1363:1363 -> <init>
-com.android.tools.r8.ir.optimize.controlflow.SwitchCaseAnalyzer -> com.android.tools.r8.internal.Hz:
+com.android.tools.r8.ir.optimize.controlflow.SwitchCaseAnalyzer -> com.android.tools.r8.internal.Jz:
     com.android.tools.r8.ir.optimize.controlflow.SwitchCaseAnalyzer INSTANCE -> a
     boolean $assertionsDisabled -> b
     1:3:void <clinit>():13:15 -> <clinit>
@@ -42520,41 +42568,41 @@
     1:1:com.android.tools.r8.ir.optimize.controlflow.SwitchCaseAnalyzer getInstance():20:20 -> a
     2:15:boolean switchCaseIsAlwaysHit(com.android.tools.r8.ir.code.Switch,int):24:37 -> a
     1:12:boolean switchCaseIsUnreachable(com.android.tools.r8.ir.code.Switch,int):41:52 -> b
-com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData -> com.android.tools.r8.internal.y9:
+com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData -> com.android.tools.r8.internal.z9:
     1:1:void <init>():24:24 -> <init>
     com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldKnownData asEnumFieldKnownData() -> a
     boolean isUnknown() -> b
-com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldKnownData -> com.android.tools.r8.internal.u9:
+com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldKnownData -> com.android.tools.r8.internal.v9:
     1:1:void <init>():52:52 -> <init>
     com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldKnownData asEnumFieldKnownData() -> a
     boolean isUnknown() -> b
     com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldMappingData asEnumFieldMappingData() -> c
     boolean isMapping() -> d
     boolean isOrdinal() -> e
-com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldMappingData -> com.android.tools.r8.internal.v9:
+com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldMappingData -> com.android.tools.r8.internal.w9:
     java.util.Map mapping -> a
     1:2:void <init>(java.util.Map):88:89 -> <init>
     1:1:com.android.tools.r8.ir.analysis.value.AbstractValue getData(com.android.tools.r8.graph.DexField):108:108 -> a
     com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldMappingData asEnumFieldMappingData() -> c
     boolean isMapping() -> d
     boolean isOrdinal() -> e
-com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldOrdinalData -> com.android.tools.r8.internal.w9:
+com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldOrdinalData -> com.android.tools.r8.internal.x9:
     1:1:void <init>():73:73 -> <init>
     boolean isMapping() -> d
     boolean isOrdinal() -> e
-com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldUnknownData -> com.android.tools.r8.internal.x9:
+com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldUnknownData -> com.android.tools.r8.internal.y9:
     com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldUnknownData INSTANCE -> a
     1:1:void <clinit>():38:38 -> <clinit>
     1:1:void <init>():44:44 -> <init>
     boolean isUnknown() -> b
     1:1:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldUnknownData getInstance():41:41 -> c
-com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldDataMap -> com.android.tools.r8.internal.z9:
+com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldDataMap -> com.android.tools.r8.internal.A9:
     com.android.tools.r8.com.google.common.collect.ImmutableMap instanceFieldMap -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():12:12 -> <clinit>
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap):17:18 -> <init>
     1:3:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldKnownData getInstanceFieldData(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):23:25 -> a
-com.android.tools.r8.ir.optimize.enums.EnumUnboxer -> com.android.tools.r8.internal.F9:
+com.android.tools.r8.ir.optimize.enums.EnumUnboxer -> com.android.tools.r8.internal.G9:
     com.android.tools.r8.graph.DexItemFactory factory -> c
     com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection enumUnboxingCandidatesInfo -> d
     com.android.tools.r8.graph.AppView appView -> b
@@ -42785,7 +42833,7 @@
     18:39:void lambda$analyzeInitializers$3(com.android.tools.r8.graph.DexProgramClass):691:712 -> b
     40:43:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):1037:1040 -> b
     1:1:void analyzeInitializers():688:688 -> c
-com.android.tools.r8.ir.optimize.enums.EnumUnboxer$1 -> com.android.tools.r8.internal.C9:
+com.android.tools.r8.ir.optimize.enums.EnumUnboxer$1 -> com.android.tools.r8.internal.D9:
     com.android.tools.r8.ir.optimize.enums.EnumUnboxer this$0 -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():389:389 -> <clinit>
@@ -42798,7 +42846,7 @@
     8:8:void fixup(com.android.tools.r8.graph.DexEncodedField):399 -> a
     9:9:void fixup(com.android.tools.r8.graph.DexEncodedField):399:399 -> a
     10:18:void fixup(com.android.tools.r8.graph.DexEncodedMethod):405:413 -> a
-com.android.tools.r8.ir.optimize.enums.EnumUnboxer$EnumAccessibilityUseRegistry -> com.android.tools.r8.internal.D9:
+com.android.tools.r8.ir.optimize.enums.EnumUnboxer$EnumAccessibilityUseRegistry -> com.android.tools.r8.internal.E9:
     com.android.tools.r8.ir.optimize.Inliner$Constraint constraint -> e
     com.android.tools.r8.ir.optimize.enums.EnumUnboxer this$0 -> f
     boolean $assertionsDisabled -> c
@@ -42837,7 +42885,7 @@
     2:227:void registerFieldInstruction(com.android.tools.r8.graph.DexField):660 -> i
     228:229:void registerFieldInstruction(com.android.tools.r8.graph.DexField):662:663 -> i
     230:230:void registerFieldInstruction(com.android.tools.r8.graph.DexField):661:661 -> i
-com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason -> com.android.tools.r8.internal.E9:
+com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason -> com.android.tools.r8.internal.F9:
     com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason MISSING_INSTANCE_FIELD_DATA -> z
     com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason UNSUPPORTED_LIBRARY_CALL -> x
     com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason VALUES_INVOKE -> v
@@ -42875,7 +42923,7 @@
     com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason ELIGIBLE -> a
     1:35:void <clinit>():1051:1085 -> <clinit>
     1:1:void <init>(java.lang.String,int):1050:1050 -> <init>
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis -> com.android.tools.r8.internal.G9:
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis -> com.android.tools.r8.internal.H9:
     com.android.tools.r8.graph.DexItemFactory factory -> d
     com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection enumToUnboxCandidates -> e
     com.android.tools.r8.graph.AppView appView -> b
@@ -42895,31 +42943,26 @@
     30:30:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates():42:42 -> a
     31:31:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removeEnumsInAnnotations():101:101 -> a
     31:31:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates():45 -> a
-    32:32:boolean com.android.tools.r8.graph.DexClass.isAnnotation():501:501 -> a
+    32:32:boolean com.android.tools.r8.graph.DexClass.isAnnotation():505:505 -> a
     32:32:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removeEnumsInAnnotations():102 -> a
     32:32:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates():45 -> a
     33:33:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removeEnumsInAnnotations():103:103 -> a
     33:33:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates():45 -> a
-    34:34:boolean com.android.tools.r8.graph.DexTypeList.contains(com.android.tools.r8.graph.DexType):37:37 -> a
-    34:34:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removeEnumsInAnnotations():103 -> a
-    34:34:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates():45 -> a
-    35:35:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removeEnumsInAnnotations():103:103 -> a
-    35:35:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates():45 -> a
-    36:38:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removeEnumsInAnnotation(com.android.tools.r8.graph.DexProgramClass):112:114 -> a
-    36:38:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removeEnumsInAnnotations():104 -> a
-    36:38:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates():45 -> a
-    39:44:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removeEnumsInAnnotation(com.android.tools.r8.graph.DexProgramClass):113:118 -> a
-    39:44:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removeEnumsInAnnotations():104 -> a
-    39:44:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates():45 -> a
-    45:49:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates():46:50 -> a
-    50:50:void lambda$removePinnedCandidates$0(com.android.tools.r8.graph.DexField):129:129 -> a
-    51:54:void lambda$removePinnedCandidates$1(com.android.tools.r8.graph.DexMethod):132:135 -> a
-    55:56:void removePinnedIfNotHolder(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.DexType):141:142 -> a
-    57:59:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removePinnedCandidate(com.android.tools.r8.graph.DexType):148:150 -> a
-    57:59:void removePinnedIfNotHolder(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.DexType):143 -> a
-    60:62:void removePinnedCandidate(com.android.tools.r8.graph.DexType):148:150 -> a
+    34:36:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removeEnumsInAnnotation(com.android.tools.r8.graph.DexProgramClass):112:114 -> a
+    34:36:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removeEnumsInAnnotations():104 -> a
+    34:36:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates():45 -> a
+    37:42:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removeEnumsInAnnotation(com.android.tools.r8.graph.DexProgramClass):113:118 -> a
+    37:42:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removeEnumsInAnnotations():104 -> a
+    37:42:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates():45 -> a
+    43:47:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates():46:50 -> a
+    48:48:void lambda$removePinnedCandidates$0(com.android.tools.r8.graph.DexField):129:129 -> a
+    49:52:void lambda$removePinnedCandidates$1(com.android.tools.r8.graph.DexMethod):132:135 -> a
+    53:54:void removePinnedIfNotHolder(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.DexType):141:142 -> a
+    55:57:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removePinnedCandidate(com.android.tools.r8.graph.DexType):148:150 -> a
+    55:57:void removePinnedIfNotHolder(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.DexType):143 -> a
+    58:60:void removePinnedCandidate(com.android.tools.r8.graph.DexType):148:150 -> a
     1:4:void removePinnedCandidates():127:130 -> b
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection -> com.android.tools.r8.internal.I9:
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection -> com.android.tools.r8.internal.J9:
     java.util.Map enumTypeToInfo -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():20:20 -> <clinit>
@@ -42939,7 +42982,7 @@
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet candidates():42:42 -> c
     1:1:void clear():104:104 -> d
     1:1:boolean isEmpty():38:38 -> e
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection$EnumUnboxingCandidateInfo -> com.android.tools.r8.internal.H9:
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection$EnumUnboxingCandidateInfo -> com.android.tools.r8.internal.I9:
     com.android.tools.r8.utils.collections.ProgramMethodSet methodDependencies -> c
     java.util.Set requiredInstanceFieldData -> d
     com.android.tools.r8.graph.DexProgramClass enumClass -> b
@@ -42953,7 +42996,7 @@
     4:4:void addRequiredInstanceFieldData(com.android.tools.r8.graph.DexField):127:127 -> a
     1:1:com.android.tools.r8.utils.collections.ProgramMethodSet access$100(com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection$EnumUnboxingCandidateInfo):107:107 -> b
     2:2:java.util.Set getRequiredInstanceFieldData():131:131 -> b
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens -> com.android.tools.r8.internal.O9:
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens -> com.android.tools.r8.internal.P9:
     boolean $assertionsDisabled -> m
     java.util.Map prototypeChangesPerMethod -> n
     java.util.Set unboxedEnums -> o
@@ -42962,7 +43005,7 @@
     1:2:com.android.tools.r8.graph.RewrittenPrototypeDescription internalDescribePrototypeChanges(com.android.tools.r8.graph.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexMethod):56:57 -> a
     1:4:com.android.tools.r8.ir.code.Invoke$Type mapInvocationType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):63:66 -> b
     1:1:com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens$Builder enumUnboxingLensBuilder():72:72 -> l
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens$Builder -> com.android.tools.r8.internal.N9:
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens$Builder -> com.android.tools.r8.internal.O9:
     java.util.Map typeMap -> b
     com.android.tools.r8.com.google.common.collect.BiMap originalFieldSignatures -> c
     com.android.tools.r8.com.google.common.collect.BiMap originalMethodSignatures -> d
@@ -42975,7 +43018,7 @@
     32:34:void move(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,boolean,int):139 -> a
     35:35:void move(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,boolean,int):136:136 -> a
     36:50:com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens build(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,java.util.Set):144:158 -> a
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter -> com.android.tools.r8.internal.P9:
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter -> com.android.tools.r8.internal.Q9:
     com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator relocator -> g
     com.android.tools.r8.graph.DexMethod zeroCheckMessageMethod -> o
     com.android.tools.r8.graph.DexMethod zeroCheckMethod -> n
@@ -43083,7 +43126,7 @@
     376:376:com.android.tools.r8.graph.MethodAccessFlags com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizedMethodAccessFlags(boolean):651:651 -> a
     376:376:com.android.tools.r8.graph.DexEncodedMethod synthesizeUtilityMethod(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexMethod,boolean):637 -> a
     377:379:com.android.tools.r8.graph.DexEncodedMethod synthesizeUtilityMethod(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexMethod,boolean):638:640 -> a
-    380:380:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean,com.android.tools.r8.cf.CfVersion):277:277 -> a
+    380:380:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean,com.android.tools.r8.cf.CfVersion):281:281 -> a
     380:380:com.android.tools.r8.graph.DexEncodedMethod synthesizeUtilityMethod(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexMethod,boolean):640 -> a
     1:1:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$0(com.android.tools.r8.graph.DexMethod):174:174 -> b
     2:7:com.android.tools.r8.graph.DexEncodedField computeValuesEncodedField(com.android.tools.r8.graph.DexField):423:428 -> b
@@ -43227,7 +43270,7 @@
     59:104:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$6(com.android.tools.r8.graph.DexMethod):276 -> h
     105:105:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeValuesUtilityMethod():631:631 -> h
     105:105:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$6(com.android.tools.r8.graph.DexMethod):276 -> h
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer -> com.android.tools.r8.internal.Q9:
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer -> com.android.tools.r8.internal.R9:
     com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator relocator -> g
     java.util.Map unboxedEnumsMethods -> b
     com.android.tools.r8.graph.DexItemFactory factory -> e
@@ -43246,11 +43289,11 @@
     125:125:void lambda$fixupTypeReferences$1(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):61:61 -> a
     126:126:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.clearEnumToUnboxMethod(com.android.tools.r8.graph.DexEncodedMethod):95:95 -> a
     126:126:void lambda$fixupTypeReferences$1(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):62 -> a
-    127:127:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():425:425 -> a
-    127:127:com.android.tools.r8.graph.Code com.android.tools.r8.graph.DexEncodedMethod.buildEmptyThrowingCode(com.android.tools.r8.utils.InternalOptions):944 -> a
+    127:127:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> a
+    127:127:com.android.tools.r8.graph.Code com.android.tools.r8.graph.DexEncodedMethod.buildEmptyThrowingCode(com.android.tools.r8.utils.InternalOptions):950 -> a
     127:127:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.clearEnumToUnboxMethod(com.android.tools.r8.graph.DexEncodedMethod):95 -> a
     127:127:void lambda$fixupTypeReferences$1(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):62 -> a
-    128:129:com.android.tools.r8.graph.Code com.android.tools.r8.graph.DexEncodedMethod.buildEmptyThrowingCode(com.android.tools.r8.utils.InternalOptions):945:946 -> a
+    128:129:com.android.tools.r8.graph.Code com.android.tools.r8.graph.DexEncodedMethod.buildEmptyThrowingCode(com.android.tools.r8.utils.InternalOptions):951:952 -> a
     128:129:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.clearEnumToUnboxMethod(com.android.tools.r8.graph.DexEncodedMethod):95 -> a
     128:129:void lambda$fixupTypeReferences$1(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):62 -> a
     130:130:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.clearEnumToUnboxMethod(com.android.tools.r8.graph.DexEncodedMethod):95:95 -> a
@@ -43270,7 +43313,7 @@
     154:154:void lambda$fixupTypeReferences$1(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):67 -> a
     155:157:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.fixupEncodedMethodToUtility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):112:114 -> a
     155:157:void lambda$fixupTypeReferences$1(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):67 -> a
-    158:158:void com.android.tools.r8.graph.DexEncodedMethod.clearParameterAnnotations():846:846 -> a
+    158:158:void com.android.tools.r8.graph.DexEncodedMethod.clearParameterAnnotations():852:852 -> a
     158:158:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.fixupEncodedMethodToUtility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):115 -> a
     158:158:void lambda$fixupTypeReferences$1(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):67 -> a
     159:159:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.fixupEncodedMethodToUtility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):116:116 -> a
@@ -43280,45 +43323,48 @@
     163:163:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
     163:163:void lambda$fixupTypeReferences$2(com.android.tools.r8.graph.DexType,java.util.List):83 -> a
     164:165:void lambda$fixupTypeReferences$2(com.android.tools.r8.graph.DexType,java.util.List):83:84 -> a
-    166:166:com.android.tools.r8.graph.DexMethod ensureUniqueMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):145:145 -> a
-    167:167:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    167:167:com.android.tools.r8.graph.DexMethod ensureUniqueMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):145 -> a
-    168:169:com.android.tools.r8.graph.DexMethod ensureUniqueMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):146:147 -> a
-    170:170:boolean com.android.tools.r8.graph.DexMethod.isInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):261:261 -> a
-    170:170:com.android.tools.r8.graph.DexMethod ensureUniqueMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):147 -> a
-    171:174:com.android.tools.r8.graph.DexMethod ensureUniqueMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):148:151 -> a
-    175:186:com.android.tools.r8.graph.DexMethod ensureUniqueMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):149:160 -> a
-    187:187:com.android.tools.r8.graph.DexMethod ensureUniqueMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):157:157 -> a
-    188:188:boolean lambda$ensureUniqueMethod$3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):152:152 -> a
-    189:195:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):170:176 -> a
-    196:291:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens$Builder.move(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):0:95 -> a
-    196:291:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):176 -> a
-    292:293:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):177:178 -> a
-    294:294:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():171:171 -> a
-    294:294:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):179 -> a
-    295:297:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):179:181 -> a
-    298:299:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):189:190 -> a
-    300:302:com.android.tools.r8.graph.DexType[] com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.fixupTypes(com.android.tools.r8.graph.DexType[]):212:214 -> a
-    300:302:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):190 -> a
-    303:303:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):191:191 -> a
-    304:314:com.android.tools.r8.graph.DexType fixupType(com.android.tools.r8.graph.DexType):195:205 -> a
-    315:403:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens$Builder.map(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):0:88 -> a
-    315:403:com.android.tools.r8.graph.DexType fixupType(com.android.tools.r8.graph.DexType):205 -> a
-    404:404:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexEncodedMethod.proto():383:383 -> a
-    404:404:com.android.tools.r8.graph.DexEncodedMethod fixupEncodedMethod(com.android.tools.r8.graph.DexEncodedMethod):120 -> a
-    405:405:com.android.tools.r8.graph.DexEncodedMethod fixupEncodedMethod(com.android.tools.r8.graph.DexEncodedMethod):120:120 -> a
-    406:406:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexEncodedMethod.proto():383:383 -> a
-    406:406:com.android.tools.r8.graph.DexEncodedMethod fixupEncodedMethod(com.android.tools.r8.graph.DexEncodedMethod):121 -> a
-    407:422:com.android.tools.r8.graph.DexEncodedMethod fixupEncodedMethod(com.android.tools.r8.graph.DexEncodedMethod):124:139 -> a
+    166:168:void lambda$fixupEncodedMethod$3(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):138:140 -> a
+    169:169:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setIsLibraryMethodOverrideIf(boolean,com.android.tools.r8.utils.OptionalBool):1533:1533 -> a
+    169:169:void lambda$fixupEncodedMethod$3(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):139 -> a
+    170:170:com.android.tools.r8.graph.DexMethod ensureUniqueMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):147:147 -> a
+    171:171:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    171:171:com.android.tools.r8.graph.DexMethod ensureUniqueMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):147 -> a
+    172:173:com.android.tools.r8.graph.DexMethod ensureUniqueMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):148:149 -> a
+    174:174:boolean com.android.tools.r8.graph.DexMethod.isInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):261:261 -> a
+    174:174:com.android.tools.r8.graph.DexMethod ensureUniqueMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):149 -> a
+    175:178:com.android.tools.r8.graph.DexMethod ensureUniqueMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):150:153 -> a
+    179:190:com.android.tools.r8.graph.DexMethod ensureUniqueMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):151:162 -> a
+    191:191:com.android.tools.r8.graph.DexMethod ensureUniqueMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):159:159 -> a
+    192:192:boolean lambda$ensureUniqueMethod$4(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):154:154 -> a
+    193:199:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):172:178 -> a
+    200:295:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens$Builder.move(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):0:95 -> a
+    200:295:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):178 -> a
+    296:297:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):179:180 -> a
+    298:298:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():171:171 -> a
+    298:298:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):181 -> a
+    299:301:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):181:183 -> a
+    302:303:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):191:192 -> a
+    304:306:com.android.tools.r8.graph.DexType[] com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.fixupTypes(com.android.tools.r8.graph.DexType[]):214:216 -> a
+    304:306:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):192 -> a
+    307:307:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):193:193 -> a
+    308:318:com.android.tools.r8.graph.DexType fixupType(com.android.tools.r8.graph.DexType):197:207 -> a
+    319:407:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens$Builder.map(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):0:88 -> a
+    319:407:com.android.tools.r8.graph.DexType fixupType(com.android.tools.r8.graph.DexType):207 -> a
+    408:408:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexEncodedMethod.proto():389:389 -> a
+    408:408:com.android.tools.r8.graph.DexEncodedMethod fixupEncodedMethod(com.android.tools.r8.graph.DexEncodedMethod):120 -> a
+    409:409:com.android.tools.r8.graph.DexEncodedMethod fixupEncodedMethod(com.android.tools.r8.graph.DexEncodedMethod):120:120 -> a
+    410:410:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexEncodedMethod.proto():389:389 -> a
+    410:410:com.android.tools.r8.graph.DexEncodedMethod fixupEncodedMethod(com.android.tools.r8.graph.DexEncodedMethod):121 -> a
+    411:428:com.android.tools.r8.graph.DexEncodedMethod fixupEncodedMethod(com.android.tools.r8.graph.DexEncodedMethod):124:141 -> a
     1:1:java.util.List lambda$fixupTypeReferences$0(com.android.tools.r8.graph.DexType):66:66 -> b
-com.android.tools.r8.ir.optimize.enums.EnumValueInfoMapCollector -> com.android.tools.r8.internal.S9:
+com.android.tools.r8.ir.optimize.enums.EnumValueInfoMapCollector -> com.android.tools.r8.internal.T9:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.EnumValueInfoMapCollection$Builder valueInfoMapsBuilder -> b
     1:1:void <init>(com.android.tools.r8.graph.AppView):37:37 -> <init>
     2:5:void <init>(com.android.tools.r8.graph.AppView):35:38 -> <init>
     1:8:com.android.tools.r8.shaking.AppInfoWithLiveness run():42:49 -> a
     9:47:void processClasses(com.android.tools.r8.graph.DexProgramClass):54:92 -> a
-com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer -> com.android.tools.r8.internal.V9:
+com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer -> com.android.tools.r8.internal.W9:
     com.android.tools.r8.graph.DexItemFactory factory -> c
     com.android.tools.r8.graph.AppView appView -> b
     boolean $assertionsDisabled -> a
@@ -43406,8 +43452,8 @@
     411:411:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> b
     411:411:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):202 -> b
     412:414:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):202:204 -> b
-com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer$1 -> com.android.tools.r8.internal.T9:
-com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer$EnumSwitchInfo -> com.android.tools.r8.internal.U9:
+com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer$1 -> com.android.tools.r8.internal.U9:
+com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer$EnumSwitchInfo -> com.android.tools.r8.internal.V9:
     com.android.tools.r8.ir.code.Instruction arrayGet -> b
     com.android.tools.r8.ir.code.Instruction staticGet -> c
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap indexMap -> d
@@ -43415,7 +43461,7 @@
     com.android.tools.r8.graph.EnumValueInfoMapCollection$EnumValueInfoMap valueInfoMap -> e
     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.graph.EnumValueInfoMapCollection$EnumValueInfoMap,com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer$1):336:336 -> <init>
     2:8: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.graph.EnumValueInfoMapCollection$EnumValueInfoMap):351:357 -> <init>
-com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator -> com.android.tools.r8.internal.RB:
+com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator -> com.android.tools.r8.internal.SB:
     com.android.tools.r8.com.google.common.collect.ImmutableMap relocationMap -> b
     com.android.tools.r8.graph.DexType defaultEnumUnboxingUtility -> a
     1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator$1):27:27 -> <init>
@@ -43425,8 +43471,8 @@
     3:3:java.lang.Object com.android.tools.r8.com.google.common.collect.ImmutableMap.getOrDefault(java.lang.Object,java.lang.Object):666:666 -> a
     3:3:com.android.tools.r8.graph.DexType getNewMemberLocationFor(com.android.tools.r8.graph.DexType):45 -> a
     4:4:com.android.tools.r8.graph.DexType getNewMemberLocationFor(com.android.tools.r8.graph.DexType):45:45 -> a
-com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator$1 -> com.android.tools.r8.internal.PB:
-com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator$Builder -> com.android.tools.r8.internal.QB:
+com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator$1 -> com.android.tools.r8.internal.QB:
+com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator$Builder -> com.android.tools.r8.internal.RB:
     java.util.Map relocationMap -> c
     com.android.tools.r8.graph.AppView appView -> d
     com.android.tools.r8.graph.DexType defaultEnumUnboxingUtility -> b
@@ -43485,7 +43531,7 @@
     1:1:com.android.tools.r8.ir.optimize.info.BottomCallSiteOptimizationInfo bottom():23:23 -> c
     boolean isTop() -> d
     1:1:com.android.tools.r8.ir.optimize.info.TopCallSiteOptimizationInfo top():27:27 -> e
-com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo -> com.android.tools.r8.internal.T6:
+com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo -> com.android.tools.r8.internal.U6:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap constants -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap dynamicUpperBoundTypes -> d
     boolean $assertionsDisabled -> b
@@ -43509,7 +43555,7 @@
     1:6:boolean equals(java.lang.Object):208:213 -> equals
     1:2:int hashCode():218:219 -> hashCode
     1:2:java.lang.String toString():224:225 -> toString
-com.android.tools.r8.ir.optimize.info.DefaultFieldOptimizationInfo -> com.android.tools.r8.internal.K7:
+com.android.tools.r8.ir.optimize.info.DefaultFieldOptimizationInfo -> com.android.tools.r8.internal.L7:
     com.android.tools.r8.ir.optimize.info.DefaultFieldOptimizationInfo INSTANCE -> a
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:void <init>():16:16 -> <init>
@@ -43522,7 +43568,7 @@
     1:1:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo mutableCopy():24:24 -> h
     boolean valueHasBeenPropagated() -> i
     1:1:com.android.tools.r8.ir.optimize.info.DefaultFieldOptimizationInfo getInstance():19:19 -> j
-com.android.tools.r8.ir.optimize.info.DefaultMethodOptimizationInfo -> com.android.tools.r8.internal.Q7:
+com.android.tools.r8.ir.optimize.info.DefaultMethodOptimizationInfo -> com.android.tools.r8.internal.R7:
     com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo DEFAULT_INSTANCE -> a
     boolean UNKNOWN_MAY_HAVE_SIDE_EFFECTS -> e
     boolean $assertionsDisabled -> f
@@ -43560,7 +43606,7 @@
     boolean neverReturnsNormally() -> x
     boolean returnValueHasBeenPropagated() -> y
     boolean returnValueOnlyDependsOnArguments() -> z
-com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo -> com.android.tools.r8.internal.Aa:
+com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo -> com.android.tools.r8.internal.Ba:
     1:1:void <init>():11:11 -> <init>
     com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo asMutableFieldOptimizationInfo() -> a
     boolean cannotBeKept() -> b
@@ -43571,13 +43617,13 @@
     boolean isDead() -> g
     com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo mutableCopy() -> h
     boolean valueHasBeenPropagated() -> i
-com.android.tools.r8.ir.optimize.info.LibraryOptimizationInfoInitializerFeedback -> com.android.tools.r8.internal.mm:
+com.android.tools.r8.ir.optimize.info.LibraryOptimizationInfoInitializerFeedback -> com.android.tools.r8.internal.nm:
     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.MethodOptimizationInfo -> com.android.tools.r8.internal.Eo:
+com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo -> com.android.tools.r8.internal.Fo:
     1:1:void <init>():18:18 -> <init>
     boolean returnsArgument() -> A
     boolean triggersClassInitBeforeAnySideEffect() -> B
@@ -43608,13 +43654,13 @@
     boolean neverReturnsNormally() -> x
     boolean returnValueHasBeenPropagated() -> y
     boolean returnValueOnlyDependsOnArguments() -> z
-com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo$InlinePreference -> com.android.tools.r8.internal.Eo$a:
+com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo$InlinePreference -> com.android.tools.r8.internal.Fo$a:
     com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo$InlinePreference NeverInline -> a
     com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo$InlinePreference ForceInline -> b
     com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo$InlinePreference Default -> c
     1:3:void <clinit>():21:23 -> <clinit>
     1:1:void <init>(java.lang.String,int):20:20 -> <init>
-com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector -> com.android.tools.r8.internal.Go:
+com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector -> com.android.tools.r8.internal.Ho:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> d
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.ir.optimize.typechecks.CheckCastAndInstanceOfMethodSpecialization checkCastAndInstanceOfMethodSpecialization -> c
@@ -43850,7 +43896,7 @@
     858:858:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1077:1077 -> a
     858:858:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1048 -> a
     858:858:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):155 -> a
-    859:859:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():486:486 -> a
+    859:859:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():492:492 -> a
     859:859:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1082 -> a
     859:859:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1048 -> a
     859:859:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):155 -> a
@@ -43895,13 +43941,13 @@
     1000:1000:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeNonNullParamOnNormalExits(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1180:1180 -> a
     1000:1000:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):158 -> a
     1001:1003:void identifyClassInlinerEligibility(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):189:191 -> a
-    1004:1004:boolean com.android.tools.r8.graph.DexEncodedMethod.isNative():474:474 -> a
+    1004:1004:boolean com.android.tools.r8.graph.DexEncodedMethod.isNative():480:480 -> a
     1004:1004:void identifyClassInlinerEligibility(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):192 -> a
     1005:1100:void identifyClassInlinerEligibility(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):193:288 -> a
     1101:1107:void identifyClassInlinerEligibility(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):263:269 -> a
     1108:1112:void identifyClassInlinerEligibility(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):247:251 -> a
     1113:1126:void identifyClassInlinerEligibility(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):226:239 -> a
-    1127:1127:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():486:486 -> a
+    1127:1127:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():492:492 -> a
     1127:1127:void identifyClassInlinerEligibility(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):303 -> a
     1128:1134:void identifyClassInlinerEligibility(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):303:309 -> a
     1135:1135:void identifyClassInlinerEligibility(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):305:305 -> a
@@ -43929,14 +43975,14 @@
     1348:1348:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$2(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):883 -> a
     1349:1355:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$2(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):883:889 -> a
     1356:1358:boolean isNullCheck(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):944:946 -> a
-com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect -> com.android.tools.r8.internal.Fo:
+com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect -> com.android.tools.r8.internal.Go:
     com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect DESIRED_EFFECT -> a
     com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect NO_EFFECT -> d
     com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect OTHER_EFFECT -> c
     com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect CONDITIONAL_EFFECT -> b
     1:4:void <clinit>():908:911 -> <clinit>
     1:1:void <init>(java.lang.String,int):907:907 -> <init>
-com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo -> com.android.tools.r8.internal.sp:
+com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo -> com.android.tools.r8.internal.tp:
     com.android.tools.r8.ir.analysis.type.ClassTypeElement dynamicLowerBoundType -> e
     int readBits -> d
     boolean $assertionsDisabled -> a
@@ -43963,16 +44009,16 @@
     1:1:void markAsDead():118:118 -> j
     1:1:void markAsPropagated():127:127 -> k
     1:1:void markCannotBeKept():91:91 -> l
-com.android.tools.r8.ir.optimize.info.OptimizationFeedback -> com.android.tools.r8.internal.Ir:
+com.android.tools.r8.ir.optimize.info.OptimizationFeedback -> com.android.tools.r8.internal.Kr:
     1:1:void <init>():18:18 -> <init>
     void modifyAppInfoWithLiveness(java.util.function.Consumer) -> a
     1:1:void fixupOptimizationInfos(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback$OptimizationInfoFixer):32:32 -> a
     2:2:void fixupOptimizationInfos(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback$OptimizationInfoFixer):31:31 -> a
     3:4:void lambda$fixupOptimizationInfos$0(com.android.tools.r8.ir.optimize.info.OptimizationFeedback$OptimizationInfoFixer,com.android.tools.r8.graph.DexProgramClass):34:35 -> a
-com.android.tools.r8.ir.optimize.info.OptimizationFeedback$OptimizationInfoFixer -> com.android.tools.r8.internal.Ir$a:
+com.android.tools.r8.ir.optimize.info.OptimizationFeedback$OptimizationInfoFixer -> com.android.tools.r8.internal.Kr$a:
     void fixup(com.android.tools.r8.graph.DexEncodedField) -> a
     void fixup(com.android.tools.r8.graph.DexEncodedMethod) -> a
-com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed -> com.android.tools.r8.internal.Jr:
+com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed -> com.android.tools.r8.internal.Lr:
     java.util.Map fieldOptimizationInfos -> c
     java.util.Map methodOptimizationInfos -> d
     boolean $assertionsDisabled -> a
@@ -44051,7 +44097,7 @@
     void setInitializerEnablingJavaVmAssertions(com.android.tools.r8.graph.DexEncodedMethod) -> g
 com.android.tools.r8.ir.optimize.info.OptimizationFeedbackIgnore$1 -> com.android.tools.r8.ir.optimize.info.a$a:
     1:1:void <init>():24:24 -> <init>
-com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple -> com.android.tools.r8.internal.Kr:
+com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple -> com.android.tools.r8.internal.Mr:
     com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple INSTANCE -> a
     1:1:void <clinit>():24:24 -> <clinit>
     1:1:void <init>():26:26 -> <init>
@@ -44085,7 +44131,7 @@
     1:1:void markMethodCannotBeKept(com.android.tools.r8.graph.DexEncodedMethod):84:84 -> f
     1:1:void setInitializerEnablingJavaVmAssertions(com.android.tools.r8.graph.DexEncodedMethod):175:175 -> g
     1:1:void unsetAbstractReturnValue(com.android.tools.r8.graph.DexEncodedMethod):106:106 -> h
-com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo -> com.android.tools.r8.internal.ms:
+com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo -> com.android.tools.r8.internal.os:
     boolean $assertionsDisabled -> a
     com.android.tools.r8.com.google.common.collect.ImmutableList parametersUsages -> b
     1:1:void <clinit>():31:31 -> <clinit>
@@ -44093,14 +44139,11 @@
     6:6:void <init>(java.util.List):38:38 -> <init>
     1:1:java.lang.Integer lambda$new$0(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage):39:39 -> a
     2:3:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage getParameterUsage(int):43:44 -> a
-    1:2:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo remove(int):52:53 -> b
-    3:3:java.lang.Object com.android.tools.r8.utils.ListUtils.last(java.util.List):30:30 -> b
-    3:3:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo remove(int):53 -> b
-    4:8:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo remove(int):53:57 -> b
-    9:10:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage.copyAndShift(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,int):117:118 -> b
-    9:10:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo remove(int):58 -> b
-    11:24:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo remove(int):58:71 -> b
-com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage -> com.android.tools.r8.internal.ms$a:
+    1:6:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo remove(int):52:57 -> b
+    7:8:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage.copyAndShift(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,int):117:118 -> b
+    7:8:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo remove(int):58 -> b
+    9:22:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo remove(int):58:71 -> b
+com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage -> com.android.tools.r8.internal.os$a:
     java.util.Set ifZeroTest -> c
     boolean isUsedInMonitor -> i
     java.util.List callsReceiver -> d
@@ -44113,7 +44156,7 @@
     1:1:void <clinit>():74:74 -> <clinit>
     1:11:void <init>(int,java.util.Set,java.util.List,boolean,boolean,boolean,boolean,boolean):103:113 -> <init>
     1:2:boolean notUsed():130:131 -> a
-com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsageBuilder -> com.android.tools.r8.internal.ns:
+com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsageBuilder -> com.android.tools.r8.internal.ps:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> d
     java.util.List callsOnReceiver -> f
     boolean isAssignedToField -> i
@@ -44161,12 +44204,12 @@
     49:49:boolean note(com.android.tools.r8.ir.code.InvokeMethodWithReceiver):239:239 -> a
     50:55:boolean note(com.android.tools.r8.ir.code.InvokeMethodWithReceiver):238:243 -> a
     56:56:boolean note(com.android.tools.r8.ir.code.InvokeMethodWithReceiver):240:240 -> a
-com.android.tools.r8.ir.optimize.info.TopCallSiteOptimizationInfo -> com.android.tools.r8.internal.CA:
+com.android.tools.r8.ir.optimize.info.TopCallSiteOptimizationInfo -> com.android.tools.r8.internal.EA:
     com.android.tools.r8.ir.optimize.info.TopCallSiteOptimizationInfo INSTANCE -> b
     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 -> f
-com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo -> com.android.tools.r8.internal.lC:
+com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo -> com.android.tools.r8.internal.mC:
     com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo bridgeInfo -> i
     int flags -> o
     java.util.BitSet nonNullParamOrThrow -> m
@@ -44280,7 +44323,7 @@
     40:40:boolean analyzeCheckCast(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InvokeMethod):95 -> a
     41:41: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
     41:41:boolean analyzeCheckCast(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InvokeMethod):95 -> a
-    42:42:boolean com.android.tools.r8.graph.DexEncodedMethod.isBridge():466:466 -> a
+    42:42:boolean com.android.tools.r8.graph.DexEncodedMethod.isBridge():472:472 -> a
     42:42:com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo analyzeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):27 -> a
     43:93: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
     94:96:boolean com.android.tools.r8.ir.optimize.info.bridge.BridgeAnalyzer.analyzeReturn(com.android.tools.r8.ir.code.Return,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.CheckCast):168:170 -> a
@@ -44289,13 +44332,13 @@
     98:100:boolean com.android.tools.r8.ir.optimize.info.bridge.BridgeAnalyzer.analyzeInvokeVirtual(com.android.tools.r8.ir.code.InvokeVirtual):153:155 -> a
     98:100:com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo analyzeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):68 -> a
     101:102:com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo analyzeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):87:88 -> a
-com.android.tools.r8.ir.optimize.info.bridge.VirtualBridgeInfo -> com.android.tools.r8.internal.IC:
+com.android.tools.r8.ir.optimize.info.bridge.VirtualBridgeInfo -> com.android.tools.r8.internal.JC:
     com.android.tools.r8.graph.DexMethod invokedMethod -> a
     1:1:void com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo.<init>():10:10 -> <init>
     1:1:void <init>(com.android.tools.r8.graph.DexMethod):32 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.DexMethod):33:33 -> <init>
     1:1:com.android.tools.r8.graph.DexMethod getInvokedMethod():37:37 -> a
-com.android.tools.r8.ir.optimize.info.field.EmptyInstanceFieldInitializationInfoCollection -> com.android.tools.r8.internal.f9:
+com.android.tools.r8.ir.optimize.info.field.EmptyInstanceFieldInitializationInfoCollection -> com.android.tools.r8.internal.g9:
     com.android.tools.r8.ir.optimize.info.field.EmptyInstanceFieldInitializationInfoCollection INSTANCE -> a
     1:1:void <clinit>():21:21 -> <clinit>
     1:1:void <init>():24:24 -> <init>
@@ -44305,7 +44348,7 @@
     void forEachWithDeterministicOrder(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.BiConsumer) -> b
     boolean isEmpty() -> b
     1:1:com.android.tools.r8.ir.optimize.info.field.EmptyInstanceFieldInitializationInfoCollection getInstance():27:27 -> c
-com.android.tools.r8.ir.optimize.info.field.InstanceFieldArgumentInitializationInfo -> com.android.tools.r8.internal.Od:
+com.android.tools.r8.ir.optimize.info.field.InstanceFieldArgumentInitializationInfo -> com.android.tools.r8.internal.Pd:
     int argumentIndex -> a
     1:2:void <init>(int):20:21 -> <init>
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens) -> a
@@ -44313,14 +44356,14 @@
     boolean isArgumentInitializationInfo() -> d
     1:1:int getArgumentIndex():25:25 -> f
     1:1:java.lang.String toString():49:49 -> toString
-com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo -> com.android.tools.r8.internal.Pd:
+com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo -> com.android.tools.r8.internal.Qd:
     boolean isTypeInitializationInfo() -> a
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens) -> a
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldArgumentInitializationInfo asArgumentInitializationInfo() -> b
     boolean isSingleValue() -> c
     boolean isArgumentInitializationInfo() -> d
     com.android.tools.r8.ir.analysis.value.SingleValue asSingleValue() -> e
-com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection -> com.android.tools.r8.internal.Rd:
+com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection -> com.android.tools.r8.internal.Sd:
     1:1:void <init>():23:23 -> <init>
     void forEach(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.BiConsumer) -> a
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo get(com.android.tools.r8.graph.DexEncodedField) -> a
@@ -44328,19 +44371,19 @@
     1:1:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection$Builder builder():26:26 -> a
     void forEachWithDeterministicOrder(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.BiConsumer) -> b
     boolean isEmpty() -> b
-com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection$Builder -> com.android.tools.r8.internal.Qd:
+com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection$Builder -> com.android.tools.r8.internal.Rd:
     java.util.TreeMap infos -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():44:44 -> <clinit>
     1:3:void <init>():44:46 -> <init>
     1:2:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection$Builder recordInitializationInfo(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):55:56 -> a
     3:6:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection build():61:64 -> a
-com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoFactory -> com.android.tools.r8.internal.Sd:
+com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoFactory -> com.android.tools.r8.internal.Td:
     java.util.concurrent.ConcurrentHashMap argumentInitializationInfos -> a
     1:3:void <init>():11:13 -> <init>
     1:3:com.android.tools.r8.ir.optimize.info.field.InstanceFieldArgumentInitializationInfo createArgumentInitializationInfo(int):18:18 -> a
     4:4:com.android.tools.r8.ir.optimize.info.field.InstanceFieldTypeInitializationInfo createTypeInitializationInfo(com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.ir.analysis.type.TypeElement):24:24 -> a
-com.android.tools.r8.ir.optimize.info.field.InstanceFieldTypeInitializationInfo -> com.android.tools.r8.internal.Ud:
+com.android.tools.r8.ir.optimize.info.field.InstanceFieldTypeInitializationInfo -> com.android.tools.r8.internal.Vd:
     com.android.tools.r8.ir.analysis.type.ClassTypeElement dynamicLowerBoundType -> a
     com.android.tools.r8.ir.analysis.type.TypeElement dynamicUpperBoundType -> b
     1:3:void <init>(com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.ir.analysis.type.TypeElement):26:28 -> <init>
@@ -44350,7 +44393,7 @@
     22:22:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):69:69 -> a
     1:6:boolean equals(java.lang.Object):83:88 -> equals
     1:1:int hashCode():75:75 -> hashCode
-com.android.tools.r8.ir.optimize.info.field.NonTrivialInstanceFieldInitializationInfoCollection -> com.android.tools.r8.internal.Yp:
+com.android.tools.r8.ir.optimize.info.field.NonTrivialInstanceFieldInitializationInfoCollection -> com.android.tools.r8.internal.aq:
     java.util.TreeMap infos -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():22:22 -> <clinit>
@@ -44366,13 +44409,13 @@
     boolean isEmpty() -> b
     1:1:void forEachWithDeterministicOrder(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.BiConsumer):55:55 -> b
     1:4:java.lang.String toString():85:88 -> toString
-com.android.tools.r8.ir.optimize.info.field.UnknownInstanceFieldInitializationInfo -> com.android.tools.r8.internal.ZB:
+com.android.tools.r8.ir.optimize.info.field.UnknownInstanceFieldInitializationInfo -> com.android.tools.r8.internal.aC:
     com.android.tools.r8.ir.optimize.info.field.UnknownInstanceFieldInitializationInfo INSTANCE -> a
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:void <init>():20:20 -> <init>
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens) -> a
     1:1:com.android.tools.r8.ir.optimize.info.field.UnknownInstanceFieldInitializationInfo getInstance():23:23 -> f
-com.android.tools.r8.ir.optimize.info.initializer.DefaultInstanceInitializerInfo -> com.android.tools.r8.internal.N7:
+com.android.tools.r8.ir.optimize.info.initializer.DefaultInstanceInitializerInfo -> com.android.tools.r8.internal.O7:
     com.android.tools.r8.ir.optimize.info.initializer.DefaultInstanceInitializerInfo INSTANCE -> a
     1:1:void <clinit>():18:18 -> <clinit>
     1:1:void <init>():21:21 -> <init>
@@ -44384,7 +44427,7 @@
     1:1:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet():39:39 -> e
     boolean receiverNeverEscapesOutsideConstructorChain() -> f
     1:1:com.android.tools.r8.ir.optimize.info.initializer.DefaultInstanceInitializerInfo getInstance():24:24 -> g
-com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo -> com.android.tools.r8.internal.Xd:
+com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo -> com.android.tools.r8.internal.Yd:
     1:1:void <init>():14:14 -> <init>
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection fieldInitializationInfos() -> a
     com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens) -> a
@@ -44393,7 +44436,7 @@
     boolean mayHaveOtherSideEffectsThanInstanceFieldAssignments() -> d
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet() -> e
     boolean receiverNeverEscapesOutsideConstructorChain() -> f
-com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo -> com.android.tools.r8.internal.bq:
+com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo -> com.android.tools.r8.internal.dq:
     com.android.tools.r8.graph.DexMethod parent -> f
     boolean $assertionsDisabled -> a
     int $r8$clinit -> b
@@ -44418,8 +44461,8 @@
     1:1:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet():67:67 -> e
     1:1:boolean receiverNeverEscapesOutsideConstructorChain():82:82 -> f
     1:1:java.lang.String toString():97:97 -> toString
-com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$1 -> com.android.tools.r8.internal.Zp:
-com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder -> com.android.tools.r8.internal.aq:
+com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$1 -> com.android.tools.r8.internal.bq:
+com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder -> com.android.tools.r8.internal.cq:
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection instanceFieldInitializationInfos -> b
     com.android.tools.r8.graph.DexMethod parent -> e
     boolean $assertionsDisabled -> a
@@ -44476,7 +44519,7 @@
     1:1:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder setInstanceFieldInitializationMayDependOnEnvironment():170:170 -> e
     1:1:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder setMayHaveOtherSideEffectsThanInstanceFieldAssignments():179:179 -> f
     1:1:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder setReceiverMayEscapeOutsideConstructorChain():184:184 -> g
-com.android.tools.r8.ir.optimize.inliner.DefaultInliningReasonStrategy -> com.android.tools.r8.internal.M7:
+com.android.tools.r8.ir.optimize.inliner.DefaultInliningReasonStrategy -> com.android.tools.r8.internal.N7:
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.ir.conversion.CallSiteInformation callSiteInformation -> c
     com.android.tools.r8.ir.optimize.Inliner inliner -> d
@@ -44488,10 +44531,10 @@
     22: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):57 -> a
     25:27:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):58:60 -> a
     28:29:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):40:41 -> a
-com.android.tools.r8.ir.optimize.inliner.FixedInliningReasonStrategy -> com.android.tools.r8.internal.Pa:
+com.android.tools.r8.ir.optimize.inliner.FixedInliningReasonStrategy -> com.android.tools.r8.internal.Qa:
     1:1:void <init>(com.android.tools.r8.ir.optimize.Inliner$Reason):15:15 -> <init>
     1:1:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):22:22 -> a
-com.android.tools.r8.ir.optimize.inliner.InlinerUtils -> com.android.tools.r8.internal.Gd:
+com.android.tools.r8.ir.optimize.inliner.InlinerUtils -> com.android.tools.r8.internal.Hd:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():14:14 -> <clinit>
     1:4:void collectAllMonitorEnterValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Set):20:23 -> a
@@ -44500,7 +44543,7 @@
     7:7:void addMonitorEnterValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):33 -> a
     8:8:void addMonitorEnterValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):36:36 -> a
     9:9:void addMonitorEnterValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):34:34 -> a
-com.android.tools.r8.ir.optimize.inliner.InliningIRProvider -> com.android.tools.r8.internal.Hd:
+com.android.tools.r8.ir.optimize.inliner.InliningIRProvider -> com.android.tools.r8.internal.Id:
     com.android.tools.r8.ir.conversion.MethodProcessor methodProcessor -> e
     com.android.tools.r8.graph.AppView appView -> b
     boolean $assertionsDisabled -> a
@@ -44518,9 +44561,9 @@
     1:7:com.android.tools.r8.ir.code.IRCode getInliningIR(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):36:42 -> b
     8:9:com.android.tools.r8.ir.code.IRCode com.android.tools.r8.graph.ProgramMethod.buildInliningIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.ir.conversion.MethodProcessor):36:37 -> b
     8:9:com.android.tools.r8.ir.code.IRCode getInliningIR(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):42 -> b
-com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy -> com.android.tools.r8.internal.Jd:
+com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy -> com.android.tools.r8.internal.Kd:
     com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod) -> a
-com.android.tools.r8.ir.optimize.inliner.NopWhyAreYouNotInliningReporter -> com.android.tools.r8.internal.dq:
+com.android.tools.r8.ir.optimize.inliner.NopWhyAreYouNotInliningReporter -> com.android.tools.r8.internal.fq:
     com.android.tools.r8.ir.optimize.inliner.NopWhyAreYouNotInliningReporter INSTANCE -> a
     1:1:void <clinit>():15:15 -> <clinit>
     1:1:void <init>():18:18 -> <init>
@@ -44558,7 +44601,7 @@
     void reportUnknownTarget() -> w
     boolean unsetReasonHasBeenReportedFlag() -> x
     1:1:com.android.tools.r8.ir.optimize.inliner.NopWhyAreYouNotInliningReporter getInstance():21:21 -> y
-com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter -> com.android.tools.r8.internal.QC:
+com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter -> com.android.tools.r8.internal.RC:
     1:1:void <init>():18:18 -> <init>
     void reportCallerNotSameClass() -> a
     void reportIncorrectArity(int,int) -> a
@@ -44595,7 +44638,7 @@
     void reportRecursiveMethod() -> v
     void reportUnknownTarget() -> w
     boolean unsetReasonHasBeenReportedFlag() -> x
-com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporterImpl -> com.android.tools.r8.internal.RC:
+com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporterImpl -> com.android.tools.r8.internal.SC:
     boolean reasonHasBeenReported -> e
     boolean $assertionsDisabled -> a
     com.android.tools.r8.graph.ProgramMethod callee -> b
@@ -44660,7 +44703,7 @@
     83:83:java.lang.String getCaptureSignature(com.android.tools.r8.graph.DexTypeList):116:116 -> a
     84:84:com.android.tools.r8.graph.DexType lambda$getCaptureSignature$2(com.android.tools.r8.graph.DexTypeList,int):116:116 -> a
     85:110:int mapFieldIntoCaptureIndex(java.lang.String,java.util.List,com.android.tools.r8.graph.DexField):123:148 -> a
-com.android.tools.r8.ir.optimize.lambda.CodeProcessor -> com.android.tools.r8.internal.z6:
+com.android.tools.r8.ir.optimize.lambda.CodeProcessor -> com.android.tools.r8.internal.A6:
     com.android.tools.r8.ir.code.IRCode code -> i
     com.android.tools.r8.ir.code.InstructionListIterator instructions -> k
     com.android.tools.r8.graph.DexItemFactory factory -> d
@@ -44756,7 +44799,7 @@
     89:95:java.lang.Void com.android.tools.r8.ir.optimize.lambda.CodeProcessor.visit(com.android.tools.r8.ir.code.Argument):403:409 -> a
     89:95:java.lang.Object visit(com.android.tools.r8.ir.code.Argument):49 -> a
     1:5:void processCode():217:221 -> b
-com.android.tools.r8.ir.optimize.lambda.CodeProcessor$1 -> com.android.tools.r8.internal.x6:
+com.android.tools.r8.ir.optimize.lambda.CodeProcessor$1 -> com.android.tools.r8.internal.y6:
     1:1:void <init>():86:86 -> <init>
     boolean isValidHolder(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexType) -> a
     boolean isValidInstanceFieldWrite(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField) -> a
@@ -44772,7 +44815,7 @@
     boolean isValidStaticFieldRead(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField) -> b
     boolean isValidInstanceFieldRead(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField) -> c
     boolean isValidStaticFieldWrite(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField) -> d
-com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy -> com.android.tools.r8.internal.y6:
+com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy -> com.android.tools.r8.internal.z6:
     boolean isValidHolder(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexType) -> a
     boolean isValidInstanceFieldWrite(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField) -> a
     boolean isValidInvoke(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod) -> a
@@ -44787,7 +44830,7 @@
     boolean isValidStaticFieldRead(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField) -> b
     boolean isValidInstanceFieldRead(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField) -> c
     boolean isValidStaticFieldWrite(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField) -> d
-com.android.tools.r8.ir.optimize.lambda.LambdaGroup -> com.android.tools.r8.internal.xl:
+com.android.tools.r8.ir.optimize.lambda.LambdaGroup -> com.android.tools.r8.internal.yl:
     java.util.Map lambdas -> d
     com.android.tools.r8.ir.optimize.lambda.LambdaGroupId id -> b
     com.android.tools.r8.graph.DexType classType -> c
@@ -44824,14 +44867,14 @@
     1:2:void remove(com.android.tools.r8.graph.DexType):143:144 -> e
     1:1:boolean isTrivial():134:134 -> f
     1:1:int size():79:79 -> g
-com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo -> com.android.tools.r8.internal.wl:
+com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo -> com.android.tools.r8.internal.xl:
     com.android.tools.r8.graph.DexProgramClass clazz -> b
     int id -> a
     1:3:void <init>(int,com.android.tools.r8.graph.DexProgramClass):59:61 -> <init>
-com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaStructureError -> com.android.tools.r8.internal.xl$a:
+com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaStructureError -> com.android.tools.r8.internal.yl$a:
     boolean reportable -> a
     1:2:void <init>(java.lang.String,boolean):233:234 -> <init>
-com.android.tools.r8.ir.optimize.lambda.LambdaGroupClassBuilder -> com.android.tools.r8.internal.yl:
+com.android.tools.r8.ir.optimize.lambda.LambdaGroupClassBuilder -> com.android.tools.r8.internal.zl:
     java.lang.String origin -> n
     com.android.tools.r8.graph.DexItemFactory factory -> m
     com.android.tools.r8.ir.optimize.lambda.LambdaGroup group -> l
@@ -44847,9 +44890,9 @@
     com.android.tools.r8.graph.DexTypeList buildInterfaces() -> g
     com.android.tools.r8.graph.DexEncodedMethod[] buildVirtualMethods() -> h
     com.android.tools.r8.graph.DexType getSuperClassType() -> i
-com.android.tools.r8.ir.optimize.lambda.LambdaGroupId -> com.android.tools.r8.internal.zl:
+com.android.tools.r8.ir.optimize.lambda.LambdaGroupId -> com.android.tools.r8.internal.Al:
     com.android.tools.r8.ir.optimize.lambda.LambdaGroup createGroup() -> a
-com.android.tools.r8.ir.optimize.lambda.LambdaMerger -> com.android.tools.r8.internal.Il:
+com.android.tools.r8.ir.optimize.lambda.LambdaMerger -> com.android.tools.r8.internal.Jl:
     java.util.Map lambdas -> b
     com.android.tools.r8.kotlin.Kotlin kotlin -> g
     java.util.Map groups -> c
@@ -44925,8 +44968,8 @@
     3:3:void lambda$collectGroupCandidates$4(com.android.tools.r8.graph.DexProgramClass):265 -> d
     4:16:void lambda$collectGroupCandidates$4(com.android.tools.r8.graph.DexProgramClass):265:277 -> d
     17:17:void lambda$collectGroupCandidates$4(com.android.tools.r8.graph.DexProgramClass):272:272 -> d
-com.android.tools.r8.ir.optimize.lambda.LambdaMerger$1 -> com.android.tools.r8.internal.Bl:
-com.android.tools.r8.ir.optimize.lambda.LambdaMerger$AnalysisStrategy -> com.android.tools.r8.internal.Cl:
+com.android.tools.r8.ir.optimize.lambda.LambdaMerger$1 -> com.android.tools.r8.internal.Cl:
+com.android.tools.r8.ir.optimize.lambda.LambdaMerger$AnalysisStrategy -> com.android.tools.r8.internal.Dl:
     com.android.tools.r8.ir.optimize.lambda.LambdaMerger this$0 -> m
     1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$1):502:502 -> <init>
     2:6:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):503:507 -> <init>
@@ -44940,12 +44983,12 @@
     7:7:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.StaticGet):539:539 -> a
     8:8:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InitClass):544:544 -> a
     9:9:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.Argument):549:549 -> a
-com.android.tools.r8.ir.optimize.lambda.LambdaMerger$AnalyzeMode -> com.android.tools.r8.internal.Dl:
+com.android.tools.r8.ir.optimize.lambda.LambdaMerger$AnalyzeMode -> com.android.tools.r8.internal.El:
     com.android.tools.r8.ir.optimize.lambda.LambdaMerger this$0 -> a
     1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):115:115 -> <init>
     2:2:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$1):115:115 -> <init>
     1:1:void analyzeCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):119:119 -> a
-com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyMode -> com.android.tools.r8.internal.El:
+com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyMode -> com.android.tools.r8.internal.Fl:
     java.util.Map lambdaGroups -> b
     com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer optimizationInfoFixer -> c
     boolean $assertionsDisabled -> a
@@ -44954,7 +44997,7 @@
     1:3:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,java.util.Map,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer):130:132 -> <init>
     1:32:void rewriteCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.Inliner,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):142:173 -> a
     33:36:void rewriteCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.Inliner,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):172:175 -> a
-com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy -> com.android.tools.r8.internal.Fl:
+com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy -> com.android.tools.r8.internal.Gl:
     boolean $assertionsDisabled -> m
     com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer optimizationInfoFixer -> n
     java.util.Set typeAffectedValues -> o
@@ -44975,7 +45018,7 @@
     12:12:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.Argument):673:673 -> a
     1:42:void processCode():584:625 -> b
     43:43:boolean typeMayHaveChanged(com.android.tools.r8.ir.code.Value):629:629 -> b
-com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer -> com.android.tools.r8.internal.Gl:
+com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer -> com.android.tools.r8.internal.Hl:
     java.util.Map lambdaGroupsClasses -> b
     com.android.tools.r8.ir.optimize.lambda.LambdaMerger this$0 -> c
     boolean $assertionsDisabled -> a
@@ -44992,12 +45035,12 @@
     1:1:java.lang.Object apply(java.lang.Object):677:677 -> apply
     2:6:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer.apply(com.android.tools.r8.graph.DexType):688:692 -> apply
     2:6:java.lang.Object apply(java.lang.Object):677 -> apply
-com.android.tools.r8.ir.optimize.lambda.LambdaMerger$Mode -> com.android.tools.r8.internal.Hl:
+com.android.tools.r8.ir.optimize.lambda.LambdaMerger$Mode -> com.android.tools.r8.internal.Il:
     1:1:void <init>():103:103 -> <init>
     2:2:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$1):103:103 -> <init>
     void analyzeCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode) -> a
     void rewriteCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.Inliner,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider) -> a
-com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor -> com.android.tools.r8.internal.Ml:
+com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor -> com.android.tools.r8.internal.Nl:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     java.util.function.Consumer onLambdaType -> d
     java.util.function.Predicate isLambdaType -> c
@@ -45335,7 +45378,7 @@
     1:1:com.android.tools.r8.graph.ClassAccessFlags buildAccessFlags():72:72 -> a
     2:13:void lambda$buildVirtualMethods$1(com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.IntBox,java.util.List,boolean,java.util.List,java.lang.Integer,java.lang.Boolean):145:156 -> a
     14:27:void lambda$buildVirtualMethods$1(com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.IntBox,java.util.List,boolean,java.util.List,java.lang.Integer,java.lang.Boolean):153:166 -> a
-    28:28:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):257:257 -> a
+    28:28:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):261:261 -> a
     28:28:void lambda$buildVirtualMethods$1(com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.IntBox,java.util.List,boolean,java.util.List,java.lang.Integer,java.lang.Boolean):166 -> a
     29:50:void lambda$buildVirtualMethods$1(com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.IntBox,java.util.List,boolean,java.util.List,java.lang.Integer,java.lang.Boolean):158:179 -> a
     51:58:com.android.tools.r8.ir.conversion.SourceCode lambda$buildVirtualMethods$0(com.android.tools.r8.graph.DexMethod,java.util.List,com.android.tools.r8.graph.DexMethod,java.lang.Integer,com.android.tools.r8.ir.code.Position):169:176 -> a
@@ -45351,11 +45394,11 @@
     1:3:com.android.tools.r8.graph.GenericSignature$ClassSignature buildClassSignature():94:94 -> b
     4:4:com.android.tools.r8.ir.conversion.SourceCode lambda$buildDirectMethods$5(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):262:262 -> b
     1:15:com.android.tools.r8.graph.DexEncodedMethod[] buildDirectMethods():245:259 -> c
-    16:16:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):257:257 -> c
+    16:16:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):261:261 -> c
     16:16:com.android.tools.r8.graph.DexEncodedMethod[] buildDirectMethods():259 -> c
     17:29:com.android.tools.r8.graph.DexEncodedMethod[] buildDirectMethods():259:271 -> c
     30:40:com.android.tools.r8.graph.DexEncodedMethod[] buildDirectMethods():269:279 -> c
-    41:41:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):257:257 -> c
+    41:41:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):261:261 -> c
     41:41:com.android.tools.r8.graph.DexEncodedMethod[] buildDirectMethods():279 -> c
     42:42:com.android.tools.r8.graph.DexEncodedMethod[] buildDirectMethods():279:279 -> c
     1:1:com.android.tools.r8.graph.EnclosingMethodAttribute buildEnclosingMethodAttribute():78:78 -> d
@@ -45378,7 +45421,7 @@
     41:41:int com.android.tools.r8.utils.InternalOptions.verificationSizeLimitInBytes():270:270 -> h
     41:41:void splitIntoGroupsBasedOnInstructionSize(java.util.List,com.android.tools.r8.utils.TriConsumer):193 -> h
     41:41:com.android.tools.r8.graph.DexEncodedMethod[] buildVirtualMethods():142 -> h
-    42:42:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():425:425 -> h
+    42:42:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> h
     42:42:int com.android.tools.r8.utils.InternalOptions.verificationSizeLimitInBytes():275 -> h
     42:42:void splitIntoGroupsBasedOnInstructionSize(java.util.List,com.android.tools.r8.utils.TriConsumer):193 -> h
     42:42:com.android.tools.r8.graph.DexEncodedMethod[] buildVirtualMethods():142 -> h
@@ -45389,7 +45432,7 @@
     47:156:com.android.tools.r8.graph.DexEncodedMethod[] buildVirtualMethods():142 -> h
     157:163:void splitIntoGroupsBasedOnInstructionSize(java.util.List,com.android.tools.r8.utils.TriConsumer):199:205 -> h
     157:163:com.android.tools.r8.graph.DexEncodedMethod[] buildVirtualMethods():142 -> h
-    164:165:int com.android.tools.r8.graph.DexCode.codeSizeInBytes():447:448 -> h
+    164:165:int com.android.tools.r8.graph.DexCode.codeSizeInBytes():452:453 -> h
     164:165:void splitIntoGroupsBasedOnInstructionSize(java.util.List,com.android.tools.r8.utils.TriConsumer):205 -> h
     164:165:com.android.tools.r8.graph.DexEncodedMethod[] buildVirtualMethods():142 -> h
     166:175:void splitIntoGroupsBasedOnInstructionSize(java.util.List,com.android.tools.r8.utils.TriConsumer):207:216 -> h
@@ -45634,7 +45677,7 @@
     28:34:void com.android.tools.r8.ir.optimize.library.BooleanMethodOptimizer.optimizeValueOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,java.util.Set):97:97 -> a
     28:34:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set):49 -> a
     1:1:com.android.tools.r8.graph.DexType getType():34:34 -> getType
-com.android.tools.r8.ir.optimize.library.EnumMethodOptimizer -> com.android.tools.r8.internal.B9:
+com.android.tools.r8.ir.optimize.library.EnumMethodOptimizer -> com.android.tools.r8.internal.C9:
     com.android.tools.r8.graph.AppView appView -> a
     1:2:void <init>(com.android.tools.r8.graph.AppView):25:26 -> <init>
     1:2:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set):41:42 -> a
@@ -45646,7 +45689,7 @@
     26:27:void com.android.tools.r8.ir.optimize.library.EnumMethodOptimizer.insertAssumeDynamicType(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):74:75 -> a
     26:27:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set):43 -> a
     1:1:com.android.tools.r8.graph.DexType getType():31:31 -> getType
-com.android.tools.r8.ir.optimize.library.LibraryFieldSynthesis -> com.android.tools.r8.internal.dm:
+com.android.tools.r8.ir.optimize.library.LibraryFieldSynthesis -> com.android.tools.r8.internal.em:
     1:2:void synthesizeEnumFields(com.android.tools.r8.graph.AppView):29:30 -> a
     3:3:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
     3:3:void synthesizeEnumFields(com.android.tools.r8.graph.AppView):31 -> a
@@ -45659,7 +45702,7 @@
     86:86:void com.android.tools.r8.graph.DexEncodedField.<init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessFlags,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexValue):61:61 -> a
     86:86:void lambda$synthesizeEnumFields$0(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexField):43 -> a
     87:87:void lambda$synthesizeEnumFields$0(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexField):37:37 -> a
-com.android.tools.r8.ir.optimize.library.LibraryMemberOptimizer -> com.android.tools.r8.internal.em:
+com.android.tools.r8.ir.optimize.library.LibraryMemberOptimizer -> com.android.tools.r8.internal.fm:
     com.android.tools.r8.graph.AppView appView -> b
     java.util.Set finalLibraryFields -> c
     java.util.Set modeledLibraryTypes -> d
@@ -45691,9 +45734,9 @@
     121:121:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> a
     121:121: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.ir.conversion.MethodProcessingId):128 -> a
     122:122: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.ir.conversion.MethodProcessingId):128:128 -> a
-com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection -> com.android.tools.r8.internal.fm:
+com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection -> com.android.tools.r8.internal.gm:
     void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set) -> a
-com.android.tools.r8.ir.optimize.library.LibraryMethodSideEffectModelCollection -> com.android.tools.r8.internal.jm:
+com.android.tools.r8.ir.optimize.library.LibraryMethodSideEffectModelCollection -> com.android.tools.r8.internal.km:
     java.util.Map finalMethodsWithoutSideEffects -> a
     java.util.Set nonFinalMethodsWithoutSideEffects -> b
     1:3:void <init>(com.android.tools.r8.graph.DexItemFactory):25:27 -> <init>
@@ -45704,7 +45747,7 @@
     24:26:boolean isSideEffectFree(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.LibraryMethod):79 -> a
     27:28:boolean isSideEffectFree(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.LibraryMethod):79:80 -> a
     1:1:java.util.Set buildNonFinalMethodsWithoutSideEffects(com.android.tools.r8.graph.DexItemFactory):55:55 -> b
-com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer -> com.android.tools.r8.internal.lm:
+com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer -> com.android.tools.r8.internal.mm:
     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
@@ -45770,7 +45813,7 @@
     198:287:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):0:89 -> a
     198:287:com.android.tools.r8.graph.DexEncodedMethod lookupMethod(com.android.tools.r8.graph.DexMethod):132 -> a
     288:290:com.android.tools.r8.graph.DexEncodedMethod lookupMethod(com.android.tools.r8.graph.DexMethod):133:135 -> a
-com.android.tools.r8.ir.optimize.library.LogMethodOptimizer -> com.android.tools.r8.internal.Vm:
+com.android.tools.r8.ir.optimize.library.LogMethodOptimizer -> com.android.tools.r8.internal.Wm:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.DexMethod wtfMethod -> i
     com.android.tools.r8.graph.DexMethod eMethod -> h
@@ -45792,28 +45835,28 @@
     4:38:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set):109:143 -> a
     39:42:void replaceInvokeWithConstNumber(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,int):150:153 -> a
     1:1:com.android.tools.r8.graph.DexType getType():99:99 -> getType
-com.android.tools.r8.ir.optimize.library.NopLibraryMethodModelCollection -> com.android.tools.r8.internal.cq:
+com.android.tools.r8.ir.optimize.library.NopLibraryMethodModelCollection -> com.android.tools.r8.internal.eq:
     com.android.tools.r8.ir.optimize.library.NopLibraryMethodModelCollection INSTANCE -> a
     1:1:void <clinit>():18:18 -> <clinit>
     1:1:void <init>():21:21 -> <init>
     void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set) -> a
     1:1:com.android.tools.r8.ir.optimize.library.NopLibraryMethodModelCollection getInstance():24:24 -> a
     1:1:com.android.tools.r8.graph.DexType getType():29:29 -> getType
-com.android.tools.r8.ir.optimize.library.ObjectMethodOptimizer -> com.android.tools.r8.internal.sr:
+com.android.tools.r8.ir.optimize.library.ObjectMethodOptimizer -> com.android.tools.r8.internal.ur:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> a
     1:2:void <init>(com.android.tools.r8.graph.AppView):21:22 -> <init>
     1:1:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set):37:37 -> a
     2:4:void com.android.tools.r8.ir.optimize.library.ObjectMethodOptimizer.optimizeGetClass(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):43:45 -> a
     2:4:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set):38 -> a
     1:1:com.android.tools.r8.graph.DexType getType():27:27 -> getType
-com.android.tools.r8.ir.optimize.library.ObjectsMethodOptimizer -> com.android.tools.r8.internal.Cr:
+com.android.tools.r8.ir.optimize.library.ObjectsMethodOptimizer -> com.android.tools.r8.internal.Er:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> a
     1:2:void <init>(com.android.tools.r8.graph.AppView):21:22 -> <init>
     1:1:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set):37:37 -> a
     2:10:void com.android.tools.r8.ir.optimize.library.ObjectsMethodOptimizer.optimizeRequireNonNull(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,java.util.Set):44:52 -> a
     2:10:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set):38 -> a
     1:1:com.android.tools.r8.graph.DexType getType():27:27 -> getType
-com.android.tools.r8.ir.optimize.library.StringMethodOptimizer -> com.android.tools.r8.internal.bz:
+com.android.tools.r8.ir.optimize.library.StringMethodOptimizer -> com.android.tools.r8.internal.dz:
     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):26:28 -> <init>
@@ -45845,7 +45888,7 @@
 com.android.tools.r8.ir.optimize.peepholes.BasicBlockPeephole -> com.android.tools.r8.internal.d2:
     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.a9:
+com.android.tools.r8.ir.optimize.peepholes.DupDupDupPeephole -> com.android.tools.r8.internal.b9:
     com.android.tools.r8.ir.optimize.peepholes.Point dup3Exp -> c
     com.android.tools.r8.ir.optimize.peepholes.Point dup2Exp -> b
     com.android.tools.r8.ir.optimize.peepholes.Point dup1Exp -> a
@@ -45866,7 +45909,7 @@
     1:1:boolean com.android.tools.r8.ir.code.Instruction.isDup():0:0 -> c
     1:1:boolean lambda$new$2(com.android.tools.r8.ir.code.Instruction):35 -> c
     2:2: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.Pm:
+com.android.tools.r8.ir.optimize.peepholes.LoadLoadDupPeephole -> com.android.tools.r8.internal.Qm:
     com.android.tools.r8.ir.optimize.peepholes.Point firstLoadExp -> c
     com.android.tools.r8.ir.optimize.peepholes.Point lastLoadExp -> b
     com.android.tools.r8.ir.optimize.peepholes.PeepholeLayout layout -> d
@@ -45877,10 +45920,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):24:24 -> 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.On:
+com.android.tools.r8.ir.optimize.peepholes.Match -> com.android.tools.r8.internal.Pn:
     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.To:
+com.android.tools.r8.ir.optimize.peepholes.MoveLoadUpPeephole -> com.android.tools.r8.internal.Uo:
     com.android.tools.r8.ir.optimize.peepholes.PeepholeLayout layout -> g
     com.android.tools.r8.ir.code.Instruction insertPosition -> d
     com.android.tools.r8.ir.optimize.peepholes.Point firstLoad -> e
@@ -45914,12 +45957,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.ps:
+com.android.tools.r8.ir.optimize.peepholes.PeepholeExpression -> com.android.tools.r8.internal.rs:
     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.qs:
+com.android.tools.r8.ir.optimize.peepholes.PeepholeHelper -> com.android.tools.r8.internal.ss:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:java.util.function.Predicate withoutLocalInfo(java.util.function.Predicate):17:17 -> a
@@ -45930,7 +45973,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.rs:
+com.android.tools.r8.ir.optimize.peepholes.PeepholeLayout -> com.android.tools.r8.internal.ts:
     com.android.tools.r8.ir.optimize.peepholes.PeepholeExpression[] expressions -> b
     java.util.List instructions -> a
     boolean backwards -> c
@@ -45945,7 +45988,7 @@
     1:1:com.android.tools.r8.ir.code.Instruction lambda$test$4(com.android.tools.r8.ir.code.InstructionListIterator):40:40 -> e
     1:1:void lambda$test$5(com.android.tools.r8.ir.code.InstructionListIterator):40:40 -> f
     1:4:com.android.tools.r8.ir.optimize.peepholes.Match test(com.android.tools.r8.ir.code.InstructionListIterator):37:40 -> g
-com.android.tools.r8.ir.optimize.peepholes.Point -> com.android.tools.r8.internal.zs:
+com.android.tools.r8.ir.optimize.peepholes.Point -> com.android.tools.r8.internal.Bs:
     java.util.function.Predicate predicate -> b
     boolean $assertionsDisabled -> a
     int index -> c
@@ -45957,7 +46000,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.Ow:
+com.android.tools.r8.ir.optimize.peepholes.RemoveDebugPositionPeephole -> com.android.tools.r8.internal.Qw:
     com.android.tools.r8.ir.optimize.peepholes.Point secondInstructionExp -> c
     com.android.tools.r8.ir.optimize.peepholes.Point debugPositionExp -> b
     com.android.tools.r8.ir.optimize.peepholes.PeepholeLayout layout -> d
@@ -45967,14 +46010,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.My:
+com.android.tools.r8.ir.optimize.peepholes.StoreLoadPeephole -> com.android.tools.r8.internal.Oy:
     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.Ny:
+com.android.tools.r8.ir.optimize.peepholes.StoreLoadToDupStorePeephole -> com.android.tools.r8.internal.Py:
     com.android.tools.r8.ir.optimize.peepholes.Point loadExp -> c
     com.android.tools.r8.ir.optimize.peepholes.Point storeExp -> b
     com.android.tools.r8.ir.optimize.peepholes.PeepholeLayout layout -> e
@@ -45992,7 +46035,7 @@
     23:23:boolean com.android.tools.r8.ir.code.Instruction.isDup():0:0 -> a
     23:23:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):62 -> a
     24:42: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.Oy:
+com.android.tools.r8.ir.optimize.peepholes.StoreSequenceLoadPeephole -> com.android.tools.r8.internal.Qy:
     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
@@ -46017,7 +46060,7 @@
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isLoad():0:0 -> c
     2:2:boolean lambda$new$2(com.android.tools.r8.ir.code.Instruction):73 -> c
     3:4: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.UC:
+com.android.tools.r8.ir.optimize.peepholes.Wildcard -> com.android.tools.r8.internal.VC:
     java.util.function.Predicate predicate -> b
     boolean $assertionsDisabled -> a
     int index -> c
@@ -46029,7 +46072,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.Y5:
+com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer -> com.android.tools.r8.internal.Z5:
     com.android.tools.r8.graph.DexItemFactory factory -> c
     com.android.tools.r8.ir.conversion.IRConverter converter -> d
     java.util.concurrent.ConcurrentHashMap candidates -> f
@@ -46050,103 +46093,97 @@
     93:94:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):138:139 -> a
     95:96:void com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.markNotEligible(com.android.tools.r8.graph.DexType,java.util.Set):187:188 -> a
     95:96:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):139 -> a
-    97:97:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):143:143 -> a
-    98:98:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getReference():375:375 -> a
-    98:98:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexEncodedMethod.getProto():371 -> a
-    98:98:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):144 -> a
-    99:99:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexEncodedMethod.getProto():371:371 -> a
-    99:99:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):144 -> a
-    100:100:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):144:144 -> a
-    101:102:void com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.markNotEligible(com.android.tools.r8.graph.DexType,java.util.Set):187:188 -> a
-    101:102:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):145 -> a
-    103:103:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():486:486 -> a
-    103:103:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):147 -> a
-    104:104:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):148:148 -> a
-    105:106:void com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.markNotEligible(com.android.tools.r8.graph.DexType,java.util.Set):187:188 -> a
-    105:106:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):148 -> a
-    107:119:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):153:165 -> a
-    120:121:void com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.markNotEligible(com.android.tools.r8.graph.DexType,java.util.Set):187:188 -> a
-    120:121:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):165 -> a
-    122:126:void lambda$collectCandidates$1(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexProgramClass):171:175 -> a
-    127:132:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isPinned(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):193:198 -> a
-    127:132:void lambda$collectCandidates$1(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexProgramClass):176 -> a
-    133:136:void lambda$collectCandidates$1(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexProgramClass):177:180 -> a
-    137:150:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):228:241 -> a
-    151:164:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):238:251 -> a
-    165:167:java.util.List com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isValidGetter(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.IRCode):533:535 -> a
-    165:167:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):252 -> a
-    168:168:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
-    168:168:java.util.List com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isValidGetter(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.IRCode):536 -> a
-    168:168:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):252 -> a
-    169:174:java.util.List com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isValidGetter(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.IRCode):537:542 -> a
-    169:174:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):252 -> a
-    175:175:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> a
-    175:175:java.util.List com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isValidGetter(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.IRCode):545 -> a
-    175:175:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):252 -> a
-    176:181:java.util.List com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isValidGetter(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.IRCode):545:550 -> a
-    176:181:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):252 -> a
-    182:213:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):254:285 -> a
-    214:222:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processInstantiation(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):392:400 -> a
-    214:222:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):286 -> a
-    223:223:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.isHostClassInitializer(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
-    223:223:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processInstantiation(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):403 -> a
-    223:223:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):286 -> a
-    224:224:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.hostType():87:87 -> a
-    224:224:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.isHostClassInitializer(com.android.tools.r8.graph.ProgramMethod):83 -> a
-    224:224:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processInstantiation(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):403 -> a
-    224:224:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):286 -> a
-    225:265:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processInstantiation(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):406:446 -> a
-    225:265:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):286 -> a
-    266:266:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isNonThrowingConstInstruction(com.android.tools.r8.ir.code.Instruction):481:481 -> a
-    266:266:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processInstantiation(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):446 -> a
-    266:266:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):286 -> a
-    267:282:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processInstantiation(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):449:464 -> a
-    267:282:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):286 -> a
-    283:289:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isValidStaticPut(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Instruction):516:522 -> a
-    283:289:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processInstantiation(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):465 -> a
-    283:289:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):286 -> a
-    290:299:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processInstantiation(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):466:475 -> a
-    290:299:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):286 -> a
-    300:306:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):288:294 -> a
-    307:308:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isAllowedInHostClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):383:384 -> a
-    307:308:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):294 -> a
-    309:309:boolean com.android.tools.r8.ir.code.Instruction.isConstString():0:0 -> a
-    309:309:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isAllowedInHostClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):385 -> a
-    309:309:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):294 -> a
-    310:310:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isAllowedInHostClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):386:386 -> a
-    310:310:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):294 -> a
-    311:316:boolean com.android.tools.r8.ir.code.Goto.isTrivialGotoToTheNextBlock(com.android.tools.r8.ir.code.IRCode):104:109 -> a
-    311:316:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isAllowedInHostClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):386 -> a
-    311:316:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):294 -> a
-    317:317:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isAllowedInHostClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):387:387 -> a
-    317:317:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):294 -> a
-    318:335:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):295:312 -> a
-    336:336:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
-    336:336:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):317 -> a
-    337:337:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):319:319 -> a
-    338:350:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processStaticFieldRead(com.android.tools.r8.ir.code.StaticGet):563:575 -> a
-    338:350:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):319 -> a
-    351:363:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):321:333 -> a
-    364:373:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic):583:592 -> a
-    364:373:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):333 -> a
-    374:389:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):335:350 -> a
-    390:390:boolean com.android.tools.r8.ir.code.Instruction.isInvokeCustom():0:0 -> a
-    390:390:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):355 -> a
-    391:392:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):357:358 -> a
-    393:393:boolean com.android.tools.r8.ir.code.Instruction.isInstanceGet():0:0 -> a
-    393:393:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):362 -> a
-    394:399:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):362:367 -> a
-    400:403:void addReferencedFrom(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.graph.ProgramMethod):375:378 -> a
-    404:404:com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder lambda$addReferencedFrom$2(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo):377:377 -> a
-    405:430:boolean isValidInitCall(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):486:511 -> a
-    431:431:boolean lambda$isValidInitCall$3(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):496:496 -> a
-    432:437:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo analyzeAllValueUsers(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Value,boolean):599:604 -> a
-    438:440:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo analyzeAllValueUsers(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Value,boolean):603:605 -> a
-    441:444:boolean isSelectedValueUsersValid(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Value,boolean,java.util.Set):615:618 -> a
-    445:445:void staticizeCandidates(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):690:690 -> a
+    97:98:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):143:144 -> a
+    99:100:void com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.markNotEligible(com.android.tools.r8.graph.DexType,java.util.Set):187:188 -> a
+    99:100:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):145 -> a
+    101:101:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():492:492 -> a
+    101:101:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):147 -> a
+    102:102:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):148:148 -> a
+    103:104:void com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.markNotEligible(com.android.tools.r8.graph.DexType,java.util.Set):187:188 -> a
+    103:104:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):148 -> a
+    105:117:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):153:165 -> a
+    118:119:void com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.markNotEligible(com.android.tools.r8.graph.DexType,java.util.Set):187:188 -> a
+    118:119:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):165 -> a
+    120:124:void lambda$collectCandidates$1(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexProgramClass):171:175 -> a
+    125:130:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isPinned(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):193:198 -> a
+    125:130:void lambda$collectCandidates$1(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexProgramClass):176 -> a
+    131:134:void lambda$collectCandidates$1(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexProgramClass):177:180 -> a
+    135:148:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):228:241 -> a
+    149:162:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):238:251 -> a
+    163:165:java.util.List com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isValidGetter(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.IRCode):533:535 -> a
+    163:165:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):252 -> a
+    166:166:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
+    166:166:java.util.List com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isValidGetter(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.IRCode):536 -> a
+    166:166:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):252 -> a
+    167:172:java.util.List com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isValidGetter(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.IRCode):537:542 -> a
+    167:172:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):252 -> a
+    173:173:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> a
+    173:173:java.util.List com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isValidGetter(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.IRCode):545 -> a
+    173:173:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):252 -> a
+    174:179:java.util.List com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isValidGetter(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.IRCode):545:550 -> a
+    174:179:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):252 -> a
+    180:211:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):254:285 -> a
+    212:220:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processInstantiation(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):392:400 -> a
+    212:220:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):286 -> a
+    221:221:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.isHostClassInitializer(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
+    221:221:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processInstantiation(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):403 -> a
+    221:221:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):286 -> a
+    222:222:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.hostType():87:87 -> a
+    222:222:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.isHostClassInitializer(com.android.tools.r8.graph.ProgramMethod):83 -> a
+    222:222:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processInstantiation(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):403 -> a
+    222:222:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):286 -> a
+    223:263:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processInstantiation(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):406:446 -> a
+    223:263:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):286 -> a
+    264:264:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isNonThrowingConstInstruction(com.android.tools.r8.ir.code.Instruction):481:481 -> a
+    264:264:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processInstantiation(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):446 -> a
+    264:264:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):286 -> a
+    265:280:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processInstantiation(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):449:464 -> a
+    265:280:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):286 -> a
+    281:287:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isValidStaticPut(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Instruction):516:522 -> a
+    281:287:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processInstantiation(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):465 -> a
+    281:287:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):286 -> a
+    288:297:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processInstantiation(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):466:475 -> a
+    288:297:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):286 -> a
+    298:304:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):288:294 -> a
+    305:306:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isAllowedInHostClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):383:384 -> a
+    305:306:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):294 -> a
+    307:307:boolean com.android.tools.r8.ir.code.Instruction.isConstString():0:0 -> a
+    307:307:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isAllowedInHostClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):385 -> a
+    307:307:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):294 -> a
+    308:308:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isAllowedInHostClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):386:386 -> a
+    308:308:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):294 -> a
+    309:314:boolean com.android.tools.r8.ir.code.Goto.isTrivialGotoToTheNextBlock(com.android.tools.r8.ir.code.IRCode):104:109 -> a
+    309:314:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isAllowedInHostClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):386 -> a
+    309:314:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):294 -> a
+    315:315:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.isAllowedInHostClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):387:387 -> a
+    315:315:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):294 -> a
+    316:333:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):295:312 -> a
+    334:334:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
+    334:334:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):317 -> a
+    335:335:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):319:319 -> a
+    336:348:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processStaticFieldRead(com.android.tools.r8.ir.code.StaticGet):563:575 -> a
+    336:348:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):319 -> a
+    349:361:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):321:333 -> a
+    362:371:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.processInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic):583:592 -> a
+    362:371:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):333 -> a
+    372:387:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):335:350 -> a
+    388:388:boolean com.android.tools.r8.ir.code.Instruction.isInvokeCustom():0:0 -> a
+    388:388:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):355 -> a
+    389:390:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):357:358 -> a
+    391:391:boolean com.android.tools.r8.ir.code.Instruction.isInstanceGet():0:0 -> a
+    391:391:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):362 -> a
+    392:397:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):362:367 -> a
+    398:401:void addReferencedFrom(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.graph.ProgramMethod):375:378 -> a
+    402:402:com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder lambda$addReferencedFrom$2(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo):377:377 -> a
+    403:428:boolean isValidInitCall(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):486:511 -> a
+    429:429:boolean lambda$isValidInitCall$3(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):496:496 -> a
+    430:435:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo analyzeAllValueUsers(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Value,boolean):599:604 -> a
+    436:438:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo analyzeAllValueUsers(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Value,boolean):603:605 -> a
+    439:442:boolean isSelectedValueUsersValid(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Value,boolean,java.util.Set):615:618 -> a
+    443:443:void staticizeCandidates(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):690:690 -> a
     1:1:boolean lambda$isValidValueUser$4(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):643:643 -> b
-com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$1 -> com.android.tools.r8.internal.V5:
-com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CallSiteReferencesInvalidator -> com.android.tools.r8.internal.W5:
+com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$1 -> com.android.tools.r8.internal.W5:
+com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CallSiteReferencesInvalidator -> com.android.tools.r8.internal.X5:
     com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer this$0 -> c
     1:1:void <init>(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$1):693:693 -> <init>
     2:3:void <init>(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer,com.android.tools.r8.graph.DexItemFactory):695:696 -> <init>
@@ -46168,7 +46205,7 @@
     1:1:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):761:761 -> g
     2:4:void registerTypeReference(com.android.tools.r8.graph.DexType):766:768 -> g
     1:2:void registerField(com.android.tools.r8.graph.DexField):705:706 -> i
-com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo -> com.android.tools.r8.internal.X5:
+com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo -> com.android.tools.r8.internal.Y5:
     java.util.concurrent.atomic.AtomicInteger fieldWrites -> e
     java.util.concurrent.atomic.AtomicInteger instancesCreated -> f
     java.util.concurrent.atomic.AtomicReference constructor -> g
@@ -46188,13 +46225,13 @@
     3:3:com.android.tools.r8.graph.DexProgramClass hostClass():91 -> a
     4:5:com.android.tools.r8.graph.DexProgramClass hostClass():91:92 -> a
     1:1:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo invalidate():97:97 -> b
-com.android.tools.r8.ir.optimize.staticizer.ClassStaticizerGraphLens -> com.android.tools.r8.internal.Z5:
+com.android.tools.r8.ir.optimize.staticizer.ClassStaticizerGraphLens -> com.android.tools.r8.internal.a6:
     boolean $assertionsDisabled -> m
     1:1:void <clinit>():15:15 -> <clinit>
     1:7:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.com.google.common.collect.BiMap):22:28 -> <init>
     8:8:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.com.google.common.collect.BiMap):21:21 -> <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):33:35 -> b
-com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor -> com.android.tools.r8.internal.Ky:
+com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor -> com.android.tools.r8.internal.My:
     com.android.tools.r8.ir.conversion.IRConverter converter -> d
     com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer classStaticizer -> c
     com.android.tools.r8.graph.AppView appView -> b
@@ -46271,75 +46308,75 @@
     406:406:boolean testAndCollectPhisComposedOfSameMember(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexMember,java.util.Set):601:601 -> a
     407:407:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
     407:407:boolean testAndCollectPhisComposedOfSameMember(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexMember,java.util.Set):604 -> a
-    408:421:boolean testAndCollectPhisComposedOfSameMember(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexMember,java.util.Set):604:617 -> a
-    422:428:void fixupStaticizedFieldUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMember):625:631 -> a
-    429:446:void fixupStaticizedFieldUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMember):630:647 -> a
-    447:447:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):651:651 -> a
-    448:448:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> a
-    448:448:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):652 -> a
-    449:454:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):655:660 -> a
-    455:455:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):1105:1105 -> a
-    455:455:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):660 -> a
-    456:463:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):661:668 -> a
-    464:464:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):304:304 -> a
-    464:464:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):667 -> a
-    465:465:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> a
-    465:465:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):304 -> a
-    465:465:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):667 -> a
-    466:466:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):727:727 -> a
-    467:467:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.factory():877:877 -> a
-    467:467:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):729 -> a
-    468:470:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):729:731 -> a
-    471:471:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.factory():877:877 -> a
-    471:471:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):733 -> a
-    472:472:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):733:733 -> a
-    473:476:boolean classMembersConflict(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):782:785 -> a
-    477:477:boolean lambda$classMembersConflict$14(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):784:784 -> a
-    478:478:boolean lambda$classMembersConflict$15(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):785:785 -> a
-    479:483:boolean hasMembersNotStaticized(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):791:795 -> a
-    484:484:com.android.tools.r8.graph.DexField mapCandidateField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):869:869 -> a
-    485:485:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.factory():877:877 -> a
-    485:485:com.android.tools.r8.graph.DexField mapCandidateField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):870 -> a
-    486:487:com.android.tools.r8.graph.DexField mapCandidateField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):871:872 -> a
-    488:488:com.android.tools.r8.graph.DexField mapCandidateField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):870:870 -> a
+    408:422:boolean testAndCollectPhisComposedOfSameMember(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexMember,java.util.Set):604:618 -> a
+    423:429:void fixupStaticizedFieldUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMember):626:632 -> a
+    430:447:void fixupStaticizedFieldUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMember):631:648 -> a
+    448:448:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):652:652 -> a
+    449:449:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> a
+    449:449:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):653 -> a
+    450:455:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):656:661 -> a
+    456:456:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):1105:1105 -> a
+    456:456:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):661 -> a
+    457:464:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):662:669 -> a
+    465:465:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):304:304 -> a
+    465:465:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):668 -> a
+    466:466:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> a
+    466:466:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):304 -> a
+    466:466:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):668 -> a
+    467:467:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):728:728 -> a
+    468:468:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.factory():878:878 -> a
+    468:468:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):730 -> a
+    469:471:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):730:732 -> a
+    472:472:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.factory():878:878 -> a
+    472:472:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):734 -> a
+    473:473:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):734:734 -> a
+    474:477:boolean classMembersConflict(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):783:786 -> a
+    478:478:boolean lambda$classMembersConflict$14(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):785:785 -> a
+    479:479:boolean lambda$classMembersConflict$15(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):786:786 -> a
+    480:484:boolean hasMembersNotStaticized(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):792:796 -> a
+    485:485:com.android.tools.r8.graph.DexField mapCandidateField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):870:870 -> a
+    486:486:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.factory():878:878 -> a
+    486:486:com.android.tools.r8.graph.DexField mapCandidateField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):871 -> a
+    487:488:com.android.tools.r8.graph.DexField mapCandidateField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):872:873 -> a
+    489:489:com.android.tools.r8.graph.DexField mapCandidateField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):871:871 -> a
     1:28:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):103:130 -> b
-    29:40:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():739:750 -> b
+    29:40:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():740:751 -> b
     29:40:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):134 -> b
-    41:41:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.factory():877:877 -> b
-    41:41:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():751 -> b
+    41:41:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.factory():878:878 -> b
+    41:41:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():752 -> b
     41:41:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):134 -> b
-    42:50:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():751:759 -> b
+    42:50:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():752:760 -> b
     42:50:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):134 -> b
     51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.hostType():87:87 -> b
-    51:51:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():762 -> b
+    51:51:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():763 -> b
     51:51:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):134 -> b
-    52:53:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():763:764 -> b
+    52:53:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():764:765 -> b
     52:53:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):134 -> b
     54:54:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> b
-    54:54:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():764 -> b
+    54:54:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():765 -> b
     54:54:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):134 -> b
-    55:58:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():764:767 -> b
+    55:58:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():765:768 -> b
     55:58:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):134 -> b
-    59:101:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.moveMembersIntoHost(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.com.google.common.collect.BiMap):805:847 -> b
-    59:101:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():769 -> b
+    59:101:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.moveMembersIntoHost(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.com.google.common.collect.BiMap):806:848 -> b
+    59:101:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():770 -> b
     59:101:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):134 -> b
-    102:102:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.factory():877:877 -> b
-    102:102:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.moveMembersIntoHost(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.com.google.common.collect.BiMap):850 -> b
-    102:102:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():769 -> b
+    102:102:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.factory():878:878 -> b
+    102:102:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.moveMembersIntoHost(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.com.google.common.collect.BiMap):851 -> b
+    102:102:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():770 -> b
     102:102:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):134 -> b
-    103:103:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.moveMembersIntoHost(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.com.google.common.collect.BiMap):850:850 -> b
-    103:103:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():769 -> b
+    103:103:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.moveMembersIntoHost(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.com.google.common.collect.BiMap):851:851 -> b
+    103:103:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():770 -> b
     103:103:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):134 -> b
-    104:120:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.moveMembersIntoHost(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.com.google.common.collect.BiMap):849:865 -> b
-    104:120:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():769 -> b
+    104:120:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.moveMembersIntoHost(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.com.google.common.collect.BiMap):850:866 -> b
+    104:120:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():770 -> b
     104:120:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):134 -> b
-    121:122:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():775:776 -> b
+    121:122:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():776:777 -> b
     121:122:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):134 -> b
     123:137:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):139:153 -> b
     138:141:void lambda$run$3(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):144:147 -> b
     142:142:boolean lambda$finalEligibilityCheck$4(com.android.tools.r8.graph.DexEncodedMethod):203:203 -> b
     143:154:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):414:425 -> b
-    155:155:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.factory():877:877 -> b
+    155:155:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.factory():878:878 -> b
     155:155:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):425 -> b
     156:163:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):425:432 -> b
     164:164:com.android.tools.r8.ir.code.InvokeDirect com.android.tools.r8.ir.code.NewInstance.getUniqueConstructorInvoke(com.android.tools.r8.graph.DexItemFactory):43:43 -> b
@@ -46372,40 +46409,40 @@
     25:25:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):494 -> d
     26:26:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):497:497 -> d
     27:27:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1024:1024 -> d
-    27:27:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):674 -> d
+    27:27:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):675 -> d
     27:27:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):498 -> d
-    28:29:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):675:676 -> d
+    28:29:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):676:677 -> d
     28:29:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):498 -> d
     30:30:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> d
-    30:30:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):678 -> d
+    30:30:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):679 -> d
     30:30:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):498 -> d
-    31:40:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):679:688 -> d
+    31:40:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):680:689 -> d
     31:40:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):498 -> d
-    41:43:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):687:689 -> d
+    41:43:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):688:690 -> d
     41:43:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):498 -> d
-    44:44:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):686:686 -> d
+    44:44:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):687:687 -> d
     44:44:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):498 -> d
     45:45:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> d
-    45:45:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):684 -> d
+    45:45:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):685 -> d
     45:45:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):498 -> d
-    46:50:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):695:699 -> d
+    46:50:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):696:700 -> d
     46:50:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):498 -> d
     51:51:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> d
-    51:51:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):699 -> d
+    51:51:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):700 -> d
     51:51:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):498 -> d
-    52:55:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):704:707 -> d
+    52:55:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):705:708 -> d
     52:55:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):498 -> d
-    56:56:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.factory():877:877 -> d
-    56:56:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):709 -> d
+    56:56:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.factory():878:878 -> d
+    56:56:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):710 -> d
     56:56:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):498 -> d
-    57:65:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):709:717 -> d
+    57:65:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):710:718 -> d
     57:65:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):498 -> d
-    66:68:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):716:718 -> d
+    66:68:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):717:719 -> d
     66:68:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):498 -> d
-    69:73:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):715:719 -> d
+    69:73:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):716:720 -> d
     69:73:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):498 -> d
     74:74:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> d
-    74:74:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):719 -> d
+    74:74:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):720 -> d
     74:74:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):498 -> d
 com.android.tools.r8.ir.optimize.string.StringBuilderAppendFlowAnalysis -> com.android.tools.r8.ir.optimize.string.d:
 com.android.tools.r8.ir.optimize.string.StringBuilderAppendFlowAnalysis$1 -> com.android.tools.r8.ir.optimize.string.a:
@@ -46631,7 +46668,7 @@
     2:40:java.lang.Number extractConstantNumber(com.android.tools.r8.ir.code.Value):472:510 -> b
     1:1:java.util.Map getBuilderState(com.android.tools.r8.ir.code.Value):317:317 -> c
     1:1:java.util.Map lambda$createBuilderState$0(com.android.tools.r8.ir.code.Value):312:312 -> d
-com.android.tools.r8.ir.optimize.string.StringOptimizer -> com.android.tools.r8.internal.dz:
+com.android.tools.r8.ir.optimize.string.StringOptimizer -> com.android.tools.r8.internal.fz:
     com.android.tools.r8.graph.DexItemFactory factory -> c
     com.android.tools.r8.graph.AppView appView -> b
     int numberOfSimplifiedConversions -> j
@@ -46755,7 +46792,7 @@
     1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$7(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):228:228 -> h
     1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$8(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):230:230 -> i
     1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$9(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):232:232 -> j
-com.android.tools.r8.ir.optimize.string.StringOptimizer$StringOptimizerEscapeAnalysisConfiguration -> com.android.tools.r8.internal.cz:
+com.android.tools.r8.ir.optimize.string.StringOptimizer$StringOptimizerEscapeAnalysisConfiguration -> com.android.tools.r8.internal.ez:
     com.android.tools.r8.ir.optimize.string.StringOptimizer$StringOptimizerEscapeAnalysisConfiguration INSTANCE -> a
     1:1:void <clinit>():580:580 -> <clinit>
     1:1:void <init>():583:583 -> <init>
@@ -47139,16 +47176,16 @@
     1463:1463: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):2336 -> a
     1464:1471: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):2337:2344 -> a
     1472:1507: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):2452:2487 -> a
-    1508:1508:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():425:425 -> a
+    1508:1508:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> a
     1508:1508:boolean unconstrainedForCf(int,com.android.tools.r8.utils.InternalOptions):2659 -> a
     1508:1508: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):2487 -> a
     1509:1515: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):2487:2493 -> a
     1516:1567:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2526:2577 -> a
     1568:1574:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2574:2580 -> a
-    1575:1575:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():425:425 -> a
+    1575:1575:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> a
     1575:1575:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2580 -> a
     1576:1583:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2580:2587 -> a
-    1584:1584:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():425:425 -> a
+    1584:1584:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> a
     1584:1584:boolean unconstrainedForCf(int,com.android.tools.r8.utils.InternalOptions):2659 -> a
     1584:1584:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2587 -> a
     1585:1622:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2587:2624 -> a
@@ -47223,14 +47260,14 @@
     101:106:void computeLiveRanges():2498:2503 -> b
     101:106:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():638 -> b
     101:106:void allocateRegisters():215 -> b
-    107:107:boolean com.android.tools.r8.utils.InternalOptions.canHaveThisTypeVerifierBug():1549:1549 -> b
+    107:107:boolean com.android.tools.r8.utils.InternalOptions.canHaveThisTypeVerifierBug():1556:1556 -> b
     107:107:void computeLiveRanges():2503 -> b
     107:107:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():638 -> b
     107:107:void allocateRegisters():215 -> b
     108:108:void computeLiveRanges():2503:2503 -> b
     108:108:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():638 -> b
     108:108:void allocateRegisters():215 -> b
-    109:109:boolean com.android.tools.r8.utils.InternalOptions.canHaveThisJitCodeDebuggingBug():1558:1558 -> b
+    109:109:boolean com.android.tools.r8.utils.InternalOptions.canHaveThisJitCodeDebuggingBug():1565:1565 -> b
     109:109:void computeLiveRanges():2503 -> b
     109:109:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():638 -> b
     109:109:void allocateRegisters():215 -> b
@@ -47264,16 +47301,16 @@
     1:3:int registersUsed():596:598 -> c
     4:9:int unadjustedRealRegisterFromAllocated(int):807:812 -> c
     10:10:boolean needsLongResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1507:1507 -> c
-    11:11:boolean com.android.tools.r8.utils.InternalOptions.canHaveOverlappingLongRegisterBug():1564:1564 -> c
+    11:11:boolean com.android.tools.r8.utils.InternalOptions.canHaveOverlappingLongRegisterBug():1571:1571 -> c
     11:11:boolean needsLongResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1507 -> c
     12:32:boolean needsLongResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1510:1530 -> c
     33:45:boolean isLongResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1543:1555 -> c
     46:46:boolean registersAreFree(int,boolean):3118:3118 -> c
     1:1:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1446:1446 -> d
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():1597:1597 -> d
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():1604:1604 -> d
     2:2:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1446 -> d
     3:3:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1446:1446 -> d
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.canHaveLongToIntBug():1771:1771 -> d
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.canHaveLongToIntBug():1778:1778 -> d
     4:4:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1446 -> d
     5:18:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1449:1462 -> d
     19:19:boolean com.android.tools.r8.ir.code.Instruction.isCmp():0:0 -> d
@@ -47284,12 +47321,12 @@
     25:25:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1477:1477 -> d
     26:26:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1446:1446 -> d
     26:26:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1477 -> d
-    27:27:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():1597:1597 -> d
+    27:27:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():1604:1604 -> d
     27:27:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1446 -> d
     27:27:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1477 -> d
     28:28:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1446:1446 -> d
     28:28:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1477 -> d
-    29:29:boolean com.android.tools.r8.utils.InternalOptions.canHaveLongToIntBug():1771:1771 -> d
+    29:29:boolean com.android.tools.r8.utils.InternalOptions.canHaveLongToIntBug():1778:1778 -> d
     29:29:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1446 -> d
     29:29:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1477 -> d
     30:43:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1449:1462 -> d
@@ -47552,7 +47589,7 @@
     1:1:java.util.TreeSet getUses():258:258 -> z
     1:1:int numberOfUsesWithConstraint():540 -> z
     2:3:int numberOfUsesWithConstraint():540:541 -> z
-com.android.tools.r8.ir.regalloc.LiveIntervalsUse -> com.android.tools.r8.internal.Lm:
+com.android.tools.r8.ir.regalloc.LiveIntervalsUse -> com.android.tools.r8.internal.Mm:
     int limit -> b
     int position -> a
     1:3:void <init>(int,int):12:14 -> <init>
@@ -47564,7 +47601,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.Nm:
+com.android.tools.r8.ir.regalloc.LiveRange -> com.android.tools.r8.internal.Om:
     com.android.tools.r8.ir.regalloc.LiveRange INFINITE -> a
     int start -> b
     int end -> c
@@ -47574,7 +47611,7 @@
     2:5:int com.android.tools.r8.ir.regalloc.LiveRange.compareTo(com.android.tools.r8.ir.regalloc.LiveRange):20:23 -> compareTo
     2:5:int compareTo(java.lang.Object):6 -> compareTo
     1:1:java.lang.String toString():28:28 -> toString
-com.android.tools.r8.ir.regalloc.RegisterAllocator -> com.android.tools.r8.internal.xw:
+com.android.tools.r8.ir.regalloc.RegisterAllocator -> com.android.tools.r8.internal.zw:
     void addNewBlockToShareIdenticalSuffix(com.android.tools.r8.ir.code.BasicBlock,int,java.util.List) -> a
     int getRegisterForValue(com.android.tools.r8.ir.code.Value,int) -> a
     boolean hasEqualTypesAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock) -> a
@@ -47583,7 +47620,7 @@
     int getArgumentOrAllocateRegisterForValue(com.android.tools.r8.ir.code.Value,int) -> b
     void mergeBlocks(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock) -> b
     int registersUsed() -> c
-com.android.tools.r8.ir.regalloc.RegisterMove -> com.android.tools.r8.internal.yw:
+com.android.tools.r8.ir.regalloc.RegisterMove -> com.android.tools.r8.internal.Aw:
     com.android.tools.r8.ir.analysis.type.TypeElement type -> b
     com.android.tools.r8.ir.code.Instruction definition -> e
     int src -> d
@@ -47599,7 +47636,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.zw:
+com.android.tools.r8.ir.regalloc.RegisterMoveScheduler -> com.android.tools.r8.internal.Bw:
     java.util.Map valueMap -> c
     int tempRegister -> g
     int usedTempRegisters -> d
@@ -47719,7 +47756,7 @@
     61:65:void scheduleMovesBeforeInstruction(int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):316:320 -> a
     66:74:void removeArgumentRestores(java.util.Set):332:340 -> a
     75:99:void scheduleMoves(int,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Position):347:371 -> a
-    100:100:boolean com.android.tools.r8.utils.InternalOptions.canHaveBoundsCheckEliminationBug():1533:1533 -> a
+    100:100:boolean com.android.tools.r8.utils.InternalOptions.canHaveBoundsCheckEliminationBug():1540:1540 -> a
     100:100:void scheduleMoves(int,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Position):371 -> a
     101:106:void scheduleMoves(int,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Position):371:376 -> a
     107:111:void scheduleMoves(int,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Position):375:379 -> a
@@ -47745,6 +47782,7 @@
     44:44:java.util.Set lambda$scheduleMovesBeforeInstruction$5(java.lang.Integer):310:310 -> f
 com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode -> com.android.tools.r8.internal.N0:
     1:1:void <init>():25:25 -> <init>
+    com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider() -> A
     1:2:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):42:43 -> a
     3:3: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.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.ir.conversion.MethodProcessor):58:58 -> a
     4:11: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.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.ir.conversion.MethodProcessor):55:62 -> a
@@ -47755,32 +47793,32 @@
     14:14:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.ClassNameMapper):96:96 -> a
     1:1:boolean computeEquals(java.lang.Object):91:91 -> c
     1:1:int computeHashCode():86:86 -> p
+    int estimatedDexCodeSizeUpperBoundInBytes() -> t
     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):96:96 -> toString
     1:1:java.lang.String toString():67 -> toString
-    boolean isEmptyVoidMethod() -> w
-    java.util.function.Consumer getRegistryCallback() -> y
-    com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider() -> z
+    boolean isEmptyVoidMethod() -> x
+    java.util.function.Consumer getRegistryCallback() -> z
 com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider -> com.android.tools.r8.internal.N0$a:
     com.android.tools.r8.ir.conversion.SourceCode get(com.android.tools.r8.ir.code.Position) -> a
-com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider -> com.android.tools.r8.internal.e8:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider -> com.android.tools.r8.internal.f8:
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):44:44 -> <init>
     1:1:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter,com.android.tools.r8.graph.DexMethod):48:48 -> a
     2:2:boolean com.android.tools.r8.ir.desugar.PrefixRewritingMapper.hasRewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):34:34 -> a
     2:2:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter,com.android.tools.r8.graph.DexMethod):48 -> a
     3:6:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter,com.android.tools.r8.graph.DexMethod):51:54 -> a
-com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterConstructorCfCodeProvider -> com.android.tools.r8.internal.Z7:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterConstructorCfCodeProvider -> com.android.tools.r8.internal.a8:
     com.android.tools.r8.graph.DexField wrapperField -> c
     1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexField):291:292 -> <init>
     1:9:com.android.tools.r8.graph.CfCode generateCfCode():297:305 -> a
     10:10:com.android.tools.r8.graph.CfCode generateCfCode():303:303 -> a
     11:23:com.android.tools.r8.graph.CfCode generateCfCode():300:312 -> a
-com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterThrowRuntimeExceptionCfCodeProvider -> com.android.tools.r8.internal.a8:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterThrowRuntimeExceptionCfCodeProvider -> com.android.tools.r8.internal.b8:
     com.android.tools.r8.graph.DexString message -> c
     1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType):323:324 -> <init>
     1:11:com.android.tools.r8.graph.CfCode generateCfCode():329:339 -> a
     12:12:com.android.tools.r8.graph.CfCode generateCfCode():337:337 -> a
     13:22:com.android.tools.r8.graph.CfCode generateCfCode():334:343 -> a
-com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterVivifiedWrapperCfCodeProvider -> com.android.tools.r8.internal.b8:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterVivifiedWrapperCfCodeProvider -> com.android.tools.r8.internal.c8:
     com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter converter -> e
     boolean itfCall -> f
     com.android.tools.r8.graph.DexField wrapperField -> c
@@ -47801,7 +47839,7 @@
     44:44:com.android.tools.r8.graph.CfCode generateCfCode():133 -> a
     45:45:com.android.tools.r8.graph.CfCode generateCfCode():132:132 -> a
     46:58:com.android.tools.r8.graph.CfCode generateCfCode():129:141 -> a
-com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterWrapperCfCodeProvider -> com.android.tools.r8.internal.c8:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterWrapperCfCodeProvider -> com.android.tools.r8.internal.d8:
     com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter converter -> e
     boolean itfCall -> f
     com.android.tools.r8.graph.DexField wrapperField -> c
@@ -47819,7 +47857,7 @@
     44:44:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider.vivifiedTypeFor(com.android.tools.r8.graph.DexType):59:59 -> a
     44:44:com.android.tools.r8.graph.CfCode generateCfCode():211 -> a
     45:50:com.android.tools.r8.graph.CfCode generateCfCode():213:218 -> a
-com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterWrapperConversionCfCodeProvider -> com.android.tools.r8.internal.d8:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterWrapperConversionCfCodeProvider -> com.android.tools.r8.internal.e8:
     com.android.tools.r8.graph.DexField wrapperField -> f
     com.android.tools.r8.graph.DexField reverseWrapperField -> e
     com.android.tools.r8.graph.DexType argType -> d
@@ -47832,7 +47870,7 @@
     4:40:com.android.tools.r8.graph.CfCode generateCfCode():242:278 -> a
     41:41:com.android.tools.r8.graph.CfCode generateCfCode():276:276 -> a
     42:51:com.android.tools.r8.graph.CfCode generateCfCode():273:282 -> a
-com.android.tools.r8.ir.synthetic.EmulateInterfaceSyntheticCfCodeProvider -> com.android.tools.r8.internal.l9:
+com.android.tools.r8.ir.synthetic.EmulateInterfaceSyntheticCfCodeProvider -> com.android.tools.r8.internal.m9:
     java.util.List extraDispatchCases -> f
     com.android.tools.r8.graph.DexType interfaceType -> c
     com.android.tools.r8.graph.DexMethod libraryMethod -> e
@@ -47844,7 +47882,7 @@
     6:48:com.android.tools.r8.graph.CfCode generateCfCode():62:104 -> a
     1:4:void addReturn(java.util.List):115:118 -> b
     1:2:void loadExtraParameters(java.util.List):109:110 -> c
-com.android.tools.r8.ir.synthetic.EnumUnboxingCfCodeProvider -> com.android.tools.r8.internal.M9:
+com.android.tools.r8.ir.synthetic.EnumUnboxingCfCodeProvider -> com.android.tools.r8.internal.N9:
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():42:42 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):45:45 -> <init>
@@ -47853,7 +47891,7 @@
     4:4:void addCfInstructionsForAbstractValue(java.util.List,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.graph.DexType):55 -> a
     5:8:void addCfInstructionsForAbstractValue(java.util.List,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.graph.DexType):56:56 -> a
     12:12:void addCfInstructionsForAbstractValue(java.util.List,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.graph.DexType):60:60 -> a
-com.android.tools.r8.ir.synthetic.EnumUnboxingCfCodeProvider$EnumUnboxingInstanceFieldCfCodeProvider -> com.android.tools.r8.internal.J9:
+com.android.tools.r8.ir.synthetic.EnumUnboxingCfCodeProvider$EnumUnboxingInstanceFieldCfCodeProvider -> com.android.tools.r8.internal.K9:
     com.android.tools.r8.ir.analysis.value.AbstractValue nullValue -> g
     com.android.tools.r8.graph.DexType returnType -> d
     com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldMappingData fieldDataMap -> f
@@ -47864,7 +47902,7 @@
     3:3:com.android.tools.r8.graph.CfCode generateCfCode():98 -> a
     4:35:com.android.tools.r8.graph.CfCode generateCfCode():98:129 -> a
     36:45:void lambda$generateCfCode$0(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.EnumValueInfoMapCollection$EnumValueInfo):106:115 -> a
-com.android.tools.r8.ir.synthetic.EnumUnboxingCfCodeProvider$EnumUnboxingValueOfCfCodeProvider -> com.android.tools.r8.internal.K9:
+com.android.tools.r8.ir.synthetic.EnumUnboxingCfCodeProvider$EnumUnboxingValueOfCfCodeProvider -> com.android.tools.r8.internal.L9:
     com.android.tools.r8.graph.DexType enumType -> d
     com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldMappingData fieldDataMap -> f
     com.android.tools.r8.graph.EnumValueInfoMapCollection$EnumValueInfoMap map -> e
@@ -47876,7 +47914,7 @@
     47:47:com.android.tools.r8.graph.CfCode generateCfCode():205:205 -> a
     48:62:com.android.tools.r8.graph.CfCode generateCfCode():201:215 -> a
     63:73:void lambda$generateCfCode$0(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.EnumValueInfoMapCollection$EnumValueInfo):185:195 -> a
-com.android.tools.r8.ir.synthetic.EnumUnboxingCfCodeProvider$EnumUnboxingValuesCfCodeProvider -> com.android.tools.r8.internal.L9:
+com.android.tools.r8.ir.synthetic.EnumUnboxingCfCodeProvider$EnumUnboxingValuesCfCodeProvider -> com.android.tools.r8.internal.M9:
     com.android.tools.r8.graph.DexField utilityField -> e
     int numEnumInstances -> f
     com.android.tools.r8.graph.DexMethod initializationMethod -> g
@@ -47888,7 +47926,7 @@
     11:11:com.android.tools.r8.graph.CfCode generateCfCode():258 -> a
     12:12:com.android.tools.r8.graph.CfCode generateCfCode():258:258 -> a
     13:18:com.android.tools.r8.graph.CfCode generateCfCode():256:261 -> a
-com.android.tools.r8.ir.synthetic.ExceptionThrowingSourceCode -> com.android.tools.r8.internal.ba:
+com.android.tools.r8.ir.synthetic.ExceptionThrowingSourceCode -> com.android.tools.r8.internal.ca:
     com.android.tools.r8.graph.DexType exceptionType -> m
     1:2:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexType):25:26 -> <init>
     1:1:void lambda$prepareInstructions$0(com.android.tools.r8.ir.conversion.IRBuilder):31:31 -> f
@@ -47897,7 +47935,7 @@
     13:20:void com.android.tools.r8.ir.synthetic.ExceptionThrowingSourceCode.build(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.graph.DexType):40:47 -> f
     13:20:void lambda$prepareInstructions$0(com.android.tools.r8.ir.conversion.IRBuilder):31 -> f
     1:1:void prepareInstructions():31:31 -> i
-com.android.tools.r8.ir.synthetic.FieldAccessorSourceCode -> com.android.tools.r8.internal.qa:
+com.android.tools.r8.ir.synthetic.FieldAccessorSourceCode -> com.android.tools.r8.internal.ra:
     boolean $assertionsDisabled -> m
     com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess fieldWithAccess -> n
     1:1:void <clinit>():15:15 -> <clinit>
@@ -47918,7 +47956,7 @@
     21:21:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isStaticPut():504:504 -> i
     21:21:void prepareInstructions():49 -> i
     22:25:void prepareInstructions():49:52 -> i
-com.android.tools.r8.ir.synthetic.ForwardMethodBuilder -> com.android.tools.r8.internal.gb:
+com.android.tools.r8.ir.synthetic.ForwardMethodBuilder -> com.android.tools.r8.internal.hb:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     java.lang.Boolean isInterface -> g
     boolean isConstructorDelegate -> i
@@ -48025,7 +48063,7 @@
     3:5:com.android.tools.r8.ir.synthetic.ForwardMethodBuilder setStaticTarget(com.android.tools.r8.graph.DexMethod,boolean):69:71 -> b
     6:6:com.android.tools.r8.ir.synthetic.ForwardMethodBuilder setCastResult():90:90 -> b
     1:3:com.android.tools.r8.ir.synthetic.ForwardMethodBuilder setVirtualTarget(com.android.tools.r8.graph.DexMethod,boolean):76:78 -> c
-com.android.tools.r8.ir.synthetic.ForwardMethodBuilder$InvokeType -> com.android.tools.r8.internal.fb:
+com.android.tools.r8.ir.synthetic.ForwardMethodBuilder$InvokeType -> com.android.tools.r8.internal.gb:
     com.android.tools.r8.ir.synthetic.ForwardMethodBuilder$InvokeType VIRTUAL -> b
     com.android.tools.r8.ir.synthetic.ForwardMethodBuilder$InvokeType STATIC -> a
     com.android.tools.r8.ir.synthetic.ForwardMethodBuilder$InvokeType SPECIAL -> c
@@ -48033,7 +48071,7 @@
     1:3:void <clinit>():34:36 -> <clinit>
     4:4:void <clinit>():33:33 -> <clinit>
     1:1:void <init>(java.lang.String,int):33:33 -> <init>
-com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode -> com.android.tools.r8.internal.hb:
+com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode -> com.android.tools.r8.internal.ib:
     boolean $assertionsDisabled -> m
     int $r8$clinit -> n
     com.android.tools.r8.graph.DexType targetReceiver -> o
@@ -48050,7 +48088,7 @@
     1:1:void lambda$prepareInstructions$3(int,com.android.tools.r8.ir.conversion.IRBuilder):214:214 -> d
     1:36:void prepareInstructions():179:214 -> i
     1:27:boolean checkSignatures():146:172 -> j
-com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder -> com.android.tools.r8.internal.hb$a:
+com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder -> com.android.tools.r8.internal.ib$a:
     com.android.tools.r8.ir.code.Invoke$Type invokeType -> f
     com.android.tools.r8.graph.DexType targetReceiver -> d
     com.android.tools.r8.graph.DexMethod target -> e
@@ -48068,15 +48106,15 @@
     6:6:com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode build(com.android.tools.r8.ir.code.Position):90:90 -> a
     1:1:com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder setTargetReceiver(com.android.tools.r8.graph.DexType):60:60 -> b
     2:2:com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder setTarget(com.android.tools.r8.graph.DexMethod):65:65 -> b
-com.android.tools.r8.ir.synthetic.SynthesizedCode -> com.android.tools.r8.internal.Qz:
+com.android.tools.r8.ir.synthetic.SynthesizedCode -> com.android.tools.r8.internal.Sz:
     java.util.function.Consumer registryCallback -> d
     com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider sourceCodeProvider -> c
     1:1:void <init>(com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider):17:17 -> <init>
     2:4:void <init>(com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider,java.util.function.Consumer):20:22 -> <init>
+    1:1:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():27:27 -> A
     1:1:void registerReachableDefinitionsDefault(com.android.tools.r8.graph.UseRegistry):36:36 -> a
-    1:1:java.util.function.Consumer getRegistryCallback():32:32 -> y
-    1:1:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():27:27 -> z
-com.android.tools.r8.ir.synthetic.SyntheticCfCodeProvider -> com.android.tools.r8.internal.Wz:
+    1:1:java.util.function.Consumer getRegistryCallback():32:32 -> z
+com.android.tools.r8.ir.synthetic.SyntheticCfCodeProvider -> com.android.tools.r8.internal.Yz:
     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>
@@ -48084,7 +48122,7 @@
     2:2:java.util.List com.android.tools.r8.ir.synthetic.SyntheticCfCodeProvider.defaultTryCatchs():46:46 -> a
     2:2:com.android.tools.r8.graph.CfCode standardCfCodeFromInstructions(java.util.List):33 -> a
     3:3:com.android.tools.r8.graph.CfCode standardCfCodeFromInstructions(java.util.List):34:34 -> a
-com.android.tools.r8.ir.synthetic.SyntheticSourceCode -> com.android.tools.r8.internal.hA:
+com.android.tools.r8.ir.synthetic.SyntheticSourceCode -> com.android.tools.r8.internal.jA:
     int[] paramRegisters -> i
     com.android.tools.r8.ir.code.Position position -> l
     int receiverRegister -> h
@@ -48137,18 +48175,18 @@
     1:3:int getParamRegister(int):92:94 -> h
     4:4:int nextInstructionIndex():109:109 -> h
     void prepareInstructions() -> i
-com.android.tools.r8.it.unimi.dsi.fastutil.Function -> com.android.tools.r8.internal.mb:
-com.android.tools.r8.it.unimi.dsi.fastutil.Hash$Strategy -> com.android.tools.r8.internal.Nb:
+com.android.tools.r8.it.unimi.dsi.fastutil.Function -> com.android.tools.r8.internal.nb:
+com.android.tools.r8.it.unimi.dsi.fastutil.Hash$Strategy -> com.android.tools.r8.internal.Ob:
     boolean equals(java.lang.Object,java.lang.Object) -> a
     int hashCode(java.lang.Object) -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.HashCommon -> com.android.tools.r8.internal.Xb:
+com.android.tools.r8.it.unimi.dsi.fastutil.HashCommon -> com.android.tools.r8.internal.Yb:
     int long2int(long) -> a
     int mix(int) -> a
     1:2:int arraySize(int,float):228:229 -> a
     long mix(long) -> b
     1:1:int maxFill(int,float):205:205 -> b
     long nextPowerOfTwo(long) -> c
-com.android.tools.r8.it.unimi.dsi.fastutil.Stack -> com.android.tools.r8.internal.xy:
+com.android.tools.r8.it.unimi.dsi.fastutil.Stack -> com.android.tools.r8.internal.zy:
 com.android.tools.r8.it.unimi.dsi.fastutil.booleans.AbstractBooleanCollection -> com.android.tools.r8.internal.h:
     1:1:void <init>():37:37 -> <init>
     1:1:boolean add(boolean):68:68 -> a
@@ -48593,7 +48631,7 @@
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ReferenceSortedMap$KeySet.tailSet(int):160:160 -> tailSet
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntSortedSet.tailSet(java.lang.Integer):68 -> tailSet
     3:3:java.util.SortedSet tailSet(java.lang.Object):22 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap -> com.android.tools.r8.internal.oe:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap -> com.android.tools.r8.internal.pe:
     int[] key -> b
     int[] value -> c
     int size -> d
@@ -48630,8 +48668,8 @@
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollections.unmodifiable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):536:536 -> values
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap.values():321 -> values
     2:2:java.util.Collection values():37 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap$1 -> com.android.tools.r8.internal.le:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap$EntrySet -> com.android.tools.r8.internal.ne:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap$1 -> com.android.tools.r8.internal.me:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap$EntrySet -> com.android.tools.r8.internal.oe:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap):133:133 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap$1):133:133 -> <init>
@@ -48641,7 +48679,7 @@
     2:2:java.util.Iterator iterator():133 -> iterator
     1:12:boolean remove(java.lang.Object):212:223 -> remove
     1:1:int size():195:195 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap$EntrySet$1 -> com.android.tools.r8.internal.me:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap$EntrySet$1 -> com.android.tools.r8.internal.ne:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap$EntrySet this$1 -> c
     int next -> b
     int curr -> a
@@ -48650,15 +48688,15 @@
     1:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap$EntrySet$1.next():147:147 -> next
     1:3:java.lang.Object next():136 -> next
     1:6:void remove():153:153 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntFunction -> com.android.tools.r8.internal.pe:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntFunction -> com.android.tools.r8.internal.qe:
     boolean containsKey(int) -> a
     int put(int,int) -> b
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap -> com.android.tools.r8.internal.se:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap -> com.android.tools.r8.internal.te:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2IntEntrySet() -> c
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$Entry -> com.android.tools.r8.internal.qe:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$Entry -> com.android.tools.r8.internal.re:
     int getIntKey() -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$FastEntrySet -> com.android.tools.r8.internal.re:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap -> com.android.tools.r8.internal.Be:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$FastEntrySet -> com.android.tools.r8.internal.se:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap -> com.android.tools.r8.internal.Ce:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$FastEntrySet entries -> i
     int[] key -> b
     int[] value -> c
@@ -48719,14 +48757,14 @@
     1:1:int size():428:428 -> size
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap.values():866:887 -> values
     1:22:java.util.Collection values():50 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$1 -> com.android.tools.r8.internal.te:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$1 -> com.android.tools.r8.internal.ue:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap):866:866 -> <init>
     1:1:boolean contains(int):879:879 -> b
     1:1:void clear():884:884 -> clear
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():869:869 -> iterator
     1:1:int size():874:874 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$EntryIterator -> com.android.tools.r8.internal.ue:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$EntryIterator -> com.android.tools.r8.internal.ve:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap this$0 -> h
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$MapEntry entry -> g
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap):664:664 -> <init>
@@ -48734,13 +48772,13 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$MapEntry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$EntryIterator.next():669:669 -> next
     1:1:java.lang.Object next():664 -> next
     1:2:void remove():674:675 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$KeyIterator -> com.android.tools.r8.internal.ve:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$KeyIterator -> com.android.tools.r8.internal.we:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap):787:788 -> <init>
     1:1:int nextInt():793:793 -> j
     1:1:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$KeyIterator.next():799:799 -> next
     1:1:java.lang.Object next():786 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$KeySet -> com.android.tools.r8.internal.we:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$KeySet -> com.android.tools.r8.internal.xe:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap):803:803 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$1):803:803 -> <init>
@@ -48749,7 +48787,7 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():806:806 -> iterator
     1:3:boolean remove(int):821:823 -> remove
     1:1:int size():811:811 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$MapEntry -> com.android.tools.r8.internal.xe:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$MapEntry -> com.android.tools.r8.internal.ye:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap this$0 -> b
     int index -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap,int):472:473 -> <init>
@@ -48770,7 +48808,7 @@
     5:5:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$MapEntry.setValue(java.lang.Integer):529:529 -> setValue
     5:5:java.lang.Object setValue(java.lang.Object):467 -> setValue
     1:1:java.lang.String toString():547:547 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.ye:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.ze:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap):689:689 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$1):689:689 -> <init>
@@ -48779,7 +48817,7 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():691:691 -> iterator
     1:30:boolean remove(java.lang.Object):724:753 -> remove
     1:1:int size():762:762 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$MapIterator -> com.android.tools.r8.internal.ze:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$MapIterator -> com.android.tools.r8.internal.Ae:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList wrapped -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap this$0 -> f
     int last -> b
@@ -48797,13 +48835,13 @@
     13:22:void remove():644 -> remove
     23:24:void remove():647:648 -> remove
     25:25:void remove():641:641 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$ValueIterator -> com.android.tools.r8.internal.Ae:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$ValueIterator -> com.android.tools.r8.internal.Be:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap):848:849 -> <init>
     1:1:int nextInt():854:854 -> j
     1:1:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$ValueIterator.next():860:860 -> next
     1:1:java.lang.Object next():847 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap -> com.android.tools.r8.internal.He:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap -> com.android.tools.r8.internal.Ie:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values -> h
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry lastEntry -> e
     boolean modified -> i
@@ -48992,14 +49030,14 @@
     209:212:java.lang.Object remove(int):494:497 -> remove
     1:1:int size():985:985 -> size
     1:18:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values():1384:1401 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$1 -> com.android.tools.r8.internal.Ce:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$1 -> com.android.tools.r8.internal.De:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap):102:102 -> <init>
     1:1:int compare(int,int):104:104 -> a
     1:1:int compare(java.lang.Object,java.lang.Object):102:102 -> compare
     2:2:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$1.compare(java.lang.Integer,java.lang.Integer):108:108 -> compare
     2:2:int compare(java.lang.Object,java.lang.Object):102 -> compare
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$2 -> com.android.tools.r8.internal.Ee:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$2 -> com.android.tools.r8.internal.Fe:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap this$0 -> b
     java.util.Comparator comparator -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap):1161:1162 -> <init>
@@ -49022,20 +49060,20 @@
     1:1:java.util.SortedSet tailSet(java.lang.Object):1161:1161 -> tailSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$2.tailSet(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1236:1236 -> tailSet
     2:2:java.util.SortedSet tailSet(java.lang.Object):1161 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$2$1 -> com.android.tools.r8.internal.De:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$2$1 -> com.android.tools.r8.internal.Ee:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$2 this$1 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$2):1162:1162 -> <init>
     1:1:int compare(java.lang.Object,java.lang.Object):1162:1162 -> compare
     2:2:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$2$1.compare(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1164:1164 -> compare
     2:2:int compare(java.lang.Object,java.lang.Object):1162 -> compare
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$3 -> com.android.tools.r8.internal.Fe:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$3 -> com.android.tools.r8.internal.Ge:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap):1384:1384 -> <init>
     1:1:void clear():1398:1398 -> clear
     1:1:boolean contains(java.lang.Object):1390:1390 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1386:1386 -> iterator
     1:1:int size():1394:1394 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry -> com.android.tools.r8.internal.Ge:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry -> com.android.tools.r8.internal.He:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry right -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry left -> c
     int info -> e
@@ -49062,7 +49100,7 @@
     1:1:boolean succ():795:795 -> j
     1:2:java.lang.Object setValue(java.lang.Object):923:924 -> setValue
     1:1:java.lang.String toString():958:958 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$EntryIterator -> com.android.tools.r8.internal.He$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$EntryIterator -> com.android.tools.r8.internal.Ie$a:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap):1131:1131 -> <init>
     1:1:void add(java.lang.Object):1130:1130 -> add
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$EntryIterator.add(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1155:1155 -> add
@@ -49074,7 +49112,7 @@
     1:1:void set(java.lang.Object):1130:1130 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$EntryIterator.set(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1150:1150 -> set
     2:2:void set(java.lang.Object):1130 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$KeyIterator -> com.android.tools.r8.internal.He$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$KeyIterator -> com.android.tools.r8.internal.Ie$b:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap):1253:1253 -> <init>
     1:1:void add(java.lang.Object):1252:1252 -> add
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$KeyIterator.add(java.lang.Integer):1301:1301 -> add
@@ -49088,12 +49126,12 @@
     1:1:void set(java.lang.Object):1252:1252 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$KeyIterator.set(java.lang.Integer):1295:1295 -> set
     2:2:void set(java.lang.Object):1252 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$KeySet -> com.android.tools.r8.internal.He$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$KeySet -> com.android.tools.r8.internal.Ie$c:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap):1308:1308 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$1):1308:1308 -> <init>
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator iterator():1311:1311 -> iterator
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap -> com.android.tools.r8.internal.He$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap -> com.android.tools.r8.internal.Ie$d:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values -> h
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap this$0 -> i
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entries -> f
@@ -49135,7 +49173,7 @@
     1:4:java.lang.Object remove(int):1657:1660 -> remove
     1:5:int size():1665:1669 -> size
     1:21:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values():1598:1618 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$1 -> com.android.tools.r8.internal.Ie:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$1 -> com.android.tools.r8.internal.Je:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap this$1 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap):1497:1497 -> <init>
     1:1:void clear():1549:1549 -> clear
@@ -49165,19 +49203,19 @@
     1:1:java.util.SortedSet tailSet(java.lang.Object):1497:1497 -> tailSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$1.tailSet(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1574:1574 -> tailSet
     2:2:java.util.SortedSet tailSet(java.lang.Object):1497 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$2 -> com.android.tools.r8.internal.Je:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$2 -> com.android.tools.r8.internal.Ke:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap this$1 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap):1598:1598 -> <init>
     1:1:void clear():1615:1615 -> clear
     1:1:boolean contains(java.lang.Object):1605:1605 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1600:1600 -> iterator
     1:1:int size():1610:1610 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$KeySet -> com.android.tools.r8.internal.He$d$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$KeySet -> com.android.tools.r8.internal.Ie$d$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap this$1 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap):1580:1580 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$1):1580:1580 -> <init>
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator iterator():1582:1582 -> iterator
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapEntryIterator -> com.android.tools.r8.internal.He$d$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapEntryIterator -> com.android.tools.r8.internal.Ie$d$b:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap):1808:1808 -> <init>
     1:1:void add(java.lang.Object):1807:1807 -> add
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapEntryIterator.add(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1832:1832 -> add
@@ -49189,12 +49227,12 @@
     1:1:void set(java.lang.Object):1807:1807 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapEntryIterator.set(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1827:1827 -> set
     2:2:void set(java.lang.Object):1807 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapIterator -> com.android.tools.r8.internal.He$d$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapIterator -> com.android.tools.r8.internal.Ie$d$c:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap this$1 -> f
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap):1777:1778 -> <init>
     1:2:void updateNext():1802:1803 -> n
     1:2:void updatePrevious():1797:1798 -> o
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapKeyIterator -> com.android.tools.r8.internal.He$d$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapKeyIterator -> com.android.tools.r8.internal.Ie$d$d:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap):1848:1848 -> <init>
     1:1:void add(java.lang.Object):1846:1846 -> add
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapKeyIterator.add(java.lang.Integer):1896:1896 -> add
@@ -49208,14 +49246,14 @@
     1:1:void set(java.lang.Object):1846:1846 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapKeyIterator.set(java.lang.Integer):1890:1890 -> set
     2:2:void set(java.lang.Object):1846 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapValueIterator -> com.android.tools.r8.internal.He$d$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapValueIterator -> com.android.tools.r8.internal.Ie$d$e:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap):1910:1910 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$1):1910:1910 -> <init>
     1:1:void add(java.lang.Object):1928:1928 -> add
     1:1:java.lang.Object next():1913:1913 -> next
     1:1:java.lang.Object previous():1918:1918 -> previous
     1:1:void set(java.lang.Object):1923:1923 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$TreeIterator -> com.android.tools.r8.internal.He$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$TreeIterator -> com.android.tools.r8.internal.Ie$e:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry prev -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap this$0 -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry curr -> c
@@ -49232,14 +49270,14 @@
     1:1:void updatePrevious():1076:1076 -> o
     1:1:int previousIndex():1092:1092 -> previousIndex
     1:12:void remove():1096:1096 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$ValueIterator -> com.android.tools.r8.internal.He$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$ValueIterator -> com.android.tools.r8.internal.Ie$f:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap):1348:1348 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$1):1348:1348 -> <init>
     1:1:void add(java.lang.Object):1366:1366 -> add
     1:1:java.lang.Object next():1351:1351 -> next
     1:1:java.lang.Object previous():1356:1356 -> previous
     1:1:void set(java.lang.Object):1361:1361 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap -> com.android.tools.r8.internal.Me:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap -> com.android.tools.r8.internal.Ne:
     java.lang.Object[] value -> c
     int[] key -> b
     int size -> d
@@ -49267,8 +49305,8 @@
     1:8:java.lang.Object remove(int):308:315 -> remove
     1:1:int size():252:252 -> size
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values():326:326 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap$1 -> com.android.tools.r8.internal.Ke:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap$EntrySet -> com.android.tools.r8.internal.Me$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap$1 -> com.android.tools.r8.internal.Le:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap$EntrySet -> com.android.tools.r8.internal.Ne$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap):133:133 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap$1):133:133 -> <init>
@@ -49278,7 +49316,7 @@
     2:2:java.util.Iterator iterator():133 -> iterator
     1:12:boolean remove(java.lang.Object):213:224 -> remove
     1:1:int size():197:197 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap$EntrySet$1 -> com.android.tools.r8.internal.Le:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap$EntrySet$1 -> com.android.tools.r8.internal.Me:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap$EntrySet this$1 -> c
     int next -> b
     int curr -> a
@@ -49287,18 +49325,18 @@
     1:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap$EntrySet$1.next():147:147 -> next
     1:3:java.lang.Object next():136 -> next
     1:7:void remove():153:153 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceFunction -> com.android.tools.r8.internal.Ne:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceFunction -> com.android.tools.r8.internal.Oe:
     boolean containsKey(int) -> a
     java.lang.Object put(int,java.lang.Object) -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap -> com.android.tools.r8.internal.Oe:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap -> com.android.tools.r8.internal.Pe:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2ReferenceEntrySet() -> b
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry -> com.android.tools.r8.internal.Oe$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry -> com.android.tools.r8.internal.Pe$a:
     int getIntKey() -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$FastEntrySet -> com.android.tools.r8.internal.Pe:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMaps -> com.android.tools.r8.internal.Re:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$FastEntrySet -> com.android.tools.r8.internal.Qe:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMaps -> com.android.tools.r8.internal.Se:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMaps$EmptyMap EMPTY_MAP -> a
     1:1:void <clinit>():124:124 -> <clinit>
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMaps$EmptyMap -> com.android.tools.r8.internal.Qe:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMaps$EmptyMap -> com.android.tools.r8.internal.Re:
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceFunctions$EmptyFunction.<init>():41:41 -> <init>
     1:1:void <init>():46 -> <init>
     boolean com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceFunctions$EmptyFunction.containsKey(int) -> a
@@ -49316,7 +49354,7 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values():86:86 -> values
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMaps$EmptyMap.values():86:86 -> values
     2:2:java.util.Collection values():43 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap -> com.android.tools.r8.internal.Te:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap -> com.android.tools.r8.internal.Ue:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values -> k
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$FastEntrySet entries -> i
     java.lang.Object[] value -> c
@@ -49375,14 +49413,14 @@
     1:12:java.lang.Object remove(int):309:320 -> remove
     1:1:int size():386:386 -> size
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values():794:815 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$1 -> com.android.tools.r8.internal.Se:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$1 -> com.android.tools.r8.internal.Te:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap):794:794 -> <init>
     1:1:void clear():812:812 -> clear
     1:1:boolean contains(java.lang.Object):807:807 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():797:797 -> iterator
     1:1:int size():802:802 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$EntryIterator -> com.android.tools.r8.internal.Te$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$EntryIterator -> com.android.tools.r8.internal.Ue$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap this$0 -> h
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapEntry entry -> g
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap):600:600 -> <init>
@@ -49390,13 +49428,13 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapEntry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$EntryIterator.next():605:605 -> next
     1:1:java.lang.Object next():600 -> next
     1:2:void remove():610:611 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$KeyIterator -> com.android.tools.r8.internal.Te$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$KeyIterator -> com.android.tools.r8.internal.Ue$b:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap):721:722 -> <init>
     1:1:int nextInt():727:727 -> j
     1:1:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$KeyIterator.next():733:733 -> next
     1:1:java.lang.Object next():720 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$KeySet -> com.android.tools.r8.internal.Te$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$KeySet -> com.android.tools.r8.internal.Ue$c:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap):737:737 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$1):737:737 -> <init>
@@ -49405,7 +49443,7 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():740:740 -> iterator
     1:3:boolean remove(int):755:757 -> remove
     1:1:int size():745:745 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapEntry -> com.android.tools.r8.internal.Te$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapEntry -> com.android.tools.r8.internal.Ue$d:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap this$0 -> b
     int index -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap,int):430:431 -> <init>
@@ -49417,7 +49455,7 @@
     1:1:int hashCode():476:476 -> hashCode
     1:2:java.lang.Object setValue(java.lang.Object):449:450 -> setValue
     1:1:java.lang.String toString():481:481 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.Te$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.Ue$e:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap):625:625 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$1):625:625 -> <init>
@@ -49426,7 +49464,7 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():627:627 -> iterator
     1:29:boolean remove(java.lang.Object):659:687 -> remove
     1:1:int size():696:696 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapIterator -> com.android.tools.r8.internal.Te$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapIterator -> com.android.tools.r8.internal.Ue$f:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList wrapped -> e
     int last -> b
     int pos -> a
@@ -49444,11 +49482,11 @@
     15:24:void remove():580 -> remove
     25:26:void remove():583:584 -> remove
     27:27:void remove():576:576 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$ValueIterator -> com.android.tools.r8.internal.Te$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$ValueIterator -> com.android.tools.r8.internal.Ue$g:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap):782:783 -> <init>
     1:1:java.lang.Object next():788:788 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap -> com.android.tools.r8.internal.Ze:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap -> com.android.tools.r8.internal.af:
     boolean[] dirPath -> j
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry tree -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values -> h
@@ -49570,8 +49608,8 @@
     256:272:java.lang.Object remove(int):457:473 -> remove
     1:1:int size():951:951 -> size
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values():1348:1369 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$1 -> com.android.tools.r8.internal.Ue:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$2 -> com.android.tools.r8.internal.We:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$1 -> com.android.tools.r8.internal.Ve:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$2 -> com.android.tools.r8.internal.Xe:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap this$0 -> b
     java.util.Comparator comparator -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap):1127:1128 -> <init>
@@ -49594,20 +49632,20 @@
     1:1:java.util.SortedSet tailSet(java.lang.Object):1127:1127 -> tailSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$2.tailSet(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1202:1202 -> tailSet
     2:2:java.util.SortedSet tailSet(java.lang.Object):1127 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$2$1 -> com.android.tools.r8.internal.Ve:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$2$1 -> com.android.tools.r8.internal.We:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$2 this$1 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$2):1128:1128 -> <init>
     1:1:int compare(java.lang.Object,java.lang.Object):1128:1128 -> compare
     2:2:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$2$1.compare(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1130:1130 -> compare
     2:2:int compare(java.lang.Object,java.lang.Object):1128 -> compare
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$3 -> com.android.tools.r8.internal.Xe:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$3 -> com.android.tools.r8.internal.Ye:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap):1348:1348 -> <init>
     1:1:void clear():1366:1366 -> clear
     1:1:boolean contains(java.lang.Object):1356:1356 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1351:1351 -> iterator
     1:1:int size():1361:1361 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry -> com.android.tools.r8.internal.Ye:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry -> com.android.tools.r8.internal.Ze:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry right -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry left -> c
     int info -> e
@@ -49634,7 +49672,7 @@
     1:1:boolean succ():770:770 -> i
     1:2:java.lang.Object setValue(java.lang.Object):889:890 -> setValue
     1:1:java.lang.String toString():924:924 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$EntryIterator -> com.android.tools.r8.internal.Ze$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$EntryIterator -> com.android.tools.r8.internal.af$a:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap):1097:1097 -> <init>
     1:1:void add(java.lang.Object):1096:1096 -> add
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$EntryIterator.add(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1121:1121 -> add
@@ -49646,7 +49684,7 @@
     1:1:void set(java.lang.Object):1096:1096 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$EntryIterator.set(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1116:1116 -> set
     2:2:void set(java.lang.Object):1096 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$KeyIterator -> com.android.tools.r8.internal.Ze$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$KeyIterator -> com.android.tools.r8.internal.af$b:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap):1219:1219 -> <init>
     1:1:void add(java.lang.Object):1218:1218 -> add
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$KeyIterator.add(java.lang.Integer):1267:1267 -> add
@@ -49660,12 +49698,12 @@
     1:1:void set(java.lang.Object):1218:1218 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$KeyIterator.set(java.lang.Integer):1261:1261 -> set
     2:2:void set(java.lang.Object):1218 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$KeySet -> com.android.tools.r8.internal.Ze$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$KeySet -> com.android.tools.r8.internal.af$c:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap):1274:1274 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$1):1274:1274 -> <init>
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator iterator():1276:1276 -> iterator
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap -> com.android.tools.r8.internal.Ze$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap -> com.android.tools.r8.internal.af$d:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values -> h
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entries -> f
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap this$0 -> i
@@ -49733,7 +49771,7 @@
     1:4:java.lang.Object remove(int):1622:1625 -> remove
     1:5:int size():1630:1634 -> size
     1:18:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values():1566:1583 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$1 -> com.android.tools.r8.internal.af:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$1 -> com.android.tools.r8.internal.bf:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap this$1 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap):1465:1465 -> <init>
     1:1:void clear():1517:1517 -> clear
@@ -49763,19 +49801,19 @@
     1:1:java.util.SortedSet tailSet(java.lang.Object):1465:1465 -> tailSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$1.tailSet(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1542:1542 -> tailSet
     2:2:java.util.SortedSet tailSet(java.lang.Object):1465 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$2 -> com.android.tools.r8.internal.bf:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$2 -> com.android.tools.r8.internal.cf:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap this$1 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap):1566:1566 -> <init>
     1:1:void clear():1580:1580 -> clear
     1:1:boolean contains(java.lang.Object):1572:1572 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1568:1568 -> iterator
     1:1:int size():1576:1576 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$KeySet -> com.android.tools.r8.internal.Ze$d$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$KeySet -> com.android.tools.r8.internal.af$d$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap this$1 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap):1548:1548 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$1):1548:1548 -> <init>
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator iterator():1550:1550 -> iterator
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapEntryIterator -> com.android.tools.r8.internal.Ze$d$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapEntryIterator -> com.android.tools.r8.internal.af$d$b:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap):1773:1773 -> <init>
     1:1:void add(java.lang.Object):1772:1772 -> add
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapEntryIterator.add(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1797:1797 -> add
@@ -49787,7 +49825,7 @@
     1:1:void set(java.lang.Object):1772:1772 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapEntryIterator.set(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1792:1792 -> set
     2:2:void set(java.lang.Object):1772 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapIterator -> com.android.tools.r8.internal.Ze$d$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapIterator -> com.android.tools.r8.internal.af$d$c:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap this$1 -> f
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap):1742:1743 -> <init>
     1:2:void updateNext():1767:1768 -> n
@@ -49798,7 +49836,7 @@
     3:237:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap.compare(int,int):0:234 -> o
     3:237:void updatePrevious():1763 -> o
     238:238:void updatePrevious():1763:1763 -> o
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapKeyIterator -> com.android.tools.r8.internal.Ze$d$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapKeyIterator -> com.android.tools.r8.internal.af$d$d:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap):1813:1813 -> <init>
     1:1:void add(java.lang.Object):1811:1811 -> add
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapKeyIterator.add(java.lang.Integer):1861:1861 -> add
@@ -49812,14 +49850,14 @@
     1:1:void set(java.lang.Object):1811:1811 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapKeyIterator.set(java.lang.Integer):1855:1855 -> set
     2:2:void set(java.lang.Object):1811 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapValueIterator -> com.android.tools.r8.internal.Ze$d$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapValueIterator -> com.android.tools.r8.internal.af$d$e:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap):1875:1875 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$1):1875:1875 -> <init>
     1:1:void add(java.lang.Object):1893:1893 -> add
     1:1:java.lang.Object next():1878:1878 -> next
     1:1:java.lang.Object previous():1883:1883 -> previous
     1:1:void set(java.lang.Object):1888:1888 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$TreeIterator -> com.android.tools.r8.internal.Ze$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$TreeIterator -> com.android.tools.r8.internal.af$e:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry next -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry prev -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry curr -> c
@@ -49836,14 +49874,14 @@
     1:1:void updatePrevious():1042:1042 -> o
     1:1:int previousIndex():1058:1058 -> previousIndex
     1:12:void remove():1062:1062 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$ValueIterator -> com.android.tools.r8.internal.Ze$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$ValueIterator -> com.android.tools.r8.internal.af$f:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap):1312:1312 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$1):1312:1312 -> <init>
     1:1:void add(java.lang.Object):1330:1330 -> add
     1:1:java.lang.Object next():1315:1315 -> next
     1:1:java.lang.Object previous():1320:1320 -> previous
     1:1:void set(java.lang.Object):1325:1325 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap -> com.android.tools.r8.internal.cf:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap -> com.android.tools.r8.internal.df:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap subMap(int,int) -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap subMap(java.lang.Integer,java.lang.Integer) -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap tailMap(java.lang.Integer) -> a
@@ -49853,10 +49891,10 @@
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap headMap(int) -> c
     int firstIntKey() -> d
     int lastIntKey() -> h
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMaps -> com.android.tools.r8.internal.ef:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMaps -> com.android.tools.r8.internal.ff:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMaps$EmptySortedMap EMPTY_MAP -> a
     1:1:void <clinit>():185:185 -> <clinit>
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMaps$EmptySortedMap -> com.android.tools.r8.internal.df:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMaps$EmptySortedMap -> com.android.tools.r8.internal.ef:
     1:1:void <init>():60:60 -> <init>
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap subMap(int,int):95:95 -> a
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap tailMap(java.lang.Integer):141:141 -> a
@@ -49881,7 +49919,7 @@
     2:2:java.lang.Integer lastKey():177:177 -> lastKey
     1:1:java.util.SortedMap subMap(java.lang.Object,java.lang.Object):57:57 -> subMap
     1:1:java.util.SortedMap tailMap(java.lang.Object):57:57 -> tailMap
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList -> com.android.tools.r8.internal.gf:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList -> com.android.tools.r8.internal.hf:
     int size -> b
     1:3:void <init>(int):81:83 -> <init>
     4:4:void <init>(int):82:82 -> <init>
@@ -49923,7 +49961,7 @@
     6:6:void grow(int):250:250 -> m
     1:6:boolean removeAll(java.util.Collection):482:487 -> removeAll
     1:1:int size():327:327 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList$1 -> com.android.tools.r8.internal.ff:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList$1 -> com.android.tools.r8.internal.gf:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList this$0 -> d
     int last -> b
     int val$index -> c
@@ -49938,7 +49976,7 @@
     1:1:int nextIndex():516:516 -> nextIndex
     1:1:int previousIndex():520:520 -> previousIndex
     1:10:void remove():534:534 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet -> com.android.tools.r8.internal.if:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet -> com.android.tools.r8.internal.jf:
     int size -> b
     1:2:void <init>():55:56 -> <init>
     3:4:void <init>(int):65:66 -> <init>
@@ -49960,25 +49998,25 @@
     2:2:java.util.Iterator iterator():29 -> iterator
     1:6:boolean remove(int):153:158 -> remove
     1:1:int size():148:148 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet$1 -> com.android.tools.r8.internal.hf:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet$1 -> com.android.tools.r8.internal.if:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet this$0 -> b
     int next -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet):119:120 -> <init>
     1:1:boolean hasNext():124:124 -> hasNext
     1:3:int nextInt():129:129 -> j
     1:2:void remove():135:136 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrays -> com.android.tools.r8.internal.jf:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrays -> com.android.tools.r8.internal.kf:
     int[] EMPTY_ARRAY -> a
     1:1:void <clinit>():100:100 -> <clinit>
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator -> com.android.tools.r8.internal.kf:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator -> com.android.tools.r8.internal.lf:
     int previousInt() -> e
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection -> com.android.tools.r8.internal.mf:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection -> com.android.tools.r8.internal.nf:
     boolean add(int) -> a
     boolean contains(int) -> b
     int[] toIntArray() -> f
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollections -> com.android.tools.r8.internal.pf:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollections -> com.android.tools.r8.internal.qf:
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection unmodifiable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):536:536 -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollections$EmptyCollection -> com.android.tools.r8.internal.nf:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollections$EmptyCollection -> com.android.tools.r8.internal.of:
     1:1:void <init>():39:39 -> <init>
     1:1:boolean addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):96:96 -> a
     1:1:boolean addAll(java.util.Collection):81:81 -> addAll
@@ -49989,7 +50027,7 @@
     1:1:boolean removeAll(java.util.Collection):86:86 -> removeAll
     1:1:boolean retainAll(java.util.Collection):91:91 -> retainAll
     1:1:java.lang.Object[] toArray():49:49 -> toArray
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollections$UnmodifiableCollection -> com.android.tools.r8.internal.of:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollections$UnmodifiableCollection -> com.android.tools.r8.internal.pf:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection collection -> a
     1:3:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):369:371 -> <init>
     1:1:boolean add(java.lang.Object):365:365 -> add
@@ -50013,18 +50051,18 @@
     1:1:java.lang.Object[] toArray(java.lang.Object[]):422:422 -> toArray
     2:2:java.lang.Object[] toArray():427:427 -> toArray
     1:1:java.lang.String toString():512:512 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntComparator -> com.android.tools.r8.internal.qf:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator -> com.android.tools.r8.internal.sf:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntComparator -> com.android.tools.r8.internal.rf:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator -> com.android.tools.r8.internal.tf:
     int nextInt() -> j
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators -> com.android.tools.r8.internal.wf:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators -> com.android.tools.r8.internal.xf:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators$EmptyIterator EMPTY_ITERATOR -> a
     1:1:void <clinit>():103:103 -> <clinit>
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators$EmptyIterator -> com.android.tools.r8.internal.tf:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators$EmptyIterator -> com.android.tools.r8.internal.uf:
     1:1:void <init>():42:42 -> <init>
     1:1:java.lang.Object clone():87:87 -> clone
     1:1:int previousInt():62:62 -> e
     1:1:int nextInt():57:57 -> j
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators$SingletonIterator -> com.android.tools.r8.internal.uf:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators$SingletonIterator -> com.android.tools.r8.internal.vf:
     int curr -> b
     int element -> a
     1:2:void <init>(int):110:111 -> <init>
@@ -50034,12 +50072,12 @@
     1:4:int nextInt():126:126 -> j
     1:1:int nextIndex():140:140 -> nextIndex
     1:1:int previousIndex():145:145 -> previousIndex
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators$UnmodifiableIterator -> com.android.tools.r8.internal.vf:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators$UnmodifiableIterator -> com.android.tools.r8.internal.wf:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator i -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator):807:808 -> <init>
     1:1:boolean hasNext():813:813 -> hasNext
     1:1:int nextInt():818:818 -> j
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList -> com.android.tools.r8.internal.xf:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList -> com.android.tools.r8.internal.yf:
     boolean add(int) -> a
     boolean addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList) -> a
     void getElements(int,int[],int,int) -> a
@@ -50048,13 +50086,13 @@
     int set(int,int) -> c
     int removeInt(int) -> d
     int getInt(int) -> e
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator -> com.android.tools.r8.internal.yf:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists -> com.android.tools.r8.internal.Af:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator -> com.android.tools.r8.internal.zf:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists -> com.android.tools.r8.internal.Bf:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists$EmptyList EMPTY_LIST -> a
     1:1:void <clinit>():323:323 -> <clinit>
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList singleton(int):478:478 -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists$1 -> com.android.tools.r8.internal.zf:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists$EmptyList -> com.android.tools.r8.internal.Af$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists$1 -> com.android.tools.r8.internal.Af:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists$EmptyList -> com.android.tools.r8.internal.Bf$a:
     1:1:void <init>():65:65 -> <init>
     1:1:boolean addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):110:110 -> a
     2:2:boolean add(java.lang.Integer):156:156 -> a
@@ -50094,7 +50132,7 @@
     2:2:java.lang.Object set(int,java.lang.Object):62 -> set
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists$EmptyList.subList(int,int):246:246 -> subList
     1:1:java.util.List subList(int,int):62 -> subList
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists$Singleton -> com.android.tools.r8.internal.Bf:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists$Singleton -> com.android.tools.r8.internal.Cf:
     int element -> a
     1:1:void <init>(int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists$1):332:332 -> <init>
     2:3:void <init>(int):336:337 -> <init>
@@ -50124,7 +50162,7 @@
     1:1:boolean removeAll(java.util.Collection):409:409 -> removeAll
     1:1:boolean retainAll(java.util.Collection):414:414 -> retainAll
     1:1:java.util.List subList(int,int):332:332 -> subList
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet -> com.android.tools.r8.internal.Hf:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet -> com.android.tools.r8.internal.If:
     float f -> g
     int size -> f
     int n -> d
@@ -50177,8 +50215,8 @@
     2:5:boolean remove(int):365 -> remove
     6:13:boolean remove(int):369:376 -> remove
     1:1:int size():412:412 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet$1 -> com.android.tools.r8.internal.Ff:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet$SetIterator -> com.android.tools.r8.internal.Gf:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet$1 -> com.android.tools.r8.internal.Gf:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet$SetIterator -> com.android.tools.r8.internal.Hf:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList wrapped -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet this$0 -> f
     int last -> b
@@ -50196,21 +50234,21 @@
     14:22:void remove():532 -> remove
     23:24:void remove():535:536 -> remove
     25:25:void remove():528:528 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet -> com.android.tools.r8.internal.Nf:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSets -> com.android.tools.r8.internal.Pf:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet -> com.android.tools.r8.internal.Of:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSets -> com.android.tools.r8.internal.Qf:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSets$EmptySet EMPTY_SET -> a
     1:1:void <clinit>():76:76 -> <clinit>
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSets$EmptySet -> com.android.tools.r8.internal.Of:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSets$EmptySet -> com.android.tools.r8.internal.Pf:
     1:1:void <init>():42:42 -> <init>
     1:1:java.lang.Object clone():52:52 -> clone
     1:1:boolean equals(java.lang.Object):58:58 -> equals
     1:1:boolean rem(int):64:64 -> g
     1:1:boolean remove(int):47:47 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet -> com.android.tools.r8.internal.Qf:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSets -> com.android.tools.r8.internal.Sf:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet -> com.android.tools.r8.internal.Rf:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSets -> com.android.tools.r8.internal.Tf:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSets$EmptySet EMPTY_SET -> a
     1:1:void <clinit>():168:168 -> <clinit>
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSets$EmptySet -> com.android.tools.r8.internal.Rf:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSets$EmptySet -> com.android.tools.r8.internal.Sf:
     1:1:void <init>():42:42 -> <init>
     1:1:java.lang.Object clone():155:155 -> clone
     1:1:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSets$EmptySet.first():139:139 -> first
@@ -50226,7 +50264,7 @@
     1:1:java.util.SortedSet tailSet(java.lang.Object):39:39 -> tailSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSets$EmptySet.tailSet(java.lang.Integer):128:128 -> tailSet
     2:2:java.util.SortedSet tailSet(java.lang.Object):39 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntStack -> com.android.tools.r8.internal.Tf:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntStack -> com.android.tools.r8.internal.Uf:
 com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLong2ReferenceMap -> com.android.tools.r8.internal.L:
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLong2ReferenceFunction.<init>():44:44 -> <init>
     1:1:void <init>():45 -> <init>
@@ -50467,10 +50505,10 @@
     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 -> com.android.tools.r8.internal.Zm:
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap$Entry -> com.android.tools.r8.internal.Xm:
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap$FastEntrySet -> com.android.tools.r8.internal.Ym:
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap -> com.android.tools.r8.internal.bn:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap -> com.android.tools.r8.internal.an:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap$Entry -> com.android.tools.r8.internal.Ym:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap$FastEntrySet -> com.android.tools.r8.internal.Zm:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap -> com.android.tools.r8.internal.cn:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values -> j
     java.lang.Object[] value -> b
     long[] key -> a
@@ -50527,14 +50565,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.an:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$1 -> com.android.tools.r8.internal.bn:
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap):794:794 -> <init>
     1:1:void clear():812:812 -> clear
     1:1:boolean contains(java.lang.Object):807:807 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():797:797 -> iterator
     1:1:int size():802:802 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$EntryIterator -> com.android.tools.r8.internal.bn$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$EntryIterator -> com.android.tools.r8.internal.cn$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapEntry entry -> g
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap this$0 -> h
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap):600:600 -> <init>
@@ -50542,13 +50580,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.bn$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$KeyIterator -> com.android.tools.r8.internal.cn$b:
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap):721:722 -> <init>
     1:1:long nextLong():727:727 -> a
     1:1:java.lang.Long com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$KeyIterator.next():733:733 -> next
     1:1:java.lang.Object next():720 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$KeySet -> com.android.tools.r8.internal.bn$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$KeySet -> com.android.tools.r8.internal.cn$c:
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap):737:737 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$1):737:737 -> <init>
@@ -50556,7 +50594,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.bn$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapEntry -> com.android.tools.r8.internal.cn$d:
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap this$0 -> b
     int index -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap,int):430:431 -> <init>
@@ -50567,7 +50605,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.bn$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.cn$e:
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap):625:625 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$1):625:625 -> <init>
@@ -50576,7 +50614,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.bn$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapIterator -> com.android.tools.r8.internal.cn$f:
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap this$0 -> f
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongArrayList wrapped -> e
     int last -> b
@@ -50594,11 +50632,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.bn$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$ValueIterator -> com.android.tools.r8.internal.cn$g:
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap):782:783 -> <init>
     1:1:java.lang.Object next():788:788 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongArrayList -> com.android.tools.r8.internal.dn:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongArrayList -> com.android.tools.r8.internal.en:
     int size -> b
     1:3:void <init>(int):81:83 -> <init>
     4:4:void <init>(int):82:82 -> <init>
@@ -50624,7 +50662,7 @@
     1:2:java.util.ListIterator listIterator(int):48 -> listIterator
     1:6:boolean removeAll(java.util.Collection):482:487 -> removeAll
     1:1:int size():327:327 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongArrayList$1 -> com.android.tools.r8.internal.cn:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongArrayList$1 -> com.android.tools.r8.internal.dn:
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongArrayList this$0 -> d
     int last -> b
     int val$index -> c
@@ -50639,18 +50677,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.en:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongBidirectionalIterator -> com.android.tools.r8.internal.fn:
     long previousLong() -> b
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongCollection -> com.android.tools.r8.internal.fn:
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongIterator -> com.android.tools.r8.internal.hn:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongCollection -> com.android.tools.r8.internal.gn:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongIterator -> com.android.tools.r8.internal.in:
     long nextLong() -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongList -> com.android.tools.r8.internal.in:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongList -> com.android.tools.r8.internal.jn:
     void add(int,long) -> a
     void removeElements(int,int) -> a
     long set(int,long) -> b
     long getLong(int) -> c
     long removeLong(int) -> f
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongSet -> com.android.tools.r8.internal.ln:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongSet -> com.android.tools.r8.internal.mn:
 com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanMap -> com.android.tools.r8.internal.i0:
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanFunction.<init>():44:44 -> <init>
     1:1:void <init>():45 -> <init>
@@ -51302,7 +51340,7 @@
     1:7:int hashCode():57:63 -> hashCode
 com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReferenceSortedSet -> com.android.tools.r8.internal.L0:
     1:1:void <init>():23:23 -> <init>
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap -> com.android.tools.r8.internal.qq:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap -> com.android.tools.r8.internal.sq:
     java.lang.Object[] key -> a
     boolean[] value -> b
     int size -> c
@@ -51331,8 +51369,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.oq:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$EntrySet -> com.android.tools.r8.internal.qq$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$1 -> com.android.tools.r8.internal.qq:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$EntrySet -> com.android.tools.r8.internal.sq$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap):133:133 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$1):133:133 -> <init>
@@ -51342,7 +51380,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.pq:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$EntrySet$1 -> com.android.tools.r8.internal.rq:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$EntrySet this$1 -> c
     int next -> b
     int curr -> a
@@ -51351,9 +51389,9 @@
     1:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$EntrySet$1.next():147:147 -> next
     1:3:java.lang.Object next():136 -> next
     1:7:void remove():153:153 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap -> com.android.tools.r8.internal.rq:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap$Entry -> com.android.tools.r8.internal.rq$a:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap -> com.android.tools.r8.internal.uq:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap -> com.android.tools.r8.internal.tq:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap$Entry -> com.android.tools.r8.internal.tq$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap -> com.android.tools.r8.internal.wq:
     java.lang.Object[] key -> b
     int[] value -> c
     int size -> d
@@ -51383,8 +51421,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.sq:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$EntrySet -> com.android.tools.r8.internal.uq$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$1 -> com.android.tools.r8.internal.uq:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$EntrySet -> com.android.tools.r8.internal.wq$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap):133:133 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$1):133:133 -> <init>
@@ -51394,7 +51432,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.tq:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$EntrySet$1 -> com.android.tools.r8.internal.vq:
     int next -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$EntrySet this$1 -> c
     int curr -> a
@@ -51403,10 +51441,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.vq:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntFunction -> com.android.tools.r8.internal.xq:
     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.xq:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap -> com.android.tools.r8.internal.zq:
     java.lang.Object[] key -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values -> n
     int maxFill -> j
@@ -51479,14 +51517,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.wq:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$1 -> com.android.tools.r8.internal.yq:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap):1596:1596 -> <init>
     1:1:boolean contains(int):1609:1609 -> b
     1:1:void clear():1614:1614 -> clear
     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.xq$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$EntryIterator -> com.android.tools.r8.internal.zq$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$MapEntry entry -> f
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap this$0 -> g
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap):1222:1222 -> <init>
@@ -51501,14 +51539,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.xq$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$KeyIterator -> com.android.tools.r8.internal.zq$b:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap this$0 -> f
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap):1455:1456 -> <init>
     1:1:void add(java.lang.Object):1452:1452 -> add
     1:1:java.lang.Object next():1461:1461 -> next
     1:1:java.lang.Object previous():1442:1442 -> previous
     1:1:void set(java.lang.Object):1447:1447 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$KeySet -> com.android.tools.r8.internal.xq$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$KeySet -> com.android.tools.r8.internal.zq$c:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap):1465:1465 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$1):1465:1465 -> <init>
@@ -51528,7 +51566,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.xq$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$MapEntry -> com.android.tools.r8.internal.zq$d:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap this$0 -> b
     int index -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap,int):824:825 -> <init>
@@ -51547,7 +51585,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.xq$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.zq$e:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap):1269:1269 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$1):1269:1269 -> <init>
@@ -51569,7 +51607,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.xq$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$MapIterator -> com.android.tools.r8.internal.zq$f:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap this$0 -> e
     int index -> d
     int next -> b
@@ -51587,7 +51625,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.xq$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$ValueIterator -> com.android.tools.r8.internal.zq$g:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap this$0 -> f
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap):1578:1579 -> <init>
     1:1:void add(java.lang.Object):1544:1544 -> add
@@ -51602,11 +51640,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.Aq:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap -> com.android.tools.r8.internal.Cq:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet object2IntEntrySet() -> g
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$Entry -> com.android.tools.r8.internal.yq:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$FastEntrySet -> com.android.tools.r8.internal.zq:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap -> com.android.tools.r8.internal.Cq:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$Entry -> com.android.tools.r8.internal.Aq:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$FastEntrySet -> com.android.tools.r8.internal.Bq:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap -> com.android.tools.r8.internal.Eq:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet keys -> j
     java.lang.Object[] key -> b
     int[] value -> c
@@ -51664,14 +51702,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.Bq:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$1 -> com.android.tools.r8.internal.Dq:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap):848:848 -> <init>
     1:1:boolean contains(int):861:861 -> b
     1:1:void clear():866:866 -> clear
     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.Cq$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$EntryIterator -> com.android.tools.r8.internal.Eq$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$MapEntry entry -> g
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap this$0 -> h
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap):654:654 -> <init>
@@ -51679,11 +51717,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.Cq$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$KeyIterator -> com.android.tools.r8.internal.Eq$b:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap):775:776 -> <init>
     1:1:java.lang.Object next():781:781 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$KeySet -> com.android.tools.r8.internal.Cq$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$KeySet -> com.android.tools.r8.internal.Eq$c:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap):785:785 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$1):785:785 -> <init>
@@ -51692,7 +51730,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.Cq$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$MapEntry -> com.android.tools.r8.internal.Eq$d:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap this$0 -> b
     int index -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap,int):473:474 -> <init>
@@ -51711,7 +51749,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.Cq$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.Eq$e:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap):679:679 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$1):679:679 -> <init>
@@ -51720,7 +51758,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.Cq$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$MapIterator -> com.android.tools.r8.internal.Eq$f:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap this$0 -> f
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList wrapped -> e
     int last -> b
@@ -51738,17 +51776,17 @@
     14:23:void remove():634 -> remove
     24:25:void remove():637:638 -> remove
     26:26:void remove():630:630 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$ValueIterator -> com.android.tools.r8.internal.Cq$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$ValueIterator -> com.android.tools.r8.internal.Eq$g:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap):830:831 -> <init>
     1:1:int nextInt():836:836 -> j
     1:1:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$ValueIterator.next():842:842 -> next
     1:1:java.lang.Object next():829 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntSortedMap$FastSortedEntrySet -> com.android.tools.r8.internal.Dq:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap -> com.android.tools.r8.internal.Eq:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap$Entry -> com.android.tools.r8.internal.Eq$a:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap$FastEntrySet -> com.android.tools.r8.internal.Fq:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap -> com.android.tools.r8.internal.Hq:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntSortedMap$FastSortedEntrySet -> com.android.tools.r8.internal.Fq:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap -> com.android.tools.r8.internal.Gq:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap$Entry -> com.android.tools.r8.internal.Gq$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap$FastEntrySet -> com.android.tools.r8.internal.Hq:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap -> com.android.tools.r8.internal.Jq:
     java.lang.Object[] key -> a
     long[] value -> b
     int maxFill -> f
@@ -51807,14 +51845,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.Gq:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$1 -> com.android.tools.r8.internal.Iq:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap):848:848 -> <init>
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongIterator iterator():851:851 -> a
     1:1:boolean contains(long):861:861 -> b
     1:1:void clear():866:866 -> clear
     1:1:int size():856:856 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$EntryIterator -> com.android.tools.r8.internal.Hq$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$EntryIterator -> com.android.tools.r8.internal.Jq$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$MapEntry entry -> g
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap this$0 -> h
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap):654:654 -> <init>
@@ -51822,11 +51860,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.Hq$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$KeyIterator -> com.android.tools.r8.internal.Jq$b:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap):775:776 -> <init>
     1:1:java.lang.Object next():781:781 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$KeySet -> com.android.tools.r8.internal.Hq$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$KeySet -> com.android.tools.r8.internal.Jq$c:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap):785:785 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$1):785:785 -> <init>
@@ -51835,7 +51873,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.Hq$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$MapEntry -> com.android.tools.r8.internal.Jq$d:
     int index -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap this$0 -> b
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap,int):473:474 -> <init>
@@ -51854,7 +51892,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.Hq$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.Jq$e:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap):679:679 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$1):679:679 -> <init>
@@ -51863,7 +51901,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.Hq$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$MapIterator -> com.android.tools.r8.internal.Jq$f:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList wrapped -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap this$0 -> f
     int last -> b
@@ -51881,13 +51919,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.Hq$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$ValueIterator -> com.android.tools.r8.internal.Jq$g:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap):830:831 -> <init>
     1:1:long nextLong():836:836 -> a
     1:1:java.lang.Long com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$ValueIterator.next():842:842 -> next
     1:1:java.lang.Object next():829 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap -> com.android.tools.r8.internal.Jq:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap -> com.android.tools.r8.internal.Lq:
     java.lang.Object[] value -> b
     int maxFill -> j
     java.lang.Object[] key -> a
@@ -51957,14 +51995,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.Iq:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$1 -> com.android.tools.r8.internal.Kq:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap):1529:1529 -> <init>
     1:1:void clear():1547:1547 -> clear
     1:1:boolean contains(java.lang.Object):1542:1542 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1532:1532 -> iterator
     1:1:int size():1537:1537 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$EntryIterator -> com.android.tools.r8.internal.Jq$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$EntryIterator -> com.android.tools.r8.internal.Lq$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$MapEntry entry -> f
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap this$0 -> g
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap):1181:1181 -> <init>
@@ -51979,14 +52017,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.Jq$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$KeyIterator -> com.android.tools.r8.internal.Lq$b:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap this$0 -> f
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap):1412:1413 -> <init>
     1:1:void add(java.lang.Object):1409:1409 -> add
     1:1:java.lang.Object next():1418:1418 -> next
     1:1:java.lang.Object previous():1399:1399 -> previous
     1:1:void set(java.lang.Object):1404:1404 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$KeySet -> com.android.tools.r8.internal.Jq$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$KeySet -> com.android.tools.r8.internal.Lq$c:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap):1422:1422 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$1):1422:1422 -> <init>
@@ -52006,7 +52044,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.Jq$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$MapEntry -> com.android.tools.r8.internal.Lq$d:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap this$0 -> b
     int index -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap,int):805:806 -> <init>
@@ -52016,7 +52054,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.Jq$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$MapEntrySet -> com.android.tools.r8.internal.Lq$e:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap):1228:1228 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$1):1228:1228 -> <init>
@@ -52038,7 +52076,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.Jq$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$MapIterator -> com.android.tools.r8.internal.Lq$f:
     int index -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap this$0 -> e
     int next -> b
@@ -52056,17 +52094,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.Jq$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$ValueIterator -> com.android.tools.r8.internal.Lq$g:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap this$0 -> f
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap):1517:1518 -> <init>
     1:1:void add(java.lang.Object):1514:1514 -> add
     1:1:java.lang.Object next():1523:1523 -> next
     1:1:java.lang.Object previous():1504:1504 -> previous
     1:1:void set(java.lang.Object):1509:1509 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap -> com.android.tools.r8.internal.Lq:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry -> com.android.tools.r8.internal.Kq:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectSortedMap$FastSortedEntrySet -> com.android.tools.r8.internal.Mq:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap -> com.android.tools.r8.internal.Oq:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap -> com.android.tools.r8.internal.Nq:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry -> com.android.tools.r8.internal.Mq:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectSortedMap$FastSortedEntrySet -> com.android.tools.r8.internal.Oq:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap -> com.android.tools.r8.internal.Qq:
     java.lang.Object[] key -> b
     java.lang.Object[] value -> c
     int maxFill -> j
@@ -52139,14 +52177,14 @@
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap.tailMap(java.lang.Object):918:918 -> tailMap
     2:2:java.util.SortedMap tailMap(java.lang.Object):85 -> tailMap
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values():1498:1519 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$1 -> com.android.tools.r8.internal.Nq:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$1 -> com.android.tools.r8.internal.Pq:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap):1498:1498 -> <init>
     1:1:void clear():1516:1516 -> clear
     1:1:boolean contains(java.lang.Object):1511:1511 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1501:1501 -> iterator
     1:1:int size():1506:1506 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$EntryIterator -> com.android.tools.r8.internal.Oq$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$EntryIterator -> com.android.tools.r8.internal.Qq$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$MapEntry entry -> f
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap this$0 -> g
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap):1150:1150 -> <init>
@@ -52161,14 +52199,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.Oq$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$KeyIterator -> com.android.tools.r8.internal.Qq$b:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap this$0 -> f
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap):1381:1382 -> <init>
     1:1:void add(java.lang.Object):1378:1378 -> add
     1:1:java.lang.Object next():1387:1387 -> next
     1:1:java.lang.Object previous():1368:1368 -> previous
     1:1:void set(java.lang.Object):1373:1373 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$KeySet -> com.android.tools.r8.internal.Oq$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$KeySet -> com.android.tools.r8.internal.Qq$c:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap):1391:1391 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$1):1391:1391 -> <init>
@@ -52188,7 +52226,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.Oq$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$MapEntry -> com.android.tools.r8.internal.Qq$d:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap this$0 -> b
     int index -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap,int):774:775 -> <init>
@@ -52198,7 +52236,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.Oq$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.Qq$e:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap):1197:1197 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$1):1197:1197 -> <init>
@@ -52220,7 +52258,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.Oq$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$MapIterator -> com.android.tools.r8.internal.Qq$f:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap this$0 -> e
     int index -> d
     int next -> b
@@ -52238,17 +52276,17 @@
     1:2:int previousIndex():1048:1049 -> previousIndex
     1:49:void remove():1071:1119 -> remove
     50:50:void remove():1072:1072 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$ValueIterator -> com.android.tools.r8.internal.Oq$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$ValueIterator -> com.android.tools.r8.internal.Qq$g:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap this$0 -> f
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap):1486:1487 -> <init>
     1:1:void add(java.lang.Object):1483:1483 -> add
     1:1:java.lang.Object next():1492:1492 -> next
     1:1:java.lang.Object previous():1473:1473 -> previous
     1:1:void set(java.lang.Object):1478:1478 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap -> com.android.tools.r8.internal.Qq:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap -> com.android.tools.r8.internal.Sq:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet object2ReferenceEntrySet() -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry -> com.android.tools.r8.internal.Pq:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap -> com.android.tools.r8.internal.Vq:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry -> com.android.tools.r8.internal.Rq:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap -> com.android.tools.r8.internal.Xq:
     java.util.Comparator actualComparator -> k
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values -> h
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet keys -> g
@@ -52375,7 +52413,7 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap subMap(java.lang.Object,java.lang.Object):1352:1352 -> subMap
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap tailMap(java.lang.Object):1347:1347 -> tailMap
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values():1311:1332 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$1 -> com.android.tools.r8.internal.Sq:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$1 -> com.android.tools.r8.internal.Uq:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap this$0 -> b
     java.util.Comparator comparator -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap):1116:1117 -> <init>
@@ -52398,20 +52436,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.Rq:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$1$1 -> com.android.tools.r8.internal.Tq:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$1 this$1 -> a
     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.Tq:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$2 -> com.android.tools.r8.internal.Vq:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap this$0 -> a
     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.Uq:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry -> com.android.tools.r8.internal.Wq:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry right -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry left -> c
     int info -> e
@@ -52438,7 +52476,7 @@
     1:1:boolean succ():757:757 -> i
     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.Vq$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$EntryIterator -> com.android.tools.r8.internal.Xq$a:
     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
@@ -52450,18 +52488,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.Vq$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$KeyIterator -> com.android.tools.r8.internal.Xq$b:
     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.Vq$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$KeySet -> com.android.tools.r8.internal.Xq$c:
     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):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.Vq$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap -> com.android.tools.r8.internal.Xq$d:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap this$0 -> i
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values -> h
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet keys -> g
@@ -52518,7 +52556,7 @@
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap tailMap(java.lang.Object):1619 -> tailMap
     4:4:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap tailMap(java.lang.Object):1619:1619 -> tailMap
     1:18:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values():1527:1544 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$1 -> com.android.tools.r8.internal.Wq:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$1 -> com.android.tools.r8.internal.Yq:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap this$1 -> a
     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
@@ -52548,19 +52586,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.Xq:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$2 -> com.android.tools.r8.internal.Zq:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap this$1 -> a
     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.Vq$d$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$KeySet -> com.android.tools.r8.internal.Xq$d$a:
     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):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.Vq$d$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$SubmapEntryIterator -> com.android.tools.r8.internal.Xq$d$b:
     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
@@ -52572,25 +52610,25 @@
     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.Vq$d$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$SubmapIterator -> com.android.tools.r8.internal.Xq$d$c:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap this$1 -> f
     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
     1:2:void updatePrevious():1723:1724 -> o
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$SubmapKeyIterator -> com.android.tools.r8.internal.Vq$d$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$SubmapKeyIterator -> com.android.tools.r8.internal.Xq$d$d:
     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.Vq$d$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$SubmapValueIterator -> com.android.tools.r8.internal.Xq$d$e:
     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.Vq$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$TreeIterator -> com.android.tools.r8.internal.Xq$e:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap this$0 -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry next -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry prev -> a
@@ -52607,17 +52645,17 @@
     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.Vq$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$ValueIterator -> com.android.tools.r8.internal.Xq$f:
     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 -> com.android.tools.r8.internal.Zq:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap -> com.android.tools.r8.internal.br:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet object2ReferenceEntrySet() -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap$FastSortedEntrySet -> com.android.tools.r8.internal.Yq:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList -> com.android.tools.r8.internal.fr:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap$FastSortedEntrySet -> com.android.tools.r8.internal.ar:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList -> com.android.tools.r8.internal.hr:
     int size -> b
     1:3:void <init>(int):96:98 -> <init>
     4:4:void <init>(int):97:97 -> <init>
@@ -52640,7 +52678,7 @@
     1:7:boolean removeAll(java.util.Collection):485:491 -> removeAll
     1:4:java.lang.Object set(int,java.lang.Object):357:357 -> set
     1:1:int size():372:372 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList$1 -> com.android.tools.r8.internal.er:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList$1 -> com.android.tools.r8.internal.gr:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList this$0 -> d
     int last -> b
     int val$index -> c
@@ -52655,7 +52693,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.hr:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArraySet -> com.android.tools.r8.internal.jr:
     int size -> b
     1:4:void <init>(java.lang.Object[],int):104:107 -> <init>
     1:1:int access$000(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArraySet):29:29 -> a
@@ -52675,19 +52713,19 @@
     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.gr:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArraySet$1 -> com.android.tools.r8.internal.ir:
     int next -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArraySet this$0 -> b
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArraySet):119:120 -> <init>
     1:1:boolean hasNext():124:124 -> hasNext
     1:3:java.lang.Object next():129:129 -> next
     1:3:void remove():135:137 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrays -> com.android.tools.r8.internal.ir:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrays -> com.android.tools.r8.internal.kr:
     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.jr:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection -> com.android.tools.r8.internal.kr:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollections$EmptyCollection -> com.android.tools.r8.internal.lr:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator -> com.android.tools.r8.internal.lr:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection -> com.android.tools.r8.internal.mr:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollections$EmptyCollection -> com.android.tools.r8.internal.nr:
     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
@@ -52696,37 +52734,37 @@
     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.mr:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators -> com.android.tools.r8.internal.pr:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator -> com.android.tools.r8.internal.or:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators -> com.android.tools.r8.internal.rr:
     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.nr:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators$EmptyIterator -> com.android.tools.r8.internal.pr:
     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$UnmodifiableIterator -> com.android.tools.r8.internal.or:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators$UnmodifiableIterator -> com.android.tools.r8.internal.qr:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator i -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator):739:740 -> <init>
     1:1:boolean hasNext():745:745 -> hasNext
     1:1:java.lang.Object next():750:750 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectList -> com.android.tools.r8.internal.qr:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectList -> com.android.tools.r8.internal.sr:
     void removeElements(int,int) -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator -> com.android.tools.r8.internal.rr:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet -> com.android.tools.r8.internal.tr:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSets -> com.android.tools.r8.internal.vr:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator -> com.android.tools.r8.internal.tr:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet -> com.android.tools.r8.internal.vr:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSets -> com.android.tools.r8.internal.xr:
     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.ur:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSets$EmptySet -> com.android.tools.r8.internal.wr:
     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.ObjectSortedSet -> com.android.tools.r8.internal.wr:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSets -> com.android.tools.r8.internal.yr:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet -> com.android.tools.r8.internal.yr:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSets -> com.android.tools.r8.internal.Ar:
     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.xr:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSets$EmptySet -> com.android.tools.r8.internal.zr:
     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
@@ -52737,10 +52775,10 @@
     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.Reference2BooleanMap -> com.android.tools.r8.internal.Lv:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap$Entry -> com.android.tools.r8.internal.Jv:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap$FastEntrySet -> com.android.tools.r8.internal.Kv:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap -> com.android.tools.r8.internal.Nv:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap -> com.android.tools.r8.internal.Nv:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap$Entry -> com.android.tools.r8.internal.Lv:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap$FastEntrySet -> com.android.tools.r8.internal.Mv:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap -> com.android.tools.r8.internal.Pv:
     com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection values -> j
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet keys -> i
     java.lang.Object[] key -> a
@@ -52798,14 +52836,14 @@
     1:1:int size():384:384 -> size
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap.values():803:824 -> values
     1:22:java.util.Collection values():49 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$1 -> com.android.tools.r8.internal.Mv:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$1 -> com.android.tools.r8.internal.Ov:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap):803:803 -> <init>
     1:1:boolean contains(boolean):816:816 -> b
     1:1:void clear():821:821 -> clear
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator iterator():806:806 -> iterator
     1:1:int size():811:811 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$EntryIterator -> com.android.tools.r8.internal.Nv$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$EntryIterator -> com.android.tools.r8.internal.Pv$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap this$0 -> h
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapEntry entry -> g
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap):609:609 -> <init>
@@ -52813,11 +52851,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.Nv$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$KeyIterator -> com.android.tools.r8.internal.Pv$b:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap):730:731 -> <init>
     1:1:java.lang.Object next():736:736 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$KeySet -> com.android.tools.r8.internal.Nv$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$KeySet -> com.android.tools.r8.internal.Pv$c:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap):740:740 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$1):740:740 -> <init>
@@ -52826,7 +52864,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.Nv$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapEntry -> com.android.tools.r8.internal.Pv$d:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap this$0 -> b
     int index -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap,int):428:429 -> <init>
@@ -52844,7 +52882,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.Nv$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.Pv$e:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap):634:634 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$1):634:634 -> <init>
@@ -52853,7 +52891,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.Nv$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapIterator -> com.android.tools.r8.internal.Pv$f:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap this$0 -> f
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList wrapped -> e
     int last -> b
@@ -52871,13 +52909,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.Nv$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$ValueIterator -> com.android.tools.r8.internal.Pv$g:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap):785:786 -> <init>
     1:1:boolean nextBoolean():791:791 -> f
     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.Qv:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap -> com.android.tools.r8.internal.Sv:
     java.lang.Object[] key -> b
     int[] value -> c
     int size -> d
@@ -52905,8 +52943,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.Ov:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$EntrySet -> com.android.tools.r8.internal.Qv$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$1 -> com.android.tools.r8.internal.Qv:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$EntrySet -> com.android.tools.r8.internal.Sv$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap):133:133 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$1):133:133 -> <init>
@@ -52916,7 +52954,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.Pv:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$EntrySet$1 -> com.android.tools.r8.internal.Rv:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$EntrySet this$1 -> c
     int next -> b
     int curr -> a
@@ -52925,11 +52963,11 @@
     1:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$EntrySet$1.next():147:147 -> next
     1:3:java.lang.Object next():136 -> next
     1:7:void remove():153:153 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntFunction -> com.android.tools.r8.internal.Rv:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntFunction -> com.android.tools.r8.internal.Tv:
     int getInt(java.lang.Object) -> a
     int put(java.lang.Object,int) -> a
     int removeInt(java.lang.Object) -> b
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap -> com.android.tools.r8.internal.Tv:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap -> com.android.tools.r8.internal.Vv:
     java.lang.Object[] key -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values -> n
     int maxFill -> j
@@ -53001,14 +53039,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.Sv:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$1 -> com.android.tools.r8.internal.Uv:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap):1596:1596 -> <init>
     1:1:boolean contains(int):1609:1609 -> b
     1:1:void clear():1614:1614 -> clear
     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.Tv$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$EntryIterator -> com.android.tools.r8.internal.Vv$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$MapEntry entry -> f
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap this$0 -> g
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap):1222:1222 -> <init>
@@ -53023,14 +53061,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.Tv$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$KeyIterator -> com.android.tools.r8.internal.Vv$b:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap this$0 -> f
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap):1455:1456 -> <init>
     1:1:void add(java.lang.Object):1452:1452 -> add
     1:1:java.lang.Object next():1461:1461 -> next
     1:1:java.lang.Object previous():1442:1442 -> previous
     1:1:void set(java.lang.Object):1447:1447 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$KeySet -> com.android.tools.r8.internal.Tv$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$KeySet -> com.android.tools.r8.internal.Vv$c:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap):1465:1465 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$1):1465:1465 -> <init>
@@ -53050,7 +53088,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.Tv$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$MapEntry -> com.android.tools.r8.internal.Vv$d:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap this$0 -> b
     int index -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap,int):824:825 -> <init>
@@ -53069,7 +53107,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.Tv$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.Vv$e:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap):1269:1269 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$1):1269:1269 -> <init>
@@ -53091,7 +53129,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.Tv$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$MapIterator -> com.android.tools.r8.internal.Vv$f:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap this$0 -> e
     int index -> d
     int next -> b
@@ -53109,7 +53147,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.Tv$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$ValueIterator -> com.android.tools.r8.internal.Vv$g:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap this$0 -> f
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap):1578:1579 -> <init>
     1:1:void add(java.lang.Object):1544:1544 -> add
@@ -53124,11 +53162,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.Uv:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap -> com.android.tools.r8.internal.Wv:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet reference2IntEntrySet() -> e
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$Entry -> com.android.tools.r8.internal.Uv$a:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$FastEntrySet -> com.android.tools.r8.internal.Vv:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap -> com.android.tools.r8.internal.Xv:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$Entry -> com.android.tools.r8.internal.Wv$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$FastEntrySet -> com.android.tools.r8.internal.Xv:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap -> com.android.tools.r8.internal.Zv:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$FastEntrySet entries -> i
     java.lang.Object[] key -> b
     int[] value -> c
@@ -53188,14 +53226,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.Wv:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$1 -> com.android.tools.r8.internal.Yv:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap):848:848 -> <init>
     1:1:boolean contains(int):861:861 -> b
     1:1:void clear():866:866 -> clear
     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.Xv$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$EntryIterator -> com.android.tools.r8.internal.Zv$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap this$0 -> h
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapEntry entry -> g
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap):654:654 -> <init>
@@ -53203,11 +53241,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.Xv$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$KeyIterator -> com.android.tools.r8.internal.Zv$b:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap):775:776 -> <init>
     1:1:java.lang.Object next():781:781 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$KeySet -> com.android.tools.r8.internal.Xv$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$KeySet -> com.android.tools.r8.internal.Zv$c:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap):785:785 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$1):785:785 -> <init>
@@ -53216,7 +53254,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.Xv$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapEntry -> com.android.tools.r8.internal.Zv$d:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap this$0 -> b
     int index -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap,int):473:474 -> <init>
@@ -53235,7 +53273,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.Xv$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.Zv$e:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap):679:679 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$1):679:679 -> <init>
@@ -53244,7 +53282,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.Xv$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapIterator -> com.android.tools.r8.internal.Zv$f:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap this$0 -> f
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList wrapped -> e
     int last -> b
@@ -53262,17 +53300,17 @@
     14:23:void remove():634 -> remove
     24:25:void remove():637:638 -> remove
     26:26:void remove():630:630 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$ValueIterator -> com.android.tools.r8.internal.Xv$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$ValueIterator -> com.android.tools.r8.internal.Zv$g:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap):830:831 -> <init>
     1:1:int nextInt():836:836 -> j
     1:1:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$ValueIterator.next():842:842 -> next
     1:1:java.lang.Object next():829 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntSortedMap$FastSortedEntrySet -> com.android.tools.r8.internal.Yv:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongMap -> com.android.tools.r8.internal.bw:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongMap$Entry -> com.android.tools.r8.internal.Zv:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongMap$FastEntrySet -> com.android.tools.r8.internal.aw:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap -> com.android.tools.r8.internal.dw:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntSortedMap$FastSortedEntrySet -> com.android.tools.r8.internal.aw:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongMap -> com.android.tools.r8.internal.dw:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongMap$Entry -> com.android.tools.r8.internal.bw:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongMap$FastEntrySet -> com.android.tools.r8.internal.cw:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap -> com.android.tools.r8.internal.fw:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet keys -> i
     java.lang.Object[] key -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongMap$FastEntrySet entries -> h
@@ -53329,14 +53367,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.cw:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$1 -> com.android.tools.r8.internal.ew:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap):848:848 -> <init>
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongIterator iterator():851:851 -> a
     1:1:boolean contains(long):861:861 -> b
     1:1:void clear():866:866 -> clear
     1:1:int size():856:856 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$EntryIterator -> com.android.tools.r8.internal.dw$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$EntryIterator -> com.android.tools.r8.internal.fw$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap this$0 -> h
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$MapEntry entry -> g
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap):654:654 -> <init>
@@ -53344,11 +53382,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.dw$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$KeyIterator -> com.android.tools.r8.internal.fw$b:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap):775:776 -> <init>
     1:1:java.lang.Object next():781:781 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$KeySet -> com.android.tools.r8.internal.dw$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$KeySet -> com.android.tools.r8.internal.fw$c:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap):785:785 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$1):785:785 -> <init>
@@ -53357,7 +53395,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.dw$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$MapEntry -> com.android.tools.r8.internal.fw$d:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap this$0 -> b
     int index -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap,int):473:474 -> <init>
@@ -53375,7 +53413,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.dw$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.fw$e:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap):679:679 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$1):679:679 -> <init>
@@ -53384,7 +53422,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.dw$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$MapIterator -> com.android.tools.r8.internal.fw$f:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList wrapped -> e
     int last -> b
     int pos -> a
@@ -53402,13 +53440,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.dw$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$ValueIterator -> com.android.tools.r8.internal.fw$g:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap):830:831 -> <init>
     1:1:long nextLong():836:836 -> a
     1:1:java.lang.Long com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$ValueIterator.next():842:842 -> next
     1:1:java.lang.Object next():829 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList -> com.android.tools.r8.internal.fw:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList -> com.android.tools.r8.internal.hw:
     int size -> b
     1:3:void <init>(int):96:98 -> <init>
     4:4:void <init>(int):97:97 -> <init>
@@ -53431,7 +53469,7 @@
     1:7:boolean removeAll(java.util.Collection):485:491 -> removeAll
     1:4:java.lang.Object set(int,java.lang.Object):357:357 -> set
     1:1:int size():372:372 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList$1 -> com.android.tools.r8.internal.ew:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList$1 -> com.android.tools.r8.internal.gw:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList this$0 -> d
     int last -> b
     int val$index -> c
@@ -53446,7 +53484,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.hw:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet -> com.android.tools.r8.internal.jw:
     int size -> b
     1:4:void <init>(java.lang.Object[],int):104:107 -> <init>
     1:1:int access$000(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet):29:29 -> a
@@ -53466,17 +53504,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.gw:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet$1 -> com.android.tools.r8.internal.iw:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet this$0 -> b
     int next -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet):119:120 -> <init>
     1:1:boolean hasNext():124:124 -> hasNext
     1:3:java.lang.Object next():129:129 -> next
     1:3:void remove():135:137 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection -> com.android.tools.r8.internal.iw:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollections -> com.android.tools.r8.internal.lw:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection -> com.android.tools.r8.internal.kw:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollections -> com.android.tools.r8.internal.nw:
     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.jw:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollections$EmptyCollection -> com.android.tools.r8.internal.lw:
     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
@@ -53484,7 +53522,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.kw:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollections$UnmodifiableCollection -> com.android.tools.r8.internal.mw:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection collection -> a
     1:3:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection):276:278 -> <init>
     1:1:boolean add(java.lang.Object):283:283 -> add
@@ -53506,9 +53544,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.mw:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceList -> com.android.tools.r8.internal.ow:
     void removeElements(int,int) -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet -> com.android.tools.r8.internal.ow:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet -> com.android.tools.r8.internal.qw:
     java.lang.Object[] key -> a
     float f -> g
     int size -> f
@@ -53555,8 +53593,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.nw:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet$SetIterator -> com.android.tools.r8.internal.ow$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet$1 -> com.android.tools.r8.internal.pw:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet$SetIterator -> com.android.tools.r8.internal.qw$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet this$0 -> f
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList wrapped -> e
     int last -> b
@@ -53574,16 +53612,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.pw:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSets -> com.android.tools.r8.internal.rw:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet -> com.android.tools.r8.internal.rw:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSets -> com.android.tools.r8.internal.tw:
     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.qw:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSets$EmptySet -> com.android.tools.r8.internal.sw:
     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.ReferenceSortedSet -> com.android.tools.r8.internal.sw:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSortedSet -> com.android.tools.r8.internal.uw:
 com.android.tools.r8.jar.CfApplicationWriter -> com.android.tools.r8.internal.e3:
     com.android.tools.r8.graph.GraphLens graphLens -> e
     com.android.tools.r8.graph.AppView appView -> d
@@ -53618,12 +53656,12 @@
     68:78:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.jar.CfApplicationWriter.getAnnotationDefaults(com.android.tools.r8.graph.DexAnnotationSet):293:303 -> a
     68:78:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional):199 -> a
     79:116:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional):201:238 -> a
-    117:121:void com.android.tools.r8.utils.ExceptionUtils.withConsumeResourceHandler(com.android.tools.r8.utils.Reporter,java.util.function.Consumer):41:45 -> a
+    117:121:void com.android.tools.r8.utils.ExceptionUtils.withConsumeResourceHandler(com.android.tools.r8.utils.Reporter,java.util.function.Consumer):42:46 -> a
     117:121:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional):238 -> a
     122:122: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):225:225 -> a
     123:123:void lambda$writeClass$1(com.android.tools.r8.ClassFileConsumer,byte[],java.lang.String,com.android.tools.r8.DiagnosticsHandler):239:239 -> a
     124:127:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):243:246 -> a
-    128:128:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():390:390 -> a
+    128:128:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():397:397 -> a
     128:128:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):247 -> a
     129:129:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):247:247 -> a
     130:138:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):246:254 -> a
@@ -53636,7 +53674,7 @@
     161:161:com.android.tools.r8.graph.MethodAccessFlags com.android.tools.r8.graph.DexEncodedMethod.getAccessFlags():201:201 -> a
     161:161: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):348 -> a
     162:162: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):348:348 -> a
-    163:163:boolean com.android.tools.r8.graph.DexEncodedMethod.isDeprecated():314:314 -> a
+    163:163:boolean com.android.tools.r8.graph.DexEncodedMethod.isDeprecated():318:318 -> a
     163:163: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):349 -> a
     164:168: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):352:356 -> a
     169:177:java.lang.String[] com.android.tools.r8.jar.CfApplicationWriter.getExceptions(com.android.tools.r8.graph.DexAnnotationSet):307:315 -> a
@@ -53667,35 +53705,35 @@
     7:7:void com.android.tools.r8.ir.conversion.LensCodeRewriterUtils.<init>(com.android.tools.r8.graph.AppView):42:42 -> b
     7:7:void writeApplication(com.android.tools.r8.ClassFileConsumer):122 -> b
     8:10:void writeApplication(com.android.tools.r8.ClassFileConsumer):123:125 -> b
-    11:11:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():390:390 -> b
+    11:11:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():397:397 -> b
     11:11:void writeApplication(com.android.tools.r8.ClassFileConsumer):126 -> b
     12:39:void writeApplication(com.android.tools.r8.ClassFileConsumer):126:153 -> b
     40:52:void writeApplication(com.android.tools.r8.ClassFileConsumer):129:141 -> b
-    53:53:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():580:580 -> b
+    53:53:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():584:584 -> b
     53:53:void writeApplication(com.android.tools.r8.ClassFileConsumer):145 -> b
     54:56:void writeApplication(com.android.tools.r8.ClassFileConsumer):147:149 -> b
     57:61:void writeApplication(com.android.tools.r8.ClassFileConsumer):146:150 -> b
     62:62:void writeApplication(com.android.tools.r8.ClassFileConsumer):143:143 -> b
     63:64:void writeApplication(com.android.tools.r8.ClassFileConsumer):131:132 -> b
-    65:65:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():580:580 -> b
+    65:65:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():584:584 -> b
     65:65:void writeApplication(com.android.tools.r8.ClassFileConsumer):136 -> b
     66:67:void writeApplication(com.android.tools.r8.ClassFileConsumer):137:138 -> b
     68:90:void writeApplication(com.android.tools.r8.ClassFileConsumer):134:156 -> b
 com.android.tools.r8.jar.CfApplicationWriter$AnnotationConsumer -> com.android.tools.r8.internal.d3:
     com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visit(java.lang.String,boolean) -> a
-com.android.tools.r8.jetbrains.kotlin.DeprecationLevel -> com.android.tools.r8.internal.W7:
+com.android.tools.r8.jetbrains.kotlin.DeprecationLevel -> com.android.tools.r8.internal.X7:
 # {"id":"sourceFile","fileName":"Annotations.kt"}
     com.android.tools.r8.jetbrains.kotlin.DeprecationLevel ERROR -> b
     com.android.tools.r8.jetbrains.kotlin.DeprecationLevel WARNING -> a
     com.android.tools.r8.jetbrains.kotlin.DeprecationLevel HIDDEN -> c
     com.android.tools.r8.jetbrains.kotlin.DeprecationLevel[] $VALUES -> d
     1:1:void <init>(java.lang.String,int):63:63 -> <init>
-com.android.tools.r8.jetbrains.kotlin.KotlinNullPointerException -> com.android.tools.r8.internal.Sk:
+com.android.tools.r8.jetbrains.kotlin.KotlinNullPointerException -> com.android.tools.r8.internal.Tk:
 # {"id":"sourceFile","fileName":"KotlinNullPointerException.kt"}
     1:1:void <init>():9:9 -> <init>
-com.android.tools.r8.jetbrains.kotlin.Lazy -> com.android.tools.r8.internal.Rl:
+com.android.tools.r8.jetbrains.kotlin.Lazy -> com.android.tools.r8.internal.Sl:
 # {"id":"sourceFile","fileName":"Lazy.kt"}
-com.android.tools.r8.jetbrains.kotlin.LazyKt -> com.android.tools.r8.internal.Wl:
+com.android.tools.r8.jetbrains.kotlin.LazyKt -> com.android.tools.r8.internal.Xl:
     1:22:com.android.tools.r8.jetbrains.kotlin.Lazy com.android.tools.r8.jetbrains.kotlin.LazyKt__LazyJVMKt.lazy(com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0):0:21 -> a
     1:22:com.android.tools.r8.jetbrains.kotlin.Lazy lazy(com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0):0 -> a
     23:23:void com.android.tools.r8.jetbrains.kotlin.SynchronizedLazyImpl.<init>(com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0,java.lang.Object,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):55:55 -> a
@@ -53710,19 +53748,19 @@
     64:64:void com.android.tools.r8.jetbrains.kotlin.SynchronizedLazyImpl.<init>(com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0,java.lang.Object,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):55:55 -> a
     64:64:com.android.tools.r8.jetbrains.kotlin.Lazy com.android.tools.r8.jetbrains.kotlin.LazyKt__LazyJVMKt.lazy(com.android.tools.r8.jetbrains.kotlin.LazyThreadSafetyMode,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0):35 -> a
     64:64:com.android.tools.r8.jetbrains.kotlin.Lazy lazy(com.android.tools.r8.jetbrains.kotlin.LazyThreadSafetyMode,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0):0 -> a
-com.android.tools.r8.jetbrains.kotlin.LazyKt__LazyKt -> com.android.tools.r8.internal.Xl:
+com.android.tools.r8.jetbrains.kotlin.LazyKt__LazyKt -> com.android.tools.r8.internal.Yl:
 # {"id":"sourceFile","fileName":"Lazy.kt"}
-com.android.tools.r8.jetbrains.kotlin.LazyThreadSafetyMode -> com.android.tools.r8.internal.Yl:
+com.android.tools.r8.jetbrains.kotlin.LazyThreadSafetyMode -> com.android.tools.r8.internal.Zl:
 # {"id":"sourceFile","fileName":"Lazy.kt"}
     com.android.tools.r8.jetbrains.kotlin.LazyThreadSafetyMode PUBLICATION -> b
     com.android.tools.r8.jetbrains.kotlin.LazyThreadSafetyMode NONE -> c
     com.android.tools.r8.jetbrains.kotlin.LazyThreadSafetyMode SYNCHRONIZED -> a
     com.android.tools.r8.jetbrains.kotlin.LazyThreadSafetyMode[] $VALUES -> d
     1:1:void <init>(java.lang.String,int):49:49 -> <init>
-com.android.tools.r8.jetbrains.kotlin.NoWhenBranchMatchedException -> com.android.tools.r8.internal.Wp:
+com.android.tools.r8.jetbrains.kotlin.NoWhenBranchMatchedException -> com.android.tools.r8.internal.Yp:
 # {"id":"sourceFile","fileName":"NoWhenBranchMatchedException.kt"}
     1:1:void <init>():9:9 -> <init>
-com.android.tools.r8.jetbrains.kotlin.Pair -> com.android.tools.r8.internal.ks:
+com.android.tools.r8.jetbrains.kotlin.Pair -> com.android.tools.r8.internal.ms:
 # {"id":"sourceFile","fileName":"Tuples.kt"}
     java.lang.Object second -> b
     java.lang.Object first -> a
@@ -53732,7 +53770,7 @@
     1:1:java.lang.Object getFirst():27:27 -> c
     1:1:java.lang.Object getSecond():28:28 -> d
     1:1:java.lang.String toString():34:34 -> toString
-com.android.tools.r8.jetbrains.kotlin.SafePublicationLazyImpl -> com.android.tools.r8.internal.sx:
+com.android.tools.r8.jetbrains.kotlin.SafePublicationLazyImpl -> com.android.tools.r8.internal.ux:
 # {"id":"sourceFile","fileName":"LazyJVM.kt"}
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0 initializer -> b
     java.util.concurrent.atomic.AtomicReferenceFieldUpdater valueUpdater -> a
@@ -53743,7 +53781,7 @@
     1:1:boolean com.android.tools.r8.jetbrains.kotlin.SafePublicationLazyImpl.isInitialized():117:117 -> toString
     1:1:java.lang.String toString():119 -> toString
     2:2:java.lang.String toString():119:119 -> toString
-com.android.tools.r8.jetbrains.kotlin.SynchronizedLazyImpl -> com.android.tools.r8.internal.Pz:
+com.android.tools.r8.jetbrains.kotlin.SynchronizedLazyImpl -> com.android.tools.r8.internal.Rz:
 # {"id":"sourceFile","fileName":"LazyJVM.kt"}
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0 initializer -> a
     java.lang.Object _value -> b
@@ -53754,23 +53792,23 @@
     1:1:boolean com.android.tools.r8.jetbrains.kotlin.SynchronizedLazyImpl.isInitialized():82:82 -> toString
     1:1:java.lang.String toString():84 -> toString
     2:2:java.lang.String toString():84:84 -> toString
-com.android.tools.r8.jetbrains.kotlin.TypeCastException -> com.android.tools.r8.internal.AB:
+com.android.tools.r8.jetbrains.kotlin.TypeCastException -> com.android.tools.r8.internal.BB:
 # {"id":"sourceFile","fileName":"TypeCastException.kt"}
     1:1:void <init>(java.lang.String):11:11 -> <init>
-com.android.tools.r8.jetbrains.kotlin.UNINITIALIZED_VALUE -> com.android.tools.r8.internal.OB:
+com.android.tools.r8.jetbrains.kotlin.UNINITIALIZED_VALUE -> com.android.tools.r8.internal.PB:
 # {"id":"sourceFile","fileName":"Lazy.kt"}
     com.android.tools.r8.jetbrains.kotlin.UNINITIALIZED_VALUE INSTANCE -> a
     1:1:void <clinit>():71:71 -> <clinit>
     1:1:void <init>():71:71 -> <init>
-com.android.tools.r8.jetbrains.kotlin.UninitializedPropertyAccessException -> com.android.tools.r8.internal.UB:
+com.android.tools.r8.jetbrains.kotlin.UninitializedPropertyAccessException -> com.android.tools.r8.internal.VB:
 # {"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.XB:
+com.android.tools.r8.jetbrains.kotlin.Unit -> com.android.tools.r8.internal.YB:
 # {"id":"sourceFile","fileName":"Unit.kt"}
     com.android.tools.r8.jetbrains.kotlin.Unit INSTANCE -> a
     1:1:void <clinit>():22:22 -> <clinit>
     1:1:void <init>():22:22 -> <init>
-com.android.tools.r8.jetbrains.kotlin.UnsafeLazyImpl -> com.android.tools.r8.internal.fC:
+com.android.tools.r8.jetbrains.kotlin.UnsafeLazyImpl -> com.android.tools.r8.internal.gC:
 # {"id":"sourceFile","fileName":"Lazy.kt"}
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0 initializer -> a
     java.lang.Object _value -> b
@@ -53780,7 +53818,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.cE:
+com.android.tools.r8.jetbrains.kotlin._Assertions -> com.android.tools.r8.internal.dE:
 # {"id":"sourceFile","fileName":"AssertionsJVM.kt"}
     boolean ENABLED -> a
     1:1:void <clinit>():14:14 -> <clinit>
@@ -53990,12 +54028,12 @@
     13831:13832:int lastIndexOf(java.lang.Object):162 -> lastIndexOf
 com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysKt -> com.android.tools.r8.internal.B1:
 # {"id":"sourceFile","fileName":"_Arrays.kt"}
-com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt$withIndex$1 -> com.android.tools.r8.internal.M6:
+com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt$withIndex$1 -> com.android.tools.r8.internal.N6:
 # {"id":"sourceFile","fileName":"_Collections.kt"}
     java.lang.Iterable $this_withIndex -> a
     1:1:java.util.Iterator com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt$withIndex$1.invoke():1387:1387 -> a
     1:1:java.lang.Object invoke():0 -> a
-com.android.tools.r8.jetbrains.kotlin.collections.EmptyIterator -> com.android.tools.r8.internal.g9:
+com.android.tools.r8.jetbrains.kotlin.collections.EmptyIterator -> com.android.tools.r8.internal.h9:
 # {"id":"sourceFile","fileName":"Collections.kt"}
     com.android.tools.r8.jetbrains.kotlin.collections.EmptyIterator INSTANCE -> a
     1:1:void <clinit>():13:13 -> <clinit>
@@ -54004,7 +54042,7 @@
     1:1:java.lang.Object next():13 -> next
     1:1:java.lang.Void com.android.tools.r8.jetbrains.kotlin.collections.EmptyIterator.previous():19:19 -> previous
     1:1:java.lang.Object previous():13 -> previous
-com.android.tools.r8.jetbrains.kotlin.collections.EmptyList -> com.android.tools.r8.internal.h9:
+com.android.tools.r8.jetbrains.kotlin.collections.EmptyList -> com.android.tools.r8.internal.i9:
 # {"id":"sourceFile","fileName":"Collections.kt"}
     com.android.tools.r8.jetbrains.kotlin.collections.EmptyList INSTANCE -> a
     1:1:void <clinit>():22:22 -> <clinit>
@@ -54027,7 +54065,7 @@
     2:2:java.util.ListIterator listIterator(int):42:42 -> listIterator
     3:3:java.util.ListIterator listIterator(int):41:41 -> listIterator
     1:1:java.util.List subList(int,int):47:47 -> subList
-com.android.tools.r8.jetbrains.kotlin.collections.EmptyMap -> com.android.tools.r8.internal.i9:
+com.android.tools.r8.jetbrains.kotlin.collections.EmptyMap -> com.android.tools.r8.internal.j9:
 # {"id":"sourceFile","fileName":"Maps.kt"}
     com.android.tools.r8.jetbrains.kotlin.collections.EmptyMap INSTANCE -> a
     1:1:void <clinit>():13:13 -> <clinit>
@@ -54039,7 +54077,7 @@
     1:1:boolean equals(java.lang.Object):16:16 -> equals
     1:1:java.util.Set keySet():13:13 -> keySet
     1:1:java.util.Collection values():13:13 -> values
-com.android.tools.r8.jetbrains.kotlin.collections.EmptySet -> com.android.tools.r8.internal.k9:
+com.android.tools.r8.jetbrains.kotlin.collections.EmptySet -> com.android.tools.r8.internal.l9:
 # {"id":"sourceFile","fileName":"Sets.kt"}
     com.android.tools.r8.jetbrains.kotlin.collections.EmptySet INSTANCE -> a
     1:1:void <clinit>():12:12 -> <clinit>
@@ -54050,19 +54088,19 @@
     1:1:boolean containsAll(java.util.Collection):22:22 -> containsAll
     1:1:boolean equals(java.lang.Object):15:15 -> equals
     1:1:java.util.Iterator iterator():24:24 -> iterator
-com.android.tools.r8.jetbrains.kotlin.collections.IndexedValue -> com.android.tools.r8.internal.td:
+com.android.tools.r8.jetbrains.kotlin.collections.IndexedValue -> com.android.tools.r8.internal.ud:
 # {"id":"sourceFile","fileName":"IndexedValue.kt"}
     java.lang.Object value -> b
     int index -> a
     1:1:void <init>(int,java.lang.Object):14:14 -> <init>
     1:1:int getIndex():14:14 -> a
     1:1:java.lang.Object getValue():14:14 -> b
-com.android.tools.r8.jetbrains.kotlin.collections.IndexingIterable -> com.android.tools.r8.internal.ud:
+com.android.tools.r8.jetbrains.kotlin.collections.IndexingIterable -> com.android.tools.r8.internal.vd:
 # {"id":"sourceFile","fileName":"Iterables.kt"}
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0 iteratorFactory -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0):24:24 -> <init>
     1:1:java.util.Iterator iterator():25:25 -> iterator
-com.android.tools.r8.jetbrains.kotlin.collections.IndexingIterator -> com.android.tools.r8.internal.vd:
+com.android.tools.r8.jetbrains.kotlin.collections.IndexingIterator -> com.android.tools.r8.internal.wd:
 # {"id":"sourceFile","fileName":"Iterators.kt"}
     java.util.Iterator iterator -> b
     int index -> a
@@ -54074,7 +54112,7 @@
     2:2:void com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt.throwIndexOverflow():0 -> next
     2:2:com.android.tools.r8.jetbrains.kotlin.collections.IndexedValue com.android.tools.r8.jetbrains.kotlin.collections.IndexingIterator.next():40 -> next
     2:2:java.lang.Object next():37 -> next
-com.android.tools.r8.jetbrains.kotlin.internal.ProgressionUtilKt -> com.android.tools.r8.internal.lt:
+com.android.tools.r8.jetbrains.kotlin.internal.ProgressionUtilKt -> com.android.tools.r8.internal.nt:
 # {"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
@@ -54082,16 +54120,16 @@
     3:3:int com.android.tools.r8.jetbrains.kotlin.internal.ProgressionUtilKt.differenceModulo(int,int,int):21:21 -> a
     3:3:int getProgressionLastElement(int,int,int):47 -> a
     4:4:int getProgressionLastElement(int,int,int):48:48 -> a
-com.android.tools.r8.jetbrains.kotlin.jvm.KotlinReflectionNotSupportedError -> com.android.tools.r8.internal.Vk:
+com.android.tools.r8.jetbrains.kotlin.jvm.KotlinReflectionNotSupportedError -> com.android.tools.r8.internal.Wk:
 # {"id":"sourceFile","fileName":"KotlinReflectionNotSupportedError.kt"}
     1:1:void <init>():11:11 -> <init>
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0 -> com.android.tools.r8.internal.nb:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0 -> com.android.tools.r8.internal.ob:
 # {"id":"sourceFile","fileName":"Functions.kt"}
     java.lang.Object invoke() -> a
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1 -> com.android.tools.r8.internal.ob:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1 -> com.android.tools.r8.internal.pb:
 # {"id":"sourceFile","fileName":"Functions.kt"}
     java.lang.Object invoke(java.lang.Object) -> a
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function2 -> com.android.tools.r8.internal.pb:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function2 -> com.android.tools.r8.internal.qb:
 # {"id":"sourceFile","fileName":"Functions.kt"}
     java.lang.Object invoke(java.lang.Object,java.lang.Object) -> a
 com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference$NoReceiver -> com.android.tools.r8.internal.Z2:
@@ -54110,7 +54148,7 @@
     2:2:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.internal.ClassReference.getJClass():10:10 -> toString
     2:2:java.lang.String toString():88 -> toString
     3:3:java.lang.String toString():88:88 -> toString
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.CollectionToArray -> com.android.tools.r8.internal.K6:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.CollectionToArray -> com.android.tools.r8.internal.L6:
 # {"id":"sourceFile","fileName":"CollectionToArray.kt"}
     java.lang.Object[] EMPTY -> a
     1:1:void <clinit>():130:130 -> <clinit>
@@ -54122,8 +54160,8 @@
     253:256:java.lang.Object[] toArray(java.util.Collection):83:86 -> a
     257:340:java.lang.Object[] toArray(java.util.Collection):21:104 -> a
     341:341:java.lang.Object[] toArray(java.util.Collection):23:23 -> a
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker -> com.android.tools.r8.internal.J7:
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.Intrinsics -> com.android.tools.r8.internal.ig:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker -> com.android.tools.r8.internal.K7:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.Intrinsics -> com.android.tools.r8.internal.jg:
     int compare(int,int) -> a
     1:1:void throwNpe():37:37 -> a
     2:2:void throwUninitializedPropertyAccessException(java.lang.String):49:49 -> a
@@ -54136,11 +54174,11 @@
     7:18:java.lang.Throwable sanitizeStackTrace(java.lang.Throwable):237 -> a
     1:15:void com.android.tools.r8.jetbrains.kotlin.jvm.internal.Intrinsics.throwParameterIsNullException(java.lang.String):127:141 -> b
     1:15:void checkParameterIsNotNull(java.lang.Object,java.lang.String):116 -> b
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.Lambda -> com.android.tools.r8.internal.ml:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.Lambda -> com.android.tools.r8.internal.nl:
 # {"id":"sourceFile","fileName":"Lambda.kt"}
     1:1:void <init>(int):10:10 -> <init>
     1:1:java.lang.String toString():11:11 -> toString
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference -> com.android.tools.r8.internal.zt:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference -> com.android.tools.r8.internal.Bt:
     com.android.tools.r8.jetbrains.kotlin.reflect.KCallable com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference.reflected -> b
     java.lang.Object com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference.receiver -> c
     java.lang.Object com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference.NO_RECEIVER -> a
@@ -54168,7 +54206,7 @@
     5:11:boolean equals(java.lang.Object):45:51 -> equals
     1:1:int hashCode():58:58 -> hashCode
     1:6:java.lang.String toString():63:68 -> toString
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1Impl -> com.android.tools.r8.internal.yt:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1Impl -> com.android.tools.r8.internal.At:
     com.android.tools.r8.jetbrains.kotlin.reflect.KDeclarationContainer owner -> d
     java.lang.String signature -> f
     java.lang.String name -> e
@@ -54219,7 +54257,7 @@
     4:4:com.android.tools.r8.jetbrains.kotlin.reflect.KProperty com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference.getReflected():25 -> e
     4:4:com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1$Getter com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1.getGetter():34 -> e
     4:4:com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1$Getter com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1.getGetter():0 -> e
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.Reflection -> com.android.tools.r8.internal.uw:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.Reflection -> com.android.tools.r8.internal.ww:
     com.android.tools.r8.jetbrains.kotlin.jvm.internal.ReflectionFactory factory -> a
     1:9:void <clinit>():22:30 -> <clinit>
     1:1:com.android.tools.r8.jetbrains.kotlin.reflect.KClass getOrCreateKotlinClass(java.lang.Class):50:50 -> a
@@ -54234,9 +54272,9 @@
     34:34:com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1 property1(com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1):94:94 -> a
     35:35:com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1 com.android.tools.r8.jetbrains.kotlin.jvm.internal.ReflectionFactory.property1(com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1):0:0 -> a
     35:35:com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1 property1(com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1):94 -> a
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.ReflectionFactory -> com.android.tools.r8.internal.vw:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.ReflectionFactory -> com.android.tools.r8.internal.xw:
     1:1:void <init>():11:11 -> <init>
-com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression -> com.android.tools.r8.internal.Jf:
+com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression -> com.android.tools.r8.internal.Kf:
 # {"id":"sourceFile","fileName":"Progressions.kt"}
     int step -> d
     int first -> b
@@ -54254,11 +54292,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlin.collections.IntIterator com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression.iterator():99:99 -> iterator
     1:1:java.util.Iterator iterator():72 -> iterator
     1:1:java.lang.String toString():111:111 -> toString
-com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression$Companion -> com.android.tools.r8.internal.If:
+com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression$Companion -> com.android.tools.r8.internal.Jf:
 # {"id":"sourceFile","fileName":"Progressions.kt"}
     1:1:void <init>():113:113 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):113:113 -> <init>
-com.android.tools.r8.jetbrains.kotlin.ranges.IntProgressionIterator -> com.android.tools.r8.internal.Kf:
+com.android.tools.r8.jetbrains.kotlin.ranges.IntProgressionIterator -> com.android.tools.r8.internal.Lf:
 # {"id":"sourceFile","fileName":"ProgressionIterators.kt"}
     int step -> d
     boolean hasNext -> b
@@ -54284,7 +54322,7 @@
     10:10:java.lang.Object com.android.tools.r8.jetbrains.kotlin.collections.IntIterator.next():0 -> next
     1:1:void com.android.tools.r8.jetbrains.kotlin.collections.IntIterator.remove():0:0 -> remove
     1:1:void com.android.tools.r8.jetbrains.kotlin.collections.IntIterator.remove():0 -> remove
-com.android.tools.r8.jetbrains.kotlin.ranges.IntRange -> com.android.tools.r8.internal.Mf:
+com.android.tools.r8.jetbrains.kotlin.ranges.IntRange -> com.android.tools.r8.internal.Nf:
 # {"id":"sourceFile","fileName":"Ranges.kt"}
     com.android.tools.r8.jetbrains.kotlin.ranges.IntRange EMPTY -> e
     com.android.tools.r8.jetbrains.kotlin.ranges.IntRange$Companion Companion -> f
@@ -54295,29 +54333,29 @@
     1:1:int hashCode():52:52 -> hashCode
     1:1:boolean isEmpty():45:45 -> isEmpty
     1:1:java.lang.String toString():54:54 -> toString
-com.android.tools.r8.jetbrains.kotlin.ranges.IntRange$Companion -> com.android.tools.r8.internal.Lf:
+com.android.tools.r8.jetbrains.kotlin.ranges.IntRange$Companion -> com.android.tools.r8.internal.Mf:
 # {"id":"sourceFile","fileName":"Ranges.kt"}
     1:1:void <init>():56:56 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):56:56 -> <init>
-com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt -> com.android.tools.r8.internal.sv:
+com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt -> com.android.tools.r8.internal.uv:
     1:1:int com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt___RangesKt.coerceIn(int,int,int):1024:1024 -> a
     1:1:int coerceIn(int,int,int):0 -> a
-com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt__RangesKt -> com.android.tools.r8.internal.tv:
+com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt__RangesKt -> com.android.tools.r8.internal.vv:
 # {"id":"sourceFile","fileName":"Ranges.kt"}
-com.android.tools.r8.jetbrains.kotlin.reflect.KCallable -> com.android.tools.r8.internal.pi:
+com.android.tools.r8.jetbrains.kotlin.reflect.KCallable -> com.android.tools.r8.internal.qi:
 # {"id":"sourceFile","fileName":"KCallable.kt"}
     java.lang.Object call(java.lang.Object[]) -> a
-com.android.tools.r8.jetbrains.kotlin.reflect.KDeclarationContainer -> com.android.tools.r8.internal.qi:
+com.android.tools.r8.jetbrains.kotlin.reflect.KDeclarationContainer -> com.android.tools.r8.internal.ri:
 # {"id":"sourceFile","fileName":"KDeclarationContainer.kt"}
-com.android.tools.r8.jetbrains.kotlin.reflect.KProperty -> com.android.tools.r8.internal.ti:
+com.android.tools.r8.jetbrains.kotlin.reflect.KProperty -> com.android.tools.r8.internal.ui:
 # {"id":"sourceFile","fileName":"KProperty.kt"}
-com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1 -> com.android.tools.r8.internal.si:
+com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1 -> com.android.tools.r8.internal.ti:
 # {"id":"sourceFile","fileName":"KProperty.kt"}
-com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1$Getter -> com.android.tools.r8.internal.ri:
+com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1$Getter -> com.android.tools.r8.internal.si:
 # {"id":"sourceFile","fileName":"KProperty.kt"}
-com.android.tools.r8.jetbrains.kotlin.sequences.Sequence -> com.android.tools.r8.internal.yx:
+com.android.tools.r8.jetbrains.kotlin.sequences.Sequence -> com.android.tools.r8.internal.Ax:
 # {"id":"sourceFile","fileName":"Sequence.kt"}
-com.android.tools.r8.jetbrains.kotlin.sequences.TransformingSequence -> com.android.tools.r8.internal.KA:
+com.android.tools.r8.jetbrains.kotlin.sequences.TransformingSequence -> com.android.tools.r8.internal.LA:
 # {"id":"sourceFile","fileName":"Sequences.kt"}
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1 transformer -> b
     com.android.tools.r8.jetbrains.kotlin.sequences.Sequence sequence -> a
@@ -54325,14 +54363,14 @@
     1:1:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence access$getSequence$p(com.android.tools.r8.jetbrains.kotlin.sequences.TransformingSequence):167:167 -> a
     1:1:com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1 access$getTransformer$p(com.android.tools.r8.jetbrains.kotlin.sequences.TransformingSequence):167:167 -> b
     1:1:java.util.Iterator iterator():169:169 -> iterator
-com.android.tools.r8.jetbrains.kotlin.sequences.TransformingSequence$iterator$1 -> com.android.tools.r8.internal.JA:
+com.android.tools.r8.jetbrains.kotlin.sequences.TransformingSequence$iterator$1 -> com.android.tools.r8.internal.KA:
 # {"id":"sourceFile","fileName":"Sequences.kt"}
     java.util.Iterator iterator -> a
     com.android.tools.r8.jetbrains.kotlin.sequences.TransformingSequence this$0 -> b
     1:2:void <init>(com.android.tools.r8.jetbrains.kotlin.sequences.TransformingSequence):169:170 -> <init>
     1:1:boolean hasNext():176:176 -> hasNext
     1:1:java.lang.Object next():172:172 -> next
-com.android.tools.r8.jetbrains.kotlin.text.DelimitedRangesSequence -> com.android.tools.r8.internal.V7:
+com.android.tools.r8.jetbrains.kotlin.text.DelimitedRangesSequence -> com.android.tools.r8.internal.W7:
 # {"id":"sourceFile","fileName":"Strings.kt"}
     java.lang.CharSequence input -> a
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function2 getNextMatch -> d
@@ -54344,7 +54382,7 @@
     1:1:int access$getLimit$p(com.android.tools.r8.jetbrains.kotlin.text.DelimitedRangesSequence):1072:1072 -> c
     1:1:int access$getStartIndex$p(com.android.tools.r8.jetbrains.kotlin.text.DelimitedRangesSequence):1072:1072 -> d
     1:1:java.util.Iterator iterator():1079:1079 -> iterator
-com.android.tools.r8.jetbrains.kotlin.text.DelimitedRangesSequence$iterator$1 -> com.android.tools.r8.internal.U7:
+com.android.tools.r8.jetbrains.kotlin.text.DelimitedRangesSequence$iterator$1 -> com.android.tools.r8.internal.V7:
 # {"id":"sourceFile","fileName":"Strings.kt"}
     com.android.tools.r8.jetbrains.kotlin.ranges.IntRange nextItem -> d
     com.android.tools.r8.jetbrains.kotlin.text.DelimitedRangesSequence this$0 -> f
@@ -54372,7 +54410,7 @@
     9:9:java.lang.Object next():1079 -> next
     10:10:com.android.tools.r8.jetbrains.kotlin.ranges.IntRange com.android.tools.r8.jetbrains.kotlin.text.DelimitedRangesSequence$iterator$1.next():1114:1114 -> next
     10:10:java.lang.Object next():1079 -> next
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt -> com.android.tools.r8.internal.qz:
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt -> com.android.tools.r8.internal.sz:
     1:62:void com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringBuilderKt.appendElement(java.lang.Appendable,java.lang.Object,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):0:61 -> a
     1:62:void appendElement(java.lang.Appendable,java.lang.Object,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):0 -> a
     63:63:boolean com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.contains(java.lang.CharSequence,char,boolean):0:0 -> a
@@ -54452,15 +54490,15 @@
     8231:8812:int com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.indexOfAny(java.lang.CharSequence,char[],int,boolean):840:1421 -> a
     8813:8814:boolean com.android.tools.r8.jetbrains.kotlin.text.CharsKt__CharKt.equals(char,char,boolean):35:36 -> a
     8813:8814:int com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.indexOfAny(java.lang.CharSequence,char[],int,boolean):842 -> a
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt__RegexExtensionsJVMKt -> com.android.tools.r8.internal.rz:
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt__RegexExtensionsJVMKt -> com.android.tools.r8.internal.tz:
 # {"id":"sourceFile","fileName":"RegexExtensionsJVM.kt"}
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringBuilderJVMKt -> com.android.tools.r8.internal.sz:
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringBuilderJVMKt -> com.android.tools.r8.internal.uz:
 # {"id":"sourceFile","fileName":"StringBuilderJVM.kt"}
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringNumberConversionsJVMKt -> com.android.tools.r8.internal.tz:
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringNumberConversionsJVMKt -> com.android.tools.r8.internal.vz:
 # {"id":"sourceFile","fileName":"StringNumberConversionsJVM.kt"}
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt -> com.android.tools.r8.internal.uz:
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt -> com.android.tools.r8.internal.wz:
 # {"id":"sourceFile","fileName":"StringsJVM.kt"}
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt$rangesDelimitedBy$2 -> com.android.tools.r8.internal.vz:
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt$rangesDelimitedBy$2 -> com.android.tools.r8.internal.xz:
 # {"id":"sourceFile","fileName":"Strings.kt"}
     char[] $delimiters -> a
     boolean $ignoreCase -> b
@@ -54469,7 +54507,7 @@
     1146:1146:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlin.TuplesKt.to(java.lang.Object,java.lang.Object):43:43 -> a
     1146:1146:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt$rangesDelimitedBy$2.invoke(java.lang.CharSequence,int):1144 -> a
     1146:1146:java.lang.Object invoke(java.lang.Object,java.lang.Object):0 -> a
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt$splitToSequence$2 -> com.android.tools.r8.internal.wz:
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt$splitToSequence$2 -> com.android.tools.r8.internal.yz:
 # {"id":"sourceFile","fileName":"Strings.kt"}
     java.lang.CharSequence $this_splitToSequence -> a
     1:1219:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt$splitToSequence$2.invoke(com.android.tools.r8.jetbrains.kotlin.ranges.IntRange):0:1218 -> a
@@ -54491,9 +54529,9 @@
     1224:1224:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.substring(java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.ranges.IntRange):361:361 -> a
     1224:1224:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt$splitToSequence$2.invoke(com.android.tools.r8.jetbrains.kotlin.ranges.IntRange):1218 -> a
     1224:1224:java.lang.Object invoke(java.lang.Object):0 -> a
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt___StringsJvmKt -> com.android.tools.r8.internal.xz:
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt___StringsJvmKt -> com.android.tools.r8.internal.zz:
 # {"id":"sourceFile","fileName":"_StringsJvm.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.Flag -> com.android.tools.r8.internal.Sa:
+com.android.tools.r8.jetbrains.kotlinx.metadata.Flag -> com.android.tools.r8.internal.Ta:
 # {"id":"sourceFile","fileName":"Flag.kt"}
     int bitWidth -> b
     int value -> c
@@ -54504,34 +54542,34 @@
     3:3:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField):43:43 -> <init>
     1:1:boolean invoke(int):52:52 -> a
     1:1:int plus$kotlinx_metadata(int):46:46 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.Flag$Type -> com.android.tools.r8.internal.Sa$a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.Flag$Type -> com.android.tools.r8.internal.Ta$a:
 # {"id":"sourceFile","fileName":"Flag.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.Flag IS_NULLABLE -> a
     1:7:void <clinit>():424:430 -> <clinit>
-com.android.tools.r8.jetbrains.kotlinx.metadata.Flag$TypeParameter -> com.android.tools.r8.internal.Sa$b:
+com.android.tools.r8.jetbrains.kotlinx.metadata.Flag$TypeParameter -> com.android.tools.r8.internal.Ta$b:
 # {"id":"sourceFile","fileName":"Flag.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.Flag IS_REIFIED -> a
     1:1:void <clinit>():441:441 -> <clinit>
-com.android.tools.r8.jetbrains.kotlinx.metadata.Flag$ValueParameter -> com.android.tools.r8.internal.Sa$c:
+com.android.tools.r8.jetbrains.kotlinx.metadata.Flag$ValueParameter -> com.android.tools.r8.internal.Ta$c:
 # {"id":"sourceFile","fileName":"Flag.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.Flag DECLARES_DEFAULT_VALUE -> a
     1:13:void <clinit>():455:467 -> <clinit>
-com.android.tools.r8.jetbrains.kotlinx.metadata.InconsistentKotlinMetadataException -> com.android.tools.r8.internal.rd:
+com.android.tools.r8.jetbrains.kotlinx.metadata.InconsistentKotlinMetadataException -> com.android.tools.r8.internal.sd:
 # {"id":"sourceFile","fileName":"InconsistentKotlinMetadataException.kt"}
     1:1:void <init>(java.lang.String,java.lang.Throwable):8:8 -> <init>
     2:2:void <init>(java.lang.String,java.lang.Throwable,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):8:8 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation -> com.android.tools.r8.internal.ui:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation -> com.android.tools.r8.internal.vi:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     java.util.Map arguments -> b
     java.lang.String className -> a
     1:1:void <init>(java.lang.String,java.util.Map):18:18 -> <init>
     1:1:java.util.Map getArguments():18:18 -> a
     1:1:java.lang.String getClassName():18:18 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument -> com.android.tools.r8.internal.vi:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument -> com.android.tools.r8.internal.wi:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     1:1:void <init>():25:25 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):25:25 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$AnnotationValue -> com.android.tools.r8.internal.vi$a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$AnnotationValue -> com.android.tools.r8.internal.wi$a:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation value -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):51:51 -> <init>
@@ -54545,12 +54583,12 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$AnnotationValue.getValue():51:51 -> toString
     1:1:java.lang.String toString():0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ArrayValue -> com.android.tools.r8.internal.vi$b:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ArrayValue -> com.android.tools.r8.internal.wi$b:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     java.util.List value -> a
     1:1:void <init>(java.util.List):52:52 -> <init>
     1:1:java.util.List getValue():52:52 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$BooleanValue -> com.android.tools.r8.internal.vi$c:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$BooleanValue -> com.android.tools.r8.internal.wi$c:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     boolean value -> a
     1:1:void <init>(boolean):38:38 -> <init>
@@ -54567,7 +54605,7 @@
     1:1:java.lang.Boolean com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$BooleanValue.getValue():38:38 -> toString
     1:1:java.lang.String toString():0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ByteValue -> com.android.tools.r8.internal.vi$d:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ByteValue -> com.android.tools.r8.internal.wi$d:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     byte value -> a
     1:1:void <init>(byte):31:31 -> <init>
@@ -54584,7 +54622,7 @@
     1:1:java.lang.Byte com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ByteValue.getValue():31:31 -> toString
     1:1:java.lang.String toString():0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$CharValue -> com.android.tools.r8.internal.vi$e:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$CharValue -> com.android.tools.r8.internal.wi$e:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     char value -> a
     1:1:void <init>(char):32:32 -> <init>
@@ -54601,7 +54639,7 @@
     1:1:java.lang.Character com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$CharValue.getValue():32:32 -> toString
     1:1:java.lang.String toString():0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$DoubleValue -> com.android.tools.r8.internal.vi$f:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$DoubleValue -> com.android.tools.r8.internal.wi$f:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     double value -> a
     1:1:void <init>(double):37:37 -> <init>
@@ -54618,14 +54656,14 @@
     1:1:java.lang.Double com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$DoubleValue.getValue():37:37 -> toString
     1:1:java.lang.String toString():0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$EnumValue -> com.android.tools.r8.internal.vi$g:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$EnumValue -> com.android.tools.r8.internal.wi$g:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     java.lang.String enumClassName -> a
     java.lang.String enumEntryName -> b
     1:2:void <init>(java.lang.String,java.lang.String):47:48 -> <init>
     1:1:java.lang.String getEnumClassName():47:47 -> a
     1:1:java.lang.String getEnumEntryName():47:47 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$FloatValue -> com.android.tools.r8.internal.vi$h:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$FloatValue -> com.android.tools.r8.internal.wi$h:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     float value -> a
     1:1:void <init>(float):36:36 -> <init>
@@ -54642,7 +54680,7 @@
     1:1:java.lang.Float com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$FloatValue.getValue():36:36 -> toString
     1:1:java.lang.String toString():0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$IntValue -> com.android.tools.r8.internal.vi$i:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$IntValue -> com.android.tools.r8.internal.wi$i:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     int value -> a
     1:1:void <init>(int):34:34 -> <init>
@@ -54659,7 +54697,7 @@
     1:1:java.lang.Integer com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$IntValue.getValue():34:34 -> toString
     1:1:java.lang.String toString():0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$KClassValue -> com.android.tools.r8.internal.vi$j:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$KClassValue -> com.android.tools.r8.internal.wi$j:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     java.lang.String value -> a
     1:1:void <init>(java.lang.String):46:46 -> <init>
@@ -54673,7 +54711,7 @@
     1:1:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$KClassValue.getValue():46:46 -> toString
     1:1:java.lang.String toString():0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$LongValue -> com.android.tools.r8.internal.vi$k:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$LongValue -> com.android.tools.r8.internal.wi$k:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     long value -> a
     1:1:void <init>(long):35:35 -> <init>
@@ -54690,7 +54728,7 @@
     1:1:java.lang.Long com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$LongValue.getValue():35:35 -> toString
     1:1:java.lang.String toString():0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ShortValue -> com.android.tools.r8.internal.vi$l:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ShortValue -> com.android.tools.r8.internal.wi$l:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     short value -> a
     1:1:void <init>(short):33:33 -> <init>
@@ -54707,7 +54745,7 @@
     1:1:java.lang.Short com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ShortValue.getValue():33:33 -> toString
     1:1:java.lang.String toString():0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$StringValue -> com.android.tools.r8.internal.vi$m:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$StringValue -> com.android.tools.r8.internal.wi$m:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     java.lang.String value -> a
     1:1:void <init>(java.lang.String):45:45 -> <init>
@@ -54721,7 +54759,7 @@
     1:1:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$StringValue.getValue():45:45 -> toString
     1:1:java.lang.String toString():0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$UByteValue -> com.android.tools.r8.internal.vi$n:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$UByteValue -> com.android.tools.r8.internal.wi$n:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     byte value -> a
     1:1:void <init>(byte):40:40 -> <init>
@@ -54738,7 +54776,7 @@
     1:1:java.lang.Byte com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$UByteValue.getValue():40:40 -> toString
     1:1:java.lang.String toString():0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$UIntValue -> com.android.tools.r8.internal.vi$o:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$UIntValue -> com.android.tools.r8.internal.wi$o:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     int value -> a
     1:1:void <init>(int):42:42 -> <init>
@@ -54755,7 +54793,7 @@
     1:1:java.lang.Integer com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$UIntValue.getValue():42:42 -> toString
     1:1:java.lang.String toString():0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ULongValue -> com.android.tools.r8.internal.vi$p:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ULongValue -> com.android.tools.r8.internal.wi$p:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     long value -> a
     1:1:void <init>(long):43:43 -> <init>
@@ -54772,7 +54810,7 @@
     1:1:java.lang.Long com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ULongValue.getValue():43:43 -> toString
     1:1:java.lang.String toString():0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$UShortValue -> com.android.tools.r8.internal.vi$q:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$UShortValue -> com.android.tools.r8.internal.wi$q:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     short value -> a
     1:1:void <init>(short):41:41 -> <init>
@@ -54789,7 +54827,7 @@
     1:1:java.lang.Short com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$UShortValue.getValue():41:41 -> toString
     1:1:java.lang.String toString():0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass -> com.android.tools.r8.internal.wi:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass -> com.android.tools.r8.internal.xi:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.util.List extensions -> o
     java.lang.String companionObject -> j
@@ -54868,9 +54906,9 @@
     1:1:java.util.List getSupertypes():54:54 -> n
     1:1:java.util.List getTypeParameters():49:49 -> o
     1:1:java.util.List getVersionRequirements():99:99 -> p
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassExtensionVisitor -> com.android.tools.r8.internal.yi:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassExtensionVisitor -> com.android.tools.r8.internal.zi:
 # {"id":"sourceFile","fileName":"extensions.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor -> com.android.tools.r8.internal.zi:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor -> com.android.tools.r8.internal.Ai:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor):57:57 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):57:57 -> <init>
@@ -54887,31 +54925,31 @@
     1:1:void visitEnd():153 -> e
     2:2:void visitEnd():153:153 -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement() -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier -> com.android.tools.r8.internal.Ai:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier -> com.android.tools.r8.internal.Bi:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     1:1:void <init>():898:898 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):898:898 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier$Class -> com.android.tools.r8.internal.Ai$a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier$Class -> com.android.tools.r8.internal.Bi$a:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.lang.String name -> a
     1:1:void <init>(java.lang.String):904:904 -> <init>
     1:1:java.lang.String getName():904:904 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier$TypeAlias -> com.android.tools.r8.internal.Ai$b:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier$TypeAlias -> com.android.tools.r8.internal.Bi$b:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.lang.String name -> a
     1:1:void <init>(java.lang.String):919:919 -> <init>
     1:1:java.lang.String getName():919:919 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier$TypeParameter -> com.android.tools.r8.internal.Ai$c:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier$TypeParameter -> com.android.tools.r8.internal.Bi$c:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     int id -> a
     1:1:void <init>(int):911:911 -> <init>
     1:1:int getId():911:911 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstantValue -> com.android.tools.r8.internal.Bi:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstantValue -> com.android.tools.r8.internal.Ci:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.lang.Object value -> a
     1:1:void <init>(java.lang.Object):968:968 -> <init>
     1:1:java.lang.Object getValue():968:968 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor -> com.android.tools.r8.internal.Ci:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor -> com.android.tools.r8.internal.Di:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.util.List valueParameters -> b
     java.util.List extensions -> d
@@ -54931,9 +54969,9 @@
     1:1:int getFlags():248:248 -> c
     1:1:java.util.List getValueParameters():252:252 -> d
     1:1:java.util.List getVersionRequirements():257:257 -> e
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorExtensionVisitor -> com.android.tools.r8.internal.Ei:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorExtensionVisitor -> com.android.tools.r8.internal.Fi:
 # {"id":"sourceFile","fileName":"extensions.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor -> com.android.tools.r8.internal.Fi:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor -> com.android.tools.r8.internal.Gi:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor delegate -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor):210:210 -> <init>
@@ -54942,7 +54980,7 @@
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor visitValueParameter(int,java.lang.String) -> a
     1:1:void visitEnd():238:238 -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement() -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmContract -> com.android.tools.r8.internal.Gi:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmContract -> com.android.tools.r8.internal.Hi:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.util.List effects -> b
     1:5:void <init>():758:762 -> <init>
@@ -54950,19 +54988,19 @@
     2:205:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor):773:773 -> a
     206:206:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor):774:774 -> a
     1:1:java.util.List getEffects():762:762 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor -> com.android.tools.r8.internal.Hi:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor -> com.android.tools.r8.internal.Ii:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor delegate -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor):663:663 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):663:663 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectVisitor visitEffect(com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind):672:672 -> a
     2:2:void visitEnd():678:678 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer -> com.android.tools.r8.internal.Ii:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer -> com.android.tools.r8.internal.Ji:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.util.List getProperties() -> a
     java.util.List getTypeAliases() -> b
     java.util.List getFunctions() -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor -> com.android.tools.r8.internal.Ji:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor -> com.android.tools.r8.internal.Ki:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor delegate -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor):11:11 -> <init>
@@ -54970,7 +55008,7 @@
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor visitProperty(int,java.lang.String,int,int) -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor visitTypeAlias(int,java.lang.String) -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor getDelegate():11:11 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffect -> com.android.tools.r8.internal.Ki:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffect -> com.android.tools.r8.internal.Li:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.util.List constructorArguments -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression conclusion -> c
@@ -54985,7 +55023,7 @@
     1:1:java.util.List getConstructorArguments():796:796 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind getInvocationKind():790:790 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType getType():789:789 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression -> com.android.tools.r8.internal.Li:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression -> com.android.tools.r8.internal.Mi:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.lang.Integer parameterIndex -> c
     java.util.List andArguments -> f
@@ -55008,7 +55046,7 @@
     1:1:java.util.List getOrArguments():859:859 -> g
     1:1:java.lang.Integer getParameterIndex():837:837 -> h
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmType isInstanceType():847:847 -> i
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor -> com.android.tools.r8.internal.Mi:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor -> com.android.tools.r8.internal.Ni:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor delegate -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor):722:722 -> <init>
@@ -55019,21 +55057,21 @@
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor visitAndArgument():756:756 -> a
     1:1:void visitEnd():769:769 -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor visitOrArgument() -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind -> com.android.tools.r8.internal.Ni:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind -> com.android.tools.r8.internal.Oi:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind[] $VALUES -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind EXACTLY_ONCE -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind AT_MOST_ONCE -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind AT_LEAST_ONCE -> c
     1:1:void <init>(java.lang.String,int):812:812 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType -> com.android.tools.r8.internal.Oi:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType -> com.android.tools.r8.internal.Pi:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType CALLS -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType RETURNS_CONSTANT -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType[] $VALUES -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType RETURNS_NOT_NULL -> c
     1:1:void <init>(java.lang.String,int):800:800 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectVisitor -> com.android.tools.r8.internal.Pi:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectVisitor -> com.android.tools.r8.internal.Qi:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectVisitor delegate -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectVisitor):691:691 -> <init>
@@ -55041,7 +55079,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor visitConclusionOfConditionalEffect():704:704 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor visitConstructorArgument():697:697 -> b
     1:1:void visitEnd():710:710 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType -> com.android.tools.r8.internal.Ri:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType -> com.android.tools.r8.internal.Si:
 # {"id":"sourceFile","fileName":"extensions.kt"}
     com.android.tools.r8.jetbrains.kotlin.reflect.KClass klass -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):31:31 -> <init>
@@ -55055,16 +55093,16 @@
     31:31:java.lang.String toString():39:39 -> toString
     32:32:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaClass(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):28:28 -> toString
     32:32:java.lang.String toString():39 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor -> com.android.tools.r8.internal.Si:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor -> com.android.tools.r8.internal.Ti:
 # {"id":"sourceFile","fileName":"extensions.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmFlexibleTypeUpperBound -> com.android.tools.r8.internal.Ti:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmFlexibleTypeUpperBound -> com.android.tools.r8.internal.Ui:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmType type -> a
     java.lang.String typeFlexibilityId -> b
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmType,java.lang.String):947:947 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmType getType():947:947 -> a
     1:1:java.lang.String getTypeFlexibilityId():947:947 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction -> com.android.tools.r8.internal.Ui:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction -> com.android.tools.r8.internal.Vi:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.util.List typeParameters -> b
     java.util.List versionRequirements -> f
@@ -55101,9 +55139,9 @@
     1:1:java.util.List getTypeParameters():297:297 -> i
     1:1:java.util.List getValueParameters():307:307 -> j
     1:1:java.util.List getVersionRequirements():317:317 -> k
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionExtensionVisitor -> com.android.tools.r8.internal.Wi:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionExtensionVisitor -> com.android.tools.r8.internal.Xi:
 # {"id":"sourceFile","fileName":"extensions.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor -> com.android.tools.r8.internal.Xi:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor -> com.android.tools.r8.internal.Yi:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor delegate -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor):248:248 -> <init>
@@ -55116,19 +55154,19 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitReturnType(int):284:284 -> b
     2:2:void visitEnd():310:310 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():290:290 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambda -> com.android.tools.r8.internal.Yi:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambda -> com.android.tools.r8.internal.Zi:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction function -> b
     1:1:void <init>():223:223 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor visitFunction(int,java.lang.String):230:230 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambdaVisitor -> com.android.tools.r8.internal.Zi:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambdaVisitor -> com.android.tools.r8.internal.aj:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambdaVisitor delegate -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambdaVisitor):187:187 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambdaVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):187:187 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor visitFunction(int,java.lang.String):195:195 -> a
     2:2:void visitEnd():201:201 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage -> com.android.tools.r8.internal.aj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage -> com.android.tools.r8.internal.bj:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.util.List functions -> b
     java.util.List extensions -> e
@@ -55168,9 +55206,9 @@
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor visitTypeAlias(int,java.lang.String):201 -> b
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor visitTypeAlias(int,java.lang.String):201:201 -> b
     1:1:java.util.List getFunctions():179:179 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageExtensionVisitor -> com.android.tools.r8.internal.cj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageExtensionVisitor -> com.android.tools.r8.internal.dj:
 # {"id":"sourceFile","fileName":"extensions.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor -> com.android.tools.r8.internal.dj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor -> com.android.tools.r8.internal.ej:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor):162:162 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):162:162 -> <init>
@@ -55178,7 +55216,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor.getDelegate():164:164 -> e
     1:1:void visitEnd():178 -> e
     2:2:void visitEnd():178:178 -> e
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty -> com.android.tools.r8.internal.ej:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty -> com.android.tools.r8.internal.fj:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.util.List typeParameters -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameter setterParameter -> d
@@ -55215,9 +55253,9 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameter getSetterParameter():394:394 -> i
     1:1:java.util.List getTypeParameters():384:384 -> j
     1:1:java.util.List getVersionRequirements():404:404 -> k
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyExtensionVisitor -> com.android.tools.r8.internal.gj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyExtensionVisitor -> com.android.tools.r8.internal.hj:
 # {"id":"sourceFile","fileName":"extensions.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor -> com.android.tools.r8.internal.hj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor -> com.android.tools.r8.internal.ij:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor delegate -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor):320:320 -> <init>
@@ -55229,7 +55267,7 @@
     5:5:void visitEnd():376:376 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitReturnType(int):356:356 -> b
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():362:362 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmType -> com.android.tools.r8.internal.ij:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmType -> com.android.tools.r8.internal.jj:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmFlexibleTypeUpperBound flexibleTypeUpperBound -> f
     int flags -> h
@@ -55267,7 +55305,7 @@
     1:1:int getFlags():594:594 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFlexibleTypeUpperBound getFlexibleTypeUpperBound():633:633 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmType getOuterType():626:626 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAlias -> com.android.tools.r8.internal.jj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAlias -> com.android.tools.r8.internal.kj:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.util.List typeParameters -> b
     java.lang.String name -> h
@@ -55293,7 +55331,7 @@
     1:1:java.lang.String getName():451:451 -> e
     1:1:java.util.List getTypeParameters():456:456 -> f
     1:1:java.util.List getVersionRequirements():477:477 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor -> com.android.tools.r8.internal.kj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor -> com.android.tools.r8.internal.lj:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor delegate -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor):386:386 -> <init>
@@ -55304,9 +55342,9 @@
     4:4:void visitEnd():435:435 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitUnderlyingType(int):405:405 -> b
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():429:429 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeExtensionVisitor -> com.android.tools.r8.internal.mj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeExtensionVisitor -> com.android.tools.r8.internal.nj:
 # {"id":"sourceFile","fileName":"extensions.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter -> com.android.tools.r8.internal.nj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter -> com.android.tools.r8.internal.oj:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.util.List upperBounds -> b
     java.util.List extensions -> c
@@ -55328,9 +55366,9 @@
     1:1:java.lang.String getName():559:559 -> d
     1:1:java.util.List getUpperBounds():566:566 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance getVariance():561:561 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterExtensionVisitor -> com.android.tools.r8.internal.pj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterExtensionVisitor -> com.android.tools.r8.internal.qj:
 # {"id":"sourceFile","fileName":"extensions.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor -> com.android.tools.r8.internal.qj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor -> com.android.tools.r8.internal.rj:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor delegate -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor):475:475 -> <init>
@@ -55338,7 +55376,7 @@
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType) -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitUpperBound(int):482:482 -> a
     2:2:void visitEnd():496:496 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeProjection -> com.android.tools.r8.internal.rj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeProjection -> com.android.tools.r8.internal.sj:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance variance -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeProjection STAR -> a
@@ -55349,7 +55387,7 @@
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmType component2() -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmType getType():929:929 -> c
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance getVariance():929:929 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor -> com.android.tools.r8.internal.sj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor -> com.android.tools.r8.internal.tj:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor delegate -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor):511:511 -> <init>
@@ -55364,7 +55402,7 @@
     2:2:void visitStarProjection():555:555 -> b
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitOuterType(int):585:585 -> b
     1:1:void visitTypeParameter(int):537:537 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameter -> com.android.tools.r8.internal.tj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameter -> com.android.tools.r8.internal.uj:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmType type -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmType varargElementType -> c
@@ -55378,7 +55416,7 @@
     1:1:java.lang.String getName():518:518 -> c
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmType getType():523:523 -> d
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmType getVarargElementType():528:528 -> e
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor -> com.android.tools.r8.internal.uj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor -> com.android.tools.r8.internal.vj:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor delegate -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor):445:445 -> <init>
@@ -55386,13 +55424,13 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitType(int):452:452 -> a
     2:2:void visitEnd():466:466 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitVarargElementType(int):460:460 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance -> com.android.tools.r8.internal.vj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance -> com.android.tools.r8.internal.wj:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance IN -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance INVARIANT -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance OUT -> c
     1:1:void <init>(java.lang.String,int):777:777 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersion -> com.android.tools.r8.internal.wj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersion -> com.android.tools.r8.internal.xj:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     int minor -> b
     int patch -> c
@@ -55402,7 +55440,7 @@
     1:1:int getMinor():956:956 -> b
     1:1:int getPatch():956:956 -> c
     1:1:java.lang.String toString():957:957 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement -> com.android.tools.r8.internal.xj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement -> com.android.tools.r8.internal.yj:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.lang.Integer errorCode -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel level -> c
@@ -55417,21 +55455,21 @@
     10:10:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor):746:746 -> a
     1:1:java.lang.Integer getErrorCode():717:717 -> b
     1:1:java.lang.String getMessage():722:722 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel -> com.android.tools.r8.internal.yj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel -> com.android.tools.r8.internal.zj:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel HIDDEN -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel ERROR -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel WARNING -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel[] $VALUES -> d
     1:1:void <init>(java.lang.String,int):821:821 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVersionKind -> com.android.tools.r8.internal.zj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVersionKind -> com.android.tools.r8.internal.Aj:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVersionKind API_VERSION -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVersionKind LANGUAGE_VERSION -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVersionKind COMPILER_VERSION -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVersionKind[] $VALUES -> d
     1:1:void <init>(java.lang.String,int):830:830 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor -> com.android.tools.r8.internal.Aj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor -> com.android.tools.r8.internal.Bj:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor delegate -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor):622:622 -> <init>
@@ -55439,7 +55477,7 @@
     void visit(com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVersionKind,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel,java.lang.Integer,java.lang.String) -> a
     void visitVersion(int,int,int) -> a
     1:1:void visitEnd():651:651 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter -> com.android.tools.r8.internal.n6:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter -> com.android.tools.r8.internal.o6:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder t -> b
     1:3:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.StringTable):396:398 -> <init>
@@ -55477,63 +55515,63 @@
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():444 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext getC():398:398 -> g
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder getT():397:397 -> h
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitConstructor$1 -> com.android.tools.r8.internal.f6:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitConstructor$1 -> com.android.tools.r8.internal.g6:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):396:396 -> a
     2:416:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitConstructor$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder):0:414 -> a
     2:416:java.lang.Object invoke(java.lang.Object):396 -> a
     417:417:java.lang.Object invoke(java.lang.Object):396:396 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitExtensions$1 -> com.android.tools.r8.internal.g6:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitExtensions$1 -> com.android.tools.r8.internal.h6:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType $type -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):396:396 -> a
     2:450:com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassExtensionVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitExtensions$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions):0:448 -> a
     2:450:java.lang.Object invoke(java.lang.Object):396 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitFunction$1 -> com.android.tools.r8.internal.h6:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitFunction$1 -> com.android.tools.r8.internal.i6:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):396:396 -> a
     2:419:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitFunction$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder):0:417 -> a
     2:419:java.lang.Object invoke(java.lang.Object):396 -> a
     420:420:java.lang.Object invoke(java.lang.Object):396:396 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitProperty$1 -> com.android.tools.r8.internal.i6:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitProperty$1 -> com.android.tools.r8.internal.j6:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):396:396 -> a
     2:422:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitProperty$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder):0:420 -> a
     2:422:java.lang.Object invoke(java.lang.Object):396 -> a
     423:423:java.lang.Object invoke(java.lang.Object):396:396 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitSupertype$1 -> com.android.tools.r8.internal.j6:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitSupertype$1 -> com.android.tools.r8.internal.k6:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):396:396 -> a
     2:413:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitSupertype$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):0:411 -> a
     2:413:java.lang.Object invoke(java.lang.Object):396 -> a
     414:414:java.lang.Object invoke(java.lang.Object):396:396 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitTypeAlias$1 -> com.android.tools.r8.internal.k6:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitTypeAlias$1 -> com.android.tools.r8.internal.l6:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):396:396 -> a
     2:425:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitTypeAlias$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder):0:423 -> a
     2:425:java.lang.Object invoke(java.lang.Object):396 -> a
     426:426:java.lang.Object invoke(java.lang.Object):396:396 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitTypeParameter$1 -> com.android.tools.r8.internal.l6:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitTypeParameter$1 -> com.android.tools.r8.internal.m6:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):396:396 -> a
     2:410:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitTypeParameter$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder):0:408 -> a
     2:410:java.lang.Object invoke(java.lang.Object):396 -> a
     411:411:java.lang.Object invoke(java.lang.Object):396:396 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitVersionRequirement$1 -> com.android.tools.r8.internal.m6:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitVersionRequirement$1 -> com.android.tools.r8.internal.n6:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):396:396 -> a
     2:2:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitVersionRequirement$1.invoke(int):444:444 -> a
     2:2:java.lang.Object invoke(java.lang.Object):396 -> a
     3:3:java.lang.Object invoke(java.lang.Object):396:396 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.LambdaWriter -> com.android.tools.r8.internal.Ol:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.LambdaWriter -> com.android.tools.r8.internal.Pl:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder t -> b
     1:3:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.StringTable):483:485 -> <init>
@@ -55544,14 +55582,14 @@
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor visitFunction(int,java.lang.String):488 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext getC():485:485 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder getT():484:484 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.LambdaWriter$visitFunction$1 -> com.android.tools.r8.internal.Nl:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.LambdaWriter$visitFunction$1 -> com.android.tools.r8.internal.Ol:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.LambdaWriter this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):483:483 -> a
     2:490:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.LambdaWriter$visitFunction$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder):0:488 -> a
     2:490:java.lang.Object invoke(java.lang.Object):483 -> a
     491:491:java.lang.Object invoke(java.lang.Object):483:483 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter -> com.android.tools.r8.internal.is:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter -> com.android.tools.r8.internal.ks:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder t -> b
     1:3:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.StringTable):458:460 -> <init>
@@ -55568,35 +55606,35 @@
     1:2:void visitEnd():477:478 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext getC():460:460 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder getT():459:459 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitExtensions$1 -> com.android.tools.r8.internal.es:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitExtensions$1 -> com.android.tools.r8.internal.gs:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter this$0 -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType $type -> b
     1:1:java.lang.Object invoke(java.lang.Object):458:458 -> a
     2:475:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageExtensionVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitExtensions$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions):0:473 -> a
     2:475:java.lang.Object invoke(java.lang.Object):458 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitFunction$1 -> com.android.tools.r8.internal.fs:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitFunction$1 -> com.android.tools.r8.internal.hs:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):458:458 -> a
     2:465:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitFunction$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder):0:463 -> a
     2:465:java.lang.Object invoke(java.lang.Object):458 -> a
     466:466:java.lang.Object invoke(java.lang.Object):458:458 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitProperty$1 -> com.android.tools.r8.internal.gs:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitProperty$1 -> com.android.tools.r8.internal.is:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):458:458 -> a
     2:468:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitProperty$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder):0:466 -> a
     2:468:java.lang.Object invoke(java.lang.Object):458 -> a
     469:469:java.lang.Object invoke(java.lang.Object):458:458 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitTypeAlias$1 -> com.android.tools.r8.internal.hs:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitTypeAlias$1 -> com.android.tools.r8.internal.js:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):458:458 -> a
     2:471:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitTypeAlias$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder):0:469 -> a
     2:471:java.lang.Object invoke(java.lang.Object):458 -> a
     472:472:java.lang.Object invoke(java.lang.Object):458:458 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext -> com.android.tools.r8.internal.xv:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext -> com.android.tools.r8.internal.zv:
 # {"id":"sourceFile","fileName":"readers.kt"}
     java.util.List extensions -> a
     java.util.Map typeParameterNameToId -> b
@@ -55613,7 +55651,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable getTypes():16:16 -> c
     2:2:java.lang.Integer getTypeParameterId(int):30:30 -> c
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable getVersionRequirements$kotlinx_metadata():17:17 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadUtilsKt -> com.android.tools.r8.internal.yv:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadUtilsKt -> com.android.tools.r8.internal.Av:
 # {"id":"sourceFile","fileName":"readUtils.kt"}
     1:1:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.ClassNameKt.isLocal(java.lang.String):0:0 -> a
     1:1:int com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteUtilsKt.getClassNameIndex(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.StringTable,java.lang.String):109 -> a
@@ -55916,7 +55954,7 @@
     4838:4838:int com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.getPropertyGetterFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):426:426 -> a
     4839:4839:int com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.getDefaultPropertyAccessorFlags(int):432:432 -> a
     1:1:int com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.getPropertySetterFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):429:429 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext -> com.android.tools.r8.internal.eD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext -> com.android.tools.r8.internal.fD:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.MutableVersionRequirementTable versionRequirements -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.StringTable strings -> b
@@ -55925,7 +55963,7 @@
     2:2:int get(java.lang.String):19:19 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.MutableVersionRequirementTable getVersionRequirements():16:16 -> b
     2:2:int getClassName(java.lang.String):22:22 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1 -> com.android.tools.r8.internal.iD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1 -> com.android.tools.r8.internal.jD:
 # {"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
@@ -55943,28 +55981,28 @@
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.access$writeVersionRequirement(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):1 -> b
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():129 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder getT():123:123 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1$visitExtensions$1 -> com.android.tools.r8.internal.fD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1$visitExtensions$1 -> com.android.tools.r8.internal.gD:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType $type -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):122:122 -> a
     2:135:com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorExtensionVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1$visitExtensions$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions):0:133 -> a
     2:135:java.lang.Object invoke(java.lang.Object):122 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1$visitValueParameter$1 -> com.android.tools.r8.internal.gD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1$visitValueParameter$1 -> com.android.tools.r8.internal.hD:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):122:122 -> a
     2:128:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1$visitValueParameter$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder):0:126 -> a
     2:128:java.lang.Object invoke(java.lang.Object):122 -> a
     129:129:java.lang.Object invoke(java.lang.Object):122:122 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1$visitVersionRequirement$1 -> com.android.tools.r8.internal.hD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1$visitVersionRequirement$1 -> com.android.tools.r8.internal.iD:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):122:122 -> a
     2:2:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1$visitVersionRequirement$1.invoke(int):129:129 -> a
     2:2:java.lang.Object invoke(java.lang.Object):122 -> a
     3:3:java.lang.Object invoke(java.lang.Object):122:122 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeContract$1 -> com.android.tools.r8.internal.kD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeContract$1 -> com.android.tools.r8.internal.lD:
 # {"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
@@ -55976,14 +56014,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):324 -> a
     3:3:void visitEnd():327:327 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder getT():321:321 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeContract$1$visitEffect$1 -> com.android.tools.r8.internal.jD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeContract$1$visitEffect$1 -> com.android.tools.r8.internal.kD:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeContract$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):320:320 -> a
     2:326:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeContract$1$visitEffect$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder):0:324 -> a
     2:326:java.lang.Object invoke(java.lang.Object):320 -> a
     327:327:java.lang.Object invoke(java.lang.Object):320:320 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1 -> com.android.tools.r8.internal.nD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1 -> com.android.tools.r8.internal.oD:
 # {"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
@@ -56005,21 +56043,21 @@
     15:15:void visitEnd():352:352 -> c
     16:21:void visitEnd():351:356 -> c
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder getT():335:335 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1$visitConclusionOfConditionalEffect$1 -> com.android.tools.r8.internal.lD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1$visitConclusionOfConditionalEffect$1 -> com.android.tools.r8.internal.mD:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):334:334 -> a
     2:343:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1$visitConclusionOfConditionalEffect$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder):0:341 -> a
     2:343:java.lang.Object invoke(java.lang.Object):334 -> a
     344:344:java.lang.Object invoke(java.lang.Object):334:334 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1$visitConstructorArgument$1 -> com.android.tools.r8.internal.mD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1$visitConstructorArgument$1 -> com.android.tools.r8.internal.nD:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):334:334 -> a
     2:340:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1$visitConstructorArgument$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder):0:338 -> a
     2:340:java.lang.Object invoke(java.lang.Object):334 -> a
     341:341:java.lang.Object invoke(java.lang.Object):334:334 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1 -> com.android.tools.r8.internal.rD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1 -> com.android.tools.r8.internal.sD:
 # {"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
@@ -56041,28 +56079,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():389 -> c
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder getT():362:362 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1$visitAndArgument$1 -> com.android.tools.r8.internal.oD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1$visitAndArgument$1 -> com.android.tools.r8.internal.pD:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):361:361 -> a
     2:388:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1$visitAndArgument$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder):0:386 -> a
     2:388:java.lang.Object invoke(java.lang.Object):361 -> a
     389:389:java.lang.Object invoke(java.lang.Object):361:361 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1$visitIsInstanceType$1 -> com.android.tools.r8.internal.pD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1$visitIsInstanceType$1 -> com.android.tools.r8.internal.qD:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):361:361 -> a
     2:385:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1$visitIsInstanceType$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):0:383 -> a
     2:385:java.lang.Object invoke(java.lang.Object):361 -> a
     386:386:java.lang.Object invoke(java.lang.Object):361:361 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1$visitOrArgument$1 -> com.android.tools.r8.internal.qD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1$visitOrArgument$1 -> com.android.tools.r8.internal.rD:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):361:361 -> a
     2:391:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1$visitOrArgument$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder):0:389 -> a
     2:391:java.lang.Object invoke(java.lang.Object):361 -> a
     392:392:java.lang.Object invoke(java.lang.Object):361:361 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1 -> com.android.tools.r8.internal.zD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1 -> com.android.tools.r8.internal.AD:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder t -> b
     int $flags -> e
@@ -56097,7 +56135,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():161 -> c
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder getT():146:146 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitContract$1 -> com.android.tools.r8.internal.sD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitContract$1 -> com.android.tools.r8.internal.tD:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):145:145 -> a
@@ -56116,49 +56154,49 @@
     172:172:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder.build():23586:23586 -> a
     172:172:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitContract$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder):164 -> a
     172:172:java.lang.Object invoke(java.lang.Object):145 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitExtensions$1 -> com.android.tools.r8.internal.tD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitExtensions$1 -> com.android.tools.r8.internal.uD:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1 this$0 -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType $type -> b
     1:1:java.lang.Object invoke(java.lang.Object):145:145 -> a
     2:170:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionExtensionVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitExtensions$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions):0:168 -> a
     2:170:java.lang.Object invoke(java.lang.Object):145 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitReceiverParameterType$1 -> com.android.tools.r8.internal.uD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitReceiverParameterType$1 -> com.android.tools.r8.internal.vD:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):145:145 -> a
     2:154:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitReceiverParameterType$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):0:152 -> a
     2:154:java.lang.Object invoke(java.lang.Object):145 -> a
     155:155:java.lang.Object invoke(java.lang.Object):145:145 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitReturnType$1 -> com.android.tools.r8.internal.vD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitReturnType$1 -> com.android.tools.r8.internal.wD:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):145:145 -> a
     2:160:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitReturnType$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):0:158 -> a
     2:160:java.lang.Object invoke(java.lang.Object):145 -> a
     161:161:java.lang.Object invoke(java.lang.Object):145:145 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitTypeParameter$1 -> com.android.tools.r8.internal.wD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitTypeParameter$1 -> com.android.tools.r8.internal.xD:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):145:145 -> a
     2:151:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitTypeParameter$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder):0:149 -> a
     2:151:java.lang.Object invoke(java.lang.Object):145 -> a
     152:152:java.lang.Object invoke(java.lang.Object):145:145 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitValueParameter$1 -> com.android.tools.r8.internal.xD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitValueParameter$1 -> com.android.tools.r8.internal.yD:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):145:145 -> a
     2:157:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitValueParameter$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder):0:155 -> a
     2:157:java.lang.Object invoke(java.lang.Object):145 -> a
     158:158:java.lang.Object invoke(java.lang.Object):145:145 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitVersionRequirement$1 -> com.android.tools.r8.internal.yD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitVersionRequirement$1 -> com.android.tools.r8.internal.zD:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):145:145 -> a
     2:2:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitVersionRequirement$1.invoke(int):161:161 -> a
     2:2:java.lang.Object invoke(java.lang.Object):145 -> a
     3:3:java.lang.Object invoke(java.lang.Object):145:145 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1 -> com.android.tools.r8.internal.GD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1 -> com.android.tools.r8.internal.HD:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder t -> b
     int $getterFlags -> f
@@ -56191,49 +56229,49 @@
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.access$writeVersionRequirement(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):1 -> b
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():198 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder getT():183:183 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitExtensions$1 -> com.android.tools.r8.internal.AD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitExtensions$1 -> com.android.tools.r8.internal.BD:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType $type -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):182:182 -> a
     2:204:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyExtensionVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitExtensions$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions):0:202 -> a
     2:204:java.lang.Object invoke(java.lang.Object):182 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitReceiverParameterType$1 -> com.android.tools.r8.internal.BD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitReceiverParameterType$1 -> com.android.tools.r8.internal.CD:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):182:182 -> a
     2:191:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitReceiverParameterType$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):0:189 -> a
     2:191:java.lang.Object invoke(java.lang.Object):182 -> a
     192:192:java.lang.Object invoke(java.lang.Object):182:182 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitReturnType$1 -> com.android.tools.r8.internal.CD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitReturnType$1 -> com.android.tools.r8.internal.DD:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):182:182 -> a
     2:197:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitReturnType$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):0:195 -> a
     2:197:java.lang.Object invoke(java.lang.Object):182 -> a
     198:198:java.lang.Object invoke(java.lang.Object):182:182 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitSetterParameter$1 -> com.android.tools.r8.internal.DD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitSetterParameter$1 -> com.android.tools.r8.internal.ED:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):182:182 -> a
     2:194:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitSetterParameter$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder):0:192 -> a
     2:194:java.lang.Object invoke(java.lang.Object):182 -> a
     195:195:java.lang.Object invoke(java.lang.Object):182:182 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitTypeParameter$1 -> com.android.tools.r8.internal.ED:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitTypeParameter$1 -> com.android.tools.r8.internal.FD:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):182:182 -> a
     2:188:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitTypeParameter$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder):0:186 -> a
     2:188:java.lang.Object invoke(java.lang.Object):182 -> a
     189:189:java.lang.Object invoke(java.lang.Object):182:182 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitVersionRequirement$1 -> com.android.tools.r8.internal.FD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitVersionRequirement$1 -> com.android.tools.r8.internal.GD:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):182:182 -> a
     2:2:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitVersionRequirement$1.invoke(int):198:198 -> a
     2:2:java.lang.Object invoke(java.lang.Object):182 -> a
     3:3:java.lang.Object invoke(java.lang.Object):182:182 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1 -> com.android.tools.r8.internal.MD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1 -> com.android.tools.r8.internal.ND:
 # {"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
@@ -56263,14 +56301,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):94 -> b
     1:1:void visitTypeParameter(int):87:87 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitAbbreviatedType$1 -> com.android.tools.r8.internal.HD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitAbbreviatedType$1 -> com.android.tools.r8.internal.ID:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):57:57 -> a
     2:93:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitAbbreviatedType$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):0:91 -> a
     2:93:java.lang.Object invoke(java.lang.Object):57 -> a
     94:94:java.lang.Object invoke(java.lang.Object):57:57 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitArgument$1 -> com.android.tools.r8.internal.ID:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitArgument$1 -> com.android.tools.r8.internal.JD:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance $variance -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1 this$0 -> a
@@ -56280,14 +56318,14 @@
     85:85:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitArgument$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):76:76 -> a
     85:85:java.lang.Object invoke(java.lang.Object):57 -> a
     86:86:java.lang.Object invoke(java.lang.Object):57:57 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitExtensions$1 -> com.android.tools.r8.internal.JD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitExtensions$1 -> com.android.tools.r8.internal.KD:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType $type -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):57:57 -> a
     2:108:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeExtensionVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitExtensions$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions):0:106 -> a
     2:108:java.lang.Object invoke(java.lang.Object):57 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitFlexibleTypeUpperBound$1 -> com.android.tools.r8.internal.KD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitFlexibleTypeUpperBound$1 -> com.android.tools.r8.internal.LD:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1 this$0 -> a
     java.lang.String $typeFlexibilityId -> b
@@ -56295,14 +56333,14 @@
     2:103:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitFlexibleTypeUpperBound$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):0:101 -> a
     2:103:java.lang.Object invoke(java.lang.Object):57 -> a
     104:104:java.lang.Object invoke(java.lang.Object):57:57 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitOuterType$1 -> com.android.tools.r8.internal.LD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitOuterType$1 -> com.android.tools.r8.internal.MD:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):57:57 -> a
     2:96:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitOuterType$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):0:94 -> a
     2:96:java.lang.Object invoke(java.lang.Object):57 -> a
     97:97:java.lang.Object invoke(java.lang.Object):57:57 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1 -> com.android.tools.r8.internal.RD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1 -> com.android.tools.r8.internal.SD:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder t -> b
     int $flags -> d
@@ -56329,35 +56367,35 @@
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.access$writeVersionRequirement(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):1 -> b
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():258 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder getT():242:242 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitExpandedType$1 -> com.android.tools.r8.internal.ND:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitExpandedType$1 -> com.android.tools.r8.internal.OD:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):241:241 -> a
     2:253:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitExpandedType$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):0:251 -> a
     2:253:java.lang.Object invoke(java.lang.Object):241 -> a
     254:254:java.lang.Object invoke(java.lang.Object):241:241 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitTypeParameter$1 -> com.android.tools.r8.internal.OD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitTypeParameter$1 -> com.android.tools.r8.internal.PD:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):241:241 -> a
     2:247:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitTypeParameter$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder):0:245 -> a
     2:247:java.lang.Object invoke(java.lang.Object):241 -> a
     248:248:java.lang.Object invoke(java.lang.Object):241:241 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitUnderlyingType$1 -> com.android.tools.r8.internal.PD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitUnderlyingType$1 -> com.android.tools.r8.internal.QD:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):241:241 -> a
     2:250:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitUnderlyingType$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):0:248 -> a
     2:250:java.lang.Object invoke(java.lang.Object):241 -> a
     251:251:java.lang.Object invoke(java.lang.Object):241:241 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitVersionRequirement$1 -> com.android.tools.r8.internal.QD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitVersionRequirement$1 -> com.android.tools.r8.internal.RD:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):241:241 -> a
     2:2:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitVersionRequirement$1.invoke(int):258:258 -> a
     2:2:java.lang.Object invoke(java.lang.Object):241 -> a
     3:3:java.lang.Object invoke(java.lang.Object):241:241 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeParameter$1 -> com.android.tools.r8.internal.UD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeParameter$1 -> com.android.tools.r8.internal.VD:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder t -> b
     int $flags -> f
@@ -56374,21 +56412,21 @@
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitUpperBound(int):33 -> a
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType):36:36 -> a
     5:16:void visitEnd():41:52 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeParameter$1$visitExtensions$1 -> com.android.tools.r8.internal.SD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeParameter$1$visitExtensions$1 -> com.android.tools.r8.internal.TD:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeParameter$1 this$0 -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType $type -> b
     1:1:java.lang.Object invoke(java.lang.Object):29:29 -> a
     2:39:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterExtensionVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeParameter$1$visitExtensions$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions):0:37 -> a
     2:39:java.lang.Object invoke(java.lang.Object):29 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeParameter$1$visitUpperBound$1 -> com.android.tools.r8.internal.TD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeParameter$1$visitUpperBound$1 -> com.android.tools.r8.internal.UD:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeParameter$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):29:29 -> a
     2:35:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeParameter$1$visitUpperBound$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):0:33 -> a
     2:35:java.lang.Object invoke(java.lang.Object):29 -> a
     36:36:java.lang.Object invoke(java.lang.Object):29:29 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1 -> com.android.tools.r8.internal.XD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1 -> com.android.tools.r8.internal.YD:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder t -> b
     int $flags -> d
@@ -56406,21 +56444,21 @@
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.writeType(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):57:57 -> b
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.access$writeType(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):1 -> b
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitVarargElementType(int):227 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1$visitType$1 -> com.android.tools.r8.internal.VD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1$visitType$1 -> com.android.tools.r8.internal.WD:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):220:220 -> a
     2:226:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1$visitType$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):0:224 -> a
     2:226:java.lang.Object invoke(java.lang.Object):220 -> a
     227:227:java.lang.Object invoke(java.lang.Object):220:220 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1$visitVarargElementType$1 -> com.android.tools.r8.internal.WD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1$visitVarargElementType$1 -> com.android.tools.r8.internal.XD:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):220:220 -> a
     2:229:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1$visitVarargElementType$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):0:227 -> a
     2:229:java.lang.Object invoke(java.lang.Object):220 -> a
     230:230:java.lang.Object invoke(java.lang.Object):220:220 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1 -> com.android.tools.r8.internal.aE:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1 -> com.android.tools.r8.internal.bE:
 # {"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
@@ -56444,7 +56482,7 @@
     36:39:void visitEnd():312:315 -> a
     40:40:void visitEnd():313:313 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder getT():272:272 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1$visitVersion$1 -> com.android.tools.r8.internal.YD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1$visitVersion$1 -> com.android.tools.r8.internal.ZD:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):271:271 -> a
@@ -56453,7 +56491,7 @@
     3:3:java.lang.Object invoke(java.lang.Object):271:271 -> a
     4:4:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1$visitVersion$1.invoke(int):306:306 -> a
     4:4:java.lang.Object invoke(java.lang.Object):271 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1$visitVersion$2 -> com.android.tools.r8.internal.ZD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1$visitVersion$2 -> com.android.tools.r8.internal.aE:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):271:271 -> a
@@ -56462,26 +56500,26 @@
     3:3:java.lang.Object invoke(java.lang.Object):271:271 -> a
     4:4:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1$visitVersion$2.invoke(int):307:307 -> a
     4:4:java.lang.Object invoke(java.lang.Object):271 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmClassExtension -> com.android.tools.r8.internal.xi:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmClassExtension -> com.android.tools.r8.internal.yi:
 # {"id":"sourceFile","fileName":"extensionNodes.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmConstructorExtension -> com.android.tools.r8.internal.Di:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmConstructorExtension -> com.android.tools.r8.internal.Ei:
 # {"id":"sourceFile","fileName":"extensionNodes.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmExtension -> com.android.tools.r8.internal.Qi:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmExtension -> com.android.tools.r8.internal.Ri:
 # {"id":"sourceFile","fileName":"extensionNodes.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmFunctionExtension -> com.android.tools.r8.internal.Vi:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmFunctionExtension -> com.android.tools.r8.internal.Wi:
 # {"id":"sourceFile","fileName":"extensionNodes.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmPackageExtension -> com.android.tools.r8.internal.bj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmPackageExtension -> com.android.tools.r8.internal.cj:
 # {"id":"sourceFile","fileName":"extensionNodes.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmPropertyExtension -> com.android.tools.r8.internal.fj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmPropertyExtension -> com.android.tools.r8.internal.gj:
 # {"id":"sourceFile","fileName":"extensionNodes.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmTypeExtension -> com.android.tools.r8.internal.lj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmTypeExtension -> com.android.tools.r8.internal.mj:
 # {"id":"sourceFile","fileName":"extensionNodes.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmTypeParameterExtension -> com.android.tools.r8.internal.oj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmTypeParameterExtension -> com.android.tools.r8.internal.pj:
 # {"id":"sourceFile","fileName":"extensionNodes.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions -> com.android.tools.r8.internal.oo:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions -> com.android.tools.r8.internal.po:
 # {"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.no:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions$Companion -> com.android.tools.r8.internal.oo:
 # {"id":"sourceFile","fileName":"MetadataExtensions.kt"}
     com.android.tools.r8.jetbrains.kotlin.Lazy INSTANCES$delegate -> b
     com.android.tools.r8.jetbrains.kotlin.reflect.KProperty[] $$delegatedProperties -> a
@@ -56489,13 +56527,13 @@
     1:2:void <clinit>():61:62 -> <clinit>
     1:1:void <init>():61:61 -> <init>
     java.util.List getINSTANCES() -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions$Companion$INSTANCES$2 -> com.android.tools.r8.internal.mo:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions$Companion$INSTANCES$2 -> com.android.tools.r8.internal.no:
 # {"id":"sourceFile","fileName":"MetadataExtensions.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions$Companion$INSTANCES$2 INSTANCE -> a
     1:2:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions$Companion$INSTANCES$2.invoke():63:64 -> a
     1:2:java.lang.Object invoke():61 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1 -> com.android.tools.r8.internal.At:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation -> com.android.tools.r8.internal.Kt:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1 -> com.android.tools.r8.internal.Ct:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation -> com.android.tools.r8.internal.Mt:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation defaultInstance -> a
     java.util.List argument_ -> f
     int memoizedSerializedSize -> h
@@ -56554,11 +56592,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.Bt:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$1 -> com.android.tools.r8.internal.Dt:
     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.It:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument -> com.android.tools.r8.internal.Kt:
     int memoizedSerializedSize -> h
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> b
     int bitField0_ -> d
@@ -56610,11 +56648,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.Ct:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$1 -> com.android.tools.r8.internal.Et:
     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.Dt:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Builder -> com.android.tools.r8.internal.Ft:
     int bitField0_ -> b
     int nameId_ -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value value_ -> d
@@ -56657,7 +56695,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.Ht:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value -> com.android.tools.r8.internal.Jt:
     int arrayDimensionCount_ -> n
     int flags_ -> o
     long intValue_ -> f
@@ -56773,11 +56811,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.Et:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$1 -> com.android.tools.r8.internal.Gt:
     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.Ft:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder -> com.android.tools.r8.internal.Ht:
     int arrayDimensionCount_ -> l
     int flags_ -> m
     int classId_ -> h
@@ -56848,7 +56886,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.Gt:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type -> com.android.tools.r8.internal.It:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type[] $VALUES -> n
     int value -> o
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type BYTE -> a
@@ -56881,7 +56919,7 @@
     11:11:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type valueOf(int):2532:2532 -> b
     12:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type valueOf(int):2531:2531 -> b
     13:13:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type valueOf(int):2530:2530 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder -> com.android.tools.r8.internal.Jt:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder -> com.android.tools.r8.internal.Lt:
     java.util.List argument_ -> d
     int bitField0_ -> b
     int id_ -> c
@@ -56919,7 +56957,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.Ot:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class -> com.android.tools.r8.internal.Qt:
     int nestedClassNameMemoizedSerializedSize -> n
     java.util.List typeAlias_ -> r
     byte memoizedIsInitialized -> y
@@ -57106,11 +57144,11 @@
     1:1:java.util.List getTypeParameterList():8977:8977 -> x
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable getTypeTable():9297:9297 -> y
     1:1:java.util.List getVersionRequirementList():9311:9311 -> z
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$1 -> com.android.tools.r8.internal.Lt:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$1 -> com.android.tools.r8.internal.Nt:
     1:1:void <init>():8778:8778 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):8783:8783 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):8778 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder -> com.android.tools.r8.internal.Mt:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder -> com.android.tools.r8.internal.Ot:
     java.util.List sealedSubclassFqName_ -> q
     java.util.List enumEntry_ -> p
     java.util.List typeAlias_ -> o
@@ -57228,7 +57266,7 @@
     1:3:void ensureTypeAliasIsMutable():10952:10954 -> p
     1:3:void ensureTypeParameterIsMutable():10195:10197 -> q
     1:3:void ensureVersionRequirementIsMutable():11327:11329 -> r
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Kind -> com.android.tools.r8.internal.Nt:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Kind -> com.android.tools.r8.internal.Pt:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Kind INTERFACE -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Kind CLASS -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Kind ENUM_ENTRY -> d
@@ -57243,7 +57281,7 @@
     1:2:void <init>(java.lang.String,int,int,int):8894:8895 -> <init>
     1:1:int getNumber():8865:8865 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Kind[] values():8795:8795 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor -> com.android.tools.r8.internal.Rt:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor -> com.android.tools.r8.internal.Tt:
     byte memoizedIsInitialized -> i
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> c
     int memoizedSerializedSize -> j
@@ -57305,11 +57343,11 @@
     1:1:boolean hasFlags():13501:13501 -> o
     1:3:void initFields():13586:13588 -> p
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder newBuilder():13718:13718 -> q
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$1 -> com.android.tools.r8.internal.Pt:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$1 -> com.android.tools.r8.internal.Rt:
     1:1:void <init>():13474:13474 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):13479:13479 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):13474 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder -> com.android.tools.r8.internal.Qt:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder -> com.android.tools.r8.internal.St:
     java.util.List valueParameter_ -> f
     int bitField0_ -> d
     int flags_ -> e
@@ -57346,7 +57384,7 @@
     1:18:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor buildPartial():13772:13789 -> h
     1:3:void ensureValueParameterIsMutable():13916:13918 -> i
     1:3:void ensureVersionRequirementIsMutable():14040:14042 -> j
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract -> com.android.tools.r8.internal.Ut:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract -> com.android.tools.r8.internal.Wt:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract defaultInstance -> a
     java.util.List effect_ -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> b
@@ -57395,11 +57433,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder toBuilder():23546 -> k
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract):23544:23544 -> k
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder toBuilder():23546 -> k
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$1 -> com.android.tools.r8.internal.St:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$1 -> com.android.tools.r8.internal.Ut:
     1:1:void <init>():23389:23389 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):23394:23394 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):23389 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder -> com.android.tools.r8.internal.Tt:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder -> com.android.tools.r8.internal.Vt:
     java.util.List effect_ -> c
     int bitField0_ -> b
     1:91:void <init>():23558:23648 -> <init>
@@ -57434,7 +57472,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder access$22300():23551 -> f
     1:7:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract buildPartial():23592:23598 -> g
     1:3:void ensureEffectIsMutable():23651:23653 -> h
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect -> com.android.tools.r8.internal.Zt:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect -> com.android.tools.r8.internal.bu:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect defaultInstance -> a
     byte memoizedIsInitialized -> i
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType effectType_ -> e
@@ -57498,11 +57536,11 @@
     1:1:boolean hasKind():24216:24216 -> n
     1:4:void initFields():24226:24229 -> o
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder newBuilder():24358:24358 -> p
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$1 -> com.android.tools.r8.internal.Vt:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$1 -> com.android.tools.r8.internal.Xt:
     1:1:void <init>():23956:23956 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):23961:23961 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):23956 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder -> com.android.tools.r8.internal.Wt:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder -> com.android.tools.r8.internal.Yt:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType effectType_ -> c
     java.util.List effectConstructorArgument_ -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression conclusionOfConditionalEffect_ -> e
@@ -57547,7 +57585,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder access$22800():24368 -> f
     1:21:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect buildPartial():24415:24435 -> g
     1:3:void ensureEffectConstructorArgumentIsMutable():24538:24540 -> h
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType -> com.android.tools.r8.internal.Xt:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType -> com.android.tools.r8.internal.Zt:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType RETURNS_NOT_NULL -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType[] $VALUES -> d
     int value -> e
@@ -57560,7 +57598,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType valueOf(int):24043:24043 -> b
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType valueOf(int):24042:24042 -> b
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType valueOf(int):24041:24041 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind -> com.android.tools.r8.internal.Yt:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind -> com.android.tools.r8.internal.au:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind AT_MOST_ONCE -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind EXACTLY_ONCE -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind AT_LEAST_ONCE -> c
@@ -57573,7 +57611,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind valueOf(int):24108:24108 -> b
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind valueOf(int):24107:24107 -> b
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind valueOf(int):24106:24106 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry -> com.android.tools.r8.internal.cu:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry -> com.android.tools.r8.internal.eu:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry defaultInstance -> b
     int memoizedSerializedSize -> h
@@ -57616,11 +57654,11 @@
     1:1:boolean hasName():20550:20550 -> m
     1:1:void initFields():20560:20560 -> n
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder newBuilder():20665:20665 -> o
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$1 -> com.android.tools.r8.internal.au:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$1 -> com.android.tools.r8.internal.cu:
     1:1:void <init>():20529:20529 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):20534:20534 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):20529 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder -> com.android.tools.r8.internal.bu:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder -> com.android.tools.r8.internal.du:
     int bitField0_ -> d
     int name_ -> e
     1:1:void <init>():20681:20681 -> <init>
@@ -57651,7 +57689,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():20688:20688 -> g
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder access$19200():20675 -> g
     1:8:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry buildPartial():20715:20722 -> h
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression -> com.android.tools.r8.internal.gu:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression -> com.android.tools.r8.internal.iu:
     int memoizedSerializedSize -> m
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> b
     int isInstanceTypeId_ -> i
@@ -57738,11 +57776,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder toBuilder():25558 -> v
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression):25556:25556 -> v
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder toBuilder():25558 -> v
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$1 -> com.android.tools.r8.internal.du:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$1 -> com.android.tools.r8.internal.fu:
     1:1:void <init>():25075:25075 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):25080:25080 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):25075 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder -> com.android.tools.r8.internal.eu:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder -> com.android.tools.r8.internal.gu:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue constantValue_ -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type isInstanceType_ -> f
     int isInstanceTypeId_ -> g
@@ -57800,7 +57838,7 @@
     1:34:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression buildPartial():25621:25654 -> h
     1:3:void ensureAndArgumentIsMutable():26005:26007 -> i
     1:3:void ensureOrArgumentIsMutable():26202:26204 -> j
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue -> com.android.tools.r8.internal.fu:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue -> com.android.tools.r8.internal.hu:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue FALSE -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue NULL -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue[] $VALUES -> d
@@ -57813,7 +57851,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue valueOf(int):25128:25128 -> b
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue valueOf(int):25127:25127 -> b
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue valueOf(int):25126:25126 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function -> com.android.tools.r8.internal.ju:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function -> com.android.tools.r8.internal.lu:
     java.util.List versionRequirement_ -> p
     int receiverTypeId_ -> m
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> c
@@ -57940,11 +57978,11 @@
     1:1:boolean hasContract():14776:14776 -> x
     1:1:boolean hasFlags():14538:14538 -> y
     1:1:boolean hasName():14582:14582 -> z
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$1 -> com.android.tools.r8.internal.hu:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$1 -> com.android.tools.r8.internal.ju:
     1:1:void <init>():14503:14503 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):14508:14508 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):14503 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder -> com.android.tools.r8.internal.iu:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder -> com.android.tools.r8.internal.ku:
     int receiverTypeId_ -> l
     java.util.List versionRequirement_ -> o
     int returnTypeId_ -> i
@@ -58054,7 +58092,7 @@
     1:3:void ensureTypeParameterIsMutable():15533:15535 -> j
     1:3:void ensureValueParameterIsMutable():15750:15752 -> k
     1:3:void ensureVersionRequirementIsMutable():15934:15936 -> l
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$MemberKind -> com.android.tools.r8.internal.ku:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$MemberKind -> com.android.tools.r8.internal.mu:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$MemberKind DELEGATION -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$MemberKind[] $VALUES -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$MemberKind SYNTHESIZED -> d
@@ -58066,7 +58104,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.lu:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Modality -> com.android.tools.r8.internal.nu:
     int value -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Modality FINAL -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Modality SEALED -> d
@@ -58078,7 +58116,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.ou:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package -> com.android.tools.r8.internal.qu:
     int memoizedSerializedSize -> l
     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
@@ -58159,11 +58197,11 @@
     1:1:boolean hasVersionRequirementTable():11825:11825 -> r
     1:5:void initFields():11835:11839 -> s
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder newBuilder():11996:11996 -> t
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$1 -> com.android.tools.r8.internal.mu:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$1 -> com.android.tools.r8.internal.ou:
     1:1:void <init>():11684:11684 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):11689:11689 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):11684 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder -> com.android.tools.r8.internal.nu:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder -> com.android.tools.r8.internal.pu:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable versionRequirementTable_ -> i
     java.util.List property_ -> f
     java.util.List function_ -> e
@@ -58223,7 +58261,7 @@
     1:3:void ensureFunctionIsMutable():12182:12184 -> j
     1:3:void ensurePropertyIsMutable():12307:12309 -> k
     1:3:void ensureTypeAliasIsMutable():12432:12434 -> l
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property -> com.android.tools.r8.internal.ru:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property -> com.android.tools.r8.internal.tu:
     int getterFlags_ -> o
     java.util.List versionRequirement_ -> q
     int receiverTypeId_ -> m
@@ -58340,11 +58378,11 @@
     1:1:boolean hasFlags():16503:16503 -> x
     1:1:boolean hasGetterFlags():16686:16686 -> y
     1:1:boolean hasName():16549:16549 -> z
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$1 -> com.android.tools.r8.internal.pu:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$1 -> com.android.tools.r8.internal.ru:
     1:1:void <init>():16466:16466 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):16471:16471 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):16466 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder -> com.android.tools.r8.internal.qu:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder -> com.android.tools.r8.internal.su:
     int getterFlags_ -> n
     int setterFlags_ -> o
     int receiverTypeId_ -> l
@@ -58448,7 +58486,7 @@
     1:54:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property buildPartial():17055:17108 -> i
     1:3:void ensureTypeParameterIsMutable():17480:17482 -> j
     1:3:void ensureVersionRequirementIsMutable():17868:17870 -> k
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type -> com.android.tools.r8.internal.yu:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type -> com.android.tools.r8.internal.Au:
     int typeAliasName_ -> n
     int typeParameter_ -> l
     int typeParameterName_ -> m
@@ -58579,11 +58617,11 @@
     1:1:int getTypeParameter():5807:5807 -> x
     1:1:int getTypeParameterName():5830:5830 -> y
     1:1:boolean hasAbbreviatedType():5902:5902 -> z
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$1 -> com.android.tools.r8.internal.su:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$1 -> com.android.tools.r8.internal.uu:
     1:1:void <init>():4972:4972 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):4977:4977 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):4972 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument -> com.android.tools.r8.internal.wu:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument -> com.android.tools.r8.internal.yu:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection projection_ -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> b
     int memoizedSerializedSize -> i
@@ -58637,11 +58675,11 @@
     1:1:boolean hasTypeId():5257:5257 -> m
     1:3:void initFields():5267:5269 -> n
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder newBuilder():5385:5385 -> o
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$1 -> com.android.tools.r8.internal.tu:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$1 -> com.android.tools.r8.internal.vu:
     1:1:void <init>():5124:5124 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):5129:5129 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):5124 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder -> com.android.tools.r8.internal.uu:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder -> com.android.tools.r8.internal.wu:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection projection_ -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type type_ -> d
     int typeId_ -> e
@@ -58685,7 +58723,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder.create():5409:5409 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder access$5000():5395 -> f
     1:16:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument buildPartial():5440:5455 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection -> com.android.tools.r8.internal.vu:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection -> com.android.tools.r8.internal.xu:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection IN -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection OUT -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection INV -> c
@@ -58700,7 +58738,7 @@
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection valueOf(int):5185:5185 -> b
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection valueOf(int):5184:5184 -> b
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection valueOf(int):5183:5183 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder -> com.android.tools.r8.internal.xu:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder -> com.android.tools.r8.internal.zu:
     int outerTypeId_ -> o
     int typeParameterName_ -> l
     int typeAliasName_ -> m
@@ -58820,7 +58858,7 @@
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type build():6253:6253 -> h
     1:61:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type buildPartial():6259:6319 -> i
     1:3:void ensureArgumentIsMutable():6434:6436 -> j
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias -> com.android.tools.r8.internal.Bu:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias -> com.android.tools.r8.internal.Du:
     int expandedTypeId_ -> l
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> c
     int underlyingTypeId_ -> j
@@ -58924,11 +58962,11 @@
     1:1:boolean hasName():19218:19218 -> x
     1:1:boolean hasUnderlyingType():19268:19268 -> y
     1:1:boolean hasUnderlyingTypeId():19283:19283 -> z
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$1 -> com.android.tools.r8.internal.zu:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$1 -> com.android.tools.r8.internal.Bu:
     1:1:void <init>():19172:19172 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):19177:19177 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):19172 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder -> com.android.tools.r8.internal.Au:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder -> com.android.tools.r8.internal.Cu:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type expandedType_ -> j
     int expandedTypeId_ -> k
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type underlyingType_ -> h
@@ -59007,7 +59045,7 @@
     1:3:void ensureAnnotationIsMutable():20213:20215 -> j
     1:3:void ensureTypeParameterIsMutable():19904:19906 -> k
     1:3:void ensureVersionRequirementIsMutable():20337:20339 -> l
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter -> com.android.tools.r8.internal.Fu:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter -> com.android.tools.r8.internal.Hu:
     int memoizedSerializedSize -> n
     int upperBoundIdMemoizedSerializedSize -> l
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> c
@@ -59092,11 +59130,11 @@
     1:1:boolean hasVariance():7510:7510 -> u
     1:6:void initFields():7578:7583 -> v
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder newBuilder():7751:7751 -> w
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$1 -> com.android.tools.r8.internal.Cu:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$1 -> com.android.tools.r8.internal.Eu:
     1:1:void <init>():7379:7379 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):7384:7384 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):7379 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder -> com.android.tools.r8.internal.Du:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder -> com.android.tools.r8.internal.Fu:
     int name_ -> f
     java.util.List upperBoundId_ -> j
     java.util.List upperBound_ -> i
@@ -59144,7 +59182,7 @@
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter build():7805:7805 -> h
     1:30:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter buildPartial():7811:7840 -> i
     1:3:void ensureUpperBoundIsMutable():8059:8061 -> j
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance -> com.android.tools.r8.internal.Eu:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance -> com.android.tools.r8.internal.Gu:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance IN -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance OUT -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance[] $VALUES -> d
@@ -59157,7 +59195,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance valueOf(int):7432:7432 -> b
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance valueOf(int):7431:7431 -> b
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance valueOf(int):7430:7430 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable -> com.android.tools.r8.internal.Iu:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable -> com.android.tools.r8.internal.Ku:
     java.util.List type_ -> e
     int memoizedSerializedSize -> h
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> b
@@ -59212,11 +59250,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder toBuilder():12998 -> l
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):12996:12996 -> l
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder toBuilder():12998 -> l
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$1 -> com.android.tools.r8.internal.Gu:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$1 -> com.android.tools.r8.internal.Iu:
     1:1:void <init>():12807:12807 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):12812:12812 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):12807 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder -> com.android.tools.r8.internal.Hu:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder -> com.android.tools.r8.internal.Ju:
     java.util.List type_ -> c
     int firstNullable_ -> d
     int bitField0_ -> b
@@ -59248,7 +59286,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():13017:13017 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder access$11800():13003 -> f
     1:13:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable buildPartial():13046:13058 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter -> com.android.tools.r8.internal.Lu:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter -> com.android.tools.r8.internal.Nu:
     byte memoizedIsInitialized -> l
     int memoizedSerializedSize -> m
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> c
@@ -59328,11 +59366,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder toBuilder():18446 -> z
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter):18444:18444 -> z
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder toBuilder():18446 -> z
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$1 -> com.android.tools.r8.internal.Ju:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$1 -> com.android.tools.r8.internal.Lu:
     1:1:void <init>():18160:18160 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):18165:18165 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):18160 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder -> com.android.tools.r8.internal.Ku:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder -> com.android.tools.r8.internal.Mu:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type varargElementType_ -> i
     int varargElementTypeId_ -> j
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type type_ -> g
@@ -59402,7 +59440,7 @@
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter build():18495 -> h
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter build():18495:18495 -> h
     1:28:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter buildPartial():18501:18528 -> i
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement -> com.android.tools.r8.internal.Qu:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement -> com.android.tools.r8.internal.Su:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level level_ -> g
     int memoizedSerializedSize -> l
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement defaultInstance -> a
@@ -59466,11 +59504,11 @@
     1:1:boolean hasVersionKind():21311:21311 -> s
     1:6:void initFields():21326:21331 -> t
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder newBuilder():21462:21462 -> u
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$1 -> com.android.tools.r8.internal.Mu:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$1 -> com.android.tools.r8.internal.Ou:
     1:1:void <init>():21034:21034 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):21039:21039 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):21034 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder -> com.android.tools.r8.internal.Nu:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder -> com.android.tools.r8.internal.Pu:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level level_ -> e
     int errorCode_ -> f
     int message_ -> g
@@ -59524,7 +59562,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():21486:21486 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder access$19800():21472 -> f
     1:28:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement buildPartial():21523:21550 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level -> com.android.tools.r8.internal.Ou:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level -> com.android.tools.r8.internal.Qu:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level[] $VALUES -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level HIDDEN -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level ERROR -> b
@@ -59537,7 +59575,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level valueOf(int):21087:21087 -> b
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level valueOf(int):21086:21086 -> b
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level valueOf(int):21085:21085 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind -> com.android.tools.r8.internal.Pu:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind -> com.android.tools.r8.internal.Ru:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind API_VERSION -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind COMPILER_VERSION -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind LANGUAGE_VERSION -> a
@@ -59550,7 +59588,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind valueOf(int):21152:21152 -> b
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind valueOf(int):21151:21151 -> b
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind valueOf(int):21150:21150 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable -> com.android.tools.r8.internal.Tu:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable -> com.android.tools.r8.internal.Vu:
     java.util.List requirement_ -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable defaultInstance -> a
@@ -59595,11 +59633,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder toBuilder():22172 -> l
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):22170:22170 -> l
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder toBuilder():22172 -> l
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$1 -> com.android.tools.r8.internal.Ru:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$1 -> com.android.tools.r8.internal.Tu:
     1:1:void <init>():22021:22021 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):22026:22026 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):22021 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder -> com.android.tools.r8.internal.Su:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder -> com.android.tools.r8.internal.Uu:
     java.util.List requirement_ -> c
     int bitField0_ -> b
     1:85:void <init>():22184:22268 -> <init>
@@ -59634,7 +59672,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder access$20900():22177 -> f
     1:7:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable buildPartial():22218:22224 -> g
     1:3:void ensureRequirementIsMutable():22271:22273 -> h
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Visibility -> com.android.tools.r8.internal.Uu:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Visibility -> com.android.tools.r8.internal.Wu:
     int value -> h
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Visibility LOCAL -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Visibility PRIVATE_TO_THIS -> e
@@ -59666,7 +59704,7 @@
     1:1:java.lang.String toString():52 -> toString
     2:6:java.lang.String toString():80:84 -> toString
     7:7:java.lang.String toString():53:53 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags -> com.android.tools.r8.internal.Ya:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags -> com.android.tools.r8.internal.Za:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField MEMBER_KIND -> j
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField IS_SUSPEND -> p
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField HAS_GETTER -> r
@@ -59703,8 +59741,8 @@
     void $$$reportNull$$$0(int) -> a
     1:1:int getAccessorFlags(boolean,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Visibility,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Modality,boolean,boolean,boolean):189:189 -> a
     2:2:int getAccessorFlags(boolean,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Visibility,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Modality,boolean,boolean,boolean):0:0 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$1 -> com.android.tools.r8.internal.Ua:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField -> com.android.tools.r8.internal.Va:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$1 -> com.android.tools.r8.internal.Va:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField -> com.android.tools.r8.internal.Wa:
     1:1:void <init>(int):259:259 -> <init>
     1:1:java.lang.Object get(int):256:256 -> a
     2:2:int toFlags(java.lang.Object):256:256 -> a
@@ -59712,7 +59750,7 @@
     1:1:java.lang.Boolean get(int):265:265 -> b
     2:2:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField.$$$reportNull$$$0(int):0:0 -> b
     2:2:java.lang.Boolean get(int):265 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$EnumLiteFlagField -> com.android.tools.r8.internal.Wa:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$EnumLiteFlagField -> com.android.tools.r8.internal.Xa:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLite[] values -> c
     1:2:void <init>(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLite[]):280:281 -> <init>
     1:1:int toFlags(java.lang.Object):276:276 -> a
@@ -59723,7 +59761,7 @@
     9:9:int bitWidth(java.lang.Object[]):0 -> a
     10:14:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLite com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$EnumLiteFlagField.get(int):296:300 -> a
     10:14:java.lang.Object get(int):276 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField -> com.android.tools.r8.internal.Xa:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField -> com.android.tools.r8.internal.Ya:
     int bitWidth -> b
     int offset -> a
     1:1:void <init>(int,int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$1):224:224 -> <init>
@@ -59733,9 +59771,9 @@
     1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField after(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLite[]):226:227 -> a
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField booleanFirst():235:235 -> a
     4:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField booleanAfter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField):239:240 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver -> com.android.tools.r8.internal.vp:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver -> com.android.tools.r8.internal.wp:
 # {"id":"sourceFile","fileName":"NameResolver.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable -> com.android.tools.r8.internal.HB:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable -> com.android.tools.r8.internal.IB:
 # {"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>
@@ -59743,7 +59781,7 @@
     34:34:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):31:31 -> <init>
     35:35:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):22:22 -> <init>
     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.DC:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement -> com.android.tools.r8.internal.EC:
 # {"id":"sourceFile","fileName":"VersionRequirement.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind kind -> c
     java.lang.String message -> f
@@ -59758,11 +59796,11 @@
     1:1:java.lang.String getMessage():29:29 -> d
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version getVersion():25:25 -> e
     1:1:java.lang.String toString():81:81 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Companion -> com.android.tools.r8.internal.AC:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Companion -> com.android.tools.r8.internal.BC:
 # {"id":"sourceFile","fileName":"VersionRequirement.kt"}
     1:1:void <init>():83:83 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):83:83 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version -> com.android.tools.r8.internal.CC:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version -> com.android.tools.r8.internal.DC:
 # {"id":"sourceFile","fileName":"VersionRequirement.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version INFINITY -> a
     int minor -> d
@@ -59778,11 +59816,11 @@
     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.VersionRequirement$Version$Companion -> com.android.tools.r8.internal.BC:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version$Companion -> com.android.tools.r8.internal.CC:
 # {"id":"sourceFile","fileName":"VersionRequirement.kt"}
     1:1:void <init>():52:52 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):52:52 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable -> com.android.tools.r8.internal.FC:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable -> com.android.tools.r8.internal.GC:
 # {"id":"sourceFile","fileName":"VersionRequirement.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable$Companion Companion -> b
     java.util.List infos -> c
@@ -59803,7 +59841,7 @@
     166:166:java.lang.Object com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt.getOrNull(java.util.List,int):0 -> a
     166:166:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement get(int):12 -> a
     167:167:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement get(int):12:12 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable$Companion -> com.android.tools.r8.internal.EC:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable$Companion -> com.android.tools.r8.internal.FC:
 # {"id":"sourceFile","fileName":"VersionRequirement.kt"}
     1:1:void <init>():14:14 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):14:14 -> <init>
@@ -59811,7 +59849,7 @@
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable$Companion.getEMPTY():15:15 -> a
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable create(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):18 -> a
     3:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable create(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):18:18 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf -> com.android.tools.r8.internal.ii:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf -> com.android.tools.r8.internal.ji:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension constructorSignature -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension propertySignature -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension flags -> e
@@ -59826,8 +59864,8 @@
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension classLocalVariable -> j
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension anonymousObjectOriginName -> k
     1:212:void <clinit>():3800:4011 -> <clinit>
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$1 -> com.android.tools.r8.internal.Rh:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature -> com.android.tools.r8.internal.Uh:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$1 -> com.android.tools.r8.internal.Sh:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature -> com.android.tools.r8.internal.Vh:
     int memoizedSerializedSize -> h
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> b
     int desc_ -> f
@@ -59878,11 +59916,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder toBuilder():2833 -> n
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature):2831:2831 -> n
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder toBuilder():2833 -> n
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$1 -> com.android.tools.r8.internal.Sh:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$1 -> com.android.tools.r8.internal.Th:
     1:1:void <init>():2670:2670 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2675:2675 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2670 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder -> com.android.tools.r8.internal.Th:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder -> com.android.tools.r8.internal.Uh:
     int desc_ -> d
     int bitField0_ -> b
     int name_ -> c
@@ -59916,7 +59954,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder.create():2852:2852 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder access$2500():2838 -> f
     1:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature buildPartial():2881:2892 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature -> com.android.tools.r8.internal.Xh:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature -> com.android.tools.r8.internal.Yh:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature defaultInstance -> a
     int memoizedSerializedSize -> h
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> b
@@ -59967,11 +60005,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder toBuilder():2371 -> n
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):2369:2369 -> n
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder toBuilder():2371 -> n
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$1 -> com.android.tools.r8.internal.Vh:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$1 -> com.android.tools.r8.internal.Wh:
     1:1:void <init>():2208:2208 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2213:2213 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2208 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder -> com.android.tools.r8.internal.Wh:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder -> com.android.tools.r8.internal.Xh:
     int desc_ -> d
     int bitField0_ -> b
     int name_ -> c
@@ -60005,7 +60043,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder.create():2390:2390 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder access$1800():2376 -> f
     1:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature buildPartial():2419:2430 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature -> com.android.tools.r8.internal.ai:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature -> com.android.tools.r8.internal.bi:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature syntheticMethod_ -> f
     byte memoizedIsInitialized -> i
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature getter_ -> g
@@ -60061,11 +60099,11 @@
     1:1:boolean hasSyntheticMethod():3232:3232 -> o
     1:4:void initFields():3276:3279 -> p
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder newBuilder():3396:3396 -> q
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$1 -> com.android.tools.r8.internal.Yh:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$1 -> com.android.tools.r8.internal.Zh:
     1:1:void <init>():3192:3192 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):3197:3197 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):3192 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder -> com.android.tools.r8.internal.Zh:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder -> com.android.tools.r8.internal.ai:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature getter_ -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature setter_ -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature syntheticMethod_ -> d
@@ -60145,7 +60183,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder.create():3420:3420 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder access$3200():3406 -> f
     1:20:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature buildPartial():3453:3472 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes -> com.android.tools.r8.internal.hi:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes -> com.android.tools.r8.internal.ii:
     java.util.List localName_ -> e
     java.util.List record_ -> d
     int memoizedSerializedSize -> h
@@ -60197,11 +60235,11 @@
     1:1:java.util.List getRecordList():1568:1568 -> i
     1:2:void initFields():1633:1634 -> j
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder newBuilder():1751:1751 -> k
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$1 -> com.android.tools.r8.internal.bi:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$1 -> com.android.tools.r8.internal.ci:
     1:1:void <init>():171:171 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):176:176 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):171 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder -> com.android.tools.r8.internal.ci:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder -> com.android.tools.r8.internal.di:
     java.util.List localName_ -> d
     java.util.List record_ -> c
     int bitField0_ -> b
@@ -60231,7 +60269,7 @@
     1:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes buildPartial():1804:1815 -> g
     1:3:void ensureLocalNameIsMutable():1996:1998 -> h
     1:3:void ensureRecordIsMutable():1872:1874 -> i
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record -> com.android.tools.r8.internal.gi:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record -> com.android.tools.r8.internal.hi:
     int memoizedSerializedSize -> n
     int replaceCharMemoizedSerializedSize -> l
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record defaultInstance -> a
@@ -60335,11 +60373,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder toBuilder():942 -> v
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record):940:940 -> v
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder toBuilder():942 -> v
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$1 -> com.android.tools.r8.internal.di:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$1 -> com.android.tools.r8.internal.ei:
     1:1:void <init>():470:470 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):475:475 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):470 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder -> com.android.tools.r8.internal.ei:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder -> com.android.tools.r8.internal.fi:
     java.lang.Object string_ -> e
     int predefinedIndex_ -> d
     java.util.List replaceChar_ -> h
@@ -60392,7 +60430,7 @@
     1:1:int getSubstringIndexCount():1372:1372 -> j
     1:1:boolean hasOperation():1300:1300 -> k
     1:1:boolean hasPredefinedIndex():1152:1152 -> l
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation -> com.android.tools.r8.internal.fi:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation -> com.android.tools.r8.internal.gi:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation INTERNAL_TO_CLASS_ID -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation NONE -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation[] $VALUES -> d
@@ -60464,18 +60502,18 @@
     java.util.Map $this_apply -> a
     1:1:java.lang.Object invoke(java.lang.Object,java.lang.Object):15:15 -> a
     2:2:void invoke(java.lang.String,java.lang.String):40:40 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmBytecodeBinaryVersion -> com.android.tools.r8.internal.lh:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmBytecodeBinaryVersion -> com.android.tools.r8.internal.mh:
 # {"id":"sourceFile","fileName":"JvmBytecodeBinaryVersion.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmBytecodeBinaryVersion INSTANCE -> f
     1:4:void <clinit>():19:22 -> <clinit>
     1:1:void <init>(int[]):14:14 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature -> com.android.tools.r8.internal.yh:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature -> com.android.tools.r8.internal.zh:
 # {"id":"sourceFile","fileName":"JvmMemberSignature.kt"}
     1:1:void <init>():14:14 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):14:14 -> <init>
     java.lang.String asString() -> a
     1:1:java.lang.String toString():27:27 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Field -> com.android.tools.r8.internal.wh:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Field -> com.android.tools.r8.internal.xh:
 # {"id":"sourceFile","fileName":"JvmMemberSignature.kt"}
     java.lang.String name -> a
     java.lang.String desc -> b
@@ -60501,7 +60539,7 @@
     3:3:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Field.getDesc():23:23 -> hashCode
     3:3:int hashCode():0 -> hashCode
     4:4:int hashCode():0:0 -> hashCode
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method -> com.android.tools.r8.internal.xh:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method -> com.android.tools.r8.internal.yh:
 # {"id":"sourceFile","fileName":"JvmMemberSignature.kt"}
     java.lang.String name -> a
     java.lang.String desc -> b
@@ -60527,7 +60565,7 @@
     3:3:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method.getDesc():19:19 -> hashCode
     3:3:int hashCode():0 -> hashCode
     4:4:int hashCode():0:0 -> hashCode
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMetadataVersion -> com.android.tools.r8.internal.Jh:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMetadataVersion -> com.android.tools.r8.internal.Kh:
 # {"id":"sourceFile","fileName":"JvmMetadataVersion.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMetadataVersion INSTANCE -> f
     boolean isStrictSemantics -> g
@@ -60539,7 +60577,7 @@
     22:37:void <clinit>():33 -> <clinit>
     1:1:void <init>(int[],boolean):14:14 -> <init>
     1:6:boolean isCompatible():20:25 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmNameResolver -> com.android.tools.r8.internal.Mh:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmNameResolver -> com.android.tools.r8.internal.Nh:
 # {"id":"sourceFile","fileName":"JvmNameResolver.kt"}
     java.util.List PREDEFINED_STRINGS -> a
     java.util.Map PREDEFINED_STRINGS_MAP -> b
@@ -60560,11 +60598,11 @@
     2:2:boolean isLocalClassName(int):75:75 -> b
     1:1:java.lang.String[] getStrings():15:15 -> c
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes getTypes():14:14 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmNameResolver$Companion -> com.android.tools.r8.internal.Lh:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmNameResolver$Companion -> com.android.tools.r8.internal.Mh:
 # {"id":"sourceFile","fileName":"JvmNameResolver.kt"}
     1:1:void <init>():77:77 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):77:77 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil -> com.android.tools.r8.internal.ji:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil -> com.android.tools.r8.internal.ki:
 # {"id":"sourceFile","fileName":"JvmProtoBufUtil.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite EXTENSION_REGISTRY -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil INSTANCE -> b
@@ -60615,7 +60653,7 @@
     45:45:com.android.tools.r8.jetbrains.kotlin.Pair readPackageDataFrom(java.lang.String[],java.lang.String[]):37 -> c
     46:46:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.readPackageDataFrom(byte[],java.lang.String[]):42:42 -> c
     46:46:com.android.tools.r8.jetbrains.kotlin.Pair readPackageDataFrom(java.lang.String[],java.lang.String[]):37 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.serialization.JvmStringTable -> com.android.tools.r8.internal.ki:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.serialization.JvmStringTable -> com.android.tools.r8.internal.li:
 # {"id":"sourceFile","fileName":"JvmStringTable.kt"}
     java.util.LinkedHashSet localNames -> d
     java.util.ArrayList records -> b
@@ -60662,7 +60700,7 @@
     777:777:void serializeTo(java.io.OutputStream):98 -> a
     778:778:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder.build():1798:1798 -> a
     778:778:void serializeTo(java.io.OutputStream):98 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.Interner -> com.android.tools.r8.internal.gg:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.Interner -> com.android.tools.r8.internal.hg:
 # {"id":"sourceFile","fileName":"Interner.kt"}
     java.util.HashMap interned -> b
     int firstIndex -> a
@@ -60681,14 +60719,14 @@
     5992:5995:java.lang.Integer find(java.lang.Object):19:22 -> a
     1:1:boolean isEmpty():16:16 -> b
     2:3:int intern(java.lang.Object):26:27 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.Interner$allInternedObjects$$inlined$sortedBy$1 -> com.android.tools.r8.internal.fg:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.Interner$allInternedObjects$$inlined$sortedBy$1 -> com.android.tools.r8.internal.gg:
 # {"id":"sourceFile","fileName":"Comparisons.kt"}
     java.util.HashMap receiver$0$inlined -> a
     1:220:int compare(java.lang.Object,java.lang.Object):102:321 -> compare
     221:221:int com.android.tools.r8.jetbrains.kotlin.comparisons.ComparisonsKt__ComparisonsKt.compareValues(java.lang.Comparable,java.lang.Comparable):78:78 -> compare
     221:221:int com.android.tools.r8.jetbrains.kotlin.comparisons.ComparisonsKt.compareValues(java.lang.Comparable,java.lang.Comparable):0 -> compare
     221:221:int compare(java.lang.Object,java.lang.Object):321 -> compare
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.MutableVersionRequirementTable -> com.android.tools.r8.internal.tp:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.MutableVersionRequirementTable -> com.android.tools.r8.internal.up:
 # {"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>
@@ -60717,7 +60755,7 @@
     42:102:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.MutableTable.serialize():0 -> a
     103:103:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.MutableTable.serialize():44:44 -> a
     103:103:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.MutableTable.serialize():0 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.TableElementWrapper -> com.android.tools.r8.internal.iA:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.TableElementWrapper -> com.android.tools.r8.internal.kA:
 # {"id":"sourceFile","fileName":"MutableTable.kt"}
     byte[] bytes -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder builder -> c
@@ -60856,7 +60894,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.B6:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream -> com.android.tools.r8.internal.C6:
     byte[] buffer -> a
     int currentLimit -> h
     int recursionDepth -> i
@@ -60964,7 +61002,7 @@
     7:7:int readTag():158 -> p
     8:8:int readTag():158:158 -> p
     1:8:void recomputeBufferSizeAfterLimit():1001:1008 -> q
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream -> com.android.tools.r8.internal.D6:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream -> com.android.tools.r8.internal.E6:
     byte[] buffer -> a
     java.io.OutputStream output -> e
     int totalBytesWritten -> d
@@ -61061,9 +61099,9 @@
     1:6:void writeRawByte(int):1042 -> f
     1:4:void writeRawLittleEndian32(int):1246:1249 -> g
     1:4:void writeRawVarint32(int):1195:1198 -> h
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream$OutOfSpaceException -> com.android.tools.r8.internal.C6:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream$OutOfSpaceException -> com.android.tools.r8.internal.D6:
     1:1:void <init>():1016:1016 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite -> com.android.tools.r8.internal.fa:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite -> com.android.tools.r8.internal.ga:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite EMPTY -> a
     java.util.Map extensionsByNumber -> b
     1:1:void <clinit>():159:159 -> <clinit>
@@ -61081,13 +61119,13 @@
     6:6:void add(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):125 -> a
     7:7:void add(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):125:125 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite newInstance():92:92 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite$ObjectIntPair -> com.android.tools.r8.internal.ea:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite$ObjectIntPair -> com.android.tools.r8.internal.fa:
     java.lang.Object object -> a
     int number -> b
     1:3:void <init>(java.lang.Object,int):167:169 -> <init>
     1:5:boolean equals(java.lang.Object):178:182 -> equals
     1:1:int hashCode():174:174 -> hashCode
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet -> com.android.tools.r8.internal.Fa:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet -> com.android.tools.r8.internal.Ga:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap fields -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet DEFAULT_INSTANCE -> a
     boolean isImmutable -> c
@@ -61340,8 +61378,8 @@
     1:5:java.util.Iterator iterator():197:201 -> e
     1:5:void makeImmutable():107:111 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet newFieldSet():92:92 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet$FieldDescriptorLite -> com.android.tools.r8.internal.Ea:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite -> com.android.tools.r8.internal.zb:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet$FieldDescriptorLite -> com.android.tools.r8.internal.Fa:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite -> com.android.tools.r8.internal.Ab:
     1:1:void <init>():53:53 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder):56:56 -> <init>
     1:1:boolean parseUnknownField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):73:73 -> a
@@ -61433,15 +61471,15 @@
     144:144:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension newSingularGeneratedExtension(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,java.lang.Object,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLiteMap,int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Class):639:639 -> a
     145:146:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension newRepeatedGeneratedExtension(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLiteMap,int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,boolean,java.lang.Class):661:662 -> a
     147:149:java.lang.reflect.Method getMethodOrDie(java.lang.Class,java.lang.String,java.lang.Class[]):735:737 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$1 -> com.android.tools.r8.internal.tb:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder -> com.android.tools.r8.internal.ub:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$1 -> com.android.tools.r8.internal.ub:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder -> com.android.tools.r8.internal.vb:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> a
     1:45:void <init>():87:131 -> <init>
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite) -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder setUnknownFields(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString):127:127 -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite getDefaultInstanceForType() -> d
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString getUnknownFields():123:123 -> e
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder -> com.android.tools.r8.internal.vb:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder -> com.android.tools.r8.internal.wb:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet extensions -> b
     boolean extensionsIsMutable -> c
     1:3:void <init>():332:334 -> <init>
@@ -61474,7 +61512,7 @@
     19:19:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.verifyExtensionContainingType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):371:371 -> b
     19:19:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder setExtension(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension,java.lang.Object):431 -> b
     1:3:void ensureExtensionsIsMutable():350:352 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage -> com.android.tools.r8.internal.wb:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage -> com.android.tools.r8.internal.xb:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet extensions -> a
     1:2:void <init>():171:172 -> <init>
     3:4:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder):175:176 -> <init>
@@ -61510,7 +61548,7 @@
     1:1:int extensionsSerializedSize():316:316 -> h
     1:1:void makeExtensionsImmutable():261:261 -> i
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage$ExtensionWriter newExtensionWriter():308:308 -> j
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage$ExtensionWriter -> com.android.tools.r8.internal.wb$a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage$ExtensionWriter -> com.android.tools.r8.internal.xb$a:
     java.util.Map$Entry next -> b
     java.util.Iterator iter -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage this$0 -> d
@@ -61547,7 +61585,7 @@
     14:14:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.writeMessageSetExtension(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):355 -> a
     14:14:void writeUntil(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):293 -> a
     15:20:void writeUntil(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):296:301 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor -> com.android.tools.r8.internal.xb:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor -> com.android.tools.r8.internal.yb:
     boolean isPacked -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLiteMap enumTypeMap -> a
     int number -> b
@@ -61558,7 +61596,7 @@
     1:1:int compareTo(java.lang.Object):671:671 -> compareTo
     2:2:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.compareTo(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor):725:725 -> compareTo
     2:2:int compareTo(java.lang.Object):671 -> compareTo
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension -> com.android.tools.r8.internal.yb:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension -> com.android.tools.r8.internal.zb:
     java.lang.Object defaultValue -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor descriptor -> d
     java.lang.reflect.Method enumValueOf -> e
@@ -61580,14 +61618,14 @@
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.getLiteJavaType():702:702 -> b
     2:2:java.lang.Object singularToFieldSetType(java.lang.Object):885 -> b
     3:4:java.lang.Object singularToFieldSetType(java.lang.Object):885:886 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal -> com.android.tools.r8.internal.bg:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal -> com.android.tools.r8.internal.cg:
     byte[] EMPTY_BYTE_ARRAY -> a
     1:6:void <clinit>():383:388 -> <clinit>
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLite -> com.android.tools.r8.internal.Zf:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLite -> com.android.tools.r8.internal.ag:
     int getNumber() -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLiteMap -> com.android.tools.r8.internal.ag:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLiteMap -> com.android.tools.r8.internal.bg:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLite findValueByNumber(int) -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.InvalidProtocolBufferException -> com.android.tools.r8.internal.lg:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.InvalidProtocolBufferException -> com.android.tools.r8.internal.mg:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite unfinishedMessage -> a
     1:1:void <init>(java.lang.String):46:46 -> <init>
     2:2:void <init>(java.lang.String):43:43 -> <init>
@@ -61596,14 +61634,14 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.InvalidProtocolBufferException negativeSize():78:78 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.InvalidProtocolBufferException recursionLimitExceeded():104:104 -> c
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.InvalidProtocolBufferException truncatedMessage():70:70 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LazyField$LazyIterator -> com.android.tools.r8.internal.Vl:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LazyField$LazyIterator -> com.android.tools.r8.internal.Wl:
     java.util.Iterator iterator -> a
     1:2:void <init>(java.util.Iterator):130:131 -> <init>
     1:1:boolean hasNext():136:136 -> hasNext
     1:2:java.util.Map$Entry com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LazyField$LazyIterator.next():142:143 -> next
     1:2:java.lang.Object next():127 -> next
     1:1:void remove():151:151 -> remove
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString -> com.android.tools.r8.internal.Km:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString -> com.android.tools.r8.internal.Lm:
     int hash -> d
     byte[] bytes -> c
     1:180:void <init>(byte[]):62:241 -> <init>
@@ -61635,8 +61673,8 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString$ByteIterator iterator():307:307 -> i
     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.Im:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString$LiteralByteIterator -> com.android.tools.r8.internal.Jm:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString$1 -> com.android.tools.r8.internal.Jm:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString$LiteralByteIterator -> com.android.tools.r8.internal.Km:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString this$0 -> c
     int limit -> b
     int position -> a
@@ -61647,12 +61685,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.lo:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLiteOrBuilder -> com.android.tools.r8.internal.mo:
     boolean isInitialized() -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite getDefaultInstanceForType() -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser -> com.android.tools.r8.internal.os:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser -> com.android.tools.r8.internal.qs:
     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.px:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString -> com.android.tools.r8.internal.rx:
     int[] minLengthByDepth -> c
     int treeDepth -> h
     int hash -> i
@@ -61702,8 +61740,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.lx:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$Balancer -> com.android.tools.r8.internal.mx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$1 -> com.android.tools.r8.internal.nx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$Balancer -> com.android.tools.r8.internal.ox:
     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>
@@ -61725,7 +61763,7 @@
     47:47:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$Balancer.insert(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString):664:664 -> a
     47:47:void doBalance(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString):629 -> a
     48:53:void doBalance(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString):630:635 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$PieceIterator -> com.android.tools.r8.internal.nx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$PieceIterator -> com.android.tools.r8.internal.px:
     java.util.Stack breadCrumbs -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString next -> b
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$1):716:716 -> <init>
@@ -61746,7 +61784,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.ox:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$RopeByteIterator -> com.android.tools.r8.internal.qx:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString$ByteIterator bytes -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$PieceIterator pieces -> a
     int bytesRemaining -> c
@@ -61757,7 +61795,7 @@
     1:1:java.lang.Byte com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$RopeByteIterator.next():799:799 -> next
     1:1:java.lang.Object next():782 -> next
     1:1:void remove():811:811 -> remove
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap -> com.android.tools.r8.internal.ny:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap -> com.android.tools.r8.internal.py:
     java.util.List entryList -> b
     java.util.Map overflowEntries -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EntrySet lazyEntrySet -> e
@@ -61792,7 +61830,7 @@
     1:9:void makeImmutable():161:169 -> n
     1:13:java.lang.Object remove(java.lang.Object):279:291 -> remove
     1:1:int size():202:202 -> size
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$1 -> com.android.tools.r8.internal.jy:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$1 -> com.android.tools.r8.internal.ly:
     1:1:void <init>(int):100:100 -> <init>
     1:5:void makeImmutable():104:108 -> n
     6:6:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.isRepeated():706:706 -> n
@@ -61802,20 +61840,20 @@
     14:14:void makeImmutable():115 -> n
     15:20:void makeImmutable():116:121 -> n
     1:1:java.lang.Object put(java.lang.Object,java.lang.Object):100:100 -> put
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EmptySet -> com.android.tools.r8.internal.my:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EmptySet -> com.android.tools.r8.internal.oy:
     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.ky:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EmptySet$1 -> com.android.tools.r8.internal.my:
     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.ly:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EmptySet$2 -> com.android.tools.r8.internal.ny:
     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.ny$a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$Entry -> com.android.tools.r8.internal.py$a:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap this$0 -> c
     java.lang.Object value -> b
     java.lang.Comparable key -> a
@@ -61839,7 +61877,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.ny$b:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EntryIterator -> com.android.tools.r8.internal.py$b:
     java.util.Iterator lazyOverflowIterator -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap this$0 -> d
     boolean nextCalledBeforeRemove -> b
@@ -61852,7 +61890,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.ny$c:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EntrySet -> com.android.tools.r8.internal.py$c:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap):470:470 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$1):470:470 -> <init>
@@ -61864,9 +61902,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.TB:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.UninitializedMessageException -> com.android.tools.r8.internal.UB:
     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.nC:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Utf8 -> com.android.tools.r8.internal.oC:
     int incompleteStateFor(int,int) -> a
     int incompleteStateFor(int,int,int) -> a
     1:66:int partialIsValidUtf8(int,byte[],int,int):163:228 -> a
@@ -61875,10 +61913,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.cD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat -> com.android.tools.r8.internal.dD:
     int makeTag(int,int) -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$1 -> com.android.tools.r8.internal.VC:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType -> com.android.tools.r8.internal.aD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$1 -> com.android.tools.r8.internal.WC:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType -> com.android.tools.r8.internal.bD:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType DOUBLE -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType[] $VALUES -> s
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType INT64 -> c
@@ -61907,18 +61945,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.WC:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType$1 -> com.android.tools.r8.internal.XC:
     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.XC:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType$2 -> com.android.tools.r8.internal.YC:
     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.YC:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType$3 -> com.android.tools.r8.internal.ZC:
     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.ZC:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType$4 -> com.android.tools.r8.internal.aD:
     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.bD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType -> com.android.tools.r8.internal.cD:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType STRING -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType BYTE_STRING -> g
     java.lang.Object defaultDefault -> k
@@ -61933,7 +61971,7 @@
     1:9:void <clinit>():78:86 -> <clinit>
     10:10:void <clinit>():77:77 -> <clinit>
     1:2:void <init>(java.lang.String,int,java.lang.Object):88:89 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmClassExtensionVisitor -> com.android.tools.r8.internal.nh:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmClassExtensionVisitor -> com.android.tools.r8.internal.oh:
 # {"id":"sourceFile","fileName":"jvmExtensionVisitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType TYPE -> b
     1:1:void <clinit>():78:78 -> <clinit>
@@ -61946,7 +61984,7 @@
     1:1:void visitEnd():68 -> b
     2:2:void visitEnd():68:68 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType getType():54:54 -> getType
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmConstructorExtensionVisitor -> com.android.tools.r8.internal.ph:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmConstructorExtensionVisitor -> com.android.tools.r8.internal.qh:
 # {"id":"sourceFile","fileName":"jvmExtensionVisitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType TYPE -> a
     1:1:void <clinit>():260:260 -> <clinit>
@@ -61954,14 +61992,14 @@
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmConstructorExtensionVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):237:237 -> <init>
     void visit(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature) -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType getType():240:240 -> getType
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmDeclarationContainerExtensionVisitor -> com.android.tools.r8.internal.qh:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmDeclarationContainerExtensionVisitor -> com.android.tools.r8.internal.rh:
 # {"id":"sourceFile","fileName":"jvmExtensionVisitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmDeclarationContainerExtensionVisitor delegate -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmDeclarationContainerExtensionVisitor):14:14 -> <init>
     void visitModuleName(java.lang.String) -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmDeclarationContainerExtensionVisitor getDelegate():15:15 -> a
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor visitLocalDelegatedProperty(int,java.lang.String,int,int):34:34 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt -> com.android.tools.r8.internal.rh:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt -> com.android.tools.r8.internal.sh:
 # {"id":"sourceFile","fileName":"jvmExtensions.kt"}
     1:32:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmTypeExtension com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlinx.metadata.KmType):0:31 -> a
     1:32:java.util.List getAnnotations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmType):167 -> a
@@ -61978,7 +62016,7 @@
     33:33:boolean isRaw(com.android.tools.r8.jetbrains.kotlinx.metadata.KmType):158:158 -> b
     34:34:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature getGetterSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):110:110 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature getSetterSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):121:121 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature -> com.android.tools.r8.internal.sh:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature -> com.android.tools.r8.internal.th:
 # {"id":"sourceFile","fileName":"JvmMemberSignature.kt"}
     java.lang.String name -> a
     java.lang.String desc -> b
@@ -61995,7 +62033,7 @@
     1:1:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature.getDesc():51:51 -> hashCode
     1:1:int hashCode():0 -> hashCode
     2:2:int hashCode():0:0 -> hashCode
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFunctionExtensionVisitor -> com.android.tools.r8.internal.uh:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFunctionExtensionVisitor -> com.android.tools.r8.internal.vh:
 # {"id":"sourceFile","fileName":"jvmExtensionVisitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType TYPE -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFunctionExtensionVisitor delegate -> b
@@ -62006,7 +62044,7 @@
     2:2:void visitLambdaClassOriginName(java.lang.String):137:137 -> a
     3:3:void visitEnd():144:144 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType getType():119:119 -> getType
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMemberSignature -> com.android.tools.r8.internal.vh:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMemberSignature -> com.android.tools.r8.internal.wh:
 # {"id":"sourceFile","fileName":"JvmMemberSignature.kt"}
     1:1:void <init>():16:16 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):16:16 -> <init>
@@ -62014,7 +62052,7 @@
     java.lang.String getDesc() -> b
     java.lang.String getName() -> c
     1:1:java.lang.String toString():30:30 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature -> com.android.tools.r8.internal.Kh:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature -> com.android.tools.r8.internal.Lh:
 # {"id":"sourceFile","fileName":"JvmMemberSignature.kt"}
     java.lang.String name -> a
     java.lang.String desc -> b
@@ -62031,7 +62069,7 @@
     1:1:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature.getDesc():40:40 -> hashCode
     1:1:int hashCode():0 -> hashCode
     2:2:int hashCode():0:0 -> hashCode
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmPackageExtensionVisitor -> com.android.tools.r8.internal.Oh:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmPackageExtensionVisitor -> com.android.tools.r8.internal.Ph:
 # {"id":"sourceFile","fileName":"jvmExtensionVisitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType TYPE -> b
     1:1:void <clinit>():108:108 -> <clinit>
@@ -62043,7 +62081,7 @@
     1:1:void visitEnd():98 -> b
     2:2:void visitEnd():98:98 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType getType():92:92 -> getType
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmPropertyExtensionVisitor -> com.android.tools.r8.internal.Qh:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmPropertyExtensionVisitor -> com.android.tools.r8.internal.Rh:
 # {"id":"sourceFile","fileName":"jvmExtensionVisitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType TYPE -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmPropertyExtensionVisitor delegate -> b
@@ -62057,7 +62095,7 @@
     4:4:void visitSyntheticMethodForAnnotations(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):212:212 -> a
     5:5:void visitEnd():219:219 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType getType():165:165 -> getType
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmTypeExtensionVisitor -> com.android.tools.r8.internal.mi:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmTypeExtensionVisitor -> com.android.tools.r8.internal.ni:
 # {"id":"sourceFile","fileName":"jvmExtensionVisitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmTypeExtensionVisitor delegate -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType TYPE -> a
@@ -62068,7 +62106,7 @@
     1:1:void visitAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):324:324 -> a
     2:2:void visitEnd():331:331 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType getType():307:307 -> getType
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmTypeParameterExtensionVisitor -> com.android.tools.r8.internal.oi:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmTypeParameterExtensionVisitor -> com.android.tools.r8.internal.pi:
 # {"id":"sourceFile","fileName":"jvmExtensionVisitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmTypeParameterExtensionVisitor delegate -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType TYPE -> a
@@ -62078,7 +62116,7 @@
     1:1:void visitAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):279:279 -> a
     2:2:void visitEnd():286:286 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType getType():271:271 -> getType
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader -> com.android.tools.r8.internal.Zj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader -> com.android.tools.r8.internal.ak:
 # {"id":"sourceFile","fileName":"KotlinClassHeader.kt"}
     java.lang.String packageName -> i
     java.lang.String extraString -> h
@@ -62100,14 +62138,14 @@
     1:1:int getKind():44:44 -> f
     1:1:int[] getMetadataVersion():52:52 -> g
     1:1:java.lang.String getPackageName():88:88 -> h
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata -> com.android.tools.r8.internal.ck:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata -> com.android.tools.r8.internal.dk:
 # {"id":"sourceFile","fileName":"KotlinClassMetadata.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader header -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion Companion -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):25:25 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):25:25 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader getHeader():25:25 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class -> com.android.tools.r8.internal.ck$a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class -> com.android.tools.r8.internal.dk$a:
 # {"id":"sourceFile","fileName":"KotlinClassMetadata.kt"}
     com.android.tools.r8.jetbrains.kotlin.reflect.KProperty[] $$delegatedProperties -> c
     com.android.tools.r8.jetbrains.kotlin.Lazy classData$delegate -> d
@@ -62120,7 +62158,7 @@
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass toKmClass():40 -> b
     4:5:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor):48:49 -> b
     4:5:com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass toKmClass():40 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$Writer -> com.android.tools.r8.internal.ck$a$a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$Writer -> com.android.tools.r8.internal.dk$a$a:
 # {"id":"sourceFile","fileName":"KotlinClassMetadata.kt"}
     1:1:void <init>():55:55 -> <init>
     1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$Writer.write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$Writer,int[],int[],int,int,java.lang.Object):68:69 -> i
@@ -62147,7 +62185,7 @@
     86:86:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$Writer.write(int[],int[],int):72 -> i
     86:86:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$Writer.write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$Writer,int[],int[],int,int,java.lang.Object):70 -> i
     86:86:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class write():0 -> i
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$classData$2 -> com.android.tools.r8.internal.ck$a$b:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$classData$2 -> com.android.tools.r8.internal.dk$a$b:
 # {"id":"sourceFile","fileName":"KotlinClassMetadata.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader $header -> a
     1:3:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$classData$2.invoke():31:33 -> a
@@ -62159,11 +62197,11 @@
     5:5:java.lang.Object invoke():29 -> a
     6:6:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$classData$2.invoke():32:32 -> a
     6:6:java.lang.Object invoke():29 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion -> com.android.tools.r8.internal.ck$b:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion -> com.android.tools.r8.internal.dk$b:
 # {"id":"sourceFile","fileName":"KotlinClassMetadata.kt"}
     1:1:void <init>():326:326 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):326:326 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade -> com.android.tools.r8.internal.ck$c:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade -> com.android.tools.r8.internal.dk$c:
 # {"id":"sourceFile","fileName":"KotlinClassMetadata.kt"}
     com.android.tools.r8.jetbrains.kotlin.reflect.KProperty[] $$delegatedProperties -> c
     com.android.tools.r8.jetbrains.kotlin.Lazy packageData$delegate -> d
@@ -62176,7 +62214,7 @@
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage toKmPackage():95 -> b
     4:5:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor):103:104 -> b
     4:5:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage toKmPackage():95 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade$Writer -> com.android.tools.r8.internal.ck$c$a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade$Writer -> com.android.tools.r8.internal.dk$c$a:
 # {"id":"sourceFile","fileName":"KotlinClassMetadata.kt"}
     1:1:void <init>():110:110 -> <init>
     1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade$Writer.write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade$Writer,int[],int[],int,int,java.lang.Object):123:124 -> h
@@ -62187,7 +62225,7 @@
     133:136:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade$Writer.write(int[],int[],int):128:131 -> h
     133:136:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade$Writer.write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade$Writer,int[],int[],int,int,java.lang.Object):125 -> h
     133:136:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade write():0 -> h
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade$packageData$2 -> com.android.tools.r8.internal.ck$c$b:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade$packageData$2 -> com.android.tools.r8.internal.dk$c$b:
 # {"id":"sourceFile","fileName":"KotlinClassMetadata.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader $header -> a
     1:3:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade$packageData$2.invoke():86:88 -> a
@@ -62199,12 +62237,12 @@
     5:5:java.lang.Object invoke():84 -> a
     6:6:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade$packageData$2.invoke():87:87 -> a
     6:6:java.lang.Object invoke():84 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade -> com.android.tools.r8.internal.ck$d:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade -> com.android.tools.r8.internal.dk$d:
 # {"id":"sourceFile","fileName":"KotlinClassMetadata.kt"}
     java.util.List partClassNames -> c
     1:5:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):217:221 -> <init>
     1:1:java.util.List getPartClassNames():221:221 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart -> com.android.tools.r8.internal.ck$e:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart -> com.android.tools.r8.internal.dk$e:
 # {"id":"sourceFile","fileName":"KotlinClassMetadata.kt"}
     com.android.tools.r8.jetbrains.kotlin.reflect.KProperty[] $$delegatedProperties -> c
     com.android.tools.r8.jetbrains.kotlin.Lazy packageData$delegate -> d
@@ -62217,7 +62255,7 @@
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage toKmPackage():277 -> b
     4:5:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor):285:286 -> b
     4:5:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage toKmPackage():277 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart$Writer -> com.android.tools.r8.internal.ck$e$a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart$Writer -> com.android.tools.r8.internal.dk$e$a:
 # {"id":"sourceFile","fileName":"KotlinClassMetadata.kt"}
     1:1:void <init>():292:292 -> <init>
     1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart$Writer.write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart$Writer,java.lang.String,int[],int[],int,int,java.lang.Object):307:308 -> a
@@ -62228,7 +62266,7 @@
     317:320:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart$Writer.write(java.lang.String,int[],int[],int):312:315 -> a
     317:320:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart$Writer.write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart$Writer,java.lang.String,int[],int[],int,int,java.lang.Object):309 -> a
     317:320:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart write(java.lang.String):0 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart$packageData$2 -> com.android.tools.r8.internal.ck$e$b:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart$packageData$2 -> com.android.tools.r8.internal.dk$e$b:
 # {"id":"sourceFile","fileName":"KotlinClassMetadata.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader $header -> a
     1:3:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart$packageData$2.invoke():262:264 -> a
@@ -62240,7 +62278,7 @@
     5:5:java.lang.Object invoke():260 -> a
     6:6:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart$packageData$2.invoke():263:263 -> a
     6:6:java.lang.Object invoke():260 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass -> com.android.tools.r8.internal.ck$f:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass -> com.android.tools.r8.internal.dk$f:
 # {"id":"sourceFile","fileName":"KotlinClassMetadata.kt"}
     com.android.tools.r8.jetbrains.kotlin.reflect.KProperty[] $$delegatedProperties -> c
     com.android.tools.r8.jetbrains.kotlin.Lazy functionData$delegate -> d
@@ -62256,7 +62294,7 @@
     174:176:com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambda toKmLambda():153 -> c
     177:177:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambdaVisitor):170:170 -> c
     177:177:com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambda toKmLambda():153 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass$Writer -> com.android.tools.r8.internal.dk:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass$Writer -> com.android.tools.r8.internal.ek:
 # {"id":"sourceFile","fileName":"KotlinClassMetadata.kt"}
     1:1:void <init>():183:183 -> <init>
     1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass$Writer.write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass$Writer,int[],int[],int,int,java.lang.Object):196:197 -> d
@@ -62273,15 +62311,15 @@
     213:216:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass$Writer.write(int[],int[],int):204:207 -> d
     213:216:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass$Writer.write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass$Writer,int[],int[],int,int,java.lang.Object):198 -> d
     213:216:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass write():0 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass$functionData$2 -> com.android.tools.r8.internal.ek:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass$functionData$2 -> com.android.tools.r8.internal.fk:
 # {"id":"sourceFile","fileName":"KotlinClassMetadata.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader $header -> a
     1:2:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass$functionData$2.invoke():142:143 -> a
     1:2:java.lang.Object invoke():140 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Unknown -> com.android.tools.r8.internal.ck$g:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Unknown -> com.android.tools.r8.internal.dk$g:
 # {"id":"sourceFile","fileName":"KotlinClassMetadata.kt"}
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):324:324 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmClassExtension -> com.android.tools.r8.internal.mh:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmClassExtension -> com.android.tools.r8.internal.nh:
 # {"id":"sourceFile","fileName":"jvmExtensionNodes.kt"}
     java.util.List localDelegatedProperties -> c
     java.lang.String anonymousObjectOriginName -> e
@@ -62300,7 +62338,7 @@
     1:1:java.lang.String getAnonymousObjectOriginName():37:37 -> c
     1:1:java.util.List getLocalDelegatedProperties():35:35 -> d
     1:1:java.lang.String getModuleName():36:36 -> e
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmConstructorExtension -> com.android.tools.r8.internal.oh:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmConstructorExtension -> com.android.tools.r8.internal.ph:
 # {"id":"sourceFile","fileName":"jvmExtensionNodes.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature signature -> b
     1:1:void <init>():133:133 -> <init>
@@ -62312,7 +62350,7 @@
     146:146:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature getSignature():134:134 -> a
     147:147:void visit(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):137:137 -> a
     1:1:void setSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):134:134 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmFunctionExtension -> com.android.tools.r8.internal.th:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmFunctionExtension -> com.android.tools.r8.internal.uh:
 # {"id":"sourceFile","fileName":"jvmExtensionNodes.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature signature -> c
     java.lang.String lambdaClassOriginName -> d
@@ -62326,7 +62364,7 @@
     103:103:void visitLambdaClassOriginName(java.lang.String):91:91 -> a
     1:1:java.lang.String getLambdaClassOriginName():84:84 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature getSignature():83:83 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions -> com.android.tools.r8.internal.Ih:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions -> com.android.tools.r8.internal.Jh:
 # {"id":"sourceFile","fileName":"JvmMetadataExtensions.kt"}
     1:1:void <init>():17:17 -> <init>
     1:279:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.toJvmMethodSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMemberSignature,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):0:278 -> a
@@ -62357,7 +62395,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmPropertyExtension createPropertyExtension():267:267 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmTypeExtension createTypeExtension():273:273 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmTypeParameterExtension createTypeParameterExtension():271:271 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeClassExtensions$1 -> com.android.tools.r8.internal.Ah:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeClassExtensions$1 -> com.android.tools.r8.internal.Bh:
 # {"id":"sourceFile","fileName":"JvmMetadataExtensions.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder $proto -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext $c -> d
@@ -62365,21 +62403,21 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor visitLocalDelegatedProperty(int,java.lang.String,int,int):116:116 -> a
     2:3:void visitModuleName(java.lang.String):121:122 -> a
     1:1:void visitAnonymousObjectOriginName(java.lang.String):111:111 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeClassExtensions$1$visitLocalDelegatedProperty$1 -> com.android.tools.r8.internal.zh:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeClassExtensions$1$visitLocalDelegatedProperty$1 -> com.android.tools.r8.internal.Ah:
 # {"id":"sourceFile","fileName":"JvmMetadataExtensions.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeClassExtensions$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):109:109 -> a
     2:119:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeClassExtensions$1$visitLocalDelegatedProperty$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder):0:117 -> a
     2:119:java.lang.Object invoke(java.lang.Object):109 -> a
     120:120:java.lang.Object invoke(java.lang.Object):109:109 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeConstructorExtensions$1 -> com.android.tools.r8.internal.Bh:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeConstructorExtensions$1 -> com.android.tools.r8.internal.Ch:
 # {"id":"sourceFile","fileName":"JvmMetadataExtensions.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder $proto -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext $c -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions this$0 -> b
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):226:226 -> <init>
     1:1:void visit(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):229:229 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeFunctionExtensions$1 -> com.android.tools.r8.internal.Ch:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeFunctionExtensions$1 -> com.android.tools.r8.internal.Dh:
 # {"id":"sourceFile","fileName":"JvmMetadataExtensions.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions this$0 -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext $c -> e
@@ -62387,21 +62425,21 @@
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):151:151 -> <init>
     1:1:void visit(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):154:154 -> a
     2:2:void visitLambdaClassOriginName(java.lang.String):159:159 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writePackageExtensions$1 -> com.android.tools.r8.internal.Eh:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writePackageExtensions$1 -> com.android.tools.r8.internal.Fh:
 # {"id":"sourceFile","fileName":"JvmMetadataExtensions.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder $proto -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext $c -> c
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder):132:132 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor visitLocalDelegatedProperty(int,java.lang.String,int,int):135:135 -> a
     2:3:void visitModuleName(java.lang.String):140:141 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writePackageExtensions$1$visitLocalDelegatedProperty$1 -> com.android.tools.r8.internal.Dh:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writePackageExtensions$1$visitLocalDelegatedProperty$1 -> com.android.tools.r8.internal.Eh:
 # {"id":"sourceFile","fileName":"JvmMetadataExtensions.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writePackageExtensions$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):132:132 -> a
     2:138:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writePackageExtensions$1$visitLocalDelegatedProperty$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder):0:136 -> a
     2:138:java.lang.Object invoke(java.lang.Object):132 -> a
     139:139:java.lang.Object invoke(java.lang.Object):132:132 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writePropertyExtensions$1 -> com.android.tools.r8.internal.Fh:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writePropertyExtensions$1 -> com.android.tools.r8.internal.Gh:
 # {"id":"sourceFile","fileName":"JvmMetadataExtensions.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions this$0 -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder signature -> d
@@ -62430,20 +62468,20 @@
     36:36:void visitEnd():216 -> a
     37:37:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder.build():3447:3447 -> a
     37:37:void visitEnd():216 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeTypeExtensions$1 -> com.android.tools.r8.internal.Gh:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeTypeExtensions$1 -> com.android.tools.r8.internal.Hh:
 # {"id":"sourceFile","fileName":"JvmMetadataExtensions.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder $proto -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext $c -> d
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):248:248 -> <init>
     1:1:void visit(boolean):251:251 -> a
     2:2:void visitAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):256:256 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeTypeParameterExtensions$1 -> com.android.tools.r8.internal.Hh:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeTypeParameterExtensions$1 -> com.android.tools.r8.internal.Ih:
 # {"id":"sourceFile","fileName":"JvmMetadataExtensions.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder $proto -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext $c -> d
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):239:239 -> <init>
     1:1:void visitAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):241:241 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmPackageExtension -> com.android.tools.r8.internal.Nh:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmPackageExtension -> com.android.tools.r8.internal.Oh:
 # {"id":"sourceFile","fileName":"jvmExtensionNodes.kt"}
     java.util.List localDelegatedProperties -> c
     java.lang.String moduleName -> d
@@ -62459,7 +62497,7 @@
     189:189:void visitModuleName(java.lang.String):69:69 -> a
     1:1:java.util.List getLocalDelegatedProperties():62:62 -> c
     1:1:java.lang.String getModuleName():63:63 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmPropertyExtension -> com.android.tools.r8.internal.Ph:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmPropertyExtension -> com.android.tools.r8.internal.Qh:
 # {"id":"sourceFile","fileName":"jvmExtensionNodes.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature syntheticMethodForAnnotations -> g
     int jvmFlags -> c
@@ -62479,7 +62517,7 @@
     1:1:int getJvmFlags():103:103 -> d
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature getSetterSignature():106:106 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature getSyntheticMethodForAnnotations():107:107 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmTypeExtension -> com.android.tools.r8.internal.li:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmTypeExtension -> com.android.tools.r8.internal.mi:
 # {"id":"sourceFile","fileName":"jvmExtensionNodes.kt"}
     java.util.List annotations -> d
     boolean isRaw -> c
@@ -62495,7 +62533,7 @@
     187:187:void visitAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):169:169 -> a
     1:1:java.util.List getAnnotations():162:162 -> b
     1:1:boolean isRaw():161:161 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmTypeParameterExtension -> com.android.tools.r8.internal.ni:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmTypeParameterExtension -> com.android.tools.r8.internal.oi:
 # {"id":"sourceFile","fileName":"jvmExtensionNodes.kt"}
     java.util.List annotations -> c
     1:2:void <init>():146:147 -> <init>
@@ -62508,39 +62546,39 @@
     185:185:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor):146 -> a
     186:186:void visitAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):150:150 -> a
     1:1:java.util.List getAnnotations():147:147 -> b
-com.android.tools.r8.kotlin.KmVisitorProviders$KmAnnotationVisitorProvider -> com.android.tools.r8.internal.Bj:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmAnnotationVisitorProvider -> com.android.tools.r8.internal.Cj:
     void get(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation) -> a
-com.android.tools.r8.kotlin.KmVisitorProviders$KmContractVisitorProvider -> com.android.tools.r8.internal.Cj:
-com.android.tools.r8.kotlin.KmVisitorProviders$KmEffectExpressionVisitorProvider -> com.android.tools.r8.internal.Dj:
-com.android.tools.r8.kotlin.KmVisitorProviders$KmEffectVisitorProvider -> com.android.tools.r8.internal.Ej:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmContractVisitorProvider -> com.android.tools.r8.internal.Dj:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmEffectExpressionVisitorProvider -> com.android.tools.r8.internal.Ej:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmEffectVisitorProvider -> com.android.tools.r8.internal.Fj:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectVisitor get(com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind) -> a
-com.android.tools.r8.kotlin.KmVisitorProviders$KmFlexibleUpperBoundVisitorProvider -> com.android.tools.r8.internal.Fj:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmFlexibleUpperBoundVisitorProvider -> com.android.tools.r8.internal.Gj:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor get(int,java.lang.String) -> a
-com.android.tools.r8.kotlin.KmVisitorProviders$KmFunctionVisitorProvider -> com.android.tools.r8.internal.Gj:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmFunctionVisitorProvider -> com.android.tools.r8.internal.Hj:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor get(int,java.lang.String) -> a
-com.android.tools.r8.kotlin.KmVisitorProviders$KmLambdaVisitorProvider -> com.android.tools.r8.internal.Hj:
-com.android.tools.r8.kotlin.KmVisitorProviders$KmPropertyVisitorProvider -> com.android.tools.r8.internal.Ij:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmLambdaVisitorProvider -> com.android.tools.r8.internal.Ij:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmPropertyVisitorProvider -> com.android.tools.r8.internal.Jj:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor get(int,java.lang.String,int,int) -> a
-com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeAliasVisitorProvider -> com.android.tools.r8.internal.Jj:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeAliasVisitorProvider -> com.android.tools.r8.internal.Kj:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor get(int,java.lang.String) -> a
-com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeParameterVisitorProvider -> com.android.tools.r8.internal.Kj:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeParameterVisitorProvider -> com.android.tools.r8.internal.Lj:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor get(int,java.lang.String,int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance) -> a
-com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeProjectionVisitorProvider -> com.android.tools.r8.internal.Lj:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeProjectionVisitorProvider -> com.android.tools.r8.internal.Mj:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor get(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance) -> a
-com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeStarProjectionVisitorProvider -> com.android.tools.r8.internal.Mj:
-com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeVisitorProvider -> com.android.tools.r8.internal.Nj:
-com.android.tools.r8.kotlin.KmVisitorProviders$KmValueParameterVisitorProvider -> com.android.tools.r8.internal.Oj:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeStarProjectionVisitorProvider -> com.android.tools.r8.internal.Nj:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeVisitorProvider -> com.android.tools.r8.internal.Oj:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmValueParameterVisitorProvider -> com.android.tools.r8.internal.Pj:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor get(int,java.lang.String) -> a
-com.android.tools.r8.kotlin.KmVisitorProviders$KmVersionRequirementVisitorProvider -> com.android.tools.r8.internal.Pj:
-com.android.tools.r8.kotlin.Kotlin -> com.android.tools.r8.internal.Rj:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmVersionRequirementVisitorProvider -> com.android.tools.r8.internal.Qj:
+com.android.tools.r8.kotlin.Kotlin -> com.android.tools.r8.internal.Sj:
     com.android.tools.r8.kotlin.Kotlin$Functional functional -> b
     com.android.tools.r8.kotlin.Kotlin$Metadata metadata -> d
     com.android.tools.r8.kotlin.Kotlin$_Assertions assertions -> e
     com.android.tools.r8.kotlin.Kotlin$Intrinsics intrinsics -> c
     com.android.tools.r8.graph.DexItemFactory factory -> a
     1:6:void <init>(com.android.tools.r8.graph.DexItemFactory):38:43 -> <init>
-com.android.tools.r8.kotlin.Kotlin$1 -> com.android.tools.r8.internal.Rj$a:
-com.android.tools.r8.kotlin.Kotlin$Functional -> com.android.tools.r8.internal.Rj$b:
+com.android.tools.r8.kotlin.Kotlin$1 -> com.android.tools.r8.internal.Sj$a:
+com.android.tools.r8.kotlin.Kotlin$Functional -> com.android.tools.r8.internal.Sj$b:
     com.android.tools.r8.kotlin.Kotlin this$0 -> f
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap functions -> b
     com.android.tools.r8.graph.DexString kotlinStyleLambdaInstanceName -> c
@@ -62560,7 +62598,7 @@
     3:3:int getArity(com.android.tools.r8.graph.DexType):86 -> a
     4:6:int getArity(com.android.tools.r8.graph.DexType):86:88 -> a
     1:1:boolean isFunctionInterface(com.android.tools.r8.graph.DexType):82:82 -> b
-com.android.tools.r8.kotlin.Kotlin$Intrinsics -> com.android.tools.r8.internal.Rj$c:
+com.android.tools.r8.kotlin.Kotlin$Intrinsics -> com.android.tools.r8.internal.Sj$c:
     com.android.tools.r8.graph.DexType type -> a
     com.android.tools.r8.graph.DexMethod throwNpe -> d
     com.android.tools.r8.graph.DexMethod checkParameterIsNotNull -> c
@@ -62570,7 +62608,7 @@
     5:8:void <init>(com.android.tools.r8.kotlin.Kotlin):113:116 -> <init>
     9:13:void <init>(com.android.tools.r8.kotlin.Kotlin):115:119 -> <init>
     14:14:void <init>(com.android.tools.r8.kotlin.Kotlin):118:118 -> <init>
-com.android.tools.r8.kotlin.Kotlin$Metadata -> com.android.tools.r8.internal.Rj$d:
+com.android.tools.r8.kotlin.Kotlin$Metadata -> com.android.tools.r8.internal.Sj$d:
     com.android.tools.r8.graph.DexString kind -> a
     com.android.tools.r8.graph.DexString metadataVersion -> b
     com.android.tools.r8.graph.DexString bytecodeVersion -> c
@@ -62581,13 +62619,13 @@
     com.android.tools.r8.graph.DexString packageName -> g
     com.android.tools.r8.graph.DexString extraInt -> h
     1:9:void <init>(com.android.tools.r8.kotlin.Kotlin):92:100 -> <init>
-com.android.tools.r8.kotlin.Kotlin$_Assertions -> com.android.tools.r8.internal.Rj$e:
+com.android.tools.r8.kotlin.Kotlin$_Assertions -> com.android.tools.r8.internal.Sj$e:
     com.android.tools.r8.graph.DexString enabledFieldName -> b
     com.android.tools.r8.graph.DexType type -> a
     com.android.tools.r8.graph.DexField enabledField -> c
     com.android.tools.r8.kotlin.Kotlin this$0 -> d
     1:5:void <init>(com.android.tools.r8.kotlin.Kotlin):103:107 -> <init>
-com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo -> com.android.tools.r8.internal.Xj:
+com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo -> com.android.tools.r8.internal.Yj:
     java.util.Map EMPTY_ARGUMENTS -> a
     1:1:void <clinit>():30:30 -> <clinit>
     1:1:void <init>():27:27 -> <init>
@@ -62596,14 +62634,14 @@
     2:6:java.util.Map create(java.util.Map,com.android.tools.r8.graph.DexItemFactory):51:55 -> a
     7:7:void lambda$create$0(java.util.LinkedHashMap,com.android.tools.r8.graph.DexItemFactory,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument):55:55 -> a
     1:10:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo createArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument,com.android.tools.r8.graph.DexItemFactory):36:45 -> b
-com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationAnnotationValueInfo -> com.android.tools.r8.internal.Sj:
+com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationAnnotationValueInfo -> com.android.tools.r8.internal.Tj:
     com.android.tools.r8.kotlin.KotlinAnnotationInfo value -> b
     1:2:void <init>(com.android.tools.r8.kotlin.KotlinAnnotationInfo):117:118 -> <init>
     1:2:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationAnnotationValueInfo com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationAnnotationValueInfo.create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$AnnotationValue,com.android.tools.r8.graph.DexItemFactory):123:124 -> a
     1:2:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationAnnotationValueInfo access$200(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$AnnotationValue,com.android.tools.r8.graph.DexItemFactory):113 -> a
     3:3:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):129:129 -> a
     4:7:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument rewrite(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):134:137 -> a
-com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationArrayValueInfo -> com.android.tools.r8.internal.Tj:
+com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationArrayValueInfo -> com.android.tools.r8.internal.Uj:
     java.util.List value -> c
     com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationArrayValueInfo EMPTY -> b
     1:2:void <clinit>():145:146 -> <clinit>
@@ -62612,14 +62650,14 @@
     1:8:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationArrayValueInfo access$300(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ArrayValue,com.android.tools.r8.graph.DexItemFactory):143 -> a
     9:10:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):167:168 -> a
     11:19:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument rewrite(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):174:182 -> a
-com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationClassValueInfo -> com.android.tools.r8.internal.Uj:
+com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationClassValueInfo -> com.android.tools.r8.internal.Vj:
     com.android.tools.r8.kotlin.KotlinTypeReference value -> b
     1:2:void <init>(com.android.tools.r8.kotlin.KotlinTypeReference):63:64 -> <init>
     1:2:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationClassValueInfo com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationClassValueInfo.create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$KClassValue,com.android.tools.r8.graph.DexItemFactory):68:69 -> a
     1:2:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationClassValueInfo access$000(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$KClassValue,com.android.tools.r8.graph.DexItemFactory):59 -> a
     3:3:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):74:74 -> a
     4:5:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument rewrite(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):79:80 -> a
-com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationEnumValueInfo -> com.android.tools.r8.internal.Vj:
+com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationEnumValueInfo -> com.android.tools.r8.internal.Wj:
     java.lang.String enumEntryName -> c
     com.android.tools.r8.kotlin.KotlinTypeReference enumClassName -> b
     1:3:void <init>(com.android.tools.r8.kotlin.KotlinTypeReference,java.lang.String):89:91 -> <init>
@@ -62627,14 +62665,14 @@
     1:3:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationEnumValueInfo access$100(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$EnumValue,com.android.tools.r8.graph.DexItemFactory):84 -> a
     4:4:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):102:102 -> a
     5:6:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument rewrite(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):107:108 -> a
-com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationPrimitiveArgumentInfo -> com.android.tools.r8.internal.Wj:
+com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationPrimitiveArgumentInfo -> com.android.tools.r8.internal.Xj:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument argument -> b
     1:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument):190:191 -> <init>
     void trace(com.android.tools.r8.graph.DexDefinitionSupplier) -> a
     1:1:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationPrimitiveArgumentInfo com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationPrimitiveArgumentInfo.create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument):195:195 -> a
     1:1:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationPrimitiveArgumentInfo access$400(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument):186 -> a
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument rewrite(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):205:205 -> a
-com.android.tools.r8.kotlin.KotlinAnnotationInfo -> com.android.tools.r8.internal.Yj:
+com.android.tools.r8.kotlin.KotlinAnnotationInfo -> com.android.tools.r8.internal.Zj:
     java.util.List EMPTY_ANNOTATIONS -> a
     java.util.Map arguments -> c
     com.android.tools.r8.kotlin.KotlinTypeReference annotationType -> b
@@ -62649,7 +62687,7 @@
     31:33:void lambda$rewrite$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,java.util.Map,java.lang.String,com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo):65:67 -> a
     34:35:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):75:76 -> a
     36:36:void lambda$trace$1(com.android.tools.r8.graph.DexDefinitionSupplier,java.lang.String,com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo):76:76 -> a
-com.android.tools.r8.kotlin.KotlinClassInfo -> com.android.tools.r8.internal.ak:
+com.android.tools.r8.kotlin.KotlinClassInfo -> com.android.tools.r8.internal.bk:
     com.android.tools.r8.kotlin.KotlinVersionRequirementInfo versionRequirements -> k
     java.lang.String packageName -> m
     com.android.tools.r8.kotlin.KotlinLocalDelegatedPropertyInfo localDelegatedProperties -> n
@@ -62675,7 +62713,7 @@
     35:35:com.android.tools.r8.kotlin.KotlinMetadataDiagnostic com.android.tools.r8.kotlin.KotlinMetadataDiagnostic.missingCompanionObject(com.android.tools.r8.graph.DexClass,java.lang.String):43:43 -> a
     35:35:void com.android.tools.r8.kotlin.KotlinClassInfo.setCompanionObject(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.Reporter):193 -> a
     35:35:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):120 -> a
-    36:36:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():580:580 -> a
+    36:36:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():584:584 -> a
     36:36:com.android.tools.r8.kotlin.KotlinMetadataDiagnostic com.android.tools.r8.kotlin.KotlinMetadataDiagnostic.missingCompanionObject(com.android.tools.r8.graph.DexClass,java.lang.String):44 -> a
     36:36:void com.android.tools.r8.kotlin.KotlinClassInfo.setCompanionObject(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.Reporter):193 -> a
     36:36:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):120 -> a
@@ -62721,14 +62759,14 @@
     1:1:java.util.function.Consumer lambda$trace$4(com.android.tools.r8.kotlin.KotlinTypeReference):312:312 -> b
     1:1:java.lang.String getPackageName():297:297 -> g
     1:1:int[] getMetadataVersion():302:302 -> n
-com.android.tools.r8.kotlin.KotlinClassLevelInfo -> com.android.tools.r8.internal.bk:
+com.android.tools.r8.kotlin.KotlinClassLevelInfo -> com.android.tools.r8.internal.ck:
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens) -> a
     java.lang.String getPackageName() -> g
     boolean isSyntheticClass() -> i
     boolean isNoKotlinInformation() -> j
     com.android.tools.r8.kotlin.KotlinSyntheticClassInfo asSyntheticClass() -> k
     int[] getMetadataVersion() -> n
-com.android.tools.r8.kotlin.KotlinClassMetadataReader -> com.android.tools.r8.internal.fk:
+com.android.tools.r8.kotlin.KotlinClassMetadataReader -> com.android.tools.r8.internal.gk:
     1:1:boolean com.android.tools.r8.graph.DexValue.isDexValueArray():0:0 -> a
     1:1:int[] getUnboxedIntArray(com.android.tools.r8.graph.DexValue,java.lang.String):178 -> a
     2:6:int[] getUnboxedIntArray(com.android.tools.r8.graph.DexValue,java.lang.String):181:185 -> a
@@ -62771,11 +62809,11 @@
     1:1:java.lang.String[] getUnboxedStringArray(com.android.tools.r8.graph.DexValue,java.lang.String):191 -> c
     2:6:java.lang.String[] getUnboxedStringArray(com.android.tools.r8.graph.DexValue,java.lang.String):194:198 -> c
     7:7:java.lang.String[] getUnboxedStringArray(com.android.tools.r8.graph.DexValue,java.lang.String):192:192 -> c
-com.android.tools.r8.kotlin.KotlinClassMetadataReader$1 -> com.android.tools.r8.internal.fk$a:
-com.android.tools.r8.kotlin.KotlinClassMetadataReader$MetadataError -> com.android.tools.r8.internal.fk$b:
+com.android.tools.r8.kotlin.KotlinClassMetadataReader$1 -> com.android.tools.r8.internal.gk$a:
+com.android.tools.r8.kotlin.KotlinClassMetadataReader$MetadataError -> com.android.tools.r8.internal.gk$b:
     1:1:void <init>(java.lang.String,com.android.tools.r8.kotlin.KotlinClassMetadataReader$1):210:210 -> <init>
     2:2:void <init>(java.lang.String):212:212 -> <init>
-com.android.tools.r8.kotlin.KotlinClassifierInfo -> com.android.tools.r8.internal.mk:
+com.android.tools.r8.kotlin.KotlinClassifierInfo -> com.android.tools.r8.internal.nk:
     1:1:void <init>():20:20 -> <init>
     void rewrite(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens) -> a
     1:9:com.android.tools.r8.kotlin.KotlinClassifierInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):24:32 -> a
@@ -62783,44 +62821,44 @@
     24:25:com.android.tools.r8.kotlin.KotlinMetadataDiagnostic com.android.tools.r8.kotlin.KotlinMetadataDiagnostic.unknownClassifier(java.lang.String):53:54 -> a
     24:25:com.android.tools.r8.kotlin.KotlinClassifierInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):44 -> a
     26:27:com.android.tools.r8.kotlin.KotlinClassifierInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):44:45 -> a
-com.android.tools.r8.kotlin.KotlinClassifierInfo$1 -> com.android.tools.r8.internal.gk:
-com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinClassClassifierInfo -> com.android.tools.r8.internal.hk:
+com.android.tools.r8.kotlin.KotlinClassifierInfo$1 -> com.android.tools.r8.internal.hk:
+com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinClassClassifierInfo -> com.android.tools.r8.internal.ik:
     boolean isLocalOrAnonymous -> b
     com.android.tools.r8.kotlin.KotlinTypeReference type -> a
     1:1:void <init>(com.android.tools.r8.kotlin.KotlinTypeReference,boolean,com.android.tools.r8.kotlin.KotlinClassifierInfo$1):51:51 -> <init>
     2:4:void <init>(com.android.tools.r8.kotlin.KotlinTypeReference,boolean):56:58 -> <init>
     1:8:void rewrite(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):63:70 -> a
     9:9:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):76:76 -> a
-com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinTypeAliasClassifierInfo -> com.android.tools.r8.internal.ik:
+com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinTypeAliasClassifierInfo -> com.android.tools.r8.internal.jk:
     java.lang.String typeAlias -> a
     1:1:void <init>(java.lang.String,com.android.tools.r8.kotlin.KotlinClassifierInfo$1):99:99 -> <init>
     2:3:void <init>(java.lang.String):103:104 -> <init>
     void trace(com.android.tools.r8.graph.DexDefinitionSupplier) -> a
     1:1:void rewrite(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):109:109 -> a
-com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinTypeParameterClassifierInfo -> com.android.tools.r8.internal.jk:
+com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinTypeParameterClassifierInfo -> com.android.tools.r8.internal.kk:
     int typeId -> a
     1:1:void <init>(int,com.android.tools.r8.kotlin.KotlinClassifierInfo$1):80:80 -> <init>
     2:3:void <init>(int):84:85 -> <init>
     void trace(com.android.tools.r8.graph.DexDefinitionSupplier) -> a
     1:1:void rewrite(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):90:90 -> a
-com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinUnknownClassClassifierInfo -> com.android.tools.r8.internal.kk:
+com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinUnknownClassClassifierInfo -> com.android.tools.r8.internal.lk:
     java.lang.String classifier -> a
     1:1:void <init>(java.lang.String,com.android.tools.r8.kotlin.KotlinClassifierInfo$1):118:118 -> <init>
     2:3:void <init>(java.lang.String):121:122 -> <init>
     void trace(com.android.tools.r8.graph.DexDefinitionSupplier) -> a
     1:1:void rewrite(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):127:127 -> a
-com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinUnknownClassifierInfo -> com.android.tools.r8.internal.lk:
+com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinUnknownClassifierInfo -> com.android.tools.r8.internal.mk:
     java.lang.String classifier -> a
     1:1:void <init>(java.lang.String,com.android.tools.r8.kotlin.KotlinClassifierInfo$1):136:136 -> <init>
     2:3:void <init>(java.lang.String):139:140 -> <init>
     void trace(com.android.tools.r8.graph.DexDefinitionSupplier) -> a
     1:1:void rewrite(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):145:145 -> a
-com.android.tools.r8.kotlin.KotlinCompanionInfo -> com.android.tools.r8.internal.nk:
+com.android.tools.r8.kotlin.KotlinCompanionInfo -> com.android.tools.r8.internal.ok:
     1:1:void <init>():14:14 -> <init>
     void trace(com.android.tools.r8.graph.DexDefinitionSupplier) -> a
     boolean isCompanion() -> e
     com.android.tools.r8.kotlin.KotlinCompanionInfo asCompanion() -> f
-com.android.tools.r8.kotlin.KotlinConstructorInfo -> com.android.tools.r8.internal.ok:
+com.android.tools.r8.kotlin.KotlinConstructorInfo -> com.android.tools.r8.internal.pk:
     java.util.List valueParameters -> b
     com.android.tools.r8.kotlin.KotlinVersionRequirementInfo versionRequirements -> c
     com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo signature -> d
@@ -62840,7 +62878,7 @@
     43:45:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):80:82 -> a
     com.android.tools.r8.kotlin.KotlinConstructorInfo asConstructor() -> c
     boolean isConstructor() -> m
-com.android.tools.r8.kotlin.KotlinContractInfo -> com.android.tools.r8.internal.pk:
+com.android.tools.r8.kotlin.KotlinContractInfo -> com.android.tools.r8.internal.qk:
     com.android.tools.r8.kotlin.KotlinContractInfo NO_EFFECT -> a
     java.util.List effects -> b
     1:1:void <clinit>():23:23 -> <clinit>
@@ -62852,7 +62890,7 @@
     17:17:java.util.function.Consumer lambda$trace$0(com.android.tools.r8.kotlin.KotlinEffectInfo):49:49 -> a
     18:18:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):49:49 -> a
     19:26:void rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmContractVisitorProvider,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):56:63 -> a
-com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo -> com.android.tools.r8.internal.rk:
+com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo -> com.android.tools.r8.internal.sk:
     java.util.List typeAliases -> b
     java.util.List propertiesWithNoBacking -> d
     java.util.List functionsWithNoBacking -> c
@@ -62881,7 +62919,7 @@
     142:142:java.util.function.Consumer lambda$trace$3(com.android.tools.r8.kotlin.KotlinFunctionInfo):216:216 -> a
     1:1:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup lambda$rewrite$1(com.android.tools.r8.kotlin.KotlinPropertyInfo):186:186 -> b
     1:1:java.util.function.Consumer lambda$trace$4(com.android.tools.r8.kotlin.KotlinPropertyInfo):217:217 -> c
-com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup -> com.android.tools.r8.internal.qk:
+com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup -> com.android.tools.r8.internal.rk:
     com.android.tools.r8.graph.DexEncodedField backingField -> b
     com.android.tools.r8.graph.DexEncodedMethod getter -> d
     com.android.tools.r8.graph.DexEncodedMethod setter -> c
@@ -62894,7 +62932,7 @@
     1:1:com.android.tools.r8.graph.DexEncodedMethod access$100(com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup):220:220 -> b
     2:3:void setSetter(com.android.tools.r8.graph.DexEncodedMethod):237:238 -> b
     1:1:com.android.tools.r8.graph.DexEncodedMethod access$200(com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup):220:220 -> c
-com.android.tools.r8.kotlin.KotlinEffectExpressionInfo -> com.android.tools.r8.internal.sk:
+com.android.tools.r8.kotlin.KotlinEffectExpressionInfo -> com.android.tools.r8.internal.tk:
     java.util.List NO_EXPRESSIONS -> a
     java.lang.Integer parameterIndex -> d
     com.android.tools.r8.kotlin.KotlinEffectExpressionInfo NO_EXPRESSION -> b
@@ -62911,7 +62949,7 @@
     26:26:java.util.function.Consumer lambda$trace$0(com.android.tools.r8.kotlin.KotlinEffectExpressionInfo):84:84 -> a
     27:44:void rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmEffectExpressionVisitorProvider,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):90:107 -> a
     1:1:java.util.function.Consumer lambda$trace$1(com.android.tools.r8.kotlin.KotlinEffectExpressionInfo):85:85 -> b
-com.android.tools.r8.kotlin.KotlinEffectInfo -> com.android.tools.r8.internal.tk:
+com.android.tools.r8.kotlin.KotlinEffectInfo -> com.android.tools.r8.internal.uk:
     com.android.tools.r8.kotlin.KotlinEffectExpressionInfo conclusion -> d
     java.util.List constructorArguments -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind invocationKind -> b
@@ -62920,12 +62958,12 @@
     1:1:java.util.function.Consumer lambda$trace$0(com.android.tools.r8.kotlin.KotlinEffectExpressionInfo):50:50 -> a
     2:3:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):50:51 -> a
     4:9:void rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmEffectVisitorProvider,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):55:60 -> a
-com.android.tools.r8.kotlin.KotlinFieldLevelInfo -> com.android.tools.r8.internal.uk:
+com.android.tools.r8.kotlin.KotlinFieldLevelInfo -> com.android.tools.r8.internal.vk:
     com.android.tools.r8.kotlin.KotlinPropertyInfo asFieldProperty() -> b
     boolean isCompanion() -> e
     com.android.tools.r8.kotlin.KotlinCompanionInfo asCompanion() -> f
     boolean isFieldProperty() -> l
-com.android.tools.r8.kotlin.KotlinFileFacadeInfo -> com.android.tools.r8.internal.vk:
+com.android.tools.r8.kotlin.KotlinFileFacadeInfo -> com.android.tools.r8.internal.wk:
     int[] metadataVersion -> c
     com.android.tools.r8.kotlin.KotlinPackageInfo packageInfo -> a
     java.lang.String packageName -> b
@@ -62936,7 +62974,7 @@
     10:10:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):80:80 -> a
     1:1:java.lang.String getPackageName():70:70 -> g
     1:1:int[] getMetadataVersion():75:75 -> n
-com.android.tools.r8.kotlin.KotlinFlexibleTypeUpperBoundInfo -> com.android.tools.r8.internal.wk:
+com.android.tools.r8.kotlin.KotlinFlexibleTypeUpperBoundInfo -> com.android.tools.r8.internal.xk:
     java.lang.String typeFlexibilityId -> k
     com.android.tools.r8.kotlin.KotlinFlexibleTypeUpperBoundInfo NO_FLEXIBLE_UPPER_BOUND -> i
     boolean $assertionsDisabled -> j
@@ -62947,7 +62985,7 @@
     16:20:void rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmFlexibleUpperBoundVisitorProvider,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):69:73 -> a
     21:21:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor lambda$rewrite$0(com.android.tools.r8.kotlin.KmVisitorProviders$KmFlexibleUpperBoundVisitorProvider,int):73:73 -> a
     22:25:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):78:81 -> a
-com.android.tools.r8.kotlin.KotlinFunctionInfo -> com.android.tools.r8.internal.xk:
+com.android.tools.r8.kotlin.KotlinFunctionInfo -> com.android.tools.r8.internal.yk:
     com.android.tools.r8.kotlin.KotlinTypeReference lambdaClassOrigin -> h
     com.android.tools.r8.kotlin.KotlinTypeInfo receiverParameterType -> e
     java.util.List typeParameters -> f
@@ -62985,14 +63023,14 @@
     boolean isFunction() -> d
     1:1:com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo getSignature():166:166 -> o
     1:1:boolean hasCrossInlineParameter():72:72 -> p
-com.android.tools.r8.kotlin.KotlinJvmFieldSignatureInfo -> com.android.tools.r8.internal.yk:
+com.android.tools.r8.kotlin.KotlinJvmFieldSignatureInfo -> com.android.tools.r8.internal.zk:
     java.lang.String name -> b
     com.android.tools.r8.kotlin.KotlinTypeReference type -> a
     1:3:void <init>(java.lang.String,com.android.tools.r8.kotlin.KotlinTypeReference):24:26 -> <init>
     1:3:com.android.tools.r8.kotlin.KotlinJvmFieldSignatureInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature,com.android.tools.r8.graph.DexItemFactory):34:36 -> a
     4:14:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature rewrite(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):41:51 -> a
     15:15:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):56:56 -> a
-com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo -> com.android.tools.r8.internal.zk:
+com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo -> com.android.tools.r8.internal.Ak:
     java.util.List EMPTY_PARAMETERS_LIST -> a
     java.lang.String invalidDescriptor -> f
     java.util.List parameters -> e
@@ -63007,7 +63045,7 @@
     41:46:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):118:123 -> a
     47:47:java.util.function.Consumer lambda$trace$0(com.android.tools.r8.kotlin.KotlinTypeReference):123:123 -> a
     1:13:java.lang.String toString():101:113 -> toString
-com.android.tools.r8.kotlin.KotlinLambdaInfo -> com.android.tools.r8.internal.Ak:
+com.android.tools.r8.kotlin.KotlinLambdaInfo -> com.android.tools.r8.internal.Bk:
     boolean $assertionsDisabled -> a
     com.android.tools.r8.kotlin.KotlinFunctionInfo function -> b
     boolean hasBacking -> c
@@ -63019,7 +63057,7 @@
     30:36:boolean rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmLambdaVisitorProvider,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):73 -> a
     37:41:boolean rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmLambdaVisitorProvider,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):72:76 -> a
     42:42:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):82:82 -> a
-com.android.tools.r8.kotlin.KotlinLocalDelegatedPropertyInfo -> com.android.tools.r8.internal.Bk:
+com.android.tools.r8.kotlin.KotlinLocalDelegatedPropertyInfo -> com.android.tools.r8.internal.Ck:
     java.util.List propertyInfos -> c
     com.android.tools.r8.kotlin.KotlinLocalDelegatedPropertyInfo EMPTY_DELEGATED_PROPERTIES -> a
     boolean $assertionsDisabled -> b
@@ -63030,7 +63068,7 @@
     17:17:java.util.function.Consumer lambda$trace$0(com.android.tools.r8.kotlin.KotlinPropertyInfo):52:52 -> a
     18:18:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):52:52 -> a
     19:20:void rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmPropertyVisitorProvider,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):57:58 -> a
-com.android.tools.r8.kotlin.KotlinMetadataDiagnostic -> com.android.tools.r8.internal.Ck:
+com.android.tools.r8.kotlin.KotlinMetadataDiagnostic -> com.android.tools.r8.internal.Dk:
     com.android.tools.r8.origin.Origin origin -> a
     com.android.tools.r8.position.Position position -> b
     java.lang.String message -> c
@@ -63038,7 +63076,7 @@
     1:1:java.lang.String getDiagnosticMessage():38:38 -> getDiagnosticMessage
     1:1:com.android.tools.r8.origin.Origin getOrigin():28:28 -> getOrigin
     1:1:com.android.tools.r8.position.Position getPosition():33:33 -> getPosition
-com.android.tools.r8.kotlin.KotlinMetadataEnqueuerExtension -> com.android.tools.r8.internal.Fk:
+com.android.tools.r8.kotlin.KotlinMetadataEnqueuerExtension -> com.android.tools.r8.internal.Gk:
     com.android.tools.r8.graph.AppView appView -> b
     boolean $assertionsDisabled -> a
     com.android.tools.r8.graph.DexDefinitionSupplier definitionSupplier -> c
@@ -63061,15 +63099,15 @@
     90:91:boolean com.android.tools.r8.kotlin.KotlinClassMetadataReader.hasKotlinClassMetadataAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):82:83 -> a
     90:91:void lambda$verifyKotlinMetadataModeledForAllClasses$6(boolean,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass):103 -> a
     92:96:void lambda$verifyKotlinMetadataModeledForAllClasses$6(boolean,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass):103:103 -> a
-com.android.tools.r8.kotlin.KotlinMetadataEnqueuerExtension$1 -> com.android.tools.r8.internal.Dk:
-com.android.tools.r8.kotlin.KotlinMetadataEnqueuerExtension$KotlinMetadataDefinitionSupplier -> com.android.tools.r8.internal.Ek:
+com.android.tools.r8.kotlin.KotlinMetadataEnqueuerExtension$1 -> com.android.tools.r8.internal.Ek:
+com.android.tools.r8.kotlin.KotlinMetadataEnqueuerExtension$KotlinMetadataDefinitionSupplier -> com.android.tools.r8.internal.Fk:
     com.android.tools.r8.graph.DexDefinitionSupplier baseSupplier -> a
     java.util.Set prunedTypes -> b
     1:1:void <init>(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.Set,com.android.tools.r8.kotlin.KotlinMetadataEnqueuerExtension$1):111:111 -> <init>
     2:4:void <init>(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.Set):117:119 -> <init>
     1:1:com.android.tools.r8.graph.DexItemFactory dexItemFactory():135:135 -> a
     1:4:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):127:130 -> c
-com.android.tools.r8.kotlin.KotlinMetadataRewriter -> com.android.tools.r8.internal.Ik:
+com.android.tools.r8.kotlin.KotlinMetadataRewriter -> com.android.tools.r8.internal.Jk:
     com.android.tools.r8.kotlin.Kotlin kotlin -> f
     com.android.tools.r8.graph.DexItemFactory factory -> e
     com.android.tools.r8.graph.AppView appView -> c
@@ -63118,8 +63156,8 @@
     3:3:void runForR8(java.util.concurrent.ExecutorService):89 -> b
     4:15:void runForR8(java.util.concurrent.ExecutorService):90:101 -> b
     16:16:void runForR8(java.util.concurrent.ExecutorService):100:100 -> b
-com.android.tools.r8.kotlin.KotlinMetadataRewriter$1 -> com.android.tools.r8.internal.Gk:
-com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo -> com.android.tools.r8.internal.Hk:
+com.android.tools.r8.kotlin.KotlinMetadataRewriter$1 -> com.android.tools.r8.internal.Hk:
+com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo -> com.android.tools.r8.internal.Ik:
     boolean writeData2 -> e
     boolean writeExtraString -> f
     boolean writePackageName -> g
@@ -63132,7 +63170,7 @@
     2:10:void <init>(boolean,boolean,boolean,boolean,boolean,boolean,boolean,boolean):55:63 -> <init>
     1:1:com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo.rewriteAll():67:67 -> a
     1:1:com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo access$100():37 -> a
-com.android.tools.r8.kotlin.KotlinMetadataUtils -> com.android.tools.r8.internal.Nk:
+com.android.tools.r8.kotlin.KotlinMetadataUtils -> com.android.tools.r8.internal.Ok:
     com.android.tools.r8.kotlin.KotlinMetadataUtils$NoKotlinInfo NO_KOTLIN_INFO -> a
     com.android.tools.r8.kotlin.KotlinMetadataUtils$NoKotlinInfo INVALID_KOTLIN_INFO -> b
     1:2:void <clinit>():33:34 -> <clinit>
@@ -63145,8 +63183,8 @@
     15:22:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature toJvmMethodSignature(com.android.tools.r8.graph.DexMethod):81:88 -> a
     23:25:boolean isValidMethodDescriptor(java.lang.String):140:142 -> a
     26:34:boolean mayProcessKotlinMetadata(com.android.tools.r8.graph.AppView):157:165 -> a
-com.android.tools.r8.kotlin.KotlinMetadataUtils$1 -> com.android.tools.r8.internal.Jk:
-com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor -> com.android.tools.r8.internal.Mk:
+com.android.tools.r8.kotlin.KotlinMetadataUtils$1 -> com.android.tools.r8.internal.Kk:
+com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor -> com.android.tools.r8.internal.Nk:
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature fieldSignature -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature getterSignature -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature setterSignature -> c
@@ -63161,17 +63199,17 @@
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature getterSignature():130:130 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature access$300(com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor):91:91 -> c
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature setterSignature():134:134 -> c
-com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor$1 -> com.android.tools.r8.internal.Lk:
+com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor$1 -> com.android.tools.r8.internal.Mk:
     com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor this$0 -> b
     1:1:void <init>(com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor):100:100 -> <init>
     1:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType):103:106 -> a
-com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor$1$1 -> com.android.tools.r8.internal.Kk:
+com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor$1$1 -> com.android.tools.r8.internal.Lk:
     com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor$1 this$1 -> d
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():106:106 -> <clinit>
     1:1:void <init>(com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor$1):106:106 -> <init>
     1:6:void visit(int,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):113:118 -> a
-com.android.tools.r8.kotlin.KotlinMetadataUtils$NoKotlinInfo -> com.android.tools.r8.internal.Nk$a:
+com.android.tools.r8.kotlin.KotlinMetadataUtils$NoKotlinInfo -> com.android.tools.r8.internal.Ok$a:
     java.lang.String name -> a
     1:1:void <init>(java.lang.String,com.android.tools.r8.kotlin.KotlinMetadataUtils$1):36:36 -> <init>
     2:3:void <init>(java.lang.String):41:42 -> <init>
@@ -63181,7 +63219,7 @@
     boolean isNoKotlinInformation() -> j
     1:1:int[] getMetadataVersion():62:62 -> n
     1:1:java.lang.String toString():47:47 -> toString
-com.android.tools.r8.kotlin.KotlinMetadataWriter -> com.android.tools.r8.internal.Ok:
+com.android.tools.r8.kotlin.KotlinMetadataWriter -> com.android.tools.r8.internal.Pk:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():47:47 -> <clinit>
     1:1:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getLocalDelegatedProperties(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage):0:0 -> a
@@ -63403,13 +63441,13 @@
     381:388:void lambda$appendKmEffectExpression$89(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression,java.lang.String):920:927 -> e
     389:402:void lambda$appendKmEffectExpression$89(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression,java.lang.String):921:934 -> e
     403:431:void lambda$appendKmEffectExpression$89(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression,java.lang.String):928:956 -> e
-com.android.tools.r8.kotlin.KotlinMethodLevelInfo -> com.android.tools.r8.internal.Pk:
+com.android.tools.r8.kotlin.KotlinMethodLevelInfo -> com.android.tools.r8.internal.Qk:
     com.android.tools.r8.kotlin.KotlinFunctionInfo asFunction() -> a
     com.android.tools.r8.kotlin.KotlinConstructorInfo asConstructor() -> c
     boolean isFunction() -> d
     com.android.tools.r8.kotlin.KotlinPropertyInfo asProperty() -> h
     boolean isConstructor() -> m
-com.android.tools.r8.kotlin.KotlinMultiFileClassFacadeInfo -> com.android.tools.r8.internal.Qk:
+com.android.tools.r8.kotlin.KotlinMultiFileClassFacadeInfo -> com.android.tools.r8.internal.Rk:
     java.util.List partClassNames -> a
     int[] metadataVersion -> c
     java.lang.String packageName -> b
@@ -63440,7 +63478,7 @@
     387:387:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):83:83 -> a
     1:1:java.lang.String getPackageName():73:73 -> g
     1:1:int[] getMetadataVersion():78:78 -> n
-com.android.tools.r8.kotlin.KotlinMultiFileClassPartInfo -> com.android.tools.r8.internal.Rk:
+com.android.tools.r8.kotlin.KotlinMultiFileClassPartInfo -> com.android.tools.r8.internal.Sk:
     int[] metadataVersion -> d
     java.lang.String facadeClassName -> a
     com.android.tools.r8.kotlin.KotlinPackageInfo packageInfo -> b
@@ -63454,7 +63492,7 @@
     10:10:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):87:87 -> a
     1:1:java.lang.String getPackageName():77:77 -> g
     1:1:int[] getMetadataVersion():82:82 -> n
-com.android.tools.r8.kotlin.KotlinPackageInfo -> com.android.tools.r8.internal.Tk:
+com.android.tools.r8.kotlin.KotlinPackageInfo -> com.android.tools.r8.internal.Uk:
     com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo containerInfo -> b
     java.lang.String moduleName -> a
     com.android.tools.r8.kotlin.KotlinLocalDelegatedPropertyInfo localDelegatedProperties -> c
@@ -63481,7 +63519,7 @@
     51:51:com.android.tools.r8.kotlin.KotlinPackageInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):60:60 -> a
     52:64:void rewrite(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):66:78 -> a
     65:66:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):83:84 -> a
-com.android.tools.r8.kotlin.KotlinPropertyInfo -> com.android.tools.r8.internal.Uk:
+com.android.tools.r8.kotlin.KotlinPropertyInfo -> com.android.tools.r8.internal.Vk:
     com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo syntheticMethodForAnnotations -> n
     com.android.tools.r8.kotlin.KotlinVersionRequirementInfo versionRequirements -> i
     int jvmFlags -> j
@@ -63520,7 +63558,7 @@
     1:1:com.android.tools.r8.kotlin.KotlinJvmFieldSignatureInfo getFieldSignature():132:132 -> o
     1:1:com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo getGetterSignature():136:136 -> p
     1:1:com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo getSetterSignature():140:140 -> q
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser -> com.android.tools.r8.internal.Wk:
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser -> com.android.tools.r8.internal.Xk:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():22:22 -> <clinit>
     1:21:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result parse(java.lang.String):113:133 -> a
@@ -63557,8 +63595,8 @@
     2:26:void lambda$parse$1(com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder,java.util.List):160 -> b
     27:34:void com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser.addDebugEntryToBuilder(java.lang.String,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder):239:246 -> b
     27:34:void lambda$parse$1(com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder,java.util.List):160 -> b
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$1 -> com.android.tools.r8.internal.Wk$a:
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$BufferedStringReader -> com.android.tools.r8.internal.Wk$b:
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$1 -> com.android.tools.r8.internal.Xk$a:
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$BufferedStringReader -> com.android.tools.r8.internal.Xk$b:
     java.io.BufferedReader reader -> b
     boolean $assertionsDisabled -> a
     java.lang.String readLine -> c
@@ -63572,25 +63610,25 @@
     1:1:java.lang.String readNextLine():49:49 -> b
     2:5:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$BufferedStringReader readUntil(java.lang.String):69:72 -> b
     1:1:void close():108:108 -> close
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$KotlinSourceDebugExtensionParserException -> com.android.tools.r8.internal.Wk$c:
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$KotlinSourceDebugExtensionParserException -> com.android.tools.r8.internal.Xk$c:
     1:1:void <init>(java.lang.String):34:34 -> <init>
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Position -> com.android.tools.r8.internal.Wk$d:
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Position -> com.android.tools.r8.internal.Xk$d:
     com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Source source -> a
     com.android.tools.r8.naming.Range range -> b
     1:3:void <init>(com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Source,com.android.tools.r8.naming.Range):304:306 -> <init>
     1:1:com.android.tools.r8.naming.Range getRange():314:314 -> a
     1:1:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Source getSource():310:310 -> b
     1:10:java.lang.String toString():319:328 -> toString
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result -> com.android.tools.r8.internal.Wk$e:
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result -> com.android.tools.r8.internal.Xk$e:
     com.android.tools.r8.utils.SegmentTree segmentTree -> a
     1:2:void <init>(com.android.tools.r8.utils.SegmentTree):254:255 -> <init>
     1:1:java.util.Map$Entry lookup(int):259:259 -> a
     2:2:int size():263:263 -> a
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder -> com.android.tools.r8.internal.Wk$f:
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder -> com.android.tools.r8.internal.Xk$f:
     java.util.Map files -> b
     com.android.tools.r8.utils.SegmentTree segmentTree -> a
     1:4:void <init>():267:270 -> <init>
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Source -> com.android.tools.r8.internal.Wk$g:
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Source -> com.android.tools.r8.internal.Xk$g:
     java.lang.String fileName -> a
     java.lang.String path -> b
     1:1:void <init>(java.lang.String,java.lang.String,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$1):277:277 -> <init>
@@ -63598,7 +63636,7 @@
     1:1:java.lang.String getFileName():287:287 -> a
     1:1:java.lang.String getPath():291:291 -> b
     1:1:java.lang.String toString():296:296 -> toString
-com.android.tools.r8.kotlin.KotlinSyntheticClassInfo -> com.android.tools.r8.internal.Yk:
+com.android.tools.r8.kotlin.KotlinSyntheticClassInfo -> com.android.tools.r8.internal.Zk:
     com.android.tools.r8.kotlin.KotlinLambdaInfo lambda -> b
     com.android.tools.r8.kotlin.KotlinSyntheticClassInfo$Flavour flavour -> e
     int[] metadataVersion -> d
@@ -63625,13 +63663,13 @@
     1:1:boolean isJavaStyleLambda():71:71 -> o
     1:1:boolean isKotlinStyleLambda():67:67 -> p
     1:1:boolean isLambda():63:63 -> q
-com.android.tools.r8.kotlin.KotlinSyntheticClassInfo$Flavour -> com.android.tools.r8.internal.Xk:
+com.android.tools.r8.kotlin.KotlinSyntheticClassInfo$Flavour -> com.android.tools.r8.internal.Yk:
     com.android.tools.r8.kotlin.KotlinSyntheticClassInfo$Flavour Unclassified -> c
     com.android.tools.r8.kotlin.KotlinSyntheticClassInfo$Flavour JavaStyleLambda -> b
     com.android.tools.r8.kotlin.KotlinSyntheticClassInfo$Flavour KotlinStyleLambda -> a
     1:3:void <clinit>():27:29 -> <clinit>
     1:1:void <init>(java.lang.String,int):26:26 -> <init>
-com.android.tools.r8.kotlin.KotlinTypeAliasInfo -> com.android.tools.r8.internal.Zk:
+com.android.tools.r8.kotlin.KotlinTypeAliasInfo -> com.android.tools.r8.internal.al:
     com.android.tools.r8.kotlin.KotlinTypeInfo expandedType -> e
     java.util.List typeParameters -> f
     com.android.tools.r8.kotlin.KotlinTypeInfo underlyingType -> d
@@ -63647,7 +63685,7 @@
     19:22:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):79:82 -> a
     23:23:java.util.function.Consumer lambda$trace$0(com.android.tools.r8.kotlin.KotlinTypeParameterInfo):81:81 -> a
     24:24:java.util.function.Consumer lambda$trace$1(com.android.tools.r8.kotlin.KotlinAnnotationInfo):82:82 -> a
-com.android.tools.r8.kotlin.KotlinTypeInfo -> com.android.tools.r8.internal.al:
+com.android.tools.r8.kotlin.KotlinTypeInfo -> com.android.tools.r8.internal.bl:
     java.util.List EMPTY_ARGUMENTS -> a
     com.android.tools.r8.kotlin.KotlinFlexibleTypeUpperBoundInfo flexibleTypeUpperBound -> h
     com.android.tools.r8.kotlin.KotlinTypeInfo outerType -> e
@@ -63665,7 +63703,7 @@
     40:49:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):112:121 -> a
     50:50:java.util.function.Consumer lambda$trace$0(com.android.tools.r8.kotlin.KotlinTypeProjectionInfo):119:119 -> a
     51:51:java.util.function.Consumer lambda$trace$1(com.android.tools.r8.kotlin.KotlinAnnotationInfo):121:121 -> a
-com.android.tools.r8.kotlin.KotlinTypeParameterInfo -> com.android.tools.r8.internal.bl:
+com.android.tools.r8.kotlin.KotlinTypeParameterInfo -> com.android.tools.r8.internal.cl:
     java.util.List EMPTY_UPPER_BOUNDS -> b
     java.util.List EMPTY_TYPE_PARAMETERS -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance variance -> f
@@ -63699,7 +63737,7 @@
     67:67:java.util.function.Consumer lambda$trace$0(com.android.tools.r8.kotlin.KotlinTypeInfo):108:108 -> a
     68:69:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):108:109 -> a
     70:70:java.util.function.Consumer lambda$trace$1(com.android.tools.r8.kotlin.KotlinAnnotationInfo):109:109 -> a
-com.android.tools.r8.kotlin.KotlinTypeProjectionInfo -> com.android.tools.r8.internal.cl:
+com.android.tools.r8.kotlin.KotlinTypeProjectionInfo -> com.android.tools.r8.internal.dl:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance variance -> a
     com.android.tools.r8.kotlin.KotlinTypeInfo typeInfo -> b
     1:3:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance,com.android.tools.r8.kotlin.KotlinTypeInfo):22:24 -> <init>
@@ -63709,7 +63747,7 @@
     5:7:void rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeProjectionVisitorProvider,com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeStarProjectionVisitorProvider,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):44:46 -> a
     8:8:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor lambda$rewrite$0(com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeProjectionVisitorProvider,int):46:46 -> a
     9:10:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):52:53 -> a
-com.android.tools.r8.kotlin.KotlinTypeReference -> com.android.tools.r8.internal.dl:
+com.android.tools.r8.kotlin.KotlinTypeReference -> com.android.tools.r8.internal.el:
     com.android.tools.r8.graph.DexType known -> b
     boolean $assertionsDisabled -> a
     java.lang.String unknown -> c
@@ -63730,7 +63768,7 @@
     1:5:com.android.tools.r8.kotlin.KotlinTypeReference fromDescriptor(java.lang.String,com.android.tools.r8.graph.DexItemFactory):47 -> b
     6:19:java.lang.String toRenamedDescriptorOrDefault(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,java.lang.String):61:74 -> b
     1:1:java.lang.String toString():98:98 -> toString
-com.android.tools.r8.kotlin.KotlinValueParameterInfo -> com.android.tools.r8.internal.el:
+com.android.tools.r8.kotlin.KotlinValueParameterInfo -> com.android.tools.r8.internal.fl:
     java.util.List EMPTY_VALUE_PARAMETERS -> a
     com.android.tools.r8.kotlin.KotlinTypeInfo varargElementType -> e
     com.android.tools.r8.kotlin.KotlinTypeInfo type -> d
@@ -63742,14 +63780,14 @@
     7:14:java.util.List create(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):59:66 -> a
     15:18:void rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmValueParameterVisitorProvider,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):73:76 -> a
     19:21:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):83:85 -> a
-com.android.tools.r8.kotlin.KotlinVersionRequirementInfo -> com.android.tools.r8.internal.gl:
+com.android.tools.r8.kotlin.KotlinVersionRequirementInfo -> com.android.tools.r8.internal.hl:
     java.util.List versionRequirements -> b
     com.android.tools.r8.kotlin.KotlinVersionRequirementInfo NO_VERSION_REQUIREMENTS -> a
     1:2:void <clinit>():17:18 -> <clinit>
     1:2:void <init>(java.util.List):22:23 -> <init>
     1:8:com.android.tools.r8.kotlin.KotlinVersionRequirementInfo create(java.util.List):27:34 -> a
     9:13:void rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmVersionRequirementVisitorProvider):38:42 -> a
-com.android.tools.r8.kotlin.KotlinVersionRequirementInfo$KotlinVersionRequirementPoint -> com.android.tools.r8.internal.fl:
+com.android.tools.r8.kotlin.KotlinVersionRequirementInfo$KotlinVersionRequirementPoint -> com.android.tools.r8.internal.gl:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel level -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVersionKind kind -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersion version -> e
@@ -63760,7 +63798,7 @@
     1:5:com.android.tools.r8.kotlin.KotlinVersionRequirementInfo$KotlinVersionRequirementPoint access$000(com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement):46 -> a
     6:8:void com.android.tools.r8.kotlin.KotlinVersionRequirementInfo$KotlinVersionRequirementPoint.rewrite(com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor):77:79 -> a
     6:8:void access$100(com.android.tools.r8.kotlin.KotlinVersionRequirementInfo$KotlinVersionRequirementPoint,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor):46 -> a
-com.android.tools.r8.logging.Log -> com.android.tools.r8.internal.Um:
+com.android.tools.r8.logging.Log -> com.android.tools.r8.internal.Vm:
     java.util.Set CLASS_FILTER -> b
     boolean ENABLED -> a
     1:1:void <clinit>():12:12 -> <clinit>
@@ -64098,7 +64136,7 @@
     1:8:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange firstRangeForLine(int):153:160 -> b
     1:7:boolean equals(java.lang.Object):218:224 -> equals
     1:1:int hashCode():229:229 -> hashCode
-com.android.tools.r8.naming.DictionaryReader -> com.android.tools.r8.internal.L8:
+com.android.tools.r8.naming.DictionaryReader -> com.android.tools.r8.internal.M8:
     java.nio.file.Path path -> c
     java.io.BufferedReader reader -> b
     boolean $assertionsDisabled -> a
@@ -64282,7 +64320,7 @@
     38:38:void replaceDexItemBasedConstStringInMethod(com.android.tools.r8.graph.DexEncodedMethod):176 -> b
     39:50:void replaceDexItemBasedConstStringInMethod(com.android.tools.r8.graph.DexEncodedMethod):177:188 -> b
     1:4:void run(java.util.concurrent.ExecutorService):49:52 -> c
-com.android.tools.r8.naming.IdentifierNameStringMarker -> com.android.tools.r8.internal.tc:
+com.android.tools.r8.naming.IdentifierNameStringMarker -> com.android.tools.r8.internal.uc:
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap identifierNameStrings -> c
     boolean $assertionsDisabled -> a
@@ -64339,7 +64377,7 @@
     532:532:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):327:327 -> a
     533:533:com.android.tools.r8.ir.code.Value lambda$decoupleIdentifierNameStringForInvokeInstruction$3(com.android.tools.r8.ir.code.Value[],com.android.tools.r8.ir.code.Value,long):325:325 -> a
     534:558:void warnUndeterminedIdentifierIfNecessary(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):360:384 -> a
-com.android.tools.r8.naming.IdentifierNameStringUtils -> com.android.tools.r8.internal.uc:
+com.android.tools.r8.naming.IdentifierNameStringUtils -> com.android.tools.r8.internal.vc:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():37:37 -> <clinit>
     boolean lambda$evaluateTypeArrayContentFromConstructionToUse$0(com.android.tools.r8.ir.code.NewArrayEmpty,com.android.tools.r8.ir.code.Instruction) -> a
@@ -64440,67 +64478,45 @@
     168:182:boolean verifyAllCallSitesAreRepresentedIn(java.util.List):656:670 -> a
     168:182:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):541 -> a
     183:213:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):543:573 -> a
-    214:214:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getReference():375:375 -> a
-    214:214:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):573 -> a
-    215:215:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):573:573 -> a
-    216:224:void print(com.android.tools.r8.graph.DexMethod,java.util.Set,java.io.PrintStream):694:702 -> a
-    216:224:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):573 -> a
-    225:231:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):580:586 -> a
-    232:232:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getReference():375:375 -> a
-    232:232:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedMethod.getHolderType():363 -> a
-    232:232:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):586 -> a
-    233:233:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedMethod.getHolderType():363:363 -> a
-    233:233:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):586 -> a
-    234:234:com.android.tools.r8.naming.MethodNamingState com.android.tools.r8.naming.MethodNameMinifier$State.getNamingState(com.android.tools.r8.graph.DexType):100:100 -> a
-    234:234:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):586 -> a
-    235:240:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):587:592 -> a
-    241:241:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getReference():375:375 -> a
-    241:241:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):593 -> a
-    242:242:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):593:593 -> a
-    243:243:com.android.tools.r8.naming.MethodNamingState com.android.tools.r8.naming.MethodNameMinifier$State.getNamingState(com.android.tools.r8.graph.DexType):100:100 -> a
-    243:243:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):593 -> a
-    244:250:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):594:600 -> a
-    251:251:com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState lambda$assignNamesToInterfaceMethods$0(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):427:427 -> a
-    252:279:void lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):449:476 -> a
-    280:280:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    280:280:void lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):476 -> a
-    281:290:void lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):477:486 -> a
-    291:304:void lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):485:498 -> a
-    305:306:java.lang.Object com.android.tools.r8.utils.DisjointSets.unionWithMakeSet(java.lang.Object,java.lang.Object):128:129 -> a
-    305:306:void lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):499 -> a
-    307:308:java.lang.Object com.android.tools.r8.utils.DisjointSets.findOrMakeSet(java.lang.Object):91:92 -> a
-    307:308:java.lang.Object com.android.tools.r8.utils.DisjointSets.unionWithMakeSet(java.lang.Object,java.lang.Object):132 -> a
-    307:308:void lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):499 -> a
-    309:311:java.lang.Object com.android.tools.r8.utils.DisjointSets.findOrMakeSet(java.lang.Object):91:91 -> a
-    309:311:java.lang.Object com.android.tools.r8.utils.DisjointSets.unionWithMakeSet(java.lang.Object,java.lang.Object):134 -> a
-    309:311:void lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):499 -> a
-    312:312:java.lang.Object com.android.tools.r8.utils.DisjointSets.findOrMakeSet(java.lang.Object):92:92 -> a
-    312:312:java.lang.Object com.android.tools.r8.utils.DisjointSets.unionWithMakeSet(java.lang.Object,java.lang.Object):134 -> a
-    312:312:void lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):499 -> a
-    313:313:java.lang.Object com.android.tools.r8.utils.DisjointSets.unionWithMakeSet(java.lang.Object,java.lang.Object):134:134 -> a
-    313:313:void lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):499 -> a
-    314:315:com.android.tools.r8.graph.DexString assignNewName(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState):604:605 -> a
-    316:316:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getReference():375:375 -> a
-    316:316:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedMethod.getHolderType():363 -> a
-    316:316:com.android.tools.r8.graph.DexString assignNewName(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState):606 -> a
-    317:317:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedMethod.getHolderType():363:363 -> a
-    317:317:com.android.tools.r8.graph.DexString assignNewName(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState):606 -> a
-    318:319:com.android.tools.r8.graph.DexString assignNewName(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState):606:607 -> a
-    320:320:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getReference():375:375 -> a
-    320:320:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedMethod.getHolderType():363 -> a
-    320:320:com.android.tools.r8.graph.DexString assignNewName(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState):607 -> a
-    321:321:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedMethod.getHolderType():363:363 -> a
-    321:321:com.android.tools.r8.graph.DexString assignNewName(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState):607 -> a
-    322:322:com.android.tools.r8.naming.MethodNamingState com.android.tools.r8.naming.MethodNameMinifier$State.getNamingState(com.android.tools.r8.graph.DexType):100:100 -> a
-    322:322:com.android.tools.r8.graph.DexString assignNewName(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState):607 -> a
-    323:326:com.android.tools.r8.graph.DexString assignNewName(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState):609:612 -> a
-    327:327:boolean lambda$assignNewName$3(com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod):611:611 -> a
-    328:328:com.android.tools.r8.graph.DexString newNameInGroup(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.MethodNamingState,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState):621:621 -> a
-    329:331:void computeReservationFrontiersForAllImplementingClasses():636:638 -> a
-    332:337:void lambda$computeReservationFrontiersForAllImplementingClasses$5(com.android.tools.r8.graph.DexClass):641:646 -> a
-    338:338:com.android.tools.r8.graph.DexType com.android.tools.r8.naming.MethodNameMinifier$State.getFrontier(com.android.tools.r8.graph.DexType):109:109 -> a
-    338:338:void lambda$computeReservationFrontiersForAllImplementingClasses$5(com.android.tools.r8.graph.DexClass):646 -> a
-    339:340:void lambda$computeReservationFrontiersForAllImplementingClasses$5(com.android.tools.r8.graph.DexClass):647:648 -> a
+    214:222:void print(com.android.tools.r8.graph.DexMethod,java.util.Set,java.io.PrintStream):694:702 -> a
+    214:222:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):573 -> a
+    223:229:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):580:586 -> a
+    230:230:com.android.tools.r8.naming.MethodNamingState com.android.tools.r8.naming.MethodNameMinifier$State.getNamingState(com.android.tools.r8.graph.DexType):100:100 -> a
+    230:230:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):586 -> a
+    231:237:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):587:593 -> a
+    238:238:com.android.tools.r8.naming.MethodNamingState com.android.tools.r8.naming.MethodNameMinifier$State.getNamingState(com.android.tools.r8.graph.DexType):100:100 -> a
+    238:238:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):593 -> a
+    239:245:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):594:600 -> a
+    246:246:com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState lambda$assignNamesToInterfaceMethods$0(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):427:427 -> a
+    247:274:void lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):449:476 -> a
+    275:275:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    275:275:void lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):476 -> a
+    276:285:void lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):477:486 -> a
+    286:299:void lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):485:498 -> a
+    300:301:java.lang.Object com.android.tools.r8.utils.DisjointSets.unionWithMakeSet(java.lang.Object,java.lang.Object):128:129 -> a
+    300:301:void lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):499 -> a
+    302:303:java.lang.Object com.android.tools.r8.utils.DisjointSets.findOrMakeSet(java.lang.Object):91:92 -> a
+    302:303:java.lang.Object com.android.tools.r8.utils.DisjointSets.unionWithMakeSet(java.lang.Object,java.lang.Object):132 -> a
+    302:303:void lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):499 -> a
+    304:306:java.lang.Object com.android.tools.r8.utils.DisjointSets.findOrMakeSet(java.lang.Object):91:91 -> a
+    304:306:java.lang.Object com.android.tools.r8.utils.DisjointSets.unionWithMakeSet(java.lang.Object,java.lang.Object):134 -> a
+    304:306:void lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):499 -> a
+    307:307:java.lang.Object com.android.tools.r8.utils.DisjointSets.findOrMakeSet(java.lang.Object):92:92 -> a
+    307:307:java.lang.Object com.android.tools.r8.utils.DisjointSets.unionWithMakeSet(java.lang.Object,java.lang.Object):134 -> a
+    307:307:void lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):499 -> a
+    308:308:java.lang.Object com.android.tools.r8.utils.DisjointSets.unionWithMakeSet(java.lang.Object,java.lang.Object):134:134 -> a
+    308:308:void lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):499 -> a
+    309:312:com.android.tools.r8.graph.DexString assignNewName(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState):604:607 -> a
+    313:313:com.android.tools.r8.naming.MethodNamingState com.android.tools.r8.naming.MethodNameMinifier$State.getNamingState(com.android.tools.r8.graph.DexType):100:100 -> a
+    313:313:com.android.tools.r8.graph.DexString assignNewName(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState):607 -> a
+    314:317:com.android.tools.r8.graph.DexString assignNewName(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState):609:612 -> a
+    318:318:boolean lambda$assignNewName$3(com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod):611:611 -> a
+    319:319:com.android.tools.r8.graph.DexString newNameInGroup(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.MethodNamingState,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState):621:621 -> a
+    320:322:void computeReservationFrontiersForAllImplementingClasses():636:638 -> a
+    323:328:void lambda$computeReservationFrontiersForAllImplementingClasses$5(com.android.tools.r8.graph.DexClass):641:646 -> a
+    329:329:com.android.tools.r8.graph.DexType com.android.tools.r8.naming.MethodNameMinifier$State.getFrontier(com.android.tools.r8.graph.DexType):109:109 -> a
+    329:329:void lambda$computeReservationFrontiersForAllImplementingClasses$5(com.android.tools.r8.graph.DexClass):646 -> a
+    330:331:void lambda$computeReservationFrontiersForAllImplementingClasses$5(com.android.tools.r8.graph.DexClass):647:648 -> a
     1:1:com.android.tools.r8.naming.MethodNameMinifier$State access$100(com.android.tools.r8.naming.InterfaceMethodNameMinifier):98:98 -> b
     2:2:java.util.Comparator getDefaultInterfaceMethodOrdering():393:393 -> b
     3:3:com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState lambda$assignNamesToInterfaceMethods$1(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):487:487 -> b
@@ -64513,19 +64529,9 @@
     1:1:boolean doEquivalent(java.lang.Object,java.lang.Object):379:379 -> a
     2:2:boolean doEquivalent(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):382:382 -> a
     2:2:boolean doEquivalent(java.lang.Object,java.lang.Object):379 -> a
-    3:3:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getReference():375:375 -> a
-    3:3:boolean doEquivalent(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):382 -> a
-    3:3:boolean doEquivalent(java.lang.Object,java.lang.Object):379 -> a
-    4:4:boolean doEquivalent(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):382:382 -> a
-    4:4:boolean doEquivalent(java.lang.Object,java.lang.Object):379 -> a
-    5:5:int doHash(java.lang.Object):379:379 -> a
-    6:6:int doHash(com.android.tools.r8.graph.DexEncodedMethod):387:387 -> a
-    6:6:int doHash(java.lang.Object):379 -> a
-    7:7:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getReference():375:375 -> a
-    7:7:int doHash(com.android.tools.r8.graph.DexEncodedMethod):387 -> a
-    7:7:int doHash(java.lang.Object):379 -> a
-    8:8:int doHash(com.android.tools.r8.graph.DexEncodedMethod):387:387 -> a
-    8:8:int doHash(java.lang.Object):379 -> a
+    3:3:int doHash(java.lang.Object):379:379 -> a
+    4:4:int doHash(com.android.tools.r8.graph.DexEncodedMethod):387:387 -> a
+    4:4:int doHash(java.lang.Object):379 -> a
 com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState -> com.android.tools.r8.naming.o:
     java.util.Map methodStates -> b
     java.util.List callSiteCollidingMethods -> c
@@ -64537,45 +64543,28 @@
     3:3:java.util.Set lambda$addState$0(com.android.tools.r8.graph.DexEncodedMethod):242:242 -> a
     4:4:void addCallSite(com.android.tools.r8.graph.DexCallSite):256:256 -> a
     5:18:com.android.tools.r8.graph.DexString getReservedName():260:273 -> a
-    19:27:boolean isAvailable(com.android.tools.r8.graph.DexString):299:307 -> a
-    28:29:java.lang.Boolean lambda$isAvailable$4(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):302:303 -> a
-    30:30:void addRenaming(com.android.tools.r8.graph.DexString,com.android.tools.r8.naming.MethodNameMinifier$State):311:311 -> a
-    31:31:void lambda$addRenaming$5(com.android.tools.r8.graph.DexString,com.android.tools.r8.naming.MethodNameMinifier$State,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):313:313 -> a
-    32:32:void com.android.tools.r8.naming.MethodNameMinifier$State.putRenaming(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexString):92:92 -> a
-    32:32:void lambda$addRenaming$5(com.android.tools.r8.graph.DexString,com.android.tools.r8.naming.MethodNameMinifier$State,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):314 -> a
-    33:33:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getReference():375:375 -> a
-    33:33:void com.android.tools.r8.naming.MethodNameMinifier$State.putRenaming(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexString):92 -> a
+    19:19:int lambda$getReservedName$2(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):267:267 -> a
+    20:28:boolean isAvailable(com.android.tools.r8.graph.DexString):299:307 -> a
+    29:30:java.lang.Boolean lambda$isAvailable$4(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):302:303 -> a
+    31:31:void addRenaming(com.android.tools.r8.graph.DexString,com.android.tools.r8.naming.MethodNameMinifier$State):311:311 -> a
+    32:32:void lambda$addRenaming$5(com.android.tools.r8.graph.DexString,com.android.tools.r8.naming.MethodNameMinifier$State,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):313:313 -> a
+    33:33:void com.android.tools.r8.naming.MethodNameMinifier$State.putRenaming(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexString):92:92 -> a
     33:33:void lambda$addRenaming$5(com.android.tools.r8.graph.DexString,com.android.tools.r8.naming.MethodNameMinifier$State,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):314 -> a
-    34:34:void com.android.tools.r8.naming.MethodNameMinifier$State.putRenaming(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexString):92:92 -> a
-    34:34:void lambda$addRenaming$5(com.android.tools.r8.graph.DexString,com.android.tools.r8.naming.MethodNameMinifier$State,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):314 -> a
-    35:35:void forEachState(java.util.function.BiConsumer):319:319 -> a
-    36:36:java.lang.Object lambda$forEachState$6(java.util.function.BiConsumer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):321:321 -> a
-    37:39:java.lang.Object forAnyState(java.util.function.BiFunction):329:331 -> a
-    40:42:boolean containsReservation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):341:343 -> a
-    43:43:boolean com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState.containsReservation(com.android.tools.r8.graph.DexType):230:230 -> a
-    43:43:boolean containsReservation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):344 -> a
-    44:45:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getReference():375:375 -> a
-    44:45:int lambda$getReservedName$2(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):267 -> a
-    46:46:int lambda$getReservedName$2(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):267:267 -> a
+    34:34:void forEachState(java.util.function.BiConsumer):319:319 -> a
+    35:35:java.lang.Object lambda$forEachState$6(java.util.function.BiConsumer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):321:321 -> a
+    36:38:java.lang.Object forAnyState(java.util.function.BiFunction):329:331 -> a
+    39:41:boolean containsReservation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):341:343 -> a
+    42:42:boolean com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState.containsReservation(com.android.tools.r8.graph.DexType):230:230 -> a
+    42:42:boolean containsReservation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):344 -> a
     1:1:java.util.List access$500(com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState):234:234 -> b
     2:2:java.util.Set lambda$appendMethodGroupState$1(com.android.tools.r8.graph.DexEncodedMethod):249:249 -> b
     3:3:void reserveName(com.android.tools.r8.graph.DexString):285:285 -> b
     4:7:void lambda$reserveName$3(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):287:290 -> b
     8:8:void com.android.tools.r8.naming.MethodNameMinifier$State.putRenaming(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexString):92:92 -> b
     8:8:void lambda$reserveName$3(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):290 -> b
-    9:9:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getReference():375:375 -> b
-    9:9:void com.android.tools.r8.naming.MethodNameMinifier$State.putRenaming(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexString):92 -> b
-    9:9:void lambda$reserveName$3(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):290 -> b
-    10:10:void com.android.tools.r8.naming.MethodNameMinifier$State.putRenaming(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexString):92:92 -> b
-    10:10:void lambda$reserveName$3(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):290 -> b
-    11:12:void lambda$reserveName$3(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):292:293 -> b
-    13:13:void com.android.tools.r8.naming.MethodNameMinifier$State.putRenaming(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexString):92:92 -> b
-    13:13:void lambda$reserveName$3(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):293 -> b
-    14:14:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getReference():375:375 -> b
-    14:14:void com.android.tools.r8.naming.MethodNameMinifier$State.putRenaming(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexString):92 -> b
-    14:14:void lambda$reserveName$3(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):293 -> b
-    15:15:void com.android.tools.r8.naming.MethodNameMinifier$State.putRenaming(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexString):92:92 -> b
-    15:15:void lambda$reserveName$3(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):293 -> b
+    9:10:void lambda$reserveName$3(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):292:293 -> b
+    11:11:void com.android.tools.r8.naming.MethodNameMinifier$State.putRenaming(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexString):92:92 -> b
+    11:11:void lambda$reserveName$3(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):293 -> b
     1:1:java.util.Set access$600(com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState):234:234 -> c
     1:1:int compareTo(java.lang.Object):234:234 -> compareTo
     2:2:int compareTo(com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState):355:355 -> compareTo
@@ -64594,19 +64583,16 @@
     3:3:com.android.tools.r8.graph.DexString com.android.tools.r8.naming.MethodNameMinifier$State.getReservedName(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):113:113 -> a
     3:3:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexEncodedMethod):117 -> a
     4:19:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexEncodedMethod):124:139 -> a
-    20:23:java.lang.Boolean lambda$getReservedName$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):127:130 -> a
-    24:24:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getReference():375:375 -> a
-    24:24:java.lang.Boolean lambda$getReservedName$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):131 -> a
-    25:28:java.lang.Boolean lambda$getReservedName$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):131:134 -> a
-    29:29:void addRenaming(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod):169:169 -> a
-    30:30:void lambda$addRenaming$5(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):171:171 -> a
-    31:31:void lambda$addRenaming$4(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):172:172 -> a
-    32:32:com.android.tools.r8.naming.MethodNamingState com.android.tools.r8.naming.MethodNameMinifier$State.getNamingState(com.android.tools.r8.graph.DexType):100:100 -> a
-    32:32:void lambda$addRenaming$4(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):172 -> a
-    33:33:void lambda$addRenaming$4(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):172:172 -> a
-    34:34:void forAll(java.util.function.Consumer):176:176 -> a
-    35:35:java.lang.Object lambda$forAll$6(java.util.function.Consumer,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):178:178 -> a
-    36:44:java.lang.Object forAny(java.util.function.Function):184:192 -> a
+    20:27:java.lang.Boolean lambda$getReservedName$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):127:134 -> a
+    28:28:void addRenaming(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod):169:169 -> a
+    29:29:void lambda$addRenaming$5(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):171:171 -> a
+    30:30:void lambda$addRenaming$4(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):172:172 -> a
+    31:31:com.android.tools.r8.naming.MethodNamingState com.android.tools.r8.naming.MethodNameMinifier$State.getNamingState(com.android.tools.r8.graph.DexType):100:100 -> a
+    31:31:void lambda$addRenaming$4(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):172 -> a
+    32:32:void lambda$addRenaming$4(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):172:172 -> a
+    33:33:void forAll(java.util.function.Consumer):176:176 -> a
+    34:34:java.lang.Object lambda$forAll$6(java.util.function.Consumer,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):178:178 -> a
+    35:43:java.lang.Object forAny(java.util.function.Function):184:192 -> a
     1:1:void lambda$reserveName$1(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):147:147 -> b
     2:2:com.android.tools.r8.naming.MethodReservationState com.android.tools.r8.naming.MethodNameMinifier$State.getReservationState(com.android.tools.r8.graph.DexType):96:96 -> b
     2:2:void lambda$reserveName$1(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):147 -> b
@@ -64615,10 +64601,8 @@
     16:17:java.lang.Boolean lambda$isAvailable$3(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):157:158 -> b
     18:18:com.android.tools.r8.naming.MethodNamingState com.android.tools.r8.naming.MethodNameMinifier$State.getNamingState(com.android.tools.r8.graph.DexType):100:100 -> b
     18:18:java.lang.Boolean lambda$isAvailable$3(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):158 -> b
-    19:19:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getReference():375:375 -> b
-    19:19:java.lang.Boolean lambda$isAvailable$3(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):159 -> b
-    20:21:java.lang.Boolean lambda$isAvailable$3(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):159:160 -> b
-    22:29:java.lang.Object forChildren(java.util.function.Function):213:220 -> b
+    19:20:java.lang.Boolean lambda$isAvailable$3(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):159:160 -> b
+    21:28:java.lang.Object forChildren(java.util.function.Function):213:220 -> b
     1:1:void reserveName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod):143:143 -> c
     2:2:void lambda$reserveName$2(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):145:145 -> c
     3:10:java.lang.Object forParents(java.util.function.Function):196:203 -> c
@@ -64729,7 +64713,7 @@
     2:2:com.android.tools.r8.naming.MethodNamingState access$200(com.android.tools.r8.naming.MethodNameMinifier,com.android.tools.r8.graph.DexType):85:85 -> 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):85:85 -> a
     4:4:java.util.function.Function getNamingKeyTransform():159:159 -> a
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():425:425 -> a
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> a
     5:5:java.util.function.Function getNamingKeyTransform():159 -> a
     6:7:java.util.function.Function getNamingKeyTransform():160:161 -> a
     8:8:com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming computeRenaming(java.util.Collection,com.android.tools.r8.utils.Timing):180:180 -> a
@@ -64740,33 +64724,28 @@
     37:37:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
     37:37:void assignNamesToClassesMethods(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodNamingState):208 -> a
     38:39:void assignNamesToClassesMethods(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodNamingState):209:210 -> a
-    40:51:void assignNameToMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.MethodNamingState):221:232 -> a
-    40:51:void assignNamesToClassesMethods(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodNamingState):211 -> a
-    52:52:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getReference():375:375 -> a
-    52:52:void assignNameToMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.MethodNamingState):232 -> a
-    52:52:void assignNamesToClassesMethods(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodNamingState):211 -> a
-    53:55:void assignNameToMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.MethodNamingState):232:234 -> a
-    53:55:void assignNamesToClassesMethods(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodNamingState):211 -> a
-    56:57:void assignNamesToClassesMethods(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodNamingState):214:215 -> a
-    58:58:com.android.tools.r8.naming.MethodNamingState lambda$assignNamesToClassesMethods$3(com.android.tools.r8.naming.MethodNamingState,com.android.tools.r8.naming.MethodReservationState,com.android.tools.r8.graph.DexType):207:207 -> a
-    59:68:com.android.tools.r8.naming.MethodReservationState allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):265:274 -> a
-    69:69:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    69:69:com.android.tools.r8.naming.MethodReservationState allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):274 -> a
-    70:70:com.android.tools.r8.naming.MethodReservationState allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):276:276 -> a
-    71:71:java.lang.Iterable shuffleMethods(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):330:330 -> a
-    71:71:com.android.tools.r8.naming.MethodReservationState allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):276 -> a
-    72:75:com.android.tools.r8.naming.MethodReservationState allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):276:279 -> a
-    76:76:com.android.tools.r8.naming.MethodReservationState lambda$allocateReservationStateAndReserve$4(com.android.tools.r8.naming.MethodReservationState,com.android.tools.r8.graph.DexType):272:272 -> a
-    77:83:com.android.tools.r8.naming.MethodNamingState getOrAllocateMethodNamingStates(com.android.tools.r8.graph.DexType):288:294 -> a
-    84:84:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    84:84:com.android.tools.r8.naming.MethodNamingState getOrAllocateMethodNamingStates(com.android.tools.r8.graph.DexType):294 -> a
-    85:87:com.android.tools.r8.naming.MethodNamingState getOrAllocateMethodNamingStates(com.android.tools.r8.graph.DexType):296:298 -> a
-    88:98:com.android.tools.r8.naming.MethodReservationState findReservationStateInHierarchy(com.android.tools.r8.graph.DexType):312:322 -> a
-    88:98:com.android.tools.r8.naming.MethodNamingState getOrAllocateMethodNamingStates(com.android.tools.r8.graph.DexType):303 -> a
-    99:101:com.android.tools.r8.naming.MethodNamingState getOrAllocateMethodNamingStates(com.android.tools.r8.graph.DexType):304:306 -> a
+    40:53:void assignNameToMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.MethodNamingState):221:234 -> a
+    40:53:void assignNamesToClassesMethods(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodNamingState):211 -> a
+    54:55:void assignNamesToClassesMethods(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodNamingState):214:215 -> a
+    56:56:com.android.tools.r8.naming.MethodNamingState lambda$assignNamesToClassesMethods$3(com.android.tools.r8.naming.MethodNamingState,com.android.tools.r8.naming.MethodReservationState,com.android.tools.r8.graph.DexType):207:207 -> a
+    57:66:com.android.tools.r8.naming.MethodReservationState allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):265:274 -> a
+    67:67:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    67:67:com.android.tools.r8.naming.MethodReservationState allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):274 -> a
+    68:68:com.android.tools.r8.naming.MethodReservationState allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):276:276 -> a
+    69:69:java.lang.Iterable shuffleMethods(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):330:330 -> a
+    69:69:com.android.tools.r8.naming.MethodReservationState allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):276 -> a
+    70:73:com.android.tools.r8.naming.MethodReservationState allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):276:279 -> a
+    74:74:com.android.tools.r8.naming.MethodReservationState lambda$allocateReservationStateAndReserve$4(com.android.tools.r8.naming.MethodReservationState,com.android.tools.r8.graph.DexType):272:272 -> a
+    75:81:com.android.tools.r8.naming.MethodNamingState getOrAllocateMethodNamingStates(com.android.tools.r8.graph.DexType):288:294 -> a
+    82:82:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    82:82:com.android.tools.r8.naming.MethodNamingState getOrAllocateMethodNamingStates(com.android.tools.r8.graph.DexType):294 -> a
+    83:85:com.android.tools.r8.naming.MethodNamingState getOrAllocateMethodNamingStates(com.android.tools.r8.graph.DexType):296:298 -> a
+    86:96:com.android.tools.r8.naming.MethodReservationState findReservationStateInHierarchy(com.android.tools.r8.graph.DexType):312:322 -> a
+    86:96:com.android.tools.r8.naming.MethodNamingState getOrAllocateMethodNamingStates(com.android.tools.r8.graph.DexType):303 -> a
+    97:99:com.android.tools.r8.naming.MethodNamingState getOrAllocateMethodNamingStates(com.android.tools.r8.graph.DexType):304:306 -> a
     1:1:com.android.tools.r8.com.google.common.collect.BiMap access$100(com.android.tools.r8.naming.MethodNameMinifier):85:85 -> b
     2:3:java.util.function.Function getReservationKeyTransform():148:149 -> b
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():425:425 -> b
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> b
     4:4:java.util.function.Function getReservationKeyTransform():149 -> b
     5:8:java.util.function.Function getReservationKeyTransform():151:154 -> b
     9:9:java.lang.Object lambda$getReservationKeyTransform$0(com.android.tools.r8.graph.DexMethod):151:151 -> b
@@ -64789,10 +64768,7 @@
     com.android.tools.r8.naming.MethodNameMinifier this$0 -> a
     1:1:void <init>(com.android.tools.r8.naming.MethodNameMinifier):89:89 -> <init>
     1:1:void putRenaming(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexString):92:92 -> a
-    2:2:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getReference():375:375 -> a
-    2:2:void putRenaming(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexString):92 -> a
-    3:3:void putRenaming(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexString):92:92 -> a
-    4:4:com.android.tools.r8.naming.MethodReservationState getReservationState(com.android.tools.r8.graph.DexType):96:96 -> a
+    2:2:com.android.tools.r8.naming.MethodReservationState getReservationState(com.android.tools.r8.graph.DexType):96:96 -> a
 com.android.tools.r8.naming.MethodNamingState -> com.android.tools.r8.naming.z:
     com.android.tools.r8.naming.MethodNamingState parentNamingState -> e
     com.android.tools.r8.naming.MethodReservationState reservationState -> d
@@ -64806,27 +64782,12 @@
     10:10:com.android.tools.r8.naming.MethodNamingState createRoot(java.util.function.Function,com.android.tools.r8.naming.MemberNamingStrategy,com.android.tools.r8.naming.MethodReservationState):40:40 -> a
     11:11:com.android.tools.r8.naming.MethodNamingState createChild(com.android.tools.r8.naming.MethodReservationState):44:44 -> a
     12:12:com.android.tools.r8.graph.DexString newOrReservedNameFor(com.android.tools.r8.graph.DexEncodedMethod):49:49 -> a
-    13:16:com.android.tools.r8.naming.MethodNamingState$InternalNewNameState createInternalState(com.android.tools.r8.graph.DexMethod):124:127 -> a
-    13:16:java.lang.Object createInternalState(com.android.tools.r8.graph.DexMethod):19 -> a
-    17:17:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getReference():375:375 -> a
-    17:17:void addRenaming(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod):78 -> a
-    18:18:void addRenaming(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod):78:78 -> a
-    19:19:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getReference():375:375 -> a
-    19:19:void addRenaming(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod):79 -> a
-    20:20:void addRenaming(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod):79:79 -> a
-    21:21:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getReference():375:375 -> a
-    21:21:com.android.tools.r8.graph.DexString newOrReservedNameFor(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiPredicate):54 -> a
-    22:26:com.android.tools.r8.graph.DexString newOrReservedNameFor(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiPredicate):54:58 -> a
-    27:27:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getReference():375:375 -> a
-    27:27:com.android.tools.r8.graph.DexString newOrReservedNameFor(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiPredicate):58 -> a
-    28:32:com.android.tools.r8.graph.DexString newOrReservedNameFor(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiPredicate):58:62 -> a
-    33:33:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getReference():375:375 -> a
-    33:33:com.android.tools.r8.graph.DexString newOrReservedNameFor(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiPredicate):63 -> a
-    34:38:com.android.tools.r8.graph.DexString newOrReservedNameFor(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiPredicate):63:67 -> a
-    1:12:boolean isAvailable(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod):83:94 -> b
-    13:13:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getReference():375:375 -> b
-    13:13:com.android.tools.r8.graph.DexString nextName(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiPredicate):71 -> b
-    14:16:com.android.tools.r8.graph.DexString nextName(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiPredicate):71:73 -> b
+    13:26:com.android.tools.r8.graph.DexString newOrReservedNameFor(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiPredicate):54:67 -> a
+    27:28:void addRenaming(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod):78:79 -> a
+    29:32:com.android.tools.r8.naming.MethodNamingState$InternalNewNameState createInternalState(com.android.tools.r8.graph.DexMethod):124:127 -> a
+    29:32:java.lang.Object createInternalState(com.android.tools.r8.graph.DexMethod):19 -> a
+    1:3:com.android.tools.r8.graph.DexString nextName(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiPredicate):71:73 -> b
+    4:15:boolean isAvailable(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod):83:94 -> b
     1:2:java.lang.Object com.android.tools.r8.naming.MethodNamingStateBase.getInternalState(com.android.tools.r8.graph.DexMethod):23:24 -> c
     1:2:com.android.tools.r8.graph.DexString getAssignedName(com.android.tools.r8.graph.DexMethod):111 -> c
     3:8:com.android.tools.r8.graph.DexString getAssignedName(com.android.tools.r8.graph.DexMethod):111:116 -> c
@@ -64867,11 +64828,9 @@
     3:8:boolean isReserved(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod):53:58 -> a
     9:9:com.android.tools.r8.naming.MethodReservationState createRoot(java.util.function.Function):33:33 -> a
     10:10:com.android.tools.r8.naming.MethodReservationState createChild():37:37 -> a
-    11:11:com.android.tools.r8.naming.MethodReservationState$InternalReservationState createInternalState(com.android.tools.r8.graph.DexMethod):77:77 -> a
-    11:11:java.lang.Object createInternalState(com.android.tools.r8.graph.DexMethod):19 -> a
-    12:12:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getReference():375:375 -> a
-    12:12:void reserveName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod):42 -> a
-    13:16:void reserveName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod):42:45 -> a
+    11:14:void reserveName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod):42:45 -> a
+    15:15:com.android.tools.r8.naming.MethodReservationState$InternalReservationState createInternalState(com.android.tools.r8.graph.DexMethod):77:77 -> a
+    15:15:java.lang.Object createInternalState(com.android.tools.r8.graph.DexMethod):19 -> a
     1:2:java.lang.Object com.android.tools.r8.naming.MethodNamingStateBase.getInternalState(com.android.tools.r8.graph.DexMethod):23:24 -> c
     1:2:java.util.Set getReservedNamesFor(com.android.tools.r8.graph.DexMethod):64 -> c
     3:9:java.util.Set getReservedNamesFor(com.android.tools.r8.graph.DexMethod):64:70 -> c
@@ -64883,11 +64842,8 @@
     1:3:void <init>():80:82 -> <init>
     1:1:boolean isReserved(com.android.tools.r8.graph.DexString):85:85 -> a
     2:5:java.util.Set getAssignedNamesFor(com.android.tools.r8.graph.DexMethod):89:92 -> a
-    6:12:void reserveName(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexString):96:102 -> a
-    13:13:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getReference():375:375 -> a
-    13:13:void reserveName(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexString):102 -> a
-    14:16:void reserveName(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexString):102:104 -> a
-    17:17:java.util.Set lambda$reserveName$0(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):103:103 -> a
+    6:14:void reserveName(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexString):96:104 -> a
+    15:15:java.util.Set lambda$reserveName$0(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):103:103 -> a
 com.android.tools.r8.naming.MinifiedRenaming -> com.android.tools.r8.naming.D:
     com.android.tools.r8.graph.AppView appView -> e
     java.util.Map packageRenaming -> f
@@ -64959,25 +64915,17 @@
     1:1:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
     1:1:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexClass):271 -> a
     2:3:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexClass):271:272 -> a
-    4:4:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):226:226 -> a
-    5:5:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getReference():375:375 -> a
-    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedMethod.getHolderType():363 -> a
-    5:5:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):226 -> a
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedMethod.getHolderType():363:363 -> a
-    6:6:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):226 -> a
-    7:8:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):226:227 -> a
+    4:5:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):226:227 -> a
+    6:6:com.android.tools.r8.graph.DexString getNextName(com.android.tools.r8.naming.InternalNamingState,boolean):249:249 -> a
+    6:6:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):230 -> a
+    7:7:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):231:231 -> a
+    8:8:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):240:240 -> a
     9:9:com.android.tools.r8.graph.DexString getNextName(com.android.tools.r8.naming.InternalNamingState,boolean):249:249 -> a
-    9:9:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):230 -> a
-    10:10:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getReference():375:375 -> a
-    10:10:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):231 -> a
-    11:11:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):231:231 -> a
-    12:12:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):240:240 -> a
-    13:13:com.android.tools.r8.graph.DexString getNextName(com.android.tools.r8.naming.InternalNamingState,boolean):249:249 -> a
-    13:13:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):243 -> a
-    14:14:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):244:244 -> a
-    15:25:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):254:264 -> a
-    26:26:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):258:258 -> a
-    27:27:boolean allowMemberRenaming(com.android.tools.r8.graph.DexClass):279:279 -> a
+    9:9:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):243 -> a
+    10:10:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):244:244 -> a
+    11:21:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):254:264 -> a
+    22:22:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):258:258 -> a
+    23:23:boolean allowMemberRenaming(com.android.tools.r8.graph.DexClass):279:279 -> a
     1:1:boolean checkAllowMemberRenaming(com.android.tools.r8.graph.DexType):283:283 -> c
     2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> c
     2:2:boolean checkAllowMemberRenaming(com.android.tools.r8.graph.DexType):283 -> c
@@ -64996,10 +64944,7 @@
     1:1:com.android.tools.r8.graph.DexString lookupName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexItemFactory):84 -> a
     2:9:com.android.tools.r8.graph.DexString lookupName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexItemFactory):85:92 -> a
     java.lang.String lookupPackageName(java.lang.String) -> a
-    10:19:com.android.tools.r8.graph.DexString lookupMethodName(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.AppView):60:69 -> a
-    20:20:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getReference():375:375 -> a
-    20:20:com.android.tools.r8.graph.DexString lookupMethodName(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.AppView):69 -> a
-    21:27:com.android.tools.r8.graph.DexString lookupMethodName(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.AppView):71:77 -> a
+    10:27:com.android.tools.r8.graph.DexString lookupMethodName(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.AppView):60:77 -> a
     28:28:com.android.tools.r8.graph.DexString lookupMethodName(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.AppView):73:73 -> a
     29:29:com.android.tools.r8.graph.DexMethod lambda$lookupMethodName$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):75:75 -> a
     30:34:com.android.tools.r8.graph.DexMethod lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):103:103 -> a
@@ -65108,76 +65053,76 @@
     1389:1392:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):124:127 -> a
     1393:1404:void computeDefaultInterfaceMethodMethods():334:345 -> a
     1393:1404:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):128 -> a
-    1405:2201:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.isCompanionClassType(com.android.tools.r8.graph.DexType):0:796 -> a
-    1405:2201:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):361 -> a
-    1405:2201:void computeDefaultInterfaceMethodMethods():345 -> a
-    1405:2201:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):128 -> a
-    2202:2203:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):364:365 -> a
-    2202:2203:void computeDefaultInterfaceMethodMethods():345 -> a
-    2202:2203:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):128 -> a
-    2204:2204:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    2204:2204:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):365 -> a
-    2204:2204:void computeDefaultInterfaceMethodMethods():345 -> a
-    2204:2204:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):128 -> a
-    2205:2205:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> a
-    2205:2205:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):366 -> a
+    1405:2202:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.isCompanionClassType(com.android.tools.r8.graph.DexType):0:797 -> a
+    1405:2202:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):361 -> a
+    1405:2202:void computeDefaultInterfaceMethodMethods():345 -> a
+    1405:2202:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):128 -> a
+    2203:2204:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):364:365 -> a
+    2203:2204:void computeDefaultInterfaceMethodMethods():345 -> a
+    2203:2204:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):128 -> a
+    2205:2205:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    2205:2205:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):365 -> a
     2205:2205:void computeDefaultInterfaceMethodMethods():345 -> a
     2205:2205:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):128 -> a
-    2206:2218:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):369:381 -> a
-    2206:2218:void computeDefaultInterfaceMethodMethods():345 -> a
-    2206:2218:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):128 -> a
-    2219:2223:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):380:384 -> a
-    2219:2223:void computeDefaultInterfaceMethodMethods():345 -> a
-    2219:2223:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):128 -> a
-    2224:2224:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):383:383 -> a
-    2224:2224:void computeDefaultInterfaceMethodMethods():345 -> a
-    2224:2224:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):128 -> a
-    2225:2271:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):129:175 -> a
-    2272:2277:void lambda$run$2(java.util.ArrayDeque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo,java.util.Set,com.android.tools.r8.graph.DexClass):101:106 -> a
-    2278:2278:void lambda$run$3(java.util.ArrayDeque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.graph.DexType):119:119 -> a
-    2279:2279:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    2279:2279:void lambda$run$3(java.util.ArrayDeque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.graph.DexType):119 -> a
-    2280:2281:void lambda$run$3(java.util.ArrayDeque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.graph.DexType):120:121 -> a
-    2282:2283:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):185:186 -> a
-    2284:2284:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    2284:2284:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):186 -> a
-    2285:2294:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):189:198 -> a
-    2295:2302:void checkAndAddMappedNames(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.position.Position):320:327 -> a
-    2295:2302:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):198 -> a
-    2303:2303:void checkAndAddMappedNames(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.position.Position):326:326 -> a
-    2303:2303:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):198 -> a
-    2304:2308:void checkAndAddMappedNames(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.position.Position):325:329 -> a
-    2304:2308:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):198 -> a
-    2309:2317:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):199:207 -> a
-    2318:2333:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):204:219 -> a
-    2334:2343:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):218:227 -> a
-    2344:2357:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):222:235 -> a
-    2358:2378:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):234:254 -> a
-    2379:2379:void com.android.tools.r8.graph.SubtypingInfo.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):212:212 -> a
-    2379:2379:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):254 -> a
-    2380:2382:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):257:259 -> a
-    2383:2383:void com.android.tools.r8.graph.SubtypingInfo.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):212:212 -> a
-    2383:2383:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):259 -> a
-    2384:2384:void lambda$computeMapping$5(java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.graph.DexType):256:256 -> a
-    2385:2391:void addNonPrivateInterfaceMappings(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.graph.DexType[]):267:273 -> a
-    2392:2392:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    2392:2392:void addNonPrivateInterfaceMappings(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.graph.DexType[]):273 -> a
-    2393:2393:void addNonPrivateInterfaceMappings(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.graph.DexType[]):275:275 -> a
-    2394:2394:void lambda$addNonPrivateInterfaceMappings$7(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.naming.MemberNaming):271:271 -> a
-    2395:2400:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):285:290 -> a
-    2401:2403:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):289:291 -> a
-    2404:2493:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):0:89 -> a
-    2404:2493:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):291 -> a
-    2494:2501:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):292:299 -> a
-    2502:2504:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):298:300 -> a
-    2505:2594:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):0:89 -> a
-    2505:2594:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):300 -> a
-    2595:2595:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):301:301 -> a
-    2596:2596:boolean com.android.tools.r8.graph.DexEncodedField.isPrivate():179:179 -> a
-    2596:2596:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):302 -> a
-    2597:2597:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):303:303 -> a
-    2598:2600:void addMemberNaming(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.MemberNaming,java.util.Map):310:310 -> a
-    2602:2605:void addMemberNaming(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.MemberNaming,java.util.Map):312:315 -> a
+    2206:2206:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> a
+    2206:2206:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):366 -> a
+    2206:2206:void computeDefaultInterfaceMethodMethods():345 -> a
+    2206:2206:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):128 -> a
+    2207:2219:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):369:381 -> a
+    2207:2219:void computeDefaultInterfaceMethodMethods():345 -> a
+    2207:2219:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):128 -> a
+    2220:2224:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):380:384 -> a
+    2220:2224:void computeDefaultInterfaceMethodMethods():345 -> a
+    2220:2224:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):128 -> a
+    2225:2225:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):383:383 -> a
+    2225:2225:void computeDefaultInterfaceMethodMethods():345 -> a
+    2225:2225:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):128 -> a
+    2226:2272:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):129:175 -> a
+    2273:2278:void lambda$run$2(java.util.ArrayDeque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo,java.util.Set,com.android.tools.r8.graph.DexClass):101:106 -> a
+    2279:2279:void lambda$run$3(java.util.ArrayDeque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.graph.DexType):119:119 -> a
+    2280:2280:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    2280:2280:void lambda$run$3(java.util.ArrayDeque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.graph.DexType):119 -> a
+    2281:2282:void lambda$run$3(java.util.ArrayDeque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.graph.DexType):120:121 -> a
+    2283:2284:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):185:186 -> a
+    2285:2285:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    2285:2285:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):186 -> a
+    2286:2295:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):189:198 -> a
+    2296:2303:void checkAndAddMappedNames(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.position.Position):320:327 -> a
+    2296:2303:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):198 -> a
+    2304:2304:void checkAndAddMappedNames(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.position.Position):326:326 -> a
+    2304:2304:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):198 -> a
+    2305:2309:void checkAndAddMappedNames(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.position.Position):325:329 -> a
+    2305:2309:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):198 -> a
+    2310:2318:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):199:207 -> a
+    2319:2334:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):204:219 -> a
+    2335:2344:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):218:227 -> a
+    2345:2358:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):222:235 -> a
+    2359:2379:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):234:254 -> a
+    2380:2380:void com.android.tools.r8.graph.SubtypingInfo.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):212:212 -> a
+    2380:2380:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):254 -> a
+    2381:2383:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):257:259 -> a
+    2384:2384:void com.android.tools.r8.graph.SubtypingInfo.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):212:212 -> a
+    2384:2384:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):259 -> a
+    2385:2385:void lambda$computeMapping$5(java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.graph.DexType):256:256 -> a
+    2386:2392:void addNonPrivateInterfaceMappings(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.graph.DexType[]):267:273 -> a
+    2393:2393:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    2393:2393:void addNonPrivateInterfaceMappings(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.graph.DexType[]):273 -> a
+    2394:2394:void addNonPrivateInterfaceMappings(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.graph.DexType[]):275:275 -> a
+    2395:2395:void lambda$addNonPrivateInterfaceMappings$7(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.naming.MemberNaming):271:271 -> a
+    2396:2401:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):285:290 -> a
+    2402:2404:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):289:291 -> a
+    2405:2494:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):0:89 -> a
+    2405:2494:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):291 -> a
+    2495:2502:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):292:299 -> a
+    2503:2505:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):298:300 -> a
+    2506:2595:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):0:89 -> a
+    2506:2595:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):300 -> a
+    2596:2596:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):301:301 -> a
+    2597:2597:boolean com.android.tools.r8.graph.DexEncodedField.isPrivate():179:179 -> a
+    2597:2597:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):302 -> a
+    2598:2598:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):303:303 -> a
+    2599:2601:void addMemberNaming(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.MemberNaming,java.util.Map):310:310 -> a
+    2603:2606:void addMemberNaming(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.MemberNaming,java.util.Map):312:315 -> a
     1:1:int lambda$run$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):98:98 -> b
     2:2:void lambda$computeMapping$4(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.naming.MemberNaming):200:200 -> b
     3:3:void lambda$computeMapping$6(java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.graph.DexType):261:261 -> b
@@ -65198,16 +65143,14 @@
     1:1:void <clinit>():448:448 -> <clinit>
     1:4:void <init>(com.android.tools.r8.graph.AppView,java.util.Map):456:459 -> <init>
     boolean allowMemberRenaming(com.android.tools.r8.graph.DexClass) -> a
-    1:1:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getReference():375:375 -> a
-    1:1:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):467 -> a
-    2:2:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):468:468 -> a
+    1:2:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):467:468 -> a
     3:92:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):0:89 -> a
     3:92:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):468 -> a
     93:93:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
     93:93:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89 -> a
     93:93:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):468 -> a
     94:108:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):469:483 -> a
-    109:109:boolean com.android.tools.r8.graph.DexClass.isAnnotation():501:501 -> a
+    109:109:boolean com.android.tools.r8.graph.DexClass.isAnnotation():505:505 -> a
     109:109:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):483 -> a
     110:110:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):483:483 -> a
     111:122:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):492:503 -> a
@@ -65379,7 +65322,7 @@
     java.lang.String msg -> d
     1:5:void <init>(com.android.tools.r8.naming.ProguardMapReader,java.lang.String,boolean):541:545 -> <init>
     1:4:java.lang.String toString():550:553 -> toString
-com.android.tools.r8.naming.ProguardMapSupplier -> com.android.tools.r8.internal.ut:
+com.android.tools.r8.naming.ProguardMapSupplier -> com.android.tools.r8.internal.wt:
     com.android.tools.r8.naming.ClassNameMapper classNameMapper -> c
     com.android.tools.r8.utils.InternalOptions options -> e
     com.android.tools.r8.utils.Reporter reporter -> f
@@ -65400,8 +65343,8 @@
     31:31:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId writeProguardMap():66 -> a
     32:32:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId writeProguardMap():67:67 -> a
     1:1:com.android.tools.r8.StringConsumer access$200(com.android.tools.r8.naming.ProguardMapSupplier):20:20 -> b
-com.android.tools.r8.naming.ProguardMapSupplier$1 -> com.android.tools.r8.internal.ut$a:
-com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapChecker -> com.android.tools.r8.internal.ut$b:
+com.android.tools.r8.naming.ProguardMapSupplier$1 -> com.android.tools.r8.internal.wt$a:
+com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapChecker -> com.android.tools.r8.internal.wt$b:
     boolean $assertionsDisabled -> a
     com.android.tools.r8.StringConsumer inner -> b
     java.lang.StringBuilder contents -> c
@@ -65414,23 +65357,23 @@
     3:5:boolean com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapChecker.validateProguardMapParses(java.lang.String):163:165 -> finished
     3:5:void finished(com.android.tools.r8.DiagnosticsHandler):158 -> finished
     6:6:void finished(com.android.tools.r8.DiagnosticsHandler):158:158 -> finished
-com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId -> com.android.tools.r8.internal.ut$c:
+com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId -> com.android.tools.r8.internal.wt$c:
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():33:33 -> <clinit>
     1:1:void <init>(java.lang.String,com.android.tools.r8.naming.ProguardMapSupplier$1):33:33 -> <init>
     2:4:void <init>(java.lang.String):35:37 -> <init>
-com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapIdBuilder -> com.android.tools.r8.internal.ut$d:
+com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapIdBuilder -> com.android.tools.r8.internal.wt$d:
     com.android.tools.r8.com.google.common.hash.Hasher hasher -> a
     1:3:void <init>():107:109 -> <init>
     1:4:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapIdBuilder com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapIdBuilder.accept(java.lang.String):113:116 -> a
     1:4:com.android.tools.r8.utils.ChainableStringConsumer accept(java.lang.String):107 -> a
     5:5:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId build():123:123 -> a
-com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapWriter -> com.android.tools.r8.internal.ut$e:
+com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapWriter -> com.android.tools.r8.internal.wt$e:
     com.android.tools.r8.naming.ProguardMapSupplier this$0 -> a
     1:1:void <init>(com.android.tools.r8.naming.ProguardMapSupplier):127:127 -> <init>
     1:1:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapWriter com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapWriter.accept(java.lang.String):131:131 -> a
     1:1:com.android.tools.r8.utils.ChainableStringConsumer accept(java.lang.String):127 -> a
-com.android.tools.r8.naming.Range -> com.android.tools.r8.internal.rv:
+com.android.tools.r8.naming.Range -> com.android.tools.r8.internal.tv:
     int to -> b
     int from -> a
     1:3:void <init>(int,int):12:14 -> <init>
@@ -65500,7 +65443,7 @@
     118:119:com.android.tools.r8.naming.ClassNamingForMapApplier$Builder classNamingBuilder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position):57:58 -> a
     118:119:com.android.tools.r8.naming.ClassNaming$Builder classNamingBuilder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position):39 -> a
     120:121:com.android.tools.r8.naming.SeedMapper build():65:66 -> a
-com.android.tools.r8.naming.SourceFileRewriter -> com.android.tools.r8.internal.ty:
+com.android.tools.r8.naming.SourceFileRewriter -> com.android.tools.r8.internal.vy:
     com.android.tools.r8.graph.AppView appView -> b
     boolean $assertionsDisabled -> a
     com.android.tools.r8.graph.DexApplication application -> c
@@ -65509,12 +65452,12 @@
     1:11:void run():33:43 -> a
     12:14:com.android.tools.r8.graph.DexString com.android.tools.r8.naming.SourceFileRewriter.getSourceFileRenaming(com.android.tools.r8.shaking.ProguardConfiguration):86:88 -> a
     12:14:void run():46 -> a
-    15:15:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():425:425 -> a
+    15:15:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> a
     15:15:com.android.tools.r8.graph.DexString com.android.tools.r8.naming.SourceFileRewriter.getSourceFileRenaming(com.android.tools.r8.shaking.ProguardConfiguration):88 -> a
     15:15:void run():46 -> a
     16:34:com.android.tools.r8.graph.DexString com.android.tools.r8.naming.SourceFileRewriter.getSourceFileRenaming(com.android.tools.r8.shaking.ProguardConfiguration):91:109 -> a
     16:34:void run():46 -> a
-    35:35:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():425:425 -> a
+    35:35:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> a
     35:35:com.android.tools.r8.graph.DexString com.android.tools.r8.naming.SourceFileRewriter.getSourceFileRenaming(com.android.tools.r8.shaking.ProguardConfiguration):109 -> a
     35:35:void run():46 -> a
     36:36:com.android.tools.r8.graph.DexString com.android.tools.r8.naming.SourceFileRewriter.getSourceFileRenaming(com.android.tools.r8.shaking.ProguardConfiguration):109:109 -> a
@@ -65581,7 +65524,7 @@
     52:52:com.android.tools.r8.graph.DexString map(java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,int):63:63 -> a
     53:53:com.android.tools.r8.graph.DexString map(java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,int):54:54 -> a
     54:92:com.android.tools.r8.graph.DexString map(java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,int):46:84 -> a
-com.android.tools.r8.naming.dexitembasedstring.FieldNameComputationInfo -> com.android.tools.r8.internal.ya:
+com.android.tools.r8.naming.dexitembasedstring.FieldNameComputationInfo -> com.android.tools.r8.internal.za:
     com.android.tools.r8.naming.dexitembasedstring.FieldNameComputationInfo FIELD_NAME_INSTANCE -> a
     1:1:void <clinit>():15:15 -> <clinit>
     1:1:void <init>():18:18 -> <init>
@@ -65589,7 +65532,7 @@
     boolean needsToComputeName() -> c
     boolean needsToRegisterReference() -> d
     1:1:com.android.tools.r8.naming.dexitembasedstring.FieldNameComputationInfo forFieldName():21:21 -> e
-com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo -> com.android.tools.r8.internal.up:
+com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo -> com.android.tools.r8.internal.vp:
     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
@@ -65715,20 +65658,20 @@
     com.android.tools.r8.naming.mappinginformation.SignatureMappingInformation asSignatureMappingInformation() -> b
     boolean isSignatureMappingInformation() -> d
     com.android.tools.r8.naming.MemberNaming$Signature getSignature() -> f
-com.android.tools.r8.naming.signature.GenericSignatureAction -> com.android.tools.r8.internal.Eb:
+com.android.tools.r8.naming.signature.GenericSignatureAction -> com.android.tools.r8.internal.Fb:
     void parsedIdentifier(java.lang.String) -> a
     java.lang.Object parsedInnerTypeName(java.lang.Object,java.lang.String) -> a
     void parsedSymbol(char) -> a
     java.lang.Object parsedTypeName(java.lang.String,com.android.tools.r8.naming.signature.GenericSignatureAction$ParserPosition) -> a
     void stop() -> a
     void start() -> b
-com.android.tools.r8.naming.signature.GenericSignatureAction$ParserPosition -> com.android.tools.r8.internal.Eb$a:
+com.android.tools.r8.naming.signature.GenericSignatureAction$ParserPosition -> com.android.tools.r8.internal.Fb$a:
     com.android.tools.r8.naming.signature.GenericSignatureAction$ParserPosition MEMBER_ANNOTATION -> c
     com.android.tools.r8.naming.signature.GenericSignatureAction$ParserPosition ENCLOSING_INNER_OR_TYPE_ANNOTATION -> b
     com.android.tools.r8.naming.signature.GenericSignatureAction$ParserPosition CLASS_SUPER_OR_INTERFACE_ANNOTATION -> a
     1:3:void <clinit>():15:17 -> <clinit>
     1:1:void <init>(java.lang.String,int):14:14 -> <init>
-com.android.tools.r8.naming.signature.GenericSignatureParser -> com.android.tools.r8.internal.Fb:
+com.android.tools.r8.naming.signature.GenericSignatureParser -> com.android.tools.r8.internal.Gb:
     com.android.tools.r8.naming.signature.GenericSignatureAction actions -> b
     char[] buffer -> f
     boolean eof -> e
@@ -65772,7 +65715,7 @@
     1:11:void updateOptTypeArguments():252:262 -> f
     1:13:void updateTypeArgument():268:280 -> g
     1:9:void updateTypeVariableSignature():286:294 -> h
-com.android.tools.r8.naming.signature.GenericSignatureRewriter -> com.android.tools.r8.internal.Gb:
+com.android.tools.r8.naming.signature.GenericSignatureRewriter -> com.android.tools.r8.internal.Hb:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.naming.NamingLens namingLens -> b
     com.android.tools.r8.utils.InternalOptions options -> c
@@ -65813,7 +65756,7 @@
     510:510:void lambda$publicizeClass$1(com.android.tools.r8.graph.ProgramField):122:122 -> a
     511:517:boolean com.android.tools.r8.optimize.ClassAndMemberPublicizer.publicizeMethod(com.android.tools.r8.graph.ProgramMethod):148:154 -> a
     511:517:void lambda$publicizeClass$2(java.util.Set,com.android.tools.r8.graph.ProgramMethod):129 -> a
-    518:518:boolean com.android.tools.r8.graph.DexEncodedMethod.isPrivate():478:478 -> a
+    518:518:boolean com.android.tools.r8.graph.DexEncodedMethod.isPrivate():484:484 -> a
     518:518:boolean com.android.tools.r8.optimize.ClassAndMemberPublicizer.publicizeMethod(com.android.tools.r8.graph.ProgramMethod):157 -> a
     518:518:void lambda$publicizeClass$2(java.util.Set,com.android.tools.r8.graph.ProgramMethod):129 -> a
     519:555:boolean com.android.tools.r8.optimize.ClassAndMemberPublicizer.publicizeMethod(com.android.tools.r8.graph.ProgramMethod):162:198 -> a
@@ -65821,7 +65764,7 @@
     556:556:boolean com.android.tools.r8.optimize.ClassAndMemberPublicizer.publicizeMethod(com.android.tools.r8.graph.ProgramMethod):165:165 -> a
     556:556:void lambda$publicizeClass$2(java.util.Set,com.android.tools.r8.graph.ProgramMethod):129 -> a
     557:557:void lambda$publicizeClass$2(java.util.Set,com.android.tools.r8.graph.ProgramMethod):130:130 -> a
-com.android.tools.r8.optimize.FieldRebindingIdentityLens -> com.android.tools.r8.internal.Da:
+com.android.tools.r8.optimize.FieldRebindingIdentityLens -> com.android.tools.r8.internal.Ea:
     boolean $assertionsDisabled -> f
     java.util.Map nonReboundFieldReferenceToDefinitionMap -> g
     1:1:void <clinit>():23:23 -> <clinit>
@@ -65843,15 +65786,15 @@
     com.android.tools.r8.graph.DexType internalDescribeLookupClassType(com.android.tools.r8.graph.DexType) -> e
     1:1:boolean isContextFreeForMethods():110:110 -> e
     com.android.tools.r8.graph.DexMethod internalGetPreviousMethodSignature(com.android.tools.r8.graph.DexMethod) -> f
-com.android.tools.r8.optimize.FieldRebindingIdentityLens$1 -> com.android.tools.r8.internal.Ba:
-com.android.tools.r8.optimize.FieldRebindingIdentityLens$Builder -> com.android.tools.r8.internal.Ca:
+com.android.tools.r8.optimize.FieldRebindingIdentityLens$1 -> com.android.tools.r8.internal.Ca:
+com.android.tools.r8.optimize.FieldRebindingIdentityLens$Builder -> com.android.tools.r8.internal.Da:
     java.util.Map nonReboundFieldReferenceToDefinitionMap -> a
     1:1:void <init>(com.android.tools.r8.optimize.FieldRebindingIdentityLens$1):113:113 -> <init>
     2:2:void <init>():118:118 -> <init>
     3:3:void <init>():115:115 -> <init>
     1:1:void recordDefinitionForNonReboundFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):122:122 -> a
     2:3:com.android.tools.r8.optimize.FieldRebindingIdentityLens build(com.android.tools.r8.graph.DexItemFactory):129:130 -> a
-com.android.tools.r8.optimize.InvokeSingleTargetExtractor -> com.android.tools.r8.internal.yg:
+com.android.tools.r8.optimize.InvokeSingleTargetExtractor -> com.android.tools.r8.internal.zg:
     com.android.tools.r8.optimize.InvokeSingleTargetExtractor$InvokeKind kind -> d
     com.android.tools.r8.graph.DexMethod target -> e
     boolean $assertionsDisabled -> c
@@ -65884,7 +65827,7 @@
     1:1:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):95 -> g
     2:2:void com.android.tools.r8.optimize.InvokeSingleTargetExtractor.invalid():32:32 -> g
     2:2:void registerTypeReference(com.android.tools.r8.graph.DexType):100 -> g
-com.android.tools.r8.optimize.InvokeSingleTargetExtractor$InvokeKind -> com.android.tools.r8.internal.xg:
+com.android.tools.r8.optimize.InvokeSingleTargetExtractor$InvokeKind -> com.android.tools.r8.internal.yg:
     com.android.tools.r8.optimize.InvokeSingleTargetExtractor$InvokeKind ILLEGAL -> d
     com.android.tools.r8.optimize.InvokeSingleTargetExtractor$InvokeKind NONE -> e
     com.android.tools.r8.optimize.InvokeSingleTargetExtractor$InvokeKind STATIC -> b
@@ -65892,7 +65835,7 @@
     com.android.tools.r8.optimize.InvokeSingleTargetExtractor$InvokeKind VIRTUAL -> a
     1:5:void <clinit>():109:113 -> <clinit>
     1:1:void <init>(java.lang.String,int):108:108 -> <init>
-com.android.tools.r8.optimize.MemberRebindingAnalysis -> com.android.tools.r8.internal.Sn:
+com.android.tools.r8.optimize.MemberRebindingAnalysis -> com.android.tools.r8.internal.Tn:
     com.android.tools.r8.optimize.MemberRebindingLens$Builder lensBuilder -> e
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.utils.InternalOptions options -> d
@@ -65932,7 +65875,7 @@
     97:97:void lambda$computeMethodRebinding$1(java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.collections.ProgramMethodSet):181:181 -> a
     98:98:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.needsBridgeForInterfaceMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Invoke$Type):211:211 -> a
     98:98:void lambda$computeMethodRebinding$1(java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.collections.ProgramMethodSet):188 -> a
-    99:99:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():425:425 -> a
+    99:99:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> a
     99:99:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.needsBridgeForInterfaceMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Invoke$Type):211 -> a
     99:99:void lambda$computeMethodRebinding$1(java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.collections.ProgramMethodSet):188 -> a
     100:103:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.needsBridgeForInterfaceMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Invoke$Type):211:214 -> a
@@ -65974,7 +65917,7 @@
     1:1:com.android.tools.r8.graph.DexEncodedMethod interfaceLookup(com.android.tools.r8.graph.DexMethod):134:134 -> c
     2:6:com.android.tools.r8.optimize.MemberRebindingLens run(java.util.concurrent.ExecutorService):332:336 -> c
     1:18:boolean verifyFieldAccessCollectionContainsAllNonReboundFieldReferences(java.util.concurrent.ExecutorService):341:358 -> d
-com.android.tools.r8.optimize.MemberRebindingAnalysis$1 -> com.android.tools.r8.internal.Rn:
+com.android.tools.r8.optimize.MemberRebindingAnalysis$1 -> com.android.tools.r8.internal.Sn:
     java.util.Set val$nonReboundFieldReferences -> c
     com.android.tools.r8.optimize.MemberRebindingAnalysis this$0 -> d
     1:1:void <init>(com.android.tools.r8.optimize.MemberRebindingAnalysis,com.android.tools.r8.graph.DexItemFactory,java.util.Set):370:370 -> <init>
@@ -65992,10 +65935,10 @@
     void registerTypeReference(com.android.tools.r8.graph.DexType) -> g
     1:1:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):389:389 -> g
     1:4:void registerFieldReference(com.android.tools.r8.graph.DexField):393:396 -> i
-    5:5:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.toReference():134:134 -> i
+    5:5:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getReference():134:134 -> i
     5:5:void registerFieldReference(com.android.tools.r8.graph.DexField):396 -> i
     6:6:void registerFieldReference(com.android.tools.r8.graph.DexField):397:397 -> i
-com.android.tools.r8.optimize.MemberRebindingIdentityLens -> com.android.tools.r8.internal.Vn:
+com.android.tools.r8.optimize.MemberRebindingIdentityLens -> com.android.tools.r8.internal.Wn:
     boolean $assertionsDisabled -> f
     java.util.Map nonReboundFieldReferenceToDefinitionMap -> g
     java.util.Map nonReboundMethodReferenceToDefinitionMap -> h
@@ -66021,8 +65964,8 @@
     com.android.tools.r8.graph.DexType internalDescribeLookupClassType(com.android.tools.r8.graph.DexType) -> e
     1:1:boolean isContextFreeForMethods():128:128 -> e
     com.android.tools.r8.graph.DexMethod internalGetPreviousMethodSignature(com.android.tools.r8.graph.DexMethod) -> f
-com.android.tools.r8.optimize.MemberRebindingIdentityLens$1 -> com.android.tools.r8.internal.Tn:
-com.android.tools.r8.optimize.MemberRebindingIdentityLens$Builder -> com.android.tools.r8.internal.Un:
+com.android.tools.r8.optimize.MemberRebindingIdentityLens$1 -> com.android.tools.r8.internal.Un:
+com.android.tools.r8.optimize.MemberRebindingIdentityLens$Builder -> com.android.tools.r8.internal.Vn:
     java.util.Map nonReboundFieldReferenceToDefinitionMap -> b
     java.util.Map nonReboundMethodReferenceToDefinitionMap -> c
     com.android.tools.r8.graph.AppView appView -> a
@@ -66034,11 +65977,9 @@
     3:3:void com.android.tools.r8.optimize.MemberRebindingIdentityLens$Builder.recordNonReboundFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):151:151 -> a
     3:3:void lambda$recordNonReboundFieldAccesses$0(com.android.tools.r8.graph.FieldAccessInfo,com.android.tools.r8.graph.DexField):146 -> a
     4:13:void recordMethodAccess(com.android.tools.r8.graph.DexMethod):155:164 -> a
-    14:14:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getReference():375:375 -> a
-    14:14:void recordMethodAccess(com.android.tools.r8.graph.DexMethod):164 -> a
-    15:15:void recordMethodAccess(com.android.tools.r8.graph.DexMethod):163:163 -> a
-    16:20:com.android.tools.r8.optimize.MemberRebindingIdentityLens build():173:177 -> a
-com.android.tools.r8.optimize.MemberRebindingIdentityLensFactory -> com.android.tools.r8.internal.Xn:
+    14:14:void recordMethodAccess(com.android.tools.r8.graph.DexMethod):163:163 -> a
+    15:19:com.android.tools.r8.optimize.MemberRebindingIdentityLens build():173:177 -> a
+com.android.tools.r8.optimize.MemberRebindingIdentityLensFactory -> com.android.tools.r8.internal.Yn:
     1:45:com.android.tools.r8.optimize.MemberRebindingIdentityLens$Builder com.android.tools.r8.optimize.MemberRebindingIdentityLens.builder(com.android.tools.r8.graph.AppView):0:44 -> a
     1:45: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 -> a
     46:48: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):73:75 -> a
@@ -66048,7 +65989,7 @@
     73:73: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
     74:74:void com.android.tools.r8.graph.UseRegistry.accept(com.android.tools.r8.graph.ProgramMethod):21:21 -> a
     74:74: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.Wn:
+com.android.tools.r8.optimize.MemberRebindingIdentityLensFactory$NonReboundMemberReferencesRegistry -> com.android.tools.r8.internal.Xn:
     com.android.tools.r8.graph.ProgramMethod context -> e
     java.util.Set seenFieldReferences -> h
     java.util.Set seenMethodReferences -> i
@@ -66063,10 +66004,7 @@
     3:9:void registerInvokeMethod(com.android.tools.r8.graph.DexMethod,java.util.Map):206:212 -> a
     10:45:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):0:35 -> a
     10:45:void registerInvokeMethod(com.android.tools.r8.graph.DexMethod,java.util.Map):212 -> a
-    46:51:void registerInvokeMethod(com.android.tools.r8.graph.DexMethod,java.util.Map):216:221 -> a
-    52:52:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getReference():375:375 -> a
-    52:52:void registerInvokeMethod(com.android.tools.r8.graph.DexMethod,java.util.Map):221 -> a
-    53:53:void registerInvokeMethod(com.android.tools.r8.graph.DexMethod,java.util.Map):228:228 -> a
+    46:58:void registerInvokeMethod(com.android.tools.r8.graph.DexMethod,java.util.Map):216:228 -> a
     1:1:void registerInvokeInterface(com.android.tools.r8.graph.DexMethod):187:187 -> b
     1:1:void registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):136:136 -> c
     2:2:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):192:192 -> c
@@ -66079,7 +66017,7 @@
     void registerTypeReference(com.android.tools.r8.graph.DexType) -> g
     1:1:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):146:146 -> g
     1:9:void registerFieldAccess(com.android.tools.r8.graph.DexField):150:158 -> i
-    10:10:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.toReference():134:134 -> i
+    10:10:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getReference():134:134 -> i
     10:10:void registerFieldAccess(com.android.tools.r8.graph.DexField):158 -> i
     11:16:void registerFieldAccess(com.android.tools.r8.graph.DexField):163:168 -> i
     17:17:boolean com.android.tools.r8.graph.AbstractAccessContexts.isBottom():0:0 -> i
@@ -66088,7 +66026,7 @@
     21:21:boolean com.android.tools.r8.graph.AbstractAccessContexts.isConcrete():0:0 -> i
     21:21:void registerFieldAccess(com.android.tools.r8.graph.DexField):171 -> i
     22:28:void registerFieldAccess(com.android.tools.r8.graph.DexField):171:177 -> i
-com.android.tools.r8.optimize.MemberRebindingLens -> com.android.tools.r8.internal.ao:
+com.android.tools.r8.optimize.MemberRebindingLens -> com.android.tools.r8.internal.bo:
     java.util.Map nonReboundFieldReferenceToDefinitionMap -> i
     boolean $assertionsDisabled -> f
     com.android.tools.r8.graph.AppView appView -> g
@@ -66121,8 +66059,8 @@
     com.android.tools.r8.graph.DexType internalDescribeLookupClassType(com.android.tools.r8.graph.DexType) -> e
     1:1:boolean isContextFreeForMethods():88:88 -> e
     com.android.tools.r8.graph.DexMethod internalGetPreviousMethodSignature(com.android.tools.r8.graph.DexMethod) -> f
-com.android.tools.r8.optimize.MemberRebindingLens$1 -> com.android.tools.r8.internal.Yn:
-com.android.tools.r8.optimize.MemberRebindingLens$Builder -> com.android.tools.r8.internal.Zn:
+com.android.tools.r8.optimize.MemberRebindingLens$1 -> com.android.tools.r8.internal.Zn:
+com.android.tools.r8.optimize.MemberRebindingLens$Builder -> com.android.tools.r8.internal.ao:
     java.util.Map methodMaps -> c
     java.util.Map nonReboundFieldReferenceToDefinitionMap -> d
     com.android.tools.r8.graph.AppView appView -> b
@@ -66137,7 +66075,7 @@
     11:11:void com.android.tools.r8.optimize.MemberRebindingLens$Builder.recordNonReboundFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):178:178 -> a
     11:11:void lambda$recordNonReboundFieldAccesses$1(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):173 -> a
     12:12:com.android.tools.r8.optimize.MemberRebindingLens build():182:182 -> a
-com.android.tools.r8.optimize.PublicizerLens -> com.android.tools.r8.internal.pv:
+com.android.tools.r8.optimize.PublicizerLens -> com.android.tools.r8.internal.rv:
     boolean $assertionsDisabled -> m
     com.android.tools.r8.graph.AppView appView -> n
     java.util.Set publicizedMethods -> o
@@ -66153,7 +66091,7 @@
     6:6:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):51 -> a
     7:9:boolean com.android.tools.r8.optimize.PublicizerLens.publicizedMethodIsPresentOnHolder(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):65:67 -> a
     7:9:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):51 -> a
-    10:10:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():482:482 -> a
+    10:10:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():488:488 -> a
     10:10:boolean com.android.tools.r8.optimize.PublicizerLens.publicizedMethodIsPresentOnHolder(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):68 -> a
     10:10:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):51 -> a
     11:11:boolean com.android.tools.r8.optimize.PublicizerLens.publicizedMethodIsPresentOnHolder(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):68:68 -> a
@@ -66162,15 +66100,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():73:73 -> l
-com.android.tools.r8.optimize.PublicizerLens$1 -> com.android.tools.r8.internal.nv:
-com.android.tools.r8.optimize.PublicizerLens$PublicizedLensBuilder -> com.android.tools.r8.internal.ov:
+com.android.tools.r8.optimize.PublicizerLens$1 -> com.android.tools.r8.internal.pv:
+com.android.tools.r8.optimize.PublicizerLens$PublicizedLensBuilder -> com.android.tools.r8.internal.qv:
     java.util.Set publicizedMethods -> a
     1:1:void <init>(com.android.tools.r8.optimize.PublicizerLens$1):76:76 -> <init>
     2:2:void <init>():79:79 -> <init>
     3:3:void <init>():77:77 -> <init>
     1:4:com.android.tools.r8.graph.GraphLens build(com.android.tools.r8.graph.AppView):82:85 -> a
     5:5:void add(com.android.tools.r8.graph.DexMethod):89:89 -> a
-com.android.tools.r8.optimize.VisibilityBridgeRemover -> com.android.tools.r8.internal.OC:
+com.android.tools.r8.optimize.VisibilityBridgeRemover -> com.android.tools.r8.internal.PC:
     com.android.tools.r8.graph.AppView appView -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():19:19 -> <clinit>
@@ -66182,7 +66120,7 @@
     29:30:void lambda$removeUnneededVisibilityBridges$1(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.utils.IntBox,com.android.tools.r8.graph.ProgramMethod):57:58 -> a
     31:34:boolean com.android.tools.r8.optimize.VisibilityBridgeRemover.isUnneededVisibilityBridge(com.android.tools.r8.graph.ProgramMethod):67:70 -> a
     31:34:void lambda$removeUnneededVisibilityBridges$0(java.util.Set,com.android.tools.r8.graph.ProgramMethod):48 -> a
-    35:35:boolean com.android.tools.r8.graph.DexEncodedMethod.isBridge():466:466 -> a
+    35:35:boolean com.android.tools.r8.graph.DexEncodedMethod.isBridge():472:472 -> a
     35:35:boolean com.android.tools.r8.optimize.VisibilityBridgeRemover.isUnneededVisibilityBridge(com.android.tools.r8.graph.ProgramMethod):71 -> a
     35:35:void lambda$removeUnneededVisibilityBridges$0(java.util.Set,com.android.tools.r8.graph.ProgramMethod):48 -> a
     36:46:boolean com.android.tools.r8.optimize.VisibilityBridgeRemover.isUnneededVisibilityBridge(com.android.tools.r8.graph.ProgramMethod):71:81 -> a
@@ -66192,7 +66130,7 @@
     47:47:void lambda$removeUnneededVisibilityBridges$0(java.util.Set,com.android.tools.r8.graph.ProgramMethod):48 -> a
     48:48:boolean com.android.tools.r8.optimize.VisibilityBridgeRemover.isUnneededVisibilityBridge(com.android.tools.r8.graph.ProgramMethod):82:82 -> a
     48:48:void lambda$removeUnneededVisibilityBridges$0(java.util.Set,com.android.tools.r8.graph.ProgramMethod):48 -> a
-    49:49:boolean com.android.tools.r8.graph.DexEncodedMethod.isPrivate():478:478 -> a
+    49:49:boolean com.android.tools.r8.graph.DexEncodedMethod.isPrivate():484:484 -> a
     49:49:boolean com.android.tools.r8.optimize.VisibilityBridgeRemover.isUnneededVisibilityBridge(com.android.tools.r8.graph.ProgramMethod):82 -> a
     49:49:void lambda$removeUnneededVisibilityBridges$0(java.util.Set,com.android.tools.r8.graph.ProgramMethod):48 -> a
     50:58:boolean com.android.tools.r8.optimize.VisibilityBridgeRemover.isUnneededVisibilityBridge(com.android.tools.r8.graph.ProgramMethod):82:90 -> a
@@ -66230,7 +66168,7 @@
     1462:1465:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):206 -> a
     1466:1469:boolean com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.mayBecomeInaccessibleAfterHoisting(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):275:278 -> a
     1466:1469:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):209 -> a
-    1470:1470:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():482:482 -> a
+    1470:1470:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():488:488 -> a
     1470:1470:boolean com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.mayBecomeInaccessibleAfterHoisting(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):278 -> a
     1470:1470:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):209 -> a
     1471:1483:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):215:227 -> a
@@ -66599,13 +66537,13 @@
     1:2:short readShort(int):3578:3579 -> f
     3:9:java.lang.String readUtf(int,char[]):3640:3646 -> f
     1:2:int readUnsignedShort(int):3566:3567 -> g
-com.android.tools.r8.org.objectweb.asm.ClassTooLargeException -> com.android.tools.r8.internal.b6:
+com.android.tools.r8.org.objectweb.asm.ClassTooLargeException -> com.android.tools.r8.internal.c6:
     java.lang.String className -> a
     int constantPoolCount -> b
     1:3:void <init>(java.lang.String,int):49:51 -> <init>
     1:1:java.lang.String getClassName():60:60 -> a
     1:1:int getConstantPoolCount():69:69 -> b
-com.android.tools.r8.org.objectweb.asm.ClassVisitor -> com.android.tools.r8.internal.d6:
+com.android.tools.r8.org.objectweb.asm.ClassVisitor -> com.android.tools.r8.internal.e6:
     com.android.tools.r8.org.objectweb.asm.ClassVisitor cv -> b
     int api -> a
     1:1:void <init>(int):57:57 -> <init>
@@ -66631,7 +66569,7 @@
     12:12:com.android.tools.r8.org.objectweb.asm.RecordComponentVisitor visitRecordComponent(java.lang.String,java.lang.String,java.lang.String):302:302 -> b
     1:5:void visitPermittedSubtypeExperimental(java.lang.String):262:266 -> c
     6:6:void visitPermittedSubtypeExperimental(java.lang.String):263:263 -> c
-com.android.tools.r8.org.objectweb.asm.ClassWriter -> com.android.tools.r8.internal.e6:
+com.android.tools.r8.org.objectweb.asm.ClassWriter -> com.android.tools.r8.internal.f6:
     int numberOfInnerClasses -> n
     com.android.tools.r8.org.objectweb.asm.FieldWriter firstField -> j
     int interfaceCount -> h
@@ -66692,7 +66630,7 @@
     295:295:byte[] toByteArray():727:727 -> b
     296:296:byte[] toByteArray():606:606 -> b
     1:5:void visitPermittedSubtypeExperimental(java.lang.String):384:388 -> c
-com.android.tools.r8.org.objectweb.asm.ConstantDynamic -> com.android.tools.r8.internal.f7:
+com.android.tools.r8.org.objectweb.asm.ConstantDynamic -> com.android.tools.r8.internal.g7:
     java.lang.Object[] bootstrapMethodArguments -> d
     java.lang.String name -> a
     java.lang.String descriptor -> b
@@ -66705,7 +66643,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.Context -> com.android.tools.r8.internal.o7:
+com.android.tools.r8.org.objectweb.asm.Context -> com.android.tools.r8.internal.p7:
     int currentFrameType -> n
     java.lang.String currentMethodDescriptor -> f
     int currentFrameLocalCount -> o
@@ -66726,15 +66664,15 @@
     int[] currentLocalVariableAnnotationRangeIndices -> l
     int currentFrameLocalCountDelta -> p
     1:1:void <init>():36:36 -> <init>
-com.android.tools.r8.org.objectweb.asm.CurrentFrame -> com.android.tools.r8.internal.r7:
+com.android.tools.r8.org.objectweb.asm.CurrentFrame -> com.android.tools.r8.internal.s7:
     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.c9:
+com.android.tools.r8.org.objectweb.asm.Edge -> com.android.tools.r8.internal.d9:
     com.android.tools.r8.org.objectweb.asm.Label successor -> b
     int info -> a
     com.android.tools.r8.org.objectweb.asm.Edge nextEdge -> c
     1:4:void <init>(int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Edge):86:89 -> <init>
-com.android.tools.r8.org.objectweb.asm.FieldVisitor -> com.android.tools.r8.internal.Ka:
+com.android.tools.r8.org.objectweb.asm.FieldVisitor -> com.android.tools.r8.internal.La:
     com.android.tools.r8.org.objectweb.asm.FieldVisitor fv -> a
     1:1:void <init>(int):57:57 -> <init>
     2:15:void <init>(int,com.android.tools.r8.org.objectweb.asm.FieldVisitor):69:82 -> <init>
@@ -66742,7 +66680,7 @@
     com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean) -> a
     1:2:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):94:95 -> a
     3:4:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):130:131 -> a
-com.android.tools.r8.org.objectweb.asm.FieldWriter -> com.android.tools.r8.internal.La:
+com.android.tools.r8.org.objectweb.asm.FieldWriter -> com.android.tools.r8.internal.Ma:
     com.android.tools.r8.org.objectweb.asm.AnnotationWriter lastRuntimeVisibleAnnotation -> h
     com.android.tools.r8.org.objectweb.asm.AnnotationWriter lastRuntimeInvisibleAnnotation -> i
     com.android.tools.r8.org.objectweb.asm.Attribute firstAttribute -> l
@@ -66764,7 +66702,7 @@
     67:67:void putFieldInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):272 -> a
     68:68:void collectAttributePrototypes(com.android.tools.r8.org.objectweb.asm.Attribute$Set):282:282 -> a
     1:14:int computeFieldInfoSize():195:208 -> b
-com.android.tools.r8.org.objectweb.asm.Frame -> com.android.tools.r8.internal.kb:
+com.android.tools.r8.org.objectweb.asm.Frame -> com.android.tools.r8.internal.lb:
     short outputStackTop -> g
     short outputStackStart -> f
     int[] initializations -> i
@@ -66861,7 +66799,7 @@
     12:16:int pop():567:571 -> b
     17:23:void pop(int):581:587 -> b
     1:16:void push(int):524:539 -> c
-com.android.tools.r8.org.objectweb.asm.Handle -> com.android.tools.r8.internal.Lb:
+com.android.tools.r8.org.objectweb.asm.Handle -> com.android.tools.r8.internal.Mb:
     boolean isInterface -> e
     java.lang.String name -> c
     java.lang.String owner -> b
@@ -66876,7 +66814,7 @@
     1:9:boolean equals(java.lang.Object):159:167 -> equals
     1:3:int hashCode():172:174 -> hashCode
     1:1:java.lang.String toString():187:187 -> toString
-com.android.tools.r8.org.objectweb.asm.Handler -> com.android.tools.r8.internal.Mb:
+com.android.tools.r8.org.objectweb.asm.Handler -> com.android.tools.r8.internal.Nb:
     com.android.tools.r8.org.objectweb.asm.Handler nextHandler -> f
     com.android.tools.r8.org.objectweb.asm.Label handlerPc -> c
     int catchType -> d
@@ -66892,7 +66830,7 @@
     25:26:void com.android.tools.r8.org.objectweb.asm.Handler.<init>(com.android.tools.r8.org.objectweb.asm.Handler,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label):106:107 -> a
     25:26:com.android.tools.r8.org.objectweb.asm.Handler removeRange(com.android.tools.r8.org.objectweb.asm.Handler,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label):147 -> a
     27:28:com.android.tools.r8.org.objectweb.asm.Handler removeRange(com.android.tools.r8.org.objectweb.asm.Handler,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label):147:148 -> a
-com.android.tools.r8.org.objectweb.asm.Label -> com.android.tools.r8.internal.kl:
+com.android.tools.r8.org.objectweb.asm.Label -> com.android.tools.r8.internal.ll:
     int bytecodeOffset -> f
     com.android.tools.r8.org.objectweb.asm.Edge outgoingEdges -> n
     com.android.tools.r8.org.objectweb.asm.Frame frame -> l
@@ -66920,7 +66858,7 @@
     92:126:void addSubroutineRetSuccessors(com.android.tools.r8.org.objectweb.asm.Label):542:576 -> a
     1:13:com.android.tools.r8.org.objectweb.asm.Label pushSuccessors(com.android.tools.r8.org.objectweb.asm.Label):592:604 -> b
     1:1:java.lang.String toString():620:620 -> toString
-com.android.tools.r8.org.objectweb.asm.MethodTooLargeException -> com.android.tools.r8.internal.Ko:
+com.android.tools.r8.org.objectweb.asm.MethodTooLargeException -> com.android.tools.r8.internal.Lo:
     java.lang.String className -> a
     int codeSize -> d
     java.lang.String descriptor -> c
@@ -66930,7 +66868,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.Lo:
+com.android.tools.r8.org.objectweb.asm.MethodVisitor -> com.android.tools.r8.internal.Mo:
     int api -> h
     com.android.tools.r8.org.objectweb.asm.MethodVisitor mv -> i
     1:1:void <init>(int):71:71 -> <init>
@@ -66975,7 +66913,7 @@
     7:8:void visitMaxs(int,int):771:772 -> c
     9:10:void visitEnd():781:782 -> c
     1:2:void visitVarInsn(int,int):357:358 -> d
-com.android.tools.r8.org.objectweb.asm.MethodWriter -> com.android.tools.r8.internal.Mo:
+com.android.tools.r8.org.objectweb.asm.MethodWriter -> com.android.tools.r8.internal.No:
     com.android.tools.r8.org.objectweb.asm.AnnotationWriter lastRuntimeVisibleAnnotation -> I
     int accessFlags -> l
     boolean hasAsmInstructions -> f0
@@ -67164,7 +67102,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.No:
+com.android.tools.r8.org.objectweb.asm.ModuleVisitor -> com.android.tools.r8.internal.Oo:
     1:1:void <init>(int):57:57 -> <init>
     2:12:void <init>(int,com.android.tools.r8.org.objectweb.asm.ModuleVisitor):68:78 -> <init>
     void visitExport(java.lang.String,int,java.lang.String[]) -> a
@@ -67174,7 +67112,7 @@
     void visitOpen(java.lang.String,int,java.lang.String[]) -> b
     void visitPackage(java.lang.String) -> b
     void visitUse(java.lang.String) -> c
-com.android.tools.r8.org.objectweb.asm.ModuleWriter -> com.android.tools.r8.internal.Oo:
+com.android.tools.r8.org.objectweb.asm.ModuleWriter -> com.android.tools.r8.internal.Po:
     com.android.tools.r8.org.objectweb.asm.ByteVector provides -> n
     int packageCount -> o
     com.android.tools.r8.org.objectweb.asm.ByteVector usesIndex -> l
@@ -67203,7 +67141,7 @@
     3:12:void visitOpen(java.lang.String,int,java.lang.String[]):146:155 -> b
     13:13:int getAttributeCount():186:186 -> b
     1:2:void visitUse(java.lang.String):160:161 -> c
-com.android.tools.r8.org.objectweb.asm.Opcodes -> com.android.tools.r8.internal.Hr:
+com.android.tools.r8.org.objectweb.asm.Opcodes -> com.android.tools.r8.internal.Jr:
     java.lang.Integer FLOAT -> c
     java.lang.Integer DOUBLE -> d
     java.lang.Integer LONG -> e
@@ -67212,14 +67150,14 @@
     java.lang.Integer TOP -> a
     java.lang.Integer INTEGER -> b
     1:7:void <clinit>():387:393 -> <clinit>
-com.android.tools.r8.org.objectweb.asm.RecordComponentVisitor -> com.android.tools.r8.internal.zv:
+com.android.tools.r8.org.objectweb.asm.RecordComponentVisitor -> com.android.tools.r8.internal.Bv:
     com.android.tools.r8.org.objectweb.asm.RecordComponentVisitor delegate -> a
     1:1:void <init>(int):56:56 -> <init>
     2:15:void <init>(int,com.android.tools.r8.org.objectweb.asm.RecordComponentVisitor):67:80 -> <init>
     com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean) -> a
     void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute) -> a
     com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean) -> a
-com.android.tools.r8.org.objectweb.asm.RecordComponentWriter -> com.android.tools.r8.internal.Av:
+com.android.tools.r8.org.objectweb.asm.RecordComponentWriter -> com.android.tools.r8.internal.Cv:
     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
@@ -67238,7 +67176,7 @@
     56:56:void com.android.tools.r8.org.objectweb.asm.Attribute.putAttributes(com.android.tools.r8.org.objectweb.asm.SymbolTable,com.android.tools.r8.org.objectweb.asm.ByteVector):279:279 -> a
     56:56:void putRecordComponentInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):213 -> a
     57:57:void collectAttributePrototypes(com.android.tools.r8.org.objectweb.asm.Attribute$Set):223:223 -> a
-com.android.tools.r8.org.objectweb.asm.SymbolTable -> com.android.tools.r8.internal.Oz:
+com.android.tools.r8.org.objectweb.asm.SymbolTable -> com.android.tools.r8.internal.Qz:
     com.android.tools.r8.org.objectweb.asm.ClassWriter classWriter -> a
     int typeCount -> k
     int bootstrapMethodCount -> i
@@ -67380,7 +67318,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.Nz:
+com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry -> com.android.tools.r8.internal.Pz:
     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
@@ -67407,7 +67345,7 @@
     40:40:void <init>(int,int,java.lang.String,java.lang.String,java.lang.String,long,int):1298:1298 -> <init>
     1:4:int com.android.tools.r8.org.objectweb.asm.Symbol.getArgumentsAndReturnSizes():238:241 -> a
     1:4:int com.android.tools.r8.org.objectweb.asm.Symbol.getArgumentsAndReturnSizes():0 -> a
-com.android.tools.r8.org.objectweb.asm.Type -> com.android.tools.r8.internal.VA:
+com.android.tools.r8.org.objectweb.asm.Type -> com.android.tools.r8.internal.WA:
     int valueBegin -> l
     int valueEnd -> m
     int sort -> j
@@ -67444,7 +67382,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.FB:
+com.android.tools.r8.org.objectweb.asm.TypePath -> com.android.tools.r8.internal.GB:
     byte[] typePathContainer -> a
     int typePathOffset -> b
     1:3:void <init>(byte[],int):72:74 -> <init>
@@ -67461,7 +67399,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.GB:
+com.android.tools.r8.org.objectweb.asm.TypeReference -> com.android.tools.r8.internal.HB:
     1:2:void com.android.tools.r8.org.objectweb.asm.Constants.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
     3:10:void com.android.tools.r8.org.objectweb.asm.Constants.checkAsmExperimental(java.lang.Object):188 -> a
@@ -67472,7 +67410,7 @@
     23:24:void com.android.tools.r8.org.objectweb.asm.Constants.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 com.android.tools.r8.org.objectweb.asm.Constants.checkAsmExperimental(java.lang.Object):189 -> a
-com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter -> com.android.tools.r8.internal.Tg:
+com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter -> com.android.tools.r8.internal.Ug:
     java.util.BitSet sharedSubroutineInsns -> F
     java.util.Map subroutinesInsns -> E
     java.util.BitSet mainSubroutineInsns -> D
@@ -67511,7 +67449,7 @@
     103:105:void com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter.emitCode():315:317 -> c
     103:105:void visitEnd():155 -> c
     106:107:void visitEnd():157:158 -> c
-com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation -> com.android.tools.r8.internal.Sg:
+com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation -> com.android.tools.r8.internal.Tg:
     java.util.Map clonedLabels -> c
     com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation parent -> a
     java.util.BitSet subroutineInsns -> b
@@ -67579,7 +67517,7 @@
     82:90:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitArray(java.lang.String):151:159 -> a
     91:98:void accept(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor):190:197 -> a
     99:115:void accept(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,java.lang.Object):211:227 -> a
-com.android.tools.r8.org.objectweb.asm.tree.FieldInsnNode -> com.android.tools.r8.internal.ta:
+com.android.tools.r8.org.objectweb.asm.tree.FieldInsnNode -> com.android.tools.r8.internal.ua:
     java.lang.String owner -> g
     java.lang.String desc -> i
     java.lang.String name -> h
@@ -67587,7 +67525,7 @@
     1:2:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):88:89 -> a
     3:3:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):94:94 -> a
     int getType() -> b
-com.android.tools.r8.org.objectweb.asm.tree.FrameNode -> com.android.tools.r8.internal.lb:
+com.android.tools.r8.org.objectweb.asm.tree.FrameNode -> com.android.tools.r8.internal.mb:
     int type -> g
     java.util.List stack -> i
     java.util.List local -> h
@@ -67606,14 +67544,14 @@
     25:44:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):152:171 -> a
     45:51:java.lang.Object[] asArray(java.util.List):178:184 -> a
     int getType() -> b
-com.android.tools.r8.org.objectweb.asm.tree.IincInsnNode -> com.android.tools.r8.internal.xc:
+com.android.tools.r8.org.objectweb.asm.tree.IincInsnNode -> com.android.tools.r8.internal.yc:
     int incr -> h
     int var -> g
     1:3:void <init>(int,int):54:56 -> <init>
     1:2:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):66:67 -> a
     3:3:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):72:72 -> a
     int getType() -> b
-com.android.tools.r8.org.objectweb.asm.tree.InsnList -> com.android.tools.r8.internal.Ld:
+com.android.tools.r8.org.objectweb.asm.tree.InsnList -> com.android.tools.r8.internal.Md:
     com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode[] cache -> d
     com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode firstInsn -> b
     int size -> a
@@ -67635,7 +67573,7 @@
     1:1:java.util.ListIterator com.android.tools.r8.org.objectweb.asm.tree.InsnList.iterator():156 -> iterator
     1:1:java.util.Iterator iterator():38 -> iterator
     1:1:int size():61:61 -> size
-com.android.tools.r8.org.objectweb.asm.tree.InsnList$InsnListIterator -> com.android.tools.r8.internal.Ld$a:
+com.android.tools.r8.org.objectweb.asm.tree.InsnList$InsnListIterator -> com.android.tools.r8.internal.Md$a:
     com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode nextInsn -> a
     com.android.tools.r8.org.objectweb.asm.tree.InsnList this$0 -> d
     com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode previousInsn -> b
@@ -67652,18 +67590,18 @@
     1:7:int previousIndex():561:567 -> previousIndex
     1:10:void remove():518:527 -> remove
     1:9:void set(java.lang.Object):585:593 -> set
-com.android.tools.r8.org.objectweb.asm.tree.InsnNode -> com.android.tools.r8.internal.Md:
+com.android.tools.r8.org.objectweb.asm.tree.InsnNode -> com.android.tools.r8.internal.Nd:
     1:1:void <init>(int):55:55 -> <init>
     1:2:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):65:66 -> a
     3:3:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):71:71 -> a
     int getType() -> b
-com.android.tools.r8.org.objectweb.asm.tree.IntInsnNode -> com.android.tools.r8.internal.rf:
+com.android.tools.r8.org.objectweb.asm.tree.IntInsnNode -> com.android.tools.r8.internal.sf:
     int operand -> g
     1:2:void <init>(int,int):51:52 -> <init>
     1:2:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):71:72 -> a
     3:3:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):77:77 -> a
     int getType() -> b
-com.android.tools.r8.org.objectweb.asm.tree.InvokeDynamicInsnNode -> com.android.tools.r8.internal.qg:
+com.android.tools.r8.org.objectweb.asm.tree.InvokeDynamicInsnNode -> com.android.tools.r8.internal.rg:
     java.lang.String name -> g
     java.lang.String desc -> h
     com.android.tools.r8.org.objectweb.asm.Handle bsm -> i
@@ -67672,7 +67610,7 @@
     1:2:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):84:85 -> a
     3:3:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):90:90 -> a
     int getType() -> b
-com.android.tools.r8.org.objectweb.asm.tree.JumpInsnNode -> com.android.tools.r8.internal.jh:
+com.android.tools.r8.org.objectweb.asm.tree.JumpInsnNode -> com.android.tools.r8.internal.kh:
     com.android.tools.r8.org.objectweb.asm.tree.LabelNode label -> g
     1:2:void <init>(int,com.android.tools.r8.org.objectweb.asm.tree.LabelNode):57:58 -> <init>
     1:2:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):79:80 -> a
@@ -67681,7 +67619,7 @@
     4:4:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):85 -> a
     5:5:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):85:85 -> a
     int getType() -> b
-com.android.tools.r8.org.objectweb.asm.tree.LabelNode -> com.android.tools.r8.internal.ll:
+com.android.tools.r8.org.objectweb.asm.tree.LabelNode -> com.android.tools.r8.internal.ml:
     com.android.tools.r8.org.objectweb.asm.Label value -> g
     1:1:void <init>():40:40 -> <init>
     1:1:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):68:68 -> a
@@ -67689,13 +67627,13 @@
     int getType() -> b
     1:4:com.android.tools.r8.org.objectweb.asm.Label getLabel():60:63 -> c
     1:1:void resetLabel():77:77 -> d
-com.android.tools.r8.org.objectweb.asm.tree.LdcInsnNode -> com.android.tools.r8.internal.Zl:
+com.android.tools.r8.org.objectweb.asm.tree.LdcInsnNode -> com.android.tools.r8.internal.am:
     java.lang.Object cst -> g
     1:2:void <init>(java.lang.Object):55:56 -> <init>
     1:2:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):66:67 -> a
     3:3:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):72:72 -> a
     int getType() -> b
-com.android.tools.r8.org.objectweb.asm.tree.LineNumberNode -> com.android.tools.r8.internal.nm:
+com.android.tools.r8.org.objectweb.asm.tree.LineNumberNode -> com.android.tools.r8.internal.om:
     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>
@@ -67705,14 +67643,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.Sm:
+com.android.tools.r8.org.objectweb.asm.tree.LocalVariableAnnotationNode -> com.android.tools.r8.internal.Tm:
     java.util.List end -> f
     java.util.List start -> e
     java.util.List index -> g
     1:4:void <init>(int,int,com.android.tools.r8.org.objectweb.asm.TypePath,com.android.tools.r8.org.objectweb.asm.tree.LabelNode[],com.android.tools.r8.org.objectweb.asm.tree.LabelNode[],int[],java.lang.String):116:119 -> <init>
     1:10:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor,boolean):129:138 -> a
     11:11:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor,boolean):137:137 -> a
-com.android.tools.r8.org.objectweb.asm.tree.LocalVariableNode -> com.android.tools.r8.internal.Tm:
+com.android.tools.r8.org.objectweb.asm.tree.LocalVariableNode -> com.android.tools.r8.internal.Um:
     int index -> f
     java.lang.String name -> a
     java.lang.String signature -> c
@@ -67720,7 +67658,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.on:
+com.android.tools.r8.org.objectweb.asm.tree.LookupSwitchInsnNode -> com.android.tools.r8.internal.pn:
     com.android.tools.r8.org.objectweb.asm.tree.LabelNode dflt -> g
     java.util.List labels -> i
     java.util.List keys -> h
@@ -67731,7 +67669,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.xo:
+com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode -> com.android.tools.r8.internal.yo:
     java.lang.String owner -> g
     java.lang.String desc -> i
     java.lang.String name -> h
@@ -67740,7 +67678,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.Co:
+com.android.tools.r8.org.objectweb.asm.tree.MethodNode -> com.android.tools.r8.internal.Do:
     java.util.List attrs -> p
     java.util.List invisibleTypeAnnotations -> o
     java.lang.String desc -> j
@@ -67824,22 +67762,22 @@
     1:5:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):274:278 -> c
     6:7:void visitMaxs(int,int):517:518 -> c
     1:1:void visitVarInsn(int,int):353:353 -> d
-com.android.tools.r8.org.objectweb.asm.tree.MethodNode$1 -> com.android.tools.r8.internal.Bo:
+com.android.tools.r8.org.objectweb.asm.tree.MethodNode$1 -> com.android.tools.r8.internal.Co:
     com.android.tools.r8.org.objectweb.asm.tree.MethodNode this$0 -> a
     1:1:void <init>(com.android.tools.r8.org.objectweb.asm.tree.MethodNode,int):251:251 -> <init>
     1:2:boolean add(java.lang.Object):254:255 -> add
-com.android.tools.r8.org.objectweb.asm.tree.MultiANewArrayInsnNode -> com.android.tools.r8.internal.Vo:
+com.android.tools.r8.org.objectweb.asm.tree.MultiANewArrayInsnNode -> com.android.tools.r8.internal.Wo:
     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.ls:
+com.android.tools.r8.org.objectweb.asm.tree.ParameterNode -> com.android.tools.r8.internal.ns:
     java.lang.String name -> a
     int access -> b
     1:3:void <init>(java.lang.String,int):55:57 -> <init>
-com.android.tools.r8.org.objectweb.asm.tree.TableSwitchInsnNode -> com.android.tools.r8.internal.jA:
+com.android.tools.r8.org.objectweb.asm.tree.TableSwitchInsnNode -> com.android.tools.r8.internal.lA:
     com.android.tools.r8.org.objectweb.asm.tree.LabelNode dflt -> i
     int max -> h
     java.util.List labels -> j
@@ -67851,7 +67789,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.TA:
+com.android.tools.r8.org.objectweb.asm.tree.TryCatchBlockNode -> com.android.tools.r8.internal.UA:
     java.util.List invisibleTypeAnnotations -> f
     java.util.List visibleTypeAnnotations -> e
     com.android.tools.r8.org.objectweb.asm.tree.LabelNode start -> a
@@ -67859,30 +67797,30 @@
     com.android.tools.r8.org.objectweb.asm.tree.LabelNode end -> b
     java.lang.String type -> d
     1:5:void <init>(com.android.tools.r8.org.objectweb.asm.tree.LabelNode,com.android.tools.r8.org.objectweb.asm.tree.LabelNode,com.android.tools.r8.org.objectweb.asm.tree.LabelNode,java.lang.String):73:77 -> <init>
-com.android.tools.r8.org.objectweb.asm.tree.TypeAnnotationNode -> com.android.tools.r8.internal.zB:
+com.android.tools.r8.org.objectweb.asm.tree.TypeAnnotationNode -> com.android.tools.r8.internal.AB:
     int typeRef -> c
     com.android.tools.r8.org.objectweb.asm.TypePath typePath -> d
     1:3:void <init>(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String):62:64 -> <init>
     4:6:void <init>(int,int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String):82:84 -> <init>
-com.android.tools.r8.org.objectweb.asm.tree.TypeInsnNode -> com.android.tools.r8.internal.EB:
+com.android.tools.r8.org.objectweb.asm.tree.TypeInsnNode -> com.android.tools.r8.internal.FB:
     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.oC:
+com.android.tools.r8.org.objectweb.asm.tree.Util -> com.android.tools.r8.internal.pC:
     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.xC:
+com.android.tools.r8.org.objectweb.asm.tree.VarInsnNode -> com.android.tools.r8.internal.yC:
     int var -> g
     1:2:void <init>(int,int):53:54 -> <init>
     1:2:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):74:75 -> a
     3:3:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):80:80 -> a
     int getType() -> b
-com.android.tools.r8.org.objectweb.asm.util.Printer -> com.android.tools.r8.internal.Ys:
+com.android.tools.r8.org.objectweb.asm.util.Printer -> com.android.tools.r8.internal.at:
     java.lang.String[] OPCODES -> a
     1:1:void <clinit>():54:54 -> <clinit>
 com.android.tools.r8.origin.ArchiveEntryOrigin -> com.android.tools.r8.origin.ArchiveEntryOrigin:
@@ -67933,7 +67871,7 @@
     1:3:void <init>(java.nio.file.Path):19:21 -> <init>
     1:1:java.nio.file.Path getPath():30:30 -> getPath
     1:1:java.lang.String part():26:26 -> part
-com.android.tools.r8.origin.SynthesizedOrigin -> com.android.tools.r8.internal.Rz:
+com.android.tools.r8.origin.SynthesizedOrigin -> com.android.tools.r8.internal.Tz:
     java.lang.String reason -> e
     1:2:void <init>(java.lang.String,java.lang.Class):13:14 -> <init>
     1:1:java.lang.String part():20:20 -> part
@@ -68113,7 +68051,7 @@
     1:3:void lambda$run$0(com.android.tools.r8.relocator.RelocatorCommand,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):49:51 -> a
     1:1:void lambda$run$1(com.android.tools.r8.relocator.RelocatorCommand,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):69:69 -> b
     1:27: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:105 -> c
-    28:28:java.lang.RuntimeException com.android.tools.r8.utils.ExceptionUtils.unwrapExecutionException(java.util.concurrent.ExecutionException):207:207 -> c
+    28:28:java.lang.RuntimeException com.android.tools.r8.utils.ExceptionUtils.unwrapExecutionException(java.util.concurrent.ExecutionException):216:216 -> c
     28:28: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
     29:34: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
     1:5:void run(com.android.tools.r8.relocator.RelocatorCommand):42:46 -> run
@@ -68241,7 +68179,7 @@
     6:9:java.util.Map getRenamedItems(java.lang.Class,java.util.function.Predicate,java.util.function.Function):141:144 -> a
     10:10:boolean lambda$getRenamedItems$0(java.lang.Class,java.util.function.Predicate,com.android.tools.r8.graph.DexType):142:142 -> a
     boolean verifyRenamingConsistentWithResolution(com.android.tools.r8.graph.DexMethod) -> b
-com.android.tools.r8.repackaging.Repackaging -> com.android.tools.r8.internal.Pw:
+com.android.tools.r8.repackaging.Repackaging -> com.android.tools.r8.internal.Rw:
     com.android.tools.r8.graph.AppView appView -> b
     boolean $assertionsDisabled -> a
     com.android.tools.r8.repackaging.Repackaging$RepackagingConfiguration repackagingConfiguration -> d
@@ -68250,48 +68188,48 @@
     1:5:void <init>(com.android.tools.r8.graph.AppView):50:54 -> <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):60:62 -> a
     4:4:com.android.tools.r8.repackaging.RepackagingLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder,java.util.concurrent.ExecutorService):69:69 -> a
-    5:1133:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isNone():0:1128 -> a
-    5:1133:com.android.tools.r8.repackaging.RepackagingLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder,java.util.concurrent.ExecutorService):69 -> a
-    1134:1137:com.android.tools.r8.repackaging.RepackagingLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder,java.util.concurrent.ExecutorService):73:76 -> a
-    1138:1153: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.Set):92:107 -> a
-    1138:1153:com.android.tools.r8.repackaging.RepackagingLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder,java.util.concurrent.ExecutorService):77 -> a
-    1154:1158:void com.android.tools.r8.repackaging.Repackaging.processRemainingPackages(com.android.tools.r8.graph.ProgramPackageCollection,com.android.tools.r8.com.google.common.collect.BiMap,java.util.Set,java.util.concurrent.ExecutorService):120:124 -> a
-    1154:1158:com.android.tools.r8.repackaging.RepackagingLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder,java.util.concurrent.ExecutorService):78 -> a
-    1159:1165:java.lang.Iterable com.android.tools.r8.repackaging.Repackaging.computeClassesToRepackage(com.android.tools.r8.graph.ProgramPackage,java.util.concurrent.ExecutorService):169:175 -> a
-    1159:1165:void com.android.tools.r8.repackaging.Repackaging.processRemainingPackages(com.android.tools.r8.graph.ProgramPackageCollection,com.android.tools.r8.com.google.common.collect.BiMap,java.util.Set,java.util.concurrent.ExecutorService):127 -> a
-    1159:1165:com.android.tools.r8.repackaging.RepackagingLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder,java.util.concurrent.ExecutorService):78 -> a
-    1166:1170:void com.android.tools.r8.repackaging.Repackaging.processRemainingPackages(com.android.tools.r8.graph.ProgramPackageCollection,com.android.tools.r8.com.google.common.collect.BiMap,java.util.Set,java.util.concurrent.ExecutorService):128:132 -> a
-    1166:1170:com.android.tools.r8.repackaging.RepackagingLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder,java.util.concurrent.ExecutorService):78 -> a
-    1171:1175:com.android.tools.r8.repackaging.RepackagingLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder,java.util.concurrent.ExecutorService):79:83 -> a
-    1176:1176:boolean lambda$run$0(java.util.Map$Entry):79:79 -> a
-    1177:1185: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):144:152 -> a
-    1186:1186:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    1186:1186: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):152 -> a
-    1187:1198: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):152:163 -> a
-    1199:1199: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):161:161 -> a
-com.android.tools.r8.repackaging.Repackaging$DefaultRepackagingConfiguration -> com.android.tools.r8.internal.Pw$a:
+    5:1140:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isNone():0:1135 -> a
+    5:1140:com.android.tools.r8.repackaging.RepackagingLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder,java.util.concurrent.ExecutorService):69 -> a
+    1141:1144:com.android.tools.r8.repackaging.RepackagingLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder,java.util.concurrent.ExecutorService):73:76 -> a
+    1145:1160: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.Set):92:107 -> a
+    1145:1160:com.android.tools.r8.repackaging.RepackagingLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder,java.util.concurrent.ExecutorService):77 -> a
+    1161:1165:void com.android.tools.r8.repackaging.Repackaging.processRemainingPackages(com.android.tools.r8.graph.ProgramPackageCollection,com.android.tools.r8.com.google.common.collect.BiMap,java.util.Set,java.util.concurrent.ExecutorService):120:124 -> a
+    1161:1165:com.android.tools.r8.repackaging.RepackagingLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder,java.util.concurrent.ExecutorService):78 -> a
+    1166:1172:java.lang.Iterable com.android.tools.r8.repackaging.Repackaging.computeClassesToRepackage(com.android.tools.r8.graph.ProgramPackage,java.util.concurrent.ExecutorService):169:175 -> a
+    1166:1172:void com.android.tools.r8.repackaging.Repackaging.processRemainingPackages(com.android.tools.r8.graph.ProgramPackageCollection,com.android.tools.r8.com.google.common.collect.BiMap,java.util.Set,java.util.concurrent.ExecutorService):127 -> a
+    1166:1172:com.android.tools.r8.repackaging.RepackagingLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder,java.util.concurrent.ExecutorService):78 -> a
+    1173:1177:void com.android.tools.r8.repackaging.Repackaging.processRemainingPackages(com.android.tools.r8.graph.ProgramPackageCollection,com.android.tools.r8.com.google.common.collect.BiMap,java.util.Set,java.util.concurrent.ExecutorService):128:132 -> a
+    1173:1177:com.android.tools.r8.repackaging.RepackagingLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder,java.util.concurrent.ExecutorService):78 -> a
+    1178:1182:com.android.tools.r8.repackaging.RepackagingLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder,java.util.concurrent.ExecutorService):79:83 -> a
+    1183:1183:boolean lambda$run$0(java.util.Map$Entry):79:79 -> a
+    1184:1192: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):144:152 -> a
+    1193:1193:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    1193:1193: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):152 -> a
+    1194:1205: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):152:163 -> a
+    1206:1206: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):161:161 -> a
+com.android.tools.r8.repackaging.Repackaging$DefaultRepackagingConfiguration -> com.android.tools.r8.internal.Rw$a:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     boolean $assertionsDisabled -> a
     com.android.tools.r8.shaking.ProguardConfiguration proguardConfiguration -> c
     1:1:void <clinit>():189:189 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.shaking.ProguardConfiguration):195:197 -> <init>
     1:3:java.lang.String getNewPackageDescriptor(com.android.tools.r8.graph.ProgramPackage,java.util.Set):202:204 -> a
-    4:1140:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isRepackageClasses():0:1136 -> a
-    4:1140:java.lang.String getNewPackageDescriptor(com.android.tools.r8.graph.ProgramPackage,java.util.Set):204 -> a
-    1141:1147:java.lang.String getNewPackageDescriptor(com.android.tools.r8.graph.ProgramPackage,java.util.Set):207:213 -> a
-    1148:1172: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):225:249 -> a
-    1173:1173: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):248:248 -> a
-com.android.tools.r8.repackaging.Repackaging$RepackagingConfiguration -> com.android.tools.r8.internal.Pw$b:
+    4:1147:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isRepackageClasses():0:1143 -> a
+    4:1147:java.lang.String getNewPackageDescriptor(com.android.tools.r8.graph.ProgramPackage,java.util.Set):204 -> a
+    1148:1154:java.lang.String getNewPackageDescriptor(com.android.tools.r8.graph.ProgramPackage,java.util.Set):207:213 -> a
+    1155:1179: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):225:249 -> a
+    1180:1180: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):248:248 -> a
+com.android.tools.r8.repackaging.Repackaging$RepackagingConfiguration -> com.android.tools.r8.internal.Rw$b:
     java.lang.String getNewPackageDescriptor(com.android.tools.r8.graph.ProgramPackage,java.util.Set) -> a
     com.android.tools.r8.graph.DexType getRepackagedType(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.lang.String,com.android.tools.r8.com.google.common.collect.BiMap) -> a
-com.android.tools.r8.repackaging.Repackaging$SuffixRenamingRepackagingConfiguration -> com.android.tools.r8.internal.Pw$c:
+com.android.tools.r8.repackaging.Repackaging$SuffixRenamingRepackagingConfiguration -> com.android.tools.r8.internal.Rw$c:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     java.lang.String classNameSuffix -> a
     1:3:void <init>(java.lang.String,com.android.tools.r8.graph.DexItemFactory):262:264 -> <init>
     1:1:java.lang.String getNewPackageDescriptor(com.android.tools.r8.graph.ProgramPackage,java.util.Set):270:270 -> a
     2:21:com.android.tools.r8.graph.DexType getRepackagedType(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.lang.String,com.android.tools.r8.com.google.common.collect.BiMap):279:298 -> a
     22:22:com.android.tools.r8.graph.DexType getRepackagedType(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.lang.String,com.android.tools.r8.com.google.common.collect.BiMap):297:297 -> a
-com.android.tools.r8.repackaging.RepackagingAnnotationTracer -> com.android.tools.r8.internal.Qw:
+com.android.tools.r8.repackaging.RepackagingAnnotationTracer -> com.android.tools.r8.internal.Sw:
     com.android.tools.r8.repackaging.RepackagingUseRegistry registry -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():18:18 -> <clinit>
@@ -68318,7 +68256,7 @@
     114:121:void traceDexValue(com.android.tools.r8.graph.DexValue):90:97 -> a
     122:123:void com.android.tools.r8.graph.DexProto.forEachType(java.util.function.Consumer):40:41 -> a
     122:123:void traceDexValue(com.android.tools.r8.graph.DexValue):97 -> a
-com.android.tools.r8.repackaging.RepackagingConstraintGraph -> com.android.tools.r8.internal.Sw:
+com.android.tools.r8.repackaging.RepackagingConstraintGraph -> com.android.tools.r8.internal.Uw:
     com.android.tools.r8.graph.ProgramPackage pkg -> c
     java.util.Map nodes -> d
     com.android.tools.r8.graph.AppView appView -> b
@@ -68333,31 +68271,25 @@
     8:8:void populateConstraints(java.util.concurrent.ExecutorService):88 -> a
     9:9:void populateConstraints(java.util.concurrent.ExecutorService):89:89 -> a
     10:10:void registerReferencesFromClass(com.android.tools.r8.graph.DexProgramClass):93:93 -> a
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getSuperType():588:588 -> a
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getSuperType():592:592 -> a
     11:11:void registerReferencesFromClass(com.android.tools.r8.graph.DexProgramClass):96 -> a
     12:34:void registerReferencesFromClass(com.android.tools.r8.graph.DexProgramClass):96:118 -> a
     35:38:void registerReferencesFromField(com.android.tools.r8.graph.ProgramField):123:126 -> a
     39:39:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexField.getType():34:34 -> a
     39:39:void registerReferencesFromField(com.android.tools.r8.graph.ProgramField):126 -> a
     40:43:void registerReferencesFromField(com.android.tools.r8.graph.ProgramField):126:129 -> a
-    44:45:void registerReferencesFromMethod(com.android.tools.r8.graph.ProgramMethod):133:134 -> a
-    46:46:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getReference():375:375 -> a
-    46:46:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexEncodedMethod.getProto():371 -> a
-    46:46:void registerReferencesFromMethod(com.android.tools.r8.graph.ProgramMethod):137 -> a
-    47:47:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexEncodedMethod.getProto():371:371 -> a
-    47:47:void registerReferencesFromMethod(com.android.tools.r8.graph.ProgramMethod):137 -> a
-    48:48:void registerReferencesFromMethod(com.android.tools.r8.graph.ProgramMethod):137:137 -> a
+    44:48:void registerReferencesFromMethod(com.android.tools.r8.graph.ProgramMethod):133:137 -> a
     49:50:void com.android.tools.r8.graph.DexProto.forEachType(java.util.function.Consumer):40:41 -> a
     49:50:void registerReferencesFromMethod(com.android.tools.r8.graph.ProgramMethod):137 -> a
     51:52:void registerReferencesFromMethod(com.android.tools.r8.graph.ProgramMethod):140:141 -> a
-    53:53:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getSuperType():588:588 -> a
+    53:53:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getSuperType():592:592 -> a
     53:53:void registerReferencesFromMethod(com.android.tools.r8.graph.ProgramMethod):141 -> a
     54:54:void registerReferencesFromMethod(com.android.tools.r8.graph.ProgramMethod):141:141 -> a
     55:55:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):48:48 -> a
     55:55:void registerReferencesFromMethod(com.android.tools.r8.graph.ProgramMethod):141 -> a
     56:58:void registerReferencesFromMethod(com.android.tools.r8.graph.ProgramMethod):143:143 -> a
     63:65:void registerReferencesFromMethod(com.android.tools.r8.graph.ProgramMethod):148:150 -> a
-    66:66:com.android.tools.r8.graph.ParameterAnnotationsList com.android.tools.r8.graph.DexEncodedMethod.getParameterAnnotations():842:842 -> a
+    66:66:com.android.tools.r8.graph.ParameterAnnotationsList com.android.tools.r8.graph.DexEncodedMethod.getParameterAnnotations():848:848 -> a
     66:66:void registerReferencesFromMethod(com.android.tools.r8.graph.ProgramMethod):151 -> a
     67:71:void registerReferencesFromMethod(com.android.tools.r8.graph.ProgramMethod):151:155 -> a
     72:80:java.lang.Iterable computeClassesToRepackage():160:168 -> a
@@ -68368,27 +68300,27 @@
     8:9:com.android.tools.r8.repackaging.RepackagingConstraintGraph$Node com.android.tools.r8.repackaging.RepackagingConstraintGraph.createNode(com.android.tools.r8.graph.DexDefinition):72:73 -> b
     8:9:boolean initializeGraph():63 -> b
     10:10:boolean initializeGraph():64:64 -> b
-com.android.tools.r8.repackaging.RepackagingConstraintGraph$Node -> com.android.tools.r8.internal.Rw:
+com.android.tools.r8.repackaging.RepackagingConstraintGraph$Node -> com.android.tools.r8.internal.Tw:
     java.util.Set neighbors -> a
     1:3:void <init>():174:176 -> <init>
     1:2:void addNeighbor(com.android.tools.r8.repackaging.RepackagingConstraintGraph$Node):179:180 -> a
     3:3:java.util.Set getNeighbors():184:184 -> a
-com.android.tools.r8.repackaging.RepackagingLens -> com.android.tools.r8.internal.Vw:
+com.android.tools.r8.repackaging.RepackagingLens -> com.android.tools.r8.internal.Xw:
     com.android.tools.r8.com.google.common.collect.BiMap originalTypes -> m
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.repackaging.RepackagingLens$1):16:16 -> <init>
     2:8:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.com.google.common.collect.BiMap):26:32 -> <init>
     9:17:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.com.google.common.collect.BiMap):25:33 -> <init>
     1:2:com.android.tools.r8.graph.DexType getOriginalType(com.android.tools.r8.graph.DexType):38:39 -> a
     3:3:boolean isSimpleRenaming(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):44:44 -> a
-com.android.tools.r8.repackaging.RepackagingLens$1 -> com.android.tools.r8.internal.Tw:
-com.android.tools.r8.repackaging.RepackagingLens$Builder -> com.android.tools.r8.internal.Uw:
+com.android.tools.r8.repackaging.RepackagingLens$1 -> com.android.tools.r8.internal.Vw:
+com.android.tools.r8.repackaging.RepackagingLens$Builder -> com.android.tools.r8.internal.Ww:
     com.android.tools.r8.com.google.common.collect.BiMap originalTypes -> b
     com.android.tools.r8.com.google.common.collect.BiMap originalFieldSignatures -> c
     com.android.tools.r8.com.google.common.collect.BiMap originalMethodSignatures -> d
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():47:47 -> <clinit>
     1:5:void <init>():47:51 -> <init>
-com.android.tools.r8.repackaging.RepackagingTreeFixer -> com.android.tools.r8.internal.Ww:
+com.android.tools.r8.repackaging.RepackagingTreeFixer -> com.android.tools.r8.internal.Yw:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> d
     com.android.tools.r8.graph.AppView appView -> c
     com.android.tools.r8.repackaging.RepackagingLens$Builder lensBuilder -> e
@@ -68405,14 +68337,14 @@
     6:73:com.android.tools.r8.repackaging.RepackagingLens run():57 -> a
     74:74:com.android.tools.r8.repackaging.RepackagingLens run():58:58 -> a
     75:78:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):63:66 -> a
-    79:79:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():580:580 -> a
+    79:79:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():584:584 -> a
     79:79:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):67 -> a
     80:80:com.android.tools.r8.graph.ClassAccessFlags com.android.tools.r8.graph.DexClass.getAccessFlags():123:123 -> a
     80:80:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):68 -> a
     81:82:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):68:69 -> a
     83:84:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.repackaging.RepackagingTreeFixer.fixupTypeList(com.android.tools.r8.graph.DexTypeList):284:285 -> a
     83:84:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):70 -> a
-    85:85:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexClass.getSourceFile():127:127 -> a
+    85:85:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexClass.getSourceFile():131:131 -> a
     85:85:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):71 -> a
     86:86:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):72:72 -> a
     87:87:com.android.tools.r8.graph.NestHostClassAttribute com.android.tools.r8.repackaging.RepackagingTreeFixer.fixupNestHost(com.android.tools.r8.graph.NestHostClassAttribute):202:202 -> a
@@ -68444,7 +68376,7 @@
     162:162:void com.android.tools.r8.repackaging.RepackagingLens$Builder.recordMove(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):62:62 -> a
     162:162:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):96 -> a
     163:167:com.android.tools.r8.graph.DexEncodedField[] fixupFields(java.util.List):124:128 -> a
-    168:168:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.toReference():134:134 -> a
+    168:168:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getReference():134:134 -> a
     168:168:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.repackaging.RepackagingTreeFixer.fixupField(com.android.tools.r8.graph.DexEncodedField):134 -> a
     168:168:com.android.tools.r8.graph.DexEncodedField[] fixupFields(java.util.List):128 -> a
     169:171:com.android.tools.r8.graph.DexField com.android.tools.r8.repackaging.RepackagingTreeFixer.fixupFieldReference(com.android.tools.r8.graph.DexField):144:146 -> a
@@ -68476,7 +68408,7 @@
     210:219:com.android.tools.r8.graph.DexType fixupType(com.android.tools.r8.graph.DexType):257:266 -> a
     220:224:com.android.tools.r8.graph.DexType[] fixupTypes(com.android.tools.r8.graph.DexType[]):273:277 -> a
     1:1:com.android.tools.r8.graph.DexProgramClass lambda$run$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):54:54 -> b
-com.android.tools.r8.repackaging.RepackagingUseRegistry -> com.android.tools.r8.internal.Xw:
+com.android.tools.r8.repackaging.RepackagingUseRegistry -> com.android.tools.r8.internal.Zw:
     com.android.tools.r8.graph.InitClassLens initClassLens -> g
     com.android.tools.r8.shaking.AppInfoWithLiveness appInfo -> d
     com.android.tools.r8.graph.ProgramDefinition context -> f
@@ -68525,69 +68457,69 @@
     1:1:void <init>(java.lang.Throwable):13:13 -> <init>
 com.android.tools.r8.retrace.Retrace -> com.android.tools.r8.retrace.Retrace:
     boolean $assertionsDisabled -> a
-    1:12:void <clinit>():52:63 -> <clinit>
-    1:1:void <init>():53:53 -> <init>
-    1:7:com.android.tools.r8.retrace.RetraceCommand$ProguardMapProducer getMappingSupplier(java.lang.String,com.android.tools.r8.DiagnosticsHandler):136:142 -> a
-    8:10:com.android.tools.r8.retrace.RetraceCommand$ProguardMapProducer getMappingSupplier(java.lang.String,com.android.tools.r8.DiagnosticsHandler):138:138 -> a
-    12:12:com.android.tools.r8.retrace.RetraceCommand$ProguardMapProducer getMappingSupplier(java.lang.String,com.android.tools.r8.DiagnosticsHandler):140:140 -> a
-    13:16:java.lang.String lambda$getMappingSupplier$0(java.nio.file.Path,com.android.tools.r8.DiagnosticsHandler,java.lang.String):144:147 -> a
-    17:19:java.lang.String lambda$getMappingSupplier$0(java.nio.file.Path,com.android.tools.r8.DiagnosticsHandler,java.lang.String):146:148 -> a
-    20:40:void lambda$run$4(com.android.tools.r8.retrace.StackTraceElementProxyRetracer,java.util.List,com.android.tools.r8.retrace.RetraceCommand,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy):187:207 -> a
-    41:47:void lambda$run$1(java.util.Map,com.android.tools.r8.utils.Box,com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl):197:203 -> a
-    48:49:void lambda$run$3(java.util.Map,java.util.List,com.android.tools.r8.utils.Box,com.android.tools.r8.retrace.RetraceCommand,com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl):210:211 -> a
-    50:53:void lambda$run$2(java.util.List,com.android.tools.r8.utils.Box,com.android.tools.r8.retrace.RetraceCommand,com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl):213:216 -> a
-    54:54:void lambda$run$2(java.util.List,com.android.tools.r8.utils.Box,com.android.tools.r8.retrace.RetraceCommand,com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl):215:215 -> a
-    55:60:void lambda$run$2(java.util.List,com.android.tools.r8.utils.Box,com.android.tools.r8.retrace.RetraceCommand,com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl):214:219 -> a
-    61:66:void lambda$run$5(com.android.tools.r8.retrace.Retrace$RetraceDiagnosticsHandler,java.util.List):272:272 -> a
-    70:71:void lambda$run$5(com.android.tools.r8.retrace.Retrace$RetraceDiagnosticsHandler,java.util.List):276:277 -> a
-    72:72:void lambda$main$6(java.lang.String[]):289:289 -> a
-    1:1:void main(java.lang.String[]):289:289 -> main
-    2:12:void withMainProgramHandler(com.android.tools.r8.retrace.Retrace$MainAction):310:320 -> main
-    2:12:void main(java.lang.String[]):289 -> main
-    13:14:void withMainProgramHandler(com.android.tools.r8.retrace.Retrace$MainAction):313:314 -> main
-    13:14:void main(java.lang.String[]):289 -> main
+    1:12:void <clinit>():53:64 -> <clinit>
+    1:1:void <init>():54:54 -> <init>
+    1:42:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):70:111 -> a
+    1:42:void run(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):268 -> a
+    43:43:java.util.List getStackTraceFromFile(java.lang.String,com.android.tools.r8.DiagnosticsHandler):157:157 -> a
+    43:43:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):111 -> a
+    43:43:void run(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):268 -> a
+    44:45:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):111:112 -> a
+    44:45:void run(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):268 -> a
+    46:47:java.util.List getStackTraceFromFile(java.lang.String,com.android.tools.r8.DiagnosticsHandler):159:160 -> a
+    46:47:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):111 -> a
+    46:47:void run(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):268 -> a
+    48:51:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):115:115 -> a
+    48:51:void run(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):268 -> a
+    54:55:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):118:119 -> a
+    54:55:void run(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):268 -> a
+    56:61:java.util.List getStackTraceFromStandardInput(boolean):304:309 -> a
+    56:61:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):127 -> a
+    56:61:void run(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):268 -> a
+    62:65:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):127:130 -> a
+    62:65:void run(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):268 -> a
+    66:85:void run(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):271:290 -> a
+    86:87:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):123:124 -> a
+    86:87:void run(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):268 -> a
+    88:94:com.android.tools.r8.retrace.RetraceCommand$ProguardMapProducer getMappingSupplier(java.lang.String,com.android.tools.r8.DiagnosticsHandler):137:143 -> a
+    95:97:com.android.tools.r8.retrace.RetraceCommand$ProguardMapProducer getMappingSupplier(java.lang.String,com.android.tools.r8.DiagnosticsHandler):139:139 -> a
+    99:99:com.android.tools.r8.retrace.RetraceCommand$ProguardMapProducer getMappingSupplier(java.lang.String,com.android.tools.r8.DiagnosticsHandler):141:141 -> a
+    100:103:java.lang.String lambda$getMappingSupplier$0(java.nio.file.Path,com.android.tools.r8.DiagnosticsHandler,java.lang.String):145:148 -> a
+    104:106:java.lang.String lambda$getMappingSupplier$0(java.nio.file.Path,com.android.tools.r8.DiagnosticsHandler,java.lang.String):147:149 -> a
+    107:127:void lambda$run$4(com.android.tools.r8.retrace.StackTraceElementProxyRetracer,java.util.List,com.android.tools.r8.retrace.RetraceCommand,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy):188:208 -> a
+    128:134:void lambda$run$1(java.util.Map,com.android.tools.r8.utils.Box,com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl):198:204 -> a
+    135:136:void lambda$run$3(java.util.Map,java.util.List,com.android.tools.r8.utils.Box,com.android.tools.r8.retrace.RetraceCommand,com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl):211:212 -> a
+    137:140:void lambda$run$2(java.util.List,com.android.tools.r8.utils.Box,com.android.tools.r8.retrace.RetraceCommand,com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl):214:217 -> a
+    141:141:void lambda$run$2(java.util.List,com.android.tools.r8.utils.Box,com.android.tools.r8.retrace.RetraceCommand,com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl):216:216 -> a
+    142:147:void lambda$run$2(java.util.List,com.android.tools.r8.utils.Box,com.android.tools.r8.retrace.RetraceCommand,com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceProxyImpl):215:220 -> a
+    148:153:void lambda$run$5(com.android.tools.r8.DiagnosticsHandler,java.util.List):282:282 -> a
+    157:158:void lambda$run$5(com.android.tools.r8.DiagnosticsHandler,java.util.List):286:287 -> a
+    159:159:void lambda$main$6(java.lang.String[]):299:299 -> a
+    1:1:void main(java.lang.String[]):299:299 -> main
+    2:11:void withMainProgramHandler(com.android.tools.r8.retrace.Retrace$MainAction):320:329 -> main
+    2:11:void main(java.lang.String[]):299 -> main
+    12:14:void withMainProgramHandler(com.android.tools.r8.retrace.Retrace$MainAction):323:325 -> main
+    12:14:void main(java.lang.String[]):299 -> main
     1:47:boolean com.android.tools.r8.retrace.RetraceCommand.printMemory():0:46 -> run
-    1:47:void run(com.android.tools.r8.retrace.RetraceCommand):170 -> run
-    48:105:void run(com.android.tools.r8.retrace.RetraceCommand):170:227 -> run
+    1:47:void run(com.android.tools.r8.retrace.RetraceCommand):171 -> run
+    48:105:void run(com.android.tools.r8.retrace.RetraceCommand):171:228 -> run
     106:106:boolean com.android.tools.r8.retrace.RetraceCommand.printTimes():42:42 -> run
-    106:106:void run(com.android.tools.r8.retrace.RetraceCommand):228 -> run
-    107:111:void run(com.android.tools.r8.retrace.RetraceCommand):229:233 -> run
-    112:125:void run(java.lang.String[]):239:252 -> run
-    126:138:void run(java.lang.String[]):244:256 -> run
-    139:180:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):69:110 -> run
-    139:180:void run(java.lang.String[]):258 -> run
-    181:181:java.util.List getStackTraceFromFile(java.lang.String,com.android.tools.r8.DiagnosticsHandler):156:156 -> run
-    181:181:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):110 -> run
-    181:181:void run(java.lang.String[]):258 -> run
-    182:183:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):110:111 -> run
-    182:183:void run(java.lang.String[]):258 -> run
-    184:185:java.util.List getStackTraceFromFile(java.lang.String,com.android.tools.r8.DiagnosticsHandler):158:159 -> run
-    184:185:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):110 -> run
-    184:185:void run(java.lang.String[]):258 -> run
-    186:189:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):114:114 -> run
-    186:189:void run(java.lang.String[]):258 -> run
-    192:193:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):117:118 -> run
-    192:193:void run(java.lang.String[]):258 -> run
-    194:199:java.util.List getStackTraceFromStandardInput(boolean):294:299 -> run
-    194:199:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):126 -> run
-    194:199:void run(java.lang.String[]):258 -> run
-    200:203:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):126:129 -> run
-    200:203:void run(java.lang.String[]):258 -> run
-    204:223:void run(java.lang.String[]):261:280 -> run
-    224:225:com.android.tools.r8.retrace.RetraceCommand$Builder parseArguments(java.lang.String[],com.android.tools.r8.DiagnosticsHandler):122:123 -> run
-    224:225:void run(java.lang.String[]):258 -> run
+    106:106:void run(com.android.tools.r8.retrace.RetraceCommand):229 -> run
+    107:111:void run(com.android.tools.r8.retrace.RetraceCommand):230:234 -> run
+    112:125:void run(java.lang.String[]):240:253 -> run
+    126:143:void run(java.lang.String[]):245:262 -> run
 com.android.tools.r8.retrace.Retrace$1 -> com.android.tools.r8.retrace.Retrace$a:
-    1:1:void <init>():257:257 -> <init>
+    1:1:void <init>():258:258 -> <init>
 com.android.tools.r8.retrace.Retrace$MainAction -> com.android.tools.r8.retrace.Retrace$b:
 com.android.tools.r8.retrace.Retrace$RetraceDiagnosticsHandler -> com.android.tools.r8.retrace.Retrace$c:
     com.android.tools.r8.DiagnosticsHandler diagnosticsHandler -> b
     boolean $assertionsDisabled -> a
     boolean printInfo -> c
-    1:1:void <clinit>():324:324 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.DiagnosticsHandler,boolean):329:332 -> <init>
-    1:1:void error(com.android.tools.r8.Diagnostic):337:337 -> error
-    1:2:void info(com.android.tools.r8.Diagnostic):347:348 -> info
-    1:1:void warning(com.android.tools.r8.Diagnostic):342:342 -> warning
+    1:1:void <clinit>():333:333 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.DiagnosticsHandler,boolean):338:341 -> <init>
+    1:1:void error(com.android.tools.r8.Diagnostic):346:346 -> error
+    1:2:void info(com.android.tools.r8.Diagnostic):356:357 -> info
+    1:1:void warning(com.android.tools.r8.Diagnostic):351:351 -> warning
 com.android.tools.r8.retrace.RetraceCommand -> com.android.tools.r8.retrace.RetraceCommand:
     com.android.tools.r8.retrace.RetraceCommand$ProguardMapProducer proguardMapProducer -> e
     com.android.tools.r8.DiagnosticsHandler diagnosticsHandler -> d
@@ -68622,10 +68554,13 @@
     20:20:com.android.tools.r8.retrace.RetraceCommand build():132:132 -> a
     21:21:com.android.tools.r8.retrace.RetraceCommand build():129:129 -> a
     22:22:com.android.tools.r8.retrace.RetraceCommand build():126:126 -> a
+com.android.tools.r8.retrace.RetraceFailedException -> com.android.tools.r8.retrace.RetraceFailedException:
+    1:1:void <init>():17:17 -> <init>
+    2:2:void <init>(java.lang.String,java.lang.Throwable):21:21 -> <init>
 com.android.tools.r8.retrace.StackTraceElementProxy -> com.android.tools.r8.retrace.StackTraceElementProxy:
     1:1:void <init>():11:11 -> <init>
 com.android.tools.r8.retrace.internal.Definition -> com.android.tools.r8.retrace.internal.a:
-com.android.tools.r8.retrace.internal.DirectClassNameMapperProguardMapProducer -> com.android.tools.r8.internal.M8:
+com.android.tools.r8.retrace.internal.DirectClassNameMapperProguardMapProducer -> com.android.tools.r8.internal.N8:
     com.android.tools.r8.naming.ClassNameMapper getClassNameMapper() -> a
 com.android.tools.r8.retrace.internal.FieldDefinition -> com.android.tools.r8.retrace.internal.e:
     1:1:void <init>():13:13 -> <init>
@@ -68711,7 +68646,7 @@
     102:102:void forEach(java.util.function.Consumer):31:31 -> forEach
     103:104:com.android.tools.r8.retrace.internal.StackTraceElementStringProxy parseLine(int,java.lang.String):212:213 -> forEach
     103:104:void forEach(java.util.function.Consumer):31 -> forEach
-com.android.tools.r8.retrace.internal.RetraceAbortException -> com.android.tools.r8.internal.hx:
+com.android.tools.r8.retrace.internal.RetraceAbortException -> com.android.tools.r8.internal.jx:
     1:1:void <init>():7:7 -> <init>
 com.android.tools.r8.retrace.internal.RetraceClassResultImpl -> com.android.tools.r8.retrace.internal.j:
     com.android.tools.r8.naming.ClassNamingForNameMapper mapper -> c
@@ -68824,7 +68759,7 @@
     17:17:com.android.tools.r8.retrace.RetraceSourceFileResult retraceSourceFile(java.lang.String):208 -> retraceSourceFile
 com.android.tools.r8.retrace.internal.RetraceClassResultImpl$ResultConstructor -> com.android.tools.r8.retrace.internal.k:
     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.RetraceCommandLineResult -> com.android.tools.r8.internal.ix:
+com.android.tools.r8.retrace.internal.RetraceCommandLineResult -> com.android.tools.r8.internal.kx:
     java.util.List nodes -> a
     1:2:void <init>(java.util.List):13:14 -> <init>
     1:1:java.util.List getNodes():18:18 -> a
@@ -69098,7 +69033,7 @@
     7:75:java.util.stream.Stream stream():34 -> stream
     76:83:java.util.stream.Stream stream():34:41 -> stream
     84:84:java.util.stream.Stream stream():30:30 -> stream
-com.android.tools.r8.retrace.internal.RetraceTypeResultImpl$ElementImpl -> com.android.tools.r8.internal.jx:
+com.android.tools.r8.retrace.internal.RetraceTypeResultImpl$ElementImpl -> com.android.tools.r8.internal.lx:
     com.android.tools.r8.retrace.internal.RetracedTypeImpl retracedType -> a
     1:2:void <init>(com.android.tools.r8.retrace.internal.RetracedTypeImpl):59:60 -> <init>
     1:1:com.android.tools.r8.retrace.internal.RetracedTypeImpl com.android.tools.r8.retrace.internal.RetraceTypeResultImpl$ElementImpl.getType():65:65 -> getType
@@ -69424,7 +69359,7 @@
     1:1:boolean hasMethodArguments():93:93 -> hasMethodArguments
     1:1:boolean hasMethodName():68:68 -> hasMethodName
 com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$1 -> com.android.tools.r8.retrace.internal.J:
-com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassNameType -> com.android.tools.r8.internal.yy:
+com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassNameType -> com.android.tools.r8.internal.Ay:
     com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassNameType BINARY -> a
     com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassNameType TYPENAME -> b
     1:2:void <clinit>():168:169 -> <clinit>
@@ -69486,7 +69421,7 @@
     1:1:com.android.tools.r8.utils.TriFunction access$100(com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex):325:325 -> a
     2:2:boolean hasIndex():358:358 -> a
     1:1:com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassStringIndex noIndex():331:331 -> b
-com.android.tools.r8.retrace.internal.StackTraceVisitor -> com.android.tools.r8.internal.zy:
+com.android.tools.r8.retrace.internal.StackTraceVisitor -> com.android.tools.r8.internal.By:
 com.android.tools.r8.shaking.AbstractMethodRemover -> com.android.tools.r8.shaking.a:
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.shaking.ScopedDexMethodSet scope -> d
@@ -69715,7 +69650,7 @@
     1:2:java.util.Set getPrunedTypes():1059:1060 -> D
     1:1:com.android.tools.r8.shaking.AppInfoWithLivenessModifier modifier():552:552 -> E
     void lambda$prunedCopyFrom$5(com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder) -> a
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():425:425 -> a
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> a
     1:1:boolean canUseConstClassInstructions(com.android.tools.r8.utils.InternalOptions):576 -> a
     2:2:boolean canUseConstClassInstructions(com.android.tools.r8.utils.InternalOptions):579:579 -> a
     3:13:void computeLargestCfVersion():586:596 -> a
@@ -69754,7 +69689,7 @@
     551:554:com.android.tools.r8.utils.TraversalContinuation lambda$isRepackagingAllowed$4(com.android.tools.r8.graph.ProgramMember):933:936 -> a
     555:555:boolean isPinned(com.android.tools.r8.graph.DexDefinition):947:947 -> a
     555:555:boolean isClassInliningAllowed(com.android.tools.r8.graph.DexProgramClass):910 -> a
-    556:556:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClass.toReference():524:524 -> a
+    556:556:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClass.getReference():528:528 -> a
     556:556:boolean isPinned(com.android.tools.r8.graph.DexDefinition):948 -> a
     556:556:boolean isClassInliningAllowed(com.android.tools.r8.graph.DexProgramClass):910 -> a
     557:557:boolean isPinned(com.android.tools.r8.graph.DexDefinition):948:948 -> a
@@ -69799,73 +69734,73 @@
     1185:1186:com.android.tools.r8.graph.ProgramMethod lookupSingleProgramTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.LibraryModeledPredicate):1094 -> a
     1187:1187:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.LibraryModeledPredicate):1079:1079 -> a
     1187:1187:com.android.tools.r8.graph.ProgramMethod lookupSingleProgramTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.LibraryModeledPredicate):1094 -> a
-    1188:1641:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.graph.DexEncodedMethod.asProgramMethodOrNull(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier):0:453 -> a
-    1188:1641:com.android.tools.r8.graph.ProgramMethod lookupSingleProgramTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.LibraryModeledPredicate):1094 -> a
-    1642:1643:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean):1100:1101 -> a
-    1644:1675:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement):1123:1154 -> a
-    1676:1676:boolean com.android.tools.r8.graph.DexEncodedMethod.isFinal():470:470 -> a
-    1676:1676:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement):1155 -> a
-    1677:1678:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement):1155:1156 -> a
-    1679:1687:com.android.tools.r8.graph.DexEncodedMethod getMethodTargetFromExactRuntimeInformation(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexClass):1220:1228 -> a
-    1679:1687:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement):1161 -> a
-    1688:1702:com.android.tools.r8.graph.DexEncodedMethod getMethodTargetFromExactRuntimeInformation(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexClass):1226:1240 -> a
-    1688:1702:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement):1161 -> a
-    1703:1715:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement):1166:1178 -> a
-    1716:1736:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement):1177:1197 -> a
-    1737:1747:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement):1196:1206 -> a
-    1748:1750:com.android.tools.r8.shaking.AppInfoWithLiveness withSwitchMaps(java.util.Map):1247:1249 -> a
-    1751:1753:com.android.tools.r8.shaking.AppInfoWithLiveness withEnumValueInfoMaps(com.android.tools.r8.graph.EnumValueInfoMapCollection):1253:1255 -> a
-    1754:1779:void forEachTypeInHierarchyOfLiveProgramClasses(java.util.function.Consumer,java.util.Collection,java.util.Set,com.android.tools.r8.graph.AppInfoWithClassHierarchy):1287:1312 -> a
-    1780:1780:void lambda$forEachTypeInHierarchyOfLiveProgramClasses$9(java.util.Set,com.android.tools.r8.graph.DexProgramClass):1288:1288 -> a
-    1781:1781:void forEachInstantiatedSubType(com.android.tools.r8.graph.DexType,java.util.function.Consumer,java.util.function.Consumer):1324:1324 -> a
-    1782:1783:void forEachInstantiatedSubTypeInChain(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer,java.util.function.Consumer):1334:1335 -> a
-    1784:1784:boolean isInstantiatedOrPinned(com.android.tools.r8.graph.DexProgramClass):1343:1343 -> a
-    1784:1784:void forEachInstantiatedSubTypeInChain(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer,java.util.function.Consumer):1336 -> a
-    1785:1786:boolean isInstantiatedInterface(com.android.tools.r8.graph.DexProgramClass):893:894 -> a
-    1785:1786:boolean isInstantiatedOrPinned(com.android.tools.r8.graph.DexProgramClass):1343 -> a
-    1785:1786:void forEachInstantiatedSubTypeInChain(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer,java.util.function.Consumer):1336 -> a
-    1787:1787:void forEachInstantiatedSubTypeInChain(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer,java.util.function.Consumer):1337:1337 -> a
-    1788:1797:boolean isPinnedNotProgramOrLibraryOverride(com.android.tools.r8.graph.DexDefinition):1347:1356 -> a
-    1798:1810:boolean mayHaveFinalizeMethodDirectlyOrIndirectly(com.android.tools.r8.ir.analysis.type.ClassTypeElement):1365:1377 -> a
-    1811:1811:com.android.tools.r8.utils.TraversalContinuation lambda$mayHaveFinalizer$11(com.android.tools.r8.ir.desugar.LambdaDescriptor):1400:1400 -> a
+    1188:1647:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.graph.DexEncodedMethod.asProgramMethodOrNull(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier):0:459 -> a
+    1188:1647:com.android.tools.r8.graph.ProgramMethod lookupSingleProgramTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.LibraryModeledPredicate):1094 -> a
+    1648:1649:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean):1100:1101 -> a
+    1650:1681:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement):1123:1154 -> a
+    1682:1682:boolean com.android.tools.r8.graph.DexEncodedMethod.isFinal():476:476 -> a
+    1682:1682:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement):1155 -> a
+    1683:1684:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement):1155:1156 -> a
+    1685:1693:com.android.tools.r8.graph.DexEncodedMethod getMethodTargetFromExactRuntimeInformation(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexClass):1220:1228 -> a
+    1685:1693:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement):1161 -> a
+    1694:1708:com.android.tools.r8.graph.DexEncodedMethod getMethodTargetFromExactRuntimeInformation(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexClass):1226:1240 -> a
+    1694:1708:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement):1161 -> a
+    1709:1721:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement):1166:1178 -> a
+    1722:1742:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement):1177:1197 -> a
+    1743:1753:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement):1196:1206 -> a
+    1754:1756:com.android.tools.r8.shaking.AppInfoWithLiveness withSwitchMaps(java.util.Map):1247:1249 -> a
+    1757:1759:com.android.tools.r8.shaking.AppInfoWithLiveness withEnumValueInfoMaps(com.android.tools.r8.graph.EnumValueInfoMapCollection):1253:1255 -> a
+    1760:1785:void forEachTypeInHierarchyOfLiveProgramClasses(java.util.function.Consumer,java.util.Collection,java.util.Set,com.android.tools.r8.graph.AppInfoWithClassHierarchy):1287:1312 -> a
+    1786:1786:void lambda$forEachTypeInHierarchyOfLiveProgramClasses$9(java.util.Set,com.android.tools.r8.graph.DexProgramClass):1288:1288 -> a
+    1787:1787:void forEachInstantiatedSubType(com.android.tools.r8.graph.DexType,java.util.function.Consumer,java.util.function.Consumer):1324:1324 -> a
+    1788:1789:void forEachInstantiatedSubTypeInChain(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer,java.util.function.Consumer):1334:1335 -> a
+    1790:1790:boolean isInstantiatedOrPinned(com.android.tools.r8.graph.DexProgramClass):1343:1343 -> a
+    1790:1790:void forEachInstantiatedSubTypeInChain(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer,java.util.function.Consumer):1336 -> a
+    1791:1792:boolean isInstantiatedInterface(com.android.tools.r8.graph.DexProgramClass):893:894 -> a
+    1791:1792:boolean isInstantiatedOrPinned(com.android.tools.r8.graph.DexProgramClass):1343 -> a
+    1791:1792:void forEachInstantiatedSubTypeInChain(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer,java.util.function.Consumer):1336 -> a
+    1793:1793:void forEachInstantiatedSubTypeInChain(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer,java.util.function.Consumer):1337:1337 -> a
+    1794:1803:boolean isPinnedNotProgramOrLibraryOverride(com.android.tools.r8.graph.DexDefinition):1347:1356 -> a
+    1804:1816:boolean mayHaveFinalizeMethodDirectlyOrIndirectly(com.android.tools.r8.ir.analysis.type.ClassTypeElement):1365:1377 -> a
+    1817:1817:com.android.tools.r8.utils.TraversalContinuation lambda$mayHaveFinalizer$11(com.android.tools.r8.ir.desugar.LambdaDescriptor):1400:1400 -> a
     1:5:boolean isInstantiatedDirectly(com.android.tools.r8.graph.DexProgramClass):764:768 -> b
     6:246:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):0:240 -> b
     6:246:boolean isInstantiatedDirectly(com.android.tools.r8.graph.DexProgramClass):768 -> b
     247:247:boolean isInstantiatedDirectly(com.android.tools.r8.graph.DexProgramClass):769:769 -> b
-    248:248:boolean com.android.tools.r8.graph.DexClass.isAnnotation():501:501 -> b
+    248:248:boolean com.android.tools.r8.graph.DexClass.isAnnotation():505:505 -> b
     248:248:boolean isInstantiatedDirectly(com.android.tools.r8.graph.DexProgramClass):771 -> b
     249:249:boolean isInstantiatedDirectly(com.android.tools.r8.graph.DexProgramClass):771:771 -> b
     250:251:boolean isFieldWritten(com.android.tools.r8.graph.DexEncodedField):804:805 -> b
     252:252:boolean lambda$isInstanceFieldWrittenOnlyInInstanceInitializers$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):849:849 -> b
     253:253:boolean isMinificationAllowed(com.android.tools.r8.graph.DexReference):914:914 -> b
-    254:254:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():542:542 -> b
+    254:254:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():549:549 -> b
     254:254:boolean isMinificationAllowed(com.android.tools.r8.graph.DexReference):914 -> b
     255:256:boolean isMinificationAllowed(com.android.tools.r8.graph.DexReference):914:915 -> b
     257:261:void forEachTypeInHierarchyOfLiveProgramClasses(java.util.function.Consumer):1274:1274 -> b
     1:4:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):557:560 -> c
-    5:801:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.isCompanionClassType(com.android.tools.r8.graph.DexType):0:796 -> c
-    5:801:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):562 -> c
-    802:802:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.hasDispatchClassSuffix(com.android.tools.r8.graph.DexType):830:830 -> c
-    802:802:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):563 -> c
-    803:803:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.isEmulatedLibraryClassType(com.android.tools.r8.graph.DexType):800:800 -> c
-    803:803:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):564 -> c
-    804:804:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):565:565 -> c
-    805:885:boolean com.android.tools.r8.ir.desugar.TwrCloseResourceRewriter.isUtilityClassDescriptor(com.android.tools.r8.graph.DexType):0:80 -> c
-    805:885:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):566 -> c
-    886:987:boolean com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter.isVivifiedType(com.android.tools.r8.graph.DexType):0:101 -> c
-    886:987:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):568 -> c
-    988:988:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):558:558 -> c
-    989:989:void mutateObjectAllocationInfoCollection(java.util.function.Consumer):756:756 -> c
-    990:991:boolean isInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexProgramClass):780:781 -> c
-    992:993:boolean isInstantiatedIndirectly(com.android.tools.r8.graph.DexProgramClass):775:776 -> c
-    992:993:boolean isInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexProgramClass):781 -> c
-    994:995:boolean isFieldWrittenByFieldPutInstruction(com.android.tools.r8.graph.DexEncodedField):809:810 -> c
-    996:996:com.android.tools.r8.graph.FieldAccessInfoCollection getFieldAccessInfoCollection():737:737 -> c
-    996:996:boolean isFieldWrittenByFieldPutInstruction(com.android.tools.r8.graph.DexEncodedField):811 -> c
-    997:1007:boolean isFieldWrittenByFieldPutInstruction(com.android.tools.r8.graph.DexEncodedField):811:821 -> c
-    1008:1009:boolean isPinned(com.android.tools.r8.graph.DexReference):942:943 -> c
-    1010:1010:boolean com.android.tools.r8.shaking.KeepInfoCollection.isPinned(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexDefinitionSupplier):135:135 -> c
-    1010:1010:boolean isPinned(com.android.tools.r8.graph.DexReference):943 -> c
+    5:802:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.isCompanionClassType(com.android.tools.r8.graph.DexType):0:797 -> c
+    5:802:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):562 -> c
+    803:803:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.hasDispatchClassSuffix(com.android.tools.r8.graph.DexType):831:831 -> c
+    803:803:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):563 -> c
+    804:804:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.isEmulatedLibraryClassType(com.android.tools.r8.graph.DexType):801:801 -> c
+    804:804:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):564 -> c
+    805:805:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):565:565 -> c
+    806:886:boolean com.android.tools.r8.ir.desugar.TwrCloseResourceRewriter.isUtilityClassDescriptor(com.android.tools.r8.graph.DexType):0:80 -> c
+    806:886:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):566 -> c
+    887:988:boolean com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter.isVivifiedType(com.android.tools.r8.graph.DexType):0:101 -> c
+    887:988:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):568 -> c
+    989:989:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):558:558 -> c
+    990:990:void mutateObjectAllocationInfoCollection(java.util.function.Consumer):756:756 -> c
+    991:992:boolean isInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexProgramClass):780:781 -> c
+    993:994:boolean isInstantiatedIndirectly(com.android.tools.r8.graph.DexProgramClass):775:776 -> c
+    993:994:boolean isInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexProgramClass):781 -> c
+    995:996:boolean isFieldWrittenByFieldPutInstruction(com.android.tools.r8.graph.DexEncodedField):809:810 -> c
+    997:997:com.android.tools.r8.graph.FieldAccessInfoCollection getFieldAccessInfoCollection():737:737 -> c
+    997:997:boolean isFieldWrittenByFieldPutInstruction(com.android.tools.r8.graph.DexEncodedField):811 -> c
+    998:1008:boolean isFieldWrittenByFieldPutInstruction(com.android.tools.r8.graph.DexEncodedField):811:821 -> c
+    1009:1010:boolean isPinned(com.android.tools.r8.graph.DexReference):942:943 -> c
+    1011:1011:boolean com.android.tools.r8.shaking.KeepInfoCollection.isPinned(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexDefinitionSupplier):135:135 -> c
+    1011:1011:boolean isPinned(com.android.tools.r8.graph.DexReference):943 -> c
     1:3:com.android.tools.r8.graph.EnumValueInfoMapCollection$EnumValueInfo getEnumValueInfo(com.android.tools.r8.graph.DexField):725:727 -> d
     4:5:boolean isInstantiatedIndirectly(com.android.tools.r8.graph.DexProgramClass):775:776 -> d
     6:8:boolean isInstanceFieldWrittenOnlyInInstanceInitializers(com.android.tools.r8.graph.DexEncodedField):837:839 -> d
@@ -69988,7 +69923,7 @@
     1:2:void <clinit>():14:15 -> <clinit>
     3:3:void <clinit>():13:13 -> <clinit>
     1:1:void <init>(java.lang.String,int):13:13 -> <init>
-com.android.tools.r8.shaking.CollectingGraphConsumer -> com.android.tools.r8.internal.J6:
+com.android.tools.r8.shaking.CollectingGraphConsumer -> com.android.tools.r8.internal.K6:
     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>
@@ -70042,7 +69977,7 @@
     1:1:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):108:108 -> g
     2:2:void registerTypeReference(com.android.tools.r8.graph.DexType):128:128 -> g
     1:1:void registerStaticFieldWriteFromMethodHandle(com.android.tools.r8.graph.DexField):113:113 -> h
-com.android.tools.r8.shaking.DefaultTreePrunerConfiguration -> com.android.tools.r8.internal.T7:
+com.android.tools.r8.shaking.DefaultTreePrunerConfiguration -> com.android.tools.r8.internal.U7:
     com.android.tools.r8.shaking.DefaultTreePrunerConfiguration INSTANCE -> a
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>():14:14 -> <init>
@@ -70062,7 +69997,7 @@
     java.util.concurrent.ConcurrentHashMap stringCache -> a
     1:2:void <init>():9:10 -> <init>
     1:1:java.lang.String lookupString(com.android.tools.r8.graph.DexString):13:13 -> a
-com.android.tools.r8.shaking.DiscardedChecker -> com.android.tools.r8.internal.O8:
+com.android.tools.r8.shaking.DiscardedChecker -> com.android.tools.r8.internal.P8:
     java.util.Set checkDiscarded -> a
     java.lang.Iterable classes -> b
     1:3:void <init>(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.lang.Iterable):20:22 -> <init>
@@ -70160,7 +70095,7 @@
     544:546:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):1024:1026 -> a
     547:547:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.methodHandleReferencedIn(com.android.tools.r8.graph.ProgramMethod):85:85 -> a
     547:547:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):1028 -> a
-    548:548:boolean com.android.tools.r8.graph.DexClass.isAnnotation():501:501 -> a
+    548:548:boolean com.android.tools.r8.graph.DexClass.isAnnotation():505:505 -> a
     548:548:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):1029 -> a
     549:553:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):1030:1034 -> a
     554:554:void lambda$new$0(com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):379:379 -> a
@@ -70208,14 +70143,14 @@
     601:602:void enqueueRootClass(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):661:662 -> a
     601:602:void enqueueRootClass(com.android.tools.r8.graph.DexType,java.util.Set):655 -> a
     603:603:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):667:667 -> a
-    604:604:boolean com.android.tools.r8.graph.DexClass.isAnnotation():501:501 -> a
+    604:604:boolean com.android.tools.r8.graph.DexClass.isAnnotation():505:505 -> a
     604:604:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):668 -> a
     605:615:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):669:679 -> a
     616:620:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):677:681 -> a
-    621:621:boolean com.android.tools.r8.graph.DexClass.isExternalizable(com.android.tools.r8.graph.AppView):650:650 -> a
+    621:621:boolean com.android.tools.r8.graph.DexClass.isExternalizable(com.android.tools.r8.graph.AppView):654:654 -> a
     621:621:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):681 -> a
     622:622:boolean com.android.tools.r8.graph.AppInfoWithClassHierarchy.isExternalizable(com.android.tools.r8.graph.DexType):277:277 -> a
-    622:622:boolean com.android.tools.r8.graph.DexClass.isExternalizable(com.android.tools.r8.graph.AppView):650 -> a
+    622:622:boolean com.android.tools.r8.graph.DexClass.isExternalizable(com.android.tools.r8.graph.AppView):654 -> a
     622:622:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):681 -> a
     623:623:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):682:682 -> a
     624:624:void enqueueRootField(com.android.tools.r8.graph.DexField,java.util.Set):690:690 -> a
@@ -70324,7 +70259,7 @@
     864:864:void lambda$traceInvokeDirect$11(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):1101:1101 -> a
     865:865:void lambda$traceNewInstance$16(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1236:1236 -> a
     866:866: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):1259:1259 -> a
-    867:867:boolean com.android.tools.r8.graph.DexClass.isAnnotation():501:501 -> a
+    867:867:boolean com.android.tools.r8.graph.DexClass.isAnnotation():505:505 -> a
     867:867: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):1261 -> a
     868:871: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):1261:1264 -> a
     872:872: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):1262:1262 -> a
@@ -70340,7 +70275,7 @@
     951:962:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):754:765 -> a
     951:962:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1627 -> a
     963:963:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1630:1630 -> a
-    964:964:boolean com.android.tools.r8.graph.DexClass.isAnnotation():501:501 -> a
+    964:964:boolean com.android.tools.r8.graph.DexClass.isAnnotation():505:505 -> a
     964:964:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1633 -> a
     965:976:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1634:1645 -> a
     977:977:java.util.Set com.android.tools.r8.shaking.RootSetBuilder$RootSetBase.getDependentKeepClassCompatRule(com.android.tools.r8.graph.DexType):1460:1460 -> a
@@ -70382,13 +70317,13 @@
     1065:1105:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):1891:1931 -> a
     1106:1108:void lambda$ensureFromLibraryOrThrow$32(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexType,java.lang.Boolean):1909:1911 -> a
     1109:1111:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1943:1945 -> a
-    1112:1112:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClass.toReference():524:524 -> a
+    1112:1112:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClass.getReference():528:528 -> a
     1112:1112:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1946 -> a
     1113:1120:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1946:1953 -> a
     1121:1123:void lambda$keepClassAndAllMembers$33(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramField):1949:1951 -> a
     1124:1126:void lambda$keepClassAndAllMembers$34(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramMethod):1955:1957 -> a
     1127:1127: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):2019:2019 -> a
-    1128:1128:boolean com.android.tools.r8.graph.DexClass.isAnnotation():501:501 -> a
+    1128:1128:boolean com.android.tools.r8.graph.DexClass.isAnnotation():505:505 -> a
     1128:1128: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):2019 -> a
     1129:1135: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):2019:2025 -> a
     1136:1137: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):2054:2055 -> a
@@ -70397,7 +70332,7 @@
     1140:1140:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
     1140:1140: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):2033 -> a
     1141:1143: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):2036:2038 -> a
-    1144:1144:boolean com.android.tools.r8.graph.DexClass.isAnnotation():501:501 -> a
+    1144:1144:boolean com.android.tools.r8.graph.DexClass.isAnnotation():505:505 -> a
     1144:1144:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2111 -> a
     1144:1144: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):2041 -> a
     1145:1146:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2111:2112 -> a
@@ -70410,14 +70345,14 @@
     1149:1149:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2113:2113 -> a
     1149:1149: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):2041 -> a
     1150:1150: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):2043:2043 -> a
-    1151:1151:boolean com.android.tools.r8.graph.DexClass.isAnnotation():501:501 -> a
+    1151:1151:boolean com.android.tools.r8.graph.DexClass.isAnnotation():505:505 -> a
     1151:1151:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2319 -> a
     1151:1151: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):2045 -> a
     1152:1154:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2319:2321 -> a
     1152:1154: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):2045 -> a
     1155:1155:void lambda$processNewlyInstantiatedClass$36(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2026:2026 -> a
     1156:1156:void markAnnotationAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2060:2060 -> a
-    1157:1157:boolean com.android.tools.r8.graph.DexClass.isAnnotation():501:501 -> a
+    1157:1157:boolean com.android.tools.r8.graph.DexClass.isAnnotation():505:505 -> a
     1157:1157:void markAnnotationAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2060 -> a
     1158:1159:void markAnnotationAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2060:2061 -> a
     1160:1161:void transitionDependentItemsForInstantiatedInterface(com.android.tools.r8.graph.DexProgramClass):2325:2326 -> a
@@ -70451,7 +70386,7 @@
     1314:1314:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ResolutionResult):2276:2276 -> a
     1315:1315:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markLibraryOrClasspathOverrideLive$38(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod):2272:2272 -> a
     1316:1331:void markOverridesAsLibraryMethodOverrides(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):2283:2298 -> a
-    1332:1336:void com.android.tools.r8.graph.DexClass.forEachImmediateSupertype(java.util.function.Consumer):696:700 -> a
+    1332:1336:void com.android.tools.r8.graph.DexClass.forEachImmediateSupertype(java.util.function.Consumer):700:704 -> a
     1332:1336:void markOverridesAsLibraryMethodOverrides(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):2298 -> a
     1337:1337:void lambda$transitionFieldsForInstantiatedClass$39(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.ProgramField):2312:2312 -> a
     1338:1339:void markFieldAsTargeted(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):2356:2357 -> a
@@ -70513,7 +70448,7 @@
     2071:2071:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):435:435 -> a
     2071:2071:com.android.tools.r8.shaking.AppInfoWithLiveness traceApplication(com.android.tools.r8.shaking.RootSetBuilder$RootSet,com.android.tools.r8.shaking.ProguardClassFilter,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2754 -> a
     2072:2076:com.android.tools.r8.shaking.AppInfoWithLiveness traceApplication(com.android.tools.r8.shaking.RootSetBuilder$RootSet,com.android.tools.r8.shaking.ProguardClassFilter,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2756:2760 -> a
-    2077:2077:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():542:542 -> a
+    2077:2077:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():549:549 -> a
     2077:2077:com.android.tools.r8.shaking.AppInfoWithLiveness traceApplication(com.android.tools.r8.shaking.RootSetBuilder$RootSet,com.android.tools.r8.shaking.ProguardClassFilter,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2760 -> a
     2078:2101:com.android.tools.r8.shaking.AppInfoWithLiveness traceApplication(com.android.tools.r8.shaking.RootSetBuilder$RootSet,com.android.tools.r8.shaking.ProguardClassFilter,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2760:2783 -> a
     2102:2102:void enqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set):725:725 -> a
@@ -70672,7 +70607,7 @@
     46:46:void access$800(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):156:156 -> b
     47:47:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):435:435 -> b
     48:49:void setInitialMissingTypes(java.util.Set):469:470 -> b
-    50:50:boolean com.android.tools.r8.graph.DexClass.isAnnotation():501:501 -> b
+    50:50:boolean com.android.tools.r8.graph.DexClass.isAnnotation():505:505 -> b
     50:50:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):3703 -> b
     51:60:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):3704:3713 -> b
     61:61:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):3711:3711 -> b
@@ -70793,7 +70728,7 @@
     434:434:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():3474:3474 -> b
     435:435:boolean lambda$checkMemberForSoftPinning$76(com.android.tools.r8.shaking.ProguardKeepRuleBase):3673:3673 -> b
     436:438:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3695:3697 -> b
-    439:439:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():610:610 -> b
+    439:439:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():614:614 -> b
     439:439:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3697 -> b
     440:440:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3697:3697 -> b
     441:444:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3723:3726 -> b
@@ -70906,7 +70841,7 @@
     606:606:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNullFromReflectiveAccess(com.android.tools.r8.graph.DexType):615:615 -> b
     606:606:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3766 -> b
     606:606:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3727 -> b
-    607:607:boolean com.android.tools.r8.graph.DexClass.isAnnotation():501:501 -> b
+    607:607:boolean com.android.tools.r8.graph.DexClass.isAnnotation():505:505 -> b
     607:607:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3770 -> b
     607:607:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3727 -> b
     608:611:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3770:3773 -> b
@@ -70984,59 +70919,59 @@
     118:118:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1178:1178 -> c
     119:119:void lambda$traceInvokeStatic$13(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):1178:1178 -> c
     120:120:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2066:2066 -> c
-    121:121:boolean com.android.tools.r8.graph.DexClass.isAnnotation():501:501 -> c
+    121:121:boolean com.android.tools.r8.graph.DexClass.isAnnotation():505:505 -> c
     121:121:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2066 -> c
     122:127:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2066:2071 -> c
     128:129:void transitionDependentItemsForInstantiatedInterface(com.android.tools.r8.graph.DexProgramClass):2325:2326 -> c
     128:129:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2072 -> c
     130:130:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markFieldAsTargeted$41(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):2357:2357 -> c
     131:135:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.ProgramField):2462:2466 -> c
-    136:746:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():0:610 -> c
-    136:746:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.ProgramField):2466 -> c
-    747:748:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.ProgramField):2468:2469 -> c
-    749:750:boolean isTypeLive(com.android.tools.r8.graph.DexClass):2488:2489 -> c
-    751:751:boolean isTypeLive(com.android.tools.r8.graph.DexProgramClass):2494:2494 -> c
-    751:751:boolean isTypeLive(com.android.tools.r8.graph.DexClass):2489 -> c
-    752:752:boolean isTypeLive(com.android.tools.r8.graph.DexClass):2490:2490 -> c
-    753:754:void markInstanceFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):2508:2509 -> c
-    755:755:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> c
-    755:755:void markInstanceFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):2509 -> c
-    756:756:void markInstanceFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):2513:2513 -> c
-    757:760:void markInstanceFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):2512:2515 -> c
-    761:768:void markInstanceFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):2514:2521 -> c
-    769:769:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():171:171 -> c
-    769:769:void markInstanceFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):2521 -> c
-    770:772:void markInstanceFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):2522:2524 -> c
-    773:865:boolean com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl.isInstantiatedDirectlyOrHasInstantiatedSubtype(com.android.tools.r8.graph.DexProgramClass):0:92 -> c
-    773:865:void markInstanceFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):2523 -> c
-    866:871:void markInstanceFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):2525:2530 -> c
-    872:872:com.android.tools.r8.utils.collections.ProgramFieldSet lambda$markInstanceFieldAsReachable$46(com.android.tools.r8.graph.DexProgramClass):2529:2529 -> c
-    873:877:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):2659:2663 -> c
-    873:877:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2671 -> c
-    878:883:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):2662:2667 -> c
-    878:883:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2671 -> c
-    884:890:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2671:2677 -> c
-    891:891:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$markSuperMethodAsReachable$54(com.android.tools.r8.graph.DexEncodedMethod):2713:2713 -> c
-    892:902:void synthesizeLambdas(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):2989:2999 -> c
-    903:906:void com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions.addInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,boolean):2876:2879 -> c
-    903:906:void synthesizeLambdas(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):2999 -> c
-    907:907:void synthesizeLambdas(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3001:3001 -> c
-    908:908:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.instantiatedIn(com.android.tools.r8.graph.ProgramMethod):33:33 -> c
-    908:908:void synthesizeLambdas(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3002 -> c
-    909:925:void synthesizeLambdas(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3003:3019 -> c
-    926:927:void synthesizeLambdas(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):2990:2991 -> c
-    928:928:void lambda$addConsequentRootSet$71(com.android.tools.r8.graph.DexReference):3440:3440 -> c
-    929:952:void markMethodAsKept(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3518:3541 -> c
-    953:961:void markMethodAsKept(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3539:3547 -> c
-    962:975:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3628:3641 -> c
-    976:976:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> c
-    976:976:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3641 -> c
-    977:977:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedViaSuperFrom(com.android.tools.r8.graph.ProgramMethod):41:41 -> c
-    977:977:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3643 -> c
-    978:978:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3643:3643 -> c
-    979:979:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedViaSuperFrom(com.android.tools.r8.graph.ProgramMethod):41:41 -> c
-    979:979:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3644 -> c
-    980:995:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3644:3659 -> c
+    136:750:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():0:614 -> c
+    136:750:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.ProgramField):2466 -> c
+    751:752:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.ProgramField):2468:2469 -> c
+    753:754:boolean isTypeLive(com.android.tools.r8.graph.DexClass):2488:2489 -> c
+    755:755:boolean isTypeLive(com.android.tools.r8.graph.DexProgramClass):2494:2494 -> c
+    755:755:boolean isTypeLive(com.android.tools.r8.graph.DexClass):2489 -> c
+    756:756:boolean isTypeLive(com.android.tools.r8.graph.DexClass):2490:2490 -> c
+    757:758:void markInstanceFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):2508:2509 -> c
+    759:759:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> c
+    759:759:void markInstanceFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):2509 -> c
+    760:760:void markInstanceFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):2513:2513 -> c
+    761:764:void markInstanceFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):2512:2515 -> c
+    765:772:void markInstanceFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):2514:2521 -> c
+    773:773:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():171:171 -> c
+    773:773:void markInstanceFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):2521 -> c
+    774:776:void markInstanceFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):2522:2524 -> c
+    777:869:boolean com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl.isInstantiatedDirectlyOrHasInstantiatedSubtype(com.android.tools.r8.graph.DexProgramClass):0:92 -> c
+    777:869:void markInstanceFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):2523 -> c
+    870:875:void markInstanceFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):2525:2530 -> c
+    876:876:com.android.tools.r8.utils.collections.ProgramFieldSet lambda$markInstanceFieldAsReachable$46(com.android.tools.r8.graph.DexProgramClass):2529:2529 -> c
+    877:881:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):2659:2663 -> c
+    877:881:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2671 -> c
+    882:887:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):2662:2667 -> c
+    882:887:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2671 -> c
+    888:894:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2671:2677 -> c
+    895:895:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$markSuperMethodAsReachable$54(com.android.tools.r8.graph.DexEncodedMethod):2713:2713 -> c
+    896:906:void synthesizeLambdas(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):2989:2999 -> c
+    907:910:void com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions.addInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,boolean):2876:2879 -> c
+    907:910:void synthesizeLambdas(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):2999 -> c
+    911:911:void synthesizeLambdas(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3001:3001 -> c
+    912:912:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.instantiatedIn(com.android.tools.r8.graph.ProgramMethod):33:33 -> c
+    912:912:void synthesizeLambdas(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3002 -> c
+    913:929:void synthesizeLambdas(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3003:3019 -> c
+    930:931:void synthesizeLambdas(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):2990:2991 -> c
+    932:932:void lambda$addConsequentRootSet$71(com.android.tools.r8.graph.DexReference):3440:3440 -> c
+    933:956:void markMethodAsKept(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3518:3541 -> c
+    957:965:void markMethodAsKept(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3539:3547 -> c
+    966:979:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3628:3641 -> c
+    980:980:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> c
+    980:980:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3641 -> c
+    981:981:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedViaSuperFrom(com.android.tools.r8.graph.ProgramMethod):41:41 -> c
+    981:981:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3643 -> c
+    982:982:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3643:3643 -> c
+    983:983:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedViaSuperFrom(com.android.tools.r8.graph.ProgramMethod):41:41 -> c
+    983:983:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3644 -> c
+    984:999:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3644:3659 -> c
     1:1:com.android.tools.r8.utils.InternalOptions access$2000(com.android.tools.r8.shaking.Enqueuer):156:156 -> d
     2:2:boolean isPinned(com.android.tools.r8.graph.DexType):550:550 -> d
     3:3:boolean com.android.tools.r8.shaking.KeepInfoCollection.isPinned(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier):0:0 -> d
@@ -71089,7 +71024,7 @@
     101:104:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1560:1560 -> d
     105:105:java.util.Set lambda$markInterfaceTypeAsLiveViaInheritanceClause$30(com.android.tools.r8.graph.DexProgramClass):1694:1694 -> d
     106:106:void shouldNotBeMinified(com.android.tools.r8.graph.DexReference):1937:1937 -> d
-    107:107:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():542:542 -> d
+    107:107:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():549:549 -> d
     107:107:void shouldNotBeMinified(com.android.tools.r8.graph.DexReference):1937 -> d
     108:108:void shouldNotBeMinified(com.android.tools.r8.graph.DexReference):1938:1938 -> d
     109:109:void com.android.tools.r8.shaking.RootSetBuilder$RootSet.shouldNotBeMinified(com.android.tools.r8.graph.DexReference):1941:1941 -> d
@@ -71277,7 +71212,7 @@
     9:9:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():171:171 -> b
     9:9:boolean addField(com.android.tools.r8.graph.DexField):4217 -> b
     10:18:boolean addField(com.android.tools.r8.graph.DexField):4219:4227 -> b
-    19:19:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():425:425 -> b
+    19:19:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> b
     19:19:boolean addField(com.android.tools.r8.graph.DexField):4227 -> b
     20:24:boolean addField(com.android.tools.r8.graph.DexField):4227:4231 -> b
     25:31:boolean addField(com.android.tools.r8.graph.DexField):4230:4236 -> b
@@ -71375,9 +71310,9 @@
     9:9:com.android.tools.r8.shaking.Enqueuer createForMainDexTracing(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.experimental.graphinfo.GraphConsumer):46:46 -> a
     1:1:com.android.tools.r8.shaking.Enqueuer createForMainDexTracing(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo):39:39 -> b
     2:2:com.android.tools.r8.shaking.Enqueuer createForWhyAreYouKeeping(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.experimental.graphinfo.GraphConsumer):53:53 -> b
-com.android.tools.r8.shaking.EnqueuerMetadataTraceable -> com.android.tools.r8.internal.s9:
+com.android.tools.r8.shaking.EnqueuerMetadataTraceable -> com.android.tools.r8.internal.t9:
     void trace(com.android.tools.r8.graph.DexDefinitionSupplier) -> a
-com.android.tools.r8.shaking.EnqueuerUseRegistryFactory -> com.android.tools.r8.internal.t9:
+com.android.tools.r8.shaking.EnqueuerUseRegistryFactory -> com.android.tools.r8.internal.u9:
     com.android.tools.r8.graph.UseRegistry create(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer) -> a
 com.android.tools.r8.shaking.EnqueuerWorklist -> com.android.tools.r8.shaking.s:
     java.util.Queue queue -> b
@@ -71391,11 +71326,11 @@
     4:4:void enqueueMarkReachableSuperAction(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):252:252 -> a
     5:5:void enqueueMarkReachableFieldAction(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):256:256 -> a
     6:6:void enqueueMarkInstantiatedAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):266:266 -> a
-    7:7:boolean com.android.tools.r8.graph.DexClass.isAnnotation():501:501 -> a
+    7:7:boolean com.android.tools.r8.graph.DexClass.isAnnotation():505:505 -> a
     7:7:void enqueueMarkInstantiatedAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):266 -> a
     8:10:void enqueueMarkInstantiatedAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):266:268 -> a
     11:11:void enqueueMarkAnnotationInstantiatedAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):272:272 -> a
-    12:12:boolean com.android.tools.r8.graph.DexClass.isAnnotation():501:501 -> a
+    12:12:boolean com.android.tools.r8.graph.DexClass.isAnnotation():505:505 -> a
     12:12:void enqueueMarkAnnotationInstantiatedAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):272 -> a
     13:15:void enqueueMarkAnnotationInstantiatedAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):272:274 -> a
     16:16:void enqueueMarkMethodKeptAction(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):288:288 -> a
@@ -71404,7 +71339,7 @@
     19:19:void enqueueTraceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):308:308 -> a
     1:1:com.android.tools.r8.shaking.EnqueuerWorklist$EnqueuerAction poll():244:244 -> b
     2:2:void enqueueMarkInterfaceInstantiatedAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):278:278 -> b
-    3:3:boolean com.android.tools.r8.graph.DexClass.isAnnotation():501:501 -> b
+    3:3:boolean com.android.tools.r8.graph.DexClass.isAnnotation():505:505 -> b
     3:3:void enqueueMarkInterfaceInstantiatedAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):278 -> b
     4:6:void enqueueMarkInterfaceInstantiatedAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):278:280 -> b
     7:7:void enqueueMarkMethodLiveAction(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):284:284 -> b
@@ -71506,7 +71441,7 @@
     java.util.List writeContexts -> a
     1:3:void <init>():23:25 -> <init>
     1:5:void fixUpMethods(java.util.List,java.util.function.Function):28:32 -> a
-com.android.tools.r8.shaking.FilteredClassPath -> com.android.tools.r8.internal.Na:
+com.android.tools.r8.shaking.FilteredClassPath -> com.android.tools.r8.internal.Oa:
     com.android.tools.r8.origin.Origin origin -> c
     com.android.tools.r8.position.Position position -> d
     java.nio.file.Path path -> a
@@ -71525,7 +71460,7 @@
     1:1:boolean com.android.tools.r8.shaking.FilteredClassPath.isUnfiltered():123:123 -> toString
     1:1:java.lang.String toString():128 -> toString
     2:16:java.lang.String toString():129:143 -> toString
-com.android.tools.r8.shaking.GlobalKeepInfoConfiguration -> com.android.tools.r8.internal.Ib:
+com.android.tools.r8.shaking.GlobalKeepInfoConfiguration -> com.android.tools.r8.internal.Jb:
 com.android.tools.r8.shaking.GraphReporter -> com.android.tools.r8.shaking.J:
     com.android.tools.r8.graph.AppView appView -> b
     java.util.Map ruleNodes -> i
@@ -71558,60 +71493,60 @@
     62:67:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportKeepField(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexEncodedField):167 -> a
     68:68:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportKeepField(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexEncodedField):170:170 -> a
     69:69:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.ProgramMethod):174:174 -> a
-    70:680:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():0:610 -> a
-    70:680:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.ProgramMethod):174 -> a
-    681:681:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.ProgramMethod):175:175 -> a
-    682:687:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.ProgramMethod):174:179 -> a
-    688:693:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.ProgramMethod):177:182 -> a
-    694:699:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportClassReferencedFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):206:211 -> a
-    700:705:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportClassReferencedFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):215:220 -> a
-    706:711:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportClassReferencedFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramField):224:229 -> a
-    712:715:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportReachableMethodAsLive(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):249:252 -> a
-    716:721:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportReachableMethodAsLive(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):250:255 -> a
-    722:722:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportLibraryMethodAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexClass):263:263 -> a
-    723:723:boolean com.android.tools.r8.shaking.InstantiatedObject.isClass():0:0 -> a
-    723:723:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportLibraryMethodAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexClass):263 -> a
-    724:725:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportLibraryMethodAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexClass):265:266 -> a
-    726:731:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportLibraryMethodAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexClass):264:269 -> a
-    732:738:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompanionMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):284:290 -> a
-    739:739:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompanionMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):288:288 -> a
-    740:742:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind):295:297 -> a
-    743:744:boolean skipReporting(com.android.tools.r8.shaking.KeepReason):325:326 -> a
-    745:745:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.KeepReason):391:391 -> a
-    745:745:boolean skipReporting(com.android.tools.r8.shaking.KeepReason):329 -> a
-    746:747:boolean skipReporting(com.android.tools.r8.shaking.KeepReason):329:330 -> a
-    748:751:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):342:345 -> a
-    752:755:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.shaking.KeepReason):349:352 -> a
-    756:759:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):356:359 -> a
-    760:760:boolean isNonProgramClass(com.android.tools.r8.graph.DexType):386:386 -> a
-    760:760:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):359 -> a
-    761:761:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    761:761:boolean isNonProgramClass(com.android.tools.r8.graph.DexType):386 -> a
-    761:761:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):359 -> a
-    762:762:boolean isNonProgramClass(com.android.tools.r8.graph.DexType):387:387 -> a
-    762:762:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):359 -> a
-    763:765:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):362:364 -> a
-    766:769:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):368:371 -> a
-    770:770:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):375:375 -> a
-    771:771:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.KeepReason):391:391 -> a
-    771:771:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):376 -> a
-    772:772:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):378:378 -> a
-    773:773:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo getEdgeInfo(com.android.tools.r8.shaking.KeepReason):408:408 -> a
-    773:773:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):379 -> a
-    774:776:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):380:382 -> a
-    777:777:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo getEdgeInfo(com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind):412:412 -> a
-    778:778:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):417:417 -> a
-    779:779:com.android.tools.r8.experimental.graphinfo.AnnotationGraphNode getAnnotationGraphNode(com.android.tools.r8.graph.DexItem):421:421 -> a
-    780:784:com.android.tools.r8.experimental.graphinfo.AnnotationGraphNode lambda$getAnnotationGraphNode$1(com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexItem):424:428 -> a
-    785:785:com.android.tools.r8.experimental.graphinfo.MethodGraphNode getMethodGraphNode(com.android.tools.r8.graph.DexMethod):444:444 -> a
-    786:799:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):447:460 -> a
-    800:800:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):454:454 -> a
-    801:801:com.android.tools.r8.experimental.graphinfo.FieldGraphNode getFieldGraphNode(com.android.tools.r8.graph.DexField):465:465 -> a
-    802:808:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$4(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):468:474 -> a
-    809:809:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$4(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):471:471 -> a
-    810:830:com.android.tools.r8.experimental.graphinfo.KeepRuleGraphNode getKeepRuleGraphNode(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase):487:507 -> a
-    831:831:com.android.tools.r8.experimental.graphinfo.KeepRuleGraphNode lambda$getKeepRuleGraphNode$5(com.android.tools.r8.shaking.ProguardKeepRuleBase,java.util.Set,com.android.tools.r8.shaking.ProguardKeepRuleBase):492:492 -> a
-    832:836:com.android.tools.r8.experimental.graphinfo.KeepRuleGraphNode lambda$getKeepRuleGraphNode$6(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.shaking.ProguardKeepRuleBase):500:504 -> a
+    70:684:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():0:614 -> a
+    70:684:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.ProgramMethod):174 -> a
+    685:685:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.ProgramMethod):175:175 -> a
+    686:691:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.ProgramMethod):174:179 -> a
+    692:697:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.ProgramMethod):177:182 -> a
+    698:703:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportClassReferencedFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):206:211 -> a
+    704:709:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportClassReferencedFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):215:220 -> a
+    710:715:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportClassReferencedFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramField):224:229 -> a
+    716:719:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportReachableMethodAsLive(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):249:252 -> a
+    720:725:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportReachableMethodAsLive(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):250:255 -> a
+    726:726:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportLibraryMethodAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexClass):263:263 -> a
+    727:727:boolean com.android.tools.r8.shaking.InstantiatedObject.isClass():0:0 -> a
+    727:727:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportLibraryMethodAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexClass):263 -> a
+    728:729:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportLibraryMethodAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexClass):265:266 -> a
+    730:735:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportLibraryMethodAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexClass):264:269 -> a
+    736:742:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompanionMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):284:290 -> a
+    743:743:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompanionMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):288:288 -> a
+    744:746:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind):295:297 -> a
+    747:748:boolean skipReporting(com.android.tools.r8.shaking.KeepReason):325:326 -> a
+    749:749:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.KeepReason):391:391 -> a
+    749:749:boolean skipReporting(com.android.tools.r8.shaking.KeepReason):329 -> a
+    750:751:boolean skipReporting(com.android.tools.r8.shaking.KeepReason):329:330 -> a
+    752:755:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):342:345 -> a
+    756:759:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.shaking.KeepReason):349:352 -> a
+    760:763:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):356:359 -> a
+    764:764:boolean isNonProgramClass(com.android.tools.r8.graph.DexType):386:386 -> a
+    764:764:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):359 -> a
+    765:765:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    765:765:boolean isNonProgramClass(com.android.tools.r8.graph.DexType):386 -> a
+    765:765:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):359 -> a
+    766:766:boolean isNonProgramClass(com.android.tools.r8.graph.DexType):387:387 -> a
+    766:766:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):359 -> a
+    767:769:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):362:364 -> a
+    770:773:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):368:371 -> a
+    774:774:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):375:375 -> a
+    775:775:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.KeepReason):391:391 -> a
+    775:775:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):376 -> a
+    776:776:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):378:378 -> a
+    777:777:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo getEdgeInfo(com.android.tools.r8.shaking.KeepReason):408:408 -> a
+    777:777:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):379 -> a
+    778:780:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):380:382 -> a
+    781:781:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo getEdgeInfo(com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind):412:412 -> a
+    782:782:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):417:417 -> a
+    783:783:com.android.tools.r8.experimental.graphinfo.AnnotationGraphNode getAnnotationGraphNode(com.android.tools.r8.graph.DexItem):421:421 -> a
+    784:788:com.android.tools.r8.experimental.graphinfo.AnnotationGraphNode lambda$getAnnotationGraphNode$1(com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexItem):424:428 -> a
+    789:789:com.android.tools.r8.experimental.graphinfo.MethodGraphNode getMethodGraphNode(com.android.tools.r8.graph.DexMethod):444:444 -> a
+    790:803:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):447:460 -> a
+    804:804:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):454:454 -> a
+    805:805:com.android.tools.r8.experimental.graphinfo.FieldGraphNode getFieldGraphNode(com.android.tools.r8.graph.DexField):465:465 -> a
+    806:812:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$4(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):468:474 -> a
+    813:813:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$4(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):471:471 -> a
+    814:834:com.android.tools.r8.experimental.graphinfo.KeepRuleGraphNode getKeepRuleGraphNode(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase):487:507 -> a
+    835:835:com.android.tools.r8.experimental.graphinfo.KeepRuleGraphNode lambda$getKeepRuleGraphNode$5(com.android.tools.r8.shaking.ProguardKeepRuleBase,java.util.Set,com.android.tools.r8.shaking.ProguardKeepRuleBase):492:492 -> a
+    836:840:com.android.tools.r8.experimental.graphinfo.KeepRuleGraphNode lambda$getKeepRuleGraphNode$6(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.shaking.ProguardKeepRuleBase):500:504 -> a
     1:4:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):195:198 -> b
     5:10:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):196:201 -> b
     11:17:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompanionClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):273:279 -> b
@@ -71667,12 +71602,12 @@
     898:899:boolean canRemoveSubsequentKeepRule(com.android.tools.r8.shaking.ProguardIfRule):154:155 -> a
     900:909:boolean isEffectivelyLive(com.android.tools.r8.graph.DexProgramClass):179:188 -> a
     910:911:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):220:221 -> a
-    912:912:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClass.toReference():524:524 -> a
+    912:912:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClass.getReference():528:528 -> a
     912:912:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):222 -> a
     913:920:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):222:229 -> a
     921:934:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):227:240 -> a
     935:964:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):238:267 -> a
-    965:965:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClass.toReference():524:524 -> a
+    965:965:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClass.getReference():528:528 -> a
     965:965:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):273 -> a
     966:967:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):273:274 -> a
     968:971:boolean lambda$evaluateIfRuleMembersAndMaterialize$2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):233:236 -> a
@@ -71740,7 +71675,7 @@
     com.android.tools.r8.ir.desugar.LambdaDescriptor lambdaDescriptor -> a
     1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaDescriptor):57:58 -> <init>
     1:1:com.android.tools.r8.ir.desugar.LambdaDescriptor asLambda():68:68 -> b
-com.android.tools.r8.shaking.InstantiationReason -> com.android.tools.r8.internal.be:
+com.android.tools.r8.shaking.InstantiationReason -> com.android.tools.r8.internal.ce:
     com.android.tools.r8.shaking.InstantiationReason REFERENCED_IN_METHOD_HANDLE -> d
     com.android.tools.r8.shaking.InstantiationReason REFLECTION -> e
     com.android.tools.r8.shaking.InstantiationReason LAMBDA -> b
@@ -71841,7 +71776,7 @@
     6:9:void <init>(com.android.tools.r8.shaking.KeepInfo$Builder):29:32 -> <init>
     10:10:void <init>(com.android.tools.r8.shaking.KeepInfo$Builder):28:28 -> <init>
     1:1:boolean isAccessModificationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):77:77 -> a
-    2:3:boolean com.android.tools.r8.utils.InternalOptions.isAccessModificationEnabled():571:572 -> a
+    2:3:boolean com.android.tools.r8.utils.InternalOptions.isAccessModificationEnabled():578:579 -> a
     2:3:boolean isAccessModificationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):77 -> a
     4:4:boolean internalIsAccessModificationAllowed():82:82 -> a
     4:4:boolean isAccessModificationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):77 -> a
@@ -71856,10 +71791,10 @@
     2:2:boolean isAllowSignatureAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):87:87 -> b
     3:3:boolean isPinned():39:39 -> b
     3:3:boolean isAllowSignatureAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):88 -> b
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():553:553 -> b
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():560:560 -> b
     4:4:boolean isAllowSignatureAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):88 -> b
     1:1:boolean isMinificationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):49:49 -> c
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():542:542 -> c
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():549:549 -> c
     2:2:boolean isMinificationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):49 -> c
     3:3:boolean internalIsMinificationAllowed():53:53 -> c
     3:3:boolean isMinificationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):49 -> c
@@ -72184,7 +72119,7 @@
     1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):142:142 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):145:145 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():150:150 -> a
-com.android.tools.r8.shaking.L8TreePruner -> com.android.tools.r8.internal.hl:
+com.android.tools.r8.shaking.L8TreePruner -> com.android.tools.r8.internal.il:
     java.util.List pruned -> c
     java.util.Set emulatedInterfaces -> a
     java.util.Set backports -> b
@@ -72196,7 +72131,7 @@
     9:21:com.android.tools.r8.graph.DexApplication prune(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):48 -> a
     22:22:com.android.tools.r8.graph.DexApplication prune(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):51:51 -> a
     23:31:com.android.tools.r8.graph.DexApplication prune(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):49:57 -> a
-com.android.tools.r8.shaking.LibraryMethodOverrideAnalysis -> com.android.tools.r8.internal.hm:
+com.android.tools.r8.shaking.LibraryMethodOverrideAnalysis -> com.android.tools.r8.internal.im:
     com.android.tools.r8.graph.AppView appView -> b
     java.util.Set nonEscapingClassesWithLibraryMethodOverrides -> c
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap escapeDebuggingCounters -> d
@@ -72232,7 +72167,7 @@
     8:12:void logResults():162:166 -> b
     13:20:void logResults():163:170 -> b
     21:27:void logResults():167:173 -> b
-com.android.tools.r8.shaking.LibraryMethodOverrideAnalysis$LibraryEscapeAnalysisConfiguration -> com.android.tools.r8.internal.gm:
+com.android.tools.r8.shaking.LibraryMethodOverrideAnalysis$LibraryEscapeAnalysisConfiguration -> com.android.tools.r8.internal.hm:
     com.android.tools.r8.shaking.LibraryMethodOverrideAnalysis$LibraryEscapeAnalysisConfiguration INSTANCE -> a
     1:1:void <clinit>():184:184 -> <clinit>
     1:1:void <init>():187:187 -> <init>
@@ -72240,9 +72175,9 @@
     2:4:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.ProgramMethod):199:201 -> a
     5:27:boolean com.android.tools.r8.shaking.LibraryMethodOverrideAnalysis$LibraryEscapeAnalysisConfiguration.isLegitimateConstructorInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.ProgramMethod):211:233 -> a
     5:27:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.ProgramMethod):200 -> a
-com.android.tools.r8.shaking.LibraryModeledPredicate -> com.android.tools.r8.internal.km:
+com.android.tools.r8.shaking.LibraryModeledPredicate -> com.android.tools.r8.internal.lm:
     boolean isModeled(com.android.tools.r8.graph.DexType) -> d
-com.android.tools.r8.shaking.MainDexClasses -> com.android.tools.r8.internal.qn:
+com.android.tools.r8.shaking.MainDexClasses -> com.android.tools.r8.internal.rn:
     java.util.Set mainDexClasses -> a
     1:1:void <init>(java.util.Set,com.android.tools.r8.shaking.MainDexClasses$1):14:14 -> <init>
     2:3:void <init>(java.util.Set):22:23 -> <init>
@@ -72261,15 +72196,15 @@
     4:4:boolean contains(com.android.tools.r8.graph.DexProgramClass):57 -> b
     1:1:boolean isEmpty():74:74 -> c
     1:1:int size():87:87 -> d
-com.android.tools.r8.shaking.MainDexClasses$1 -> com.android.tools.r8.internal.qn$a:
-com.android.tools.r8.shaking.MainDexClasses$Builder -> com.android.tools.r8.internal.qn$b:
+com.android.tools.r8.shaking.MainDexClasses$1 -> com.android.tools.r8.internal.rn$a:
+com.android.tools.r8.shaking.MainDexClasses$Builder -> com.android.tools.r8.internal.rn$b:
     java.util.Set mainDexClasses -> a
     1:1:void <init>(com.android.tools.r8.shaking.MainDexClasses$1):100:100 -> <init>
     2:2:void <init>():104:104 -> <init>
     3:3:void <init>():102:102 -> <init>
     1:1:void add(com.android.tools.r8.graph.DexProgramClass):107:107 -> a
     2:2:com.android.tools.r8.shaking.MainDexClasses build():111:111 -> a
-com.android.tools.r8.shaking.MainDexDirectReferenceTracer -> com.android.tools.r8.internal.un:
+com.android.tools.r8.shaking.MainDexDirectReferenceTracer -> com.android.tools.r8.internal.vn:
     com.android.tools.r8.shaking.MainDexDirectReferenceTracer$AnnotationDirectReferenceCollector annotationDirectReferenceCollector -> b
     com.android.tools.r8.shaking.MainDexDirectReferenceTracer$DirectReferencesCollector codeDirectReferenceCollector -> c
     com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfo -> d
@@ -72288,18 +72223,16 @@
     13:13:void run(java.util.Set):53 -> a
     14:15:void run(java.util.Set):55:56 -> a
     16:16:void lambda$run$0(com.android.tools.r8.graph.DexEncodedField):55:55 -> a
-    17:17:void lambda$run$2(com.android.tools.r8.graph.ProgramMethod):61:61 -> a
-    18:20:boolean hasReferencesOutsideFromCode(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod,java.util.Set):72:74 -> a
-    21:21:void com.android.tools.r8.shaking.MainDexDirectReferenceTracer.runOnCode(com.android.tools.r8.graph.ProgramMethod):66:66 -> a
-    21:21:boolean hasReferencesOutsideFromCode(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod,java.util.Set):85 -> a
-    22:22:boolean hasReferencesOutsideFromCode(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod,java.util.Set):87:87 -> a
-    23:27:void lambda$hasReferencesOutsideFromCode$3(com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Set,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.graph.DexType):77:81 -> a
-    28:31:void traceMethodDirectDependencies(com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):95:98 -> a
-    32:32:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getReference():375:375 -> a
-    32:32:boolean lambda$run$1(com.android.tools.r8.graph.DexEncodedMethod):58 -> a
-    33:34:boolean lambda$run$1(com.android.tools.r8.graph.DexEncodedMethod):58:59 -> a
-com.android.tools.r8.shaking.MainDexDirectReferenceTracer$1 -> com.android.tools.r8.internal.rn:
-com.android.tools.r8.shaking.MainDexDirectReferenceTracer$AnnotationDirectReferenceCollector -> com.android.tools.r8.internal.sn:
+    17:18:boolean lambda$run$1(com.android.tools.r8.graph.DexEncodedMethod):58:59 -> a
+    19:19:void lambda$run$2(com.android.tools.r8.graph.ProgramMethod):61:61 -> a
+    20:22:boolean hasReferencesOutsideFromCode(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod,java.util.Set):72:74 -> a
+    23:23:void com.android.tools.r8.shaking.MainDexDirectReferenceTracer.runOnCode(com.android.tools.r8.graph.ProgramMethod):66:66 -> a
+    23:23:boolean hasReferencesOutsideFromCode(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod,java.util.Set):85 -> a
+    24:24:boolean hasReferencesOutsideFromCode(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod,java.util.Set):87:87 -> a
+    25:29:void lambda$hasReferencesOutsideFromCode$3(com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Set,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.graph.DexType):77:81 -> a
+    30:33:void traceMethodDirectDependencies(com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):95:98 -> a
+com.android.tools.r8.shaking.MainDexDirectReferenceTracer$1 -> com.android.tools.r8.internal.sn:
+com.android.tools.r8.shaking.MainDexDirectReferenceTracer$AnnotationDirectReferenceCollector -> com.android.tools.r8.internal.tn:
     com.android.tools.r8.shaking.MainDexDirectReferenceTracer this$0 -> a
     1:1:void <init>(com.android.tools.r8.shaking.MainDexDirectReferenceTracer):184:184 -> <init>
     2:2:void <init>(com.android.tools.r8.shaking.MainDexDirectReferenceTracer,com.android.tools.r8.shaking.MainDexDirectReferenceTracer$1):184:184 -> <init>
@@ -72310,7 +72243,7 @@
     1:2:boolean addField(com.android.tools.r8.graph.DexField):194:195 -> b
     3:4:boolean addMethod(com.android.tools.r8.graph.DexMethod):201:202 -> b
     5:5:boolean addType(com.android.tools.r8.graph.DexType):222:222 -> b
-com.android.tools.r8.shaking.MainDexDirectReferenceTracer$DirectReferencesCollector -> com.android.tools.r8.internal.tn:
+com.android.tools.r8.shaking.MainDexDirectReferenceTracer$DirectReferencesCollector -> com.android.tools.r8.internal.un:
     com.android.tools.r8.shaking.MainDexDirectReferenceTracer this$0 -> c
     1:1:void <init>(com.android.tools.r8.shaking.MainDexDirectReferenceTracer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.shaking.MainDexDirectReferenceTracer$1):102:102 -> <init>
     2:3:void <init>(com.android.tools.r8.shaking.MainDexDirectReferenceTracer,com.android.tools.r8.graph.DexItemFactory):104:105 -> <init>
@@ -72330,7 +72263,7 @@
     1:1:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):160:160 -> g
     2:2:void registerTypeReference(com.android.tools.r8.graph.DexType):175:175 -> g
     1:2:void registerFieldAccess(com.android.tools.r8.graph.DexField):164:165 -> i
-com.android.tools.r8.shaking.MainDexListBuilder -> com.android.tools.r8.internal.vn:
+com.android.tools.r8.shaking.MainDexListBuilder -> com.android.tools.r8.internal.wn:
     java.util.Map annotationTypeContainEnum -> d
     com.android.tools.r8.graph.AppView appView -> c
     com.android.tools.r8.shaking.MainDexTracingResult$Builder mainDexClassesBuilder -> e
@@ -72382,9 +72315,9 @@
     6:13:void com.android.tools.r8.shaking.MainDexListBuilder.addAnnotationsWithEnum(com.android.tools.r8.graph.DexProgramClass):141:148 -> d
     6:13:void traceRuntimeAnnotationsWithEnumForMainDex():78 -> d
     14:14:void traceRuntimeAnnotationsWithEnumForMainDex():83:83 -> d
-    15:21:void com.android.tools.r8.graph.DexClass.forEachAnnotation(java.util.function.Consumer):225:231 -> d
+    15:21:void com.android.tools.r8.graph.DexClass.forEachAnnotation(java.util.function.Consumer):229:235 -> d
     15:21:void traceRuntimeAnnotationsWithEnumForMainDex():83 -> d
-com.android.tools.r8.shaking.MainDexTracingResult -> com.android.tools.r8.internal.xn:
+com.android.tools.r8.shaking.MainDexTracingResult -> com.android.tools.r8.internal.yn:
     java.util.Set roots -> c
     java.util.Set dependencies -> d
     java.util.Set classes -> e
@@ -72414,8 +72347,8 @@
     1:1:java.util.Set getDependencies():89:89 -> b
     1:1:java.util.Set getRoots():85:85 -> c
     1:2:boolean isEmpty():80:81 -> d
-com.android.tools.r8.shaking.MainDexTracingResult$1 -> com.android.tools.r8.internal.xn$a:
-com.android.tools.r8.shaking.MainDexTracingResult$Builder -> com.android.tools.r8.internal.xn$b:
+com.android.tools.r8.shaking.MainDexTracingResult$1 -> com.android.tools.r8.internal.yn$a:
+com.android.tools.r8.shaking.MainDexTracingResult$Builder -> com.android.tools.r8.internal.yn$b:
     java.util.Set roots -> c
     java.util.Set dependencies -> d
     boolean $assertionsDisabled -> a
@@ -72485,7 +72418,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.mt:
+com.android.tools.r8.shaking.ProguardAccessFlags -> com.android.tools.r8.internal.ot:
     java.util.List NAMES -> b
     int flags -> c
     int PPP_MASK -> a
@@ -72738,7 +72671,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.nt:
+com.android.tools.r8.shaking.ProguardClassType -> com.android.tools.r8.internal.pt:
     com.android.tools.r8.shaking.ProguardClassType ANNOTATION_INTERFACE -> a
     com.android.tools.r8.shaking.ProguardClassType CLASS -> b
     com.android.tools.r8.shaking.ProguardClassType UNSPECIFIED -> e
@@ -72751,19 +72684,19 @@
     2:2:void <init>(java.lang.String,int,com.android.tools.r8.shaking.ProguardClassType$1):9:9 -> <init>
     boolean matches(com.android.tools.r8.graph.DexClass) -> a
     1:9:java.lang.String toString():43:51 -> toString
-com.android.tools.r8.shaking.ProguardClassType$1 -> com.android.tools.r8.internal.nt$a:
+com.android.tools.r8.shaking.ProguardClassType$1 -> com.android.tools.r8.internal.pt$a:
     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.nt$b:
+com.android.tools.r8.shaking.ProguardClassType$2 -> com.android.tools.r8.internal.pt$b:
     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.nt$c:
+com.android.tools.r8.shaking.ProguardClassType$3 -> com.android.tools.r8.internal.pt$c:
     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.nt$d:
+com.android.tools.r8.shaking.ProguardClassType$4 -> com.android.tools.r8.internal.pt$d:
     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.nt$e:
+com.android.tools.r8.shaking.ProguardClassType$5 -> com.android.tools.r8.internal.pt$e:
     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.ProguardConfiguration -> com.android.tools.r8.shaking.S0:
@@ -74026,9 +73959,9 @@
     1:1:boolean isUsed():57:57 -> x
     1:1:void markAsUsed():61:61 -> y
     java.lang.String modifierString() -> z
-com.android.tools.r8.shaking.ProguardConfigurationSource -> com.android.tools.r8.internal.ot:
+com.android.tools.r8.shaking.ProguardConfigurationSource -> com.android.tools.r8.internal.qt:
     java.nio.file.Path getBaseDirectory() -> a
-com.android.tools.r8.shaking.ProguardConfigurationSourceBytes -> com.android.tools.r8.internal.pt:
+com.android.tools.r8.shaking.ProguardConfigurationSourceBytes -> com.android.tools.r8.internal.rt:
     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>
@@ -74036,14 +73969,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.qt:
+com.android.tools.r8.shaking.ProguardConfigurationSourceFile -> com.android.tools.r8.internal.st:
     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.rt:
+com.android.tools.r8.shaking.ProguardConfigurationSourceStrings -> com.android.tools.r8.internal.tt:
     java.util.List config -> b
     com.android.tools.r8.origin.Origin origin -> c
     java.nio.file.Path basePath -> a
@@ -74163,7 +74096,7 @@
     1:1:void <init>():50:50 -> <init>
     2:2:void <init>():47:47 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> d
-com.android.tools.r8.shaking.ProguardKeepAttributes -> com.android.tools.r8.internal.st:
+com.android.tools.r8.shaking.ProguardKeepAttributes -> com.android.tools.r8.internal.ut:
     boolean runtimeVisibleAnnotations -> m
     boolean runtimeInvisibleAnnotations -> n
     boolean runtimeVisibleParameterAnnotations -> o
@@ -74275,7 +74208,7 @@
     1:1:void setAllowsOptimization(boolean):27:27 -> c
     1:1:void setAllowsShrinking(boolean):23:23 -> d
     1:1:void setIncludeDescriptorClasses(boolean):36:36 -> e
-com.android.tools.r8.shaking.ProguardKeepRuleType -> com.android.tools.r8.internal.tt:
+com.android.tools.r8.shaking.ProguardKeepRuleType -> com.android.tools.r8.internal.vt:
     com.android.tools.r8.shaking.ProguardKeepRuleType[] $VALUES -> e
     com.android.tools.r8.shaking.ProguardKeepRuleType KEEP_CLASS_MEMBERS -> b
     com.android.tools.r8.shaking.ProguardKeepRuleType KEEP_CLASSES_WITH_MEMBERS -> c
@@ -74379,7 +74312,7 @@
     com.android.tools.r8.shaking.ProguardMemberRuleReturnValue$Type NULL -> d
     1:4:void <clinit>():12:15 -> <clinit>
     1:1:void <init>(java.lang.String,int):11:11 -> <init>
-com.android.tools.r8.shaking.ProguardMemberType -> com.android.tools.r8.internal.vt:
+com.android.tools.r8.shaking.ProguardMemberType -> com.android.tools.r8.internal.xt:
     com.android.tools.r8.shaking.ProguardMemberType METHOD -> h
     com.android.tools.r8.shaking.ProguardMemberType CONSTRUCTOR -> g
     com.android.tools.r8.shaking.ProguardMemberType INIT -> f
@@ -74438,7 +74371,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.wt:
+com.android.tools.r8.shaking.ProguardPackageMatcher -> com.android.tools.r8.internal.yt:
     java.lang.String pattern -> a
     1:2:void <init>(java.lang.String):12:13 -> <init>
     1:1:boolean matches(com.android.tools.r8.graph.DexType):17:17 -> a
@@ -74523,7 +74456,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.xt:
+com.android.tools.r8.shaking.ProguardRuleParserException -> com.android.tools.r8.internal.zt:
     com.android.tools.r8.origin.Origin origin -> c
     com.android.tools.r8.position.Position position -> d
     java.lang.String message -> a
@@ -74802,7 +74735,7 @@
     21:26:void lambda$runPerRule$4(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):289:294 -> a
     27:62:com.android.tools.r8.shaking.RootSetBuilder$RootSet run(java.util.concurrent.ExecutorService):301:336 -> a
     63:66:com.android.tools.r8.shaking.RootSetBuilder$RootSet run(java.util.concurrent.ExecutorService):335:338 -> a
-    67:67:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():542:542 -> a
+    67:67:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():549:549 -> a
     67:67:com.android.tools.r8.shaking.RootSetBuilder$RootSet run(java.util.concurrent.ExecutorService):338 -> a
     68:98:com.android.tools.r8.shaking.RootSetBuilder$RootSet run(java.util.concurrent.ExecutorService):338:368 -> a
     99:99:com.android.tools.r8.shaking.RootSetBuilder$RootSet run(java.util.concurrent.ExecutorService):317:317 -> a
@@ -74863,7 +74796,7 @@
     475:475:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
     475:475:void includeDescriptor(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase):1045 -> a
     476:484:void includeDescriptor(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase):1046:1054 -> a
-    485:485:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():542:542 -> a
+    485:485:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():549:549 -> a
     485:485:void includeDescriptor(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase):1054 -> a
     486:486:void includeDescriptor(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase):1055:1055 -> a
     487:487:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1080:1080 -> a
@@ -74880,7 +74813,7 @@
     515:523:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1111 -> a
     524:528:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1112:1112 -> a
     539:578:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1123:1162 -> a
-    579:579:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():542:542 -> a
+    579:579:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():549:549 -> a
     579:579:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1162 -> a
     580:584:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1162:1166 -> a
     585:589:void includeDescriptorClasses(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase):1060:1064 -> a
@@ -74913,20 +74846,11 @@
     781:797:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1305:1321 -> a
     798:798:java.util.Set lambda$addItemToSets$16(com.android.tools.r8.graph.DexType):1133:1133 -> a
     799:799:com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules lambda$addItemToSets$17(com.android.tools.r8.graph.DexReference):1141:1141 -> a
-    800:800:void reportAssumeNoSideEffectsWarningForJavaLangClassMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule):1699:1699 -> a
-    801:801:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getReference():375:375 -> a
-    801:801:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedMethod.getHolderType():363 -> a
-    801:801:void reportAssumeNoSideEffectsWarningForJavaLangClassMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule):1699 -> a
-    802:802:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedMethod.getHolderType():363:363 -> a
-    802:802:void reportAssumeNoSideEffectsWarningForJavaLangClassMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule):1699 -> a
-    803:806:void reportAssumeNoSideEffectsWarningForJavaLangClassMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule):1699:1702 -> a
-    807:807:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getReference():375:375 -> a
-    807:807:void reportAssumeNoSideEffectsWarningForJavaLangClassMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule):1703 -> a
-    808:808:void reportAssumeNoSideEffectsWarningForJavaLangClassMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule):1703:1703 -> a
-    809:809:java.util.Set lambda$reportAssumeNoSideEffectsWarningForJavaLangClassMethod$21(com.android.tools.r8.utils.OriginWithPosition):1702:1702 -> a
-    810:810:boolean isWaitOrNotifyMethod(com.android.tools.r8.graph.DexMethod):1707:1707 -> a
-    811:822:void lambda$generateAssumeNoSideEffectsWarnings$22(com.android.tools.r8.utils.OriginWithPosition,java.util.Set):1726:1737 -> a
-    823:823:void lambda$generateAssumeNoSideEffectsWarnings$22(com.android.tools.r8.utils.OriginWithPosition,java.util.Set):1732:1732 -> a
+    800:804:void reportAssumeNoSideEffectsWarningForJavaLangClassMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule):1699:1703 -> a
+    805:805:java.util.Set lambda$reportAssumeNoSideEffectsWarningForJavaLangClassMethod$21(com.android.tools.r8.utils.OriginWithPosition):1702:1702 -> a
+    806:806:boolean isWaitOrNotifyMethod(com.android.tools.r8.graph.DexMethod):1707:1707 -> a
+    807:818:void lambda$generateAssumeNoSideEffectsWarnings$22(com.android.tools.r8.utils.OriginWithPosition,java.util.Set):1726:1737 -> a
+    819:819:void lambda$generateAssumeNoSideEffectsWarnings$22(com.android.tools.r8.utils.OriginWithPosition,java.util.Set):1732:1732 -> a
     1:1:com.android.tools.r8.shaking.DexStringCache access$300(com.android.tools.r8.shaking.RootSetBuilder):80:80 -> b
     2:2:boolean lambda$process$1(com.android.tools.r8.graph.DexDefinition):202:202 -> b
     3:12:com.android.tools.r8.graph.DexDefinition testAndGetPrecondition(com.android.tools.r8.graph.DexDefinition,java.util.Map):448:457 -> b
@@ -75201,7 +75125,7 @@
     54:54:void lambda$tryAndKeepMethodOnClass$0(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.shaking.RootSetBuilder):609 -> a
     55:57:void lambda$tryAndKeepMethodOnClass$0(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.shaking.RootSetBuilder):617:619 -> a
     58:58:void lambda$tryAndKeepMethodOnClass$0(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.shaking.RootSetBuilder):618:618 -> a
-com.android.tools.r8.shaking.RuntimeTypeCheckInfo -> com.android.tools.r8.internal.qx:
+com.android.tools.r8.shaking.RuntimeTypeCheckInfo -> com.android.tools.r8.internal.sx:
     java.util.Set exceptionGuardTypes -> c
     java.util.Set instanceOfTypes -> a
     java.util.Set checkCastTypes -> b
@@ -75213,7 +75137,7 @@
     3:3:boolean com.android.tools.r8.shaking.RuntimeTypeCheckInfo.isExceptionGuardType(com.android.tools.r8.graph.DexProgramClass):82:82 -> a
     3:3:boolean isRuntimeCheckType(com.android.tools.r8.graph.DexProgramClass):86 -> a
     4:7:com.android.tools.r8.shaking.RuntimeTypeCheckInfo rewriteWithLens(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):90:93 -> a
-com.android.tools.r8.shaking.RuntimeTypeCheckInfo$Builder -> com.android.tools.r8.internal.qx$a:
+com.android.tools.r8.shaking.RuntimeTypeCheckInfo$Builder -> com.android.tools.r8.internal.sx$a:
     java.util.Set checkCastTypes -> c
     java.util.Set exceptionGuardTypes -> d
     java.util.Set instanceOfTypes -> b
@@ -75246,7 +75170,7 @@
     com.android.tools.r8.shaking.ScopedDexMethodSet$AddMethodIfMoreVisibleResult NOT_ADDED -> a
     1:3:void <clinit>():17:19 -> <clinit>
     1:1:void <init>(java.lang.String,int):16:16 -> <init>
-com.android.tools.r8.shaking.SingleTargetLookupCache -> com.android.tools.r8.internal.cy:
+com.android.tools.r8.shaking.SingleTargetLookupCache -> com.android.tools.r8.internal.ey:
     java.util.Map cache -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():16:16 -> <clinit>
@@ -75259,7 +75183,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.StaticClassMerger -> com.android.tools.r8.internal.Fy:
+com.android.tools.r8.shaking.StaticClassMerger -> com.android.tools.r8.internal.Hy:
     com.android.tools.r8.graph.AppView appView -> b
     int numberOfMergedClasses -> i
     com.android.tools.r8.shaking.MainDexTracingResult mainDexClasses -> c
@@ -75318,14 +75242,14 @@
     3:3:boolean com.android.tools.r8.graph.DexEncodedField.isPublic():187:187 -> b
     3:3:boolean lambda$mayMergeAcrossPackageBoundaries$4(com.android.tools.r8.graph.DexEncodedField):417 -> b
     4:4:boolean isValidRepresentative(com.android.tools.r8.graph.DexProgramClass):322:322 -> b
-    5:5:boolean com.android.tools.r8.graph.DexEncodedMethod.isNative():474:474 -> b
+    5:5:boolean com.android.tools.r8.graph.DexEncodedMethod.isNative():480:480 -> b
     5:5:boolean lambda$getMergeGroup$2(com.android.tools.r8.graph.DexEncodedMethod):283 -> b
     6:11:boolean lambda$getMergeGroup$2(com.android.tools.r8.graph.DexEncodedMethod):283:288 -> b
-    1:1:boolean com.android.tools.r8.graph.DexEncodedMethod.isPrivate():478:478 -> c
+    1:1:boolean com.android.tools.r8.graph.DexEncodedMethod.isPrivate():484:484 -> c
     1:1:boolean lambda$mayMergeAcrossPackageBoundaries$3(com.android.tools.r8.graph.DexEncodedMethod):414 -> c
-    2:2:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():482:482 -> c
+    2:2:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():488:488 -> c
     2:2:boolean lambda$mayMergeAcrossPackageBoundaries$3(com.android.tools.r8.graph.DexEncodedMethod):414 -> c
-    3:3:boolean com.android.tools.r8.graph.DexClass.isPublic():560:560 -> c
+    3:3:boolean com.android.tools.r8.graph.DexClass.isPublic():564:564 -> c
     3:3:boolean mayMergeAcrossPackageBoundaries(com.android.tools.r8.graph.DexProgramClass):408 -> c
     4:30:boolean mayMergeAcrossPackageBoundaries(com.android.tools.r8.graph.DexProgramClass):413:439 -> c
     1:2:void merge(com.android.tools.r8.graph.DexProgramClass):326:327 -> d
@@ -75346,9 +75270,9 @@
     26:26:void merge(com.android.tools.r8.graph.DexProgramClass):328 -> d
     27:45:void com.android.tools.r8.shaking.StaticClassMerger.merge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.StaticClassMerger$MergeGroup):350:368 -> d
     27:45:void merge(com.android.tools.r8.graph.DexProgramClass):328 -> d
-    46:46:boolean com.android.tools.r8.graph.DexEncodedMethod.isPrivate():478:478 -> d
+    46:46:boolean com.android.tools.r8.graph.DexEncodedMethod.isPrivate():484:484 -> d
     46:46:boolean lambda$mayMergeAcrossPackageBoundaries$5(com.android.tools.r8.graph.DexEncodedMethod):425 -> d
-com.android.tools.r8.shaking.StaticClassMerger$MergeGroup -> com.android.tools.r8.internal.Cy:
+com.android.tools.r8.shaking.StaticClassMerger$MergeGroup -> com.android.tools.r8.internal.Ey:
     com.android.tools.r8.shaking.StaticClassMerger$MergeGroup DONT_MERGE -> d
     com.android.tools.r8.shaking.StaticClassMerger$MergeGroup[] $VALUES -> e
     boolean $assertionsDisabled -> f
@@ -75358,7 +75282,7 @@
     1:6:void <clinit>():64:64 -> <clinit>
     1:1:void <init>(java.lang.String,int):64:64 -> <init>
     1:9:java.lang.String toString():72:80 -> toString
-com.android.tools.r8.shaking.StaticClassMerger$MergeKey -> com.android.tools.r8.internal.Dy:
+com.android.tools.r8.shaking.StaticClassMerger$MergeKey -> com.android.tools.r8.internal.Fy:
     com.android.tools.r8.FeatureSplit featureSplit -> a
     java.lang.String packageOrGlobal -> c
     com.android.tools.r8.shaking.StaticClassMerger$MergeGroup mergeGroup -> b
@@ -75370,7 +75294,7 @@
     1:1:com.android.tools.r8.shaking.StaticClassMerger$MergeKey toGlobal():105:105 -> d
     1:7:boolean equals(java.lang.Object):126:132 -> equals
     1:1:int hashCode():118:118 -> hashCode
-com.android.tools.r8.shaking.StaticClassMerger$Representative -> com.android.tools.r8.internal.Ey:
+com.android.tools.r8.shaking.StaticClassMerger$Representative -> com.android.tools.r8.internal.Gy:
     com.android.tools.r8.graph.DexProgramClass clazz -> b
     com.android.tools.r8.shaking.StaticClassMerger this$0 -> f
     boolean hasSynchronizedMethods -> e
@@ -75386,10 +75310,10 @@
     5:5:boolean com.android.tools.r8.com.google.common.collect.HashMultiset.add(java.lang.Object):33 -> a
     5:5:void include(com.android.tools.r8.graph.DexProgramClass):161 -> a
     6:7:void include(com.android.tools.r8.graph.DexProgramClass):164:165 -> a
-    8:8:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():486:486 -> a
+    8:8:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():492:492 -> a
     8:8:void include(com.android.tools.r8.graph.DexProgramClass):165 -> a
     9:9:void include(com.android.tools.r8.graph.DexProgramClass):165:165 -> a
-    10:10:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():486:486 -> a
+    10:10:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():492:492 -> a
     10:10:void include(com.android.tools.r8.graph.DexProgramClass):166 -> a
     11:12:void include(com.android.tools.r8.graph.DexProgramClass):167:168 -> a
     13:13:boolean com.android.tools.r8.com.google.common.collect.AbstractMultiset.add(java.lang.Object):84:84 -> a
@@ -75411,85 +75335,89 @@
     2:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.TreePrunerConfiguration):47:47 -> <init>
     3:21:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.TreePrunerConfiguration):40:58 -> <init>
     1:1:void lambda$new$0(com.android.tools.r8.utils.InternalOptions,java.lang.String):56:56 -> a
-    2:3:com.android.tools.r8.graph.DirectMappedDexApplication$Builder removeUnused(com.android.tools.r8.graph.DirectMappedDexApplication):76:77 -> a
-    4:27:java.util.List getNewProgramClasses(java.util.List):81:104 -> a
-    4:27:com.android.tools.r8.graph.DirectMappedDexApplication$Builder removeUnused(com.android.tools.r8.graph.DirectMappedDexApplication):77 -> a
-    28:47:void pruneUnusedInterfaces(com.android.tools.r8.graph.DexProgramClass):124:143 -> a
-    28:47:java.util.List getNewProgramClasses(java.util.List):107 -> a
-    28:47:com.android.tools.r8.graph.DirectMappedDexApplication$Builder removeUnused(com.android.tools.r8.graph.DirectMappedDexApplication):77 -> a
-    48:58:java.util.List getNewProgramClasses(java.util.List):108:118 -> a
-    48:58:com.android.tools.r8.graph.DirectMappedDexApplication$Builder removeUnused(com.android.tools.r8.graph.DirectMappedDexApplication):77 -> a
-    59:59:com.android.tools.r8.graph.DirectMappedDexApplication$Builder removeUnused(com.android.tools.r8.graph.DirectMappedDexApplication):77:77 -> a
-    60:61:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):161:162 -> a
-    62:67:java.util.List com.android.tools.r8.utils.IterableUtils.ensureUnmodifiableList(java.lang.Iterable):19:24 -> a
-    62:67:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.lang.Iterable,com.android.tools.r8.graph.DexClass):266 -> a
-    62:67:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):162 -> a
-    68:68:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.lang.Iterable,com.android.tools.r8.graph.DexClass):266:266 -> a
-    68:68:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):162 -> a
-    69:72:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):164:167 -> a
-    73:78:java.util.List com.android.tools.r8.utils.IterableUtils.ensureUnmodifiableList(java.lang.Iterable):19:24 -> a
-    73:78:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.lang.Iterable,com.android.tools.r8.graph.DexClass):266 -> a
-    73:78:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):167 -> a
-    79:79:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.lang.Iterable,com.android.tools.r8.graph.DexClass):266:266 -> a
-    79:79:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):167 -> a
-    80:91:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):169:180 -> a
-    92:99:void rewriteNestAttributes(com.android.tools.r8.graph.DexProgramClass):187:194 -> a
-    92:99:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):181 -> a
-    100:100:void claimNestOwnership(com.android.tools.r8.graph.DexClass):219:219 -> a
-    100:100:void rewriteNestAttributes(com.android.tools.r8.graph.DexProgramClass):195 -> a
-    100:100:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):181 -> a
-    101:101:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    101:101:void claimNestOwnership(com.android.tools.r8.graph.DexClass):219 -> a
-    101:101:void rewriteNestAttributes(com.android.tools.r8.graph.DexProgramClass):195 -> a
-    101:101:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):181 -> a
-    102:105:void claimNestOwnership(com.android.tools.r8.graph.DexClass):224:227 -> a
-    102:105:void rewriteNestAttributes(com.android.tools.r8.graph.DexProgramClass):195 -> a
-    102:105:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):181 -> a
-    106:106:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    106:106:void claimNestOwnership(com.android.tools.r8.graph.DexClass):227 -> a
-    106:106:void rewriteNestAttributes(com.android.tools.r8.graph.DexProgramClass):195 -> a
-    106:106:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):181 -> a
-    107:113:void claimNestOwnership(com.android.tools.r8.graph.DexClass):229:235 -> a
-    107:113:void rewriteNestAttributes(com.android.tools.r8.graph.DexProgramClass):195 -> a
-    107:113:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):181 -> a
-    114:115:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):182:183 -> a
-    116:118:boolean verifyNoDeadFields(com.android.tools.r8.graph.DexProgramClass):372:374 -> a
-    116:118:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):183 -> a
-    119:119:boolean isTypeLive(com.android.tools.r8.graph.DexType):205:205 -> a
-    120:120:boolean isTypeLive(com.android.tools.r8.graph.DexType):205:205 -> a
-    120:120:void retainReachableInterfacesFrom(com.android.tools.r8.graph.DexType,java.util.Set):148 -> a
-    121:127:void retainReachableInterfacesFrom(com.android.tools.r8.graph.DexType,java.util.Set):149:155 -> a
-    128:129:void clearDeadNestMembers(com.android.tools.r8.graph.DexClass):211:212 -> a
-    130:130:boolean lambda$clearDeadNestMembers$1(com.android.tools.r8.graph.NestMemberClassAttribute):214:214 -> a
-    131:131:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    131:131:boolean lambda$clearDeadNestMembers$1(com.android.tools.r8.graph.NestMemberClassAttribute):214 -> a
-    132:132:boolean lambda$clearDeadNestMembers$1(com.android.tools.r8.graph.NestMemberClassAttribute):215:215 -> a
-    133:136:boolean isAttributeReferencingPrunedItem(com.android.tools.r8.graph.EnclosingMethodAttribute):241:244 -> a
-    137:137:boolean isAttributeReferencingMissingOrPrunedType(com.android.tools.r8.graph.InnerClassAttribute):248:248 -> a
-    138:138:boolean isTypeMissing(com.android.tools.r8.graph.DexType):201:201 -> a
-    138:138:boolean isAttributeReferencingMissingOrPrunedType(com.android.tools.r8.graph.InnerClassAttribute):248 -> a
-    139:142:boolean isAttributeReferencingMissingOrPrunedType(com.android.tools.r8.graph.InnerClassAttribute):248:251 -> a
-    143:143:boolean isTypeMissing(com.android.tools.r8.graph.DexType):201:201 -> a
-    143:143:boolean isAttributeReferencingMissingOrPrunedType(com.android.tools.r8.graph.InnerClassAttribute):252 -> a
-    144:144:boolean isTypeLive(com.android.tools.r8.graph.DexType):205:205 -> a
-    144:144:boolean isAttributeReferencingMissingOrPrunedType(com.android.tools.r8.graph.InnerClassAttribute):252 -> a
-    145:146:int firstUnreachableIndex(java.util.List,java.util.function.Predicate):257:258 -> a
-    147:168:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):270:291 -> a
-    169:186:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):288:305 -> a
-    187:187:boolean com.android.tools.r8.graph.DexEncodedMethod.isFinal():470:470 -> a
-    187:187:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):306 -> a
-    188:190:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):306:308 -> a
-    191:191:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():486:486 -> a
-    191:191:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):309 -> a
-    192:200:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):309:317 -> a
-    201:212:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):316:327 -> a
-    213:213:boolean lambda$reachableMethods$2(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexEncodedMethod):273:273 -> a
-    214:243:com.android.tools.r8.graph.DexEncodedField[] reachableFields(java.util.List):331:360 -> a
-    244:244:boolean lambda$reachableFields$3(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexEncodedField):333:333 -> a
-    245:245:java.util.Collection getMethodsToKeepForConfigurationDebugging():368:368 -> a
-    1:1:java.util.Set getRemovedClasses():364:364 -> b
+    2:3:com.android.tools.r8.graph.DirectMappedDexApplication$Builder removeUnused(com.android.tools.r8.graph.DirectMappedDexApplication):77:78 -> a
+    4:27:java.util.List getNewProgramClasses(java.util.List):82:105 -> a
+    4:27:com.android.tools.r8.graph.DirectMappedDexApplication$Builder removeUnused(com.android.tools.r8.graph.DirectMappedDexApplication):78 -> a
+    28:39:void pruneUnusedInterfaces(com.android.tools.r8.graph.DexProgramClass):124:135 -> a
+    28:39:java.util.List getNewProgramClasses(java.util.List):108 -> a
+    28:39:com.android.tools.r8.graph.DirectMappedDexApplication$Builder removeUnused(com.android.tools.r8.graph.DirectMappedDexApplication):78 -> a
+    40:50:java.util.List getNewProgramClasses(java.util.List):109:119 -> a
+    40:50:com.android.tools.r8.graph.DirectMappedDexApplication$Builder removeUnused(com.android.tools.r8.graph.DirectMappedDexApplication):78 -> a
+    51:51:com.android.tools.r8.graph.DirectMappedDexApplication$Builder removeUnused(com.android.tools.r8.graph.DirectMappedDexApplication):78:78 -> a
+    52:52:void removeInterfacesImplementedDirectlyAndIndirectlyByClassFromSet(com.android.tools.r8.graph.DexType,java.util.Set):141:141 -> a
+    53:53:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    53:53:void removeInterfacesImplementedDirectlyAndIndirectlyByClassFromSet(com.android.tools.r8.graph.DexType,java.util.Set):141 -> a
+    54:61:void removeInterfacesImplementedDirectlyAndIndirectlyByClassFromSet(com.android.tools.r8.graph.DexType,java.util.Set):145:152 -> a
+    62:63:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):170:171 -> a
+    64:69:java.util.List com.android.tools.r8.utils.IterableUtils.ensureUnmodifiableList(java.lang.Iterable):19:24 -> a
+    64:69:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.lang.Iterable,com.android.tools.r8.graph.DexClass):275 -> a
+    64:69:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):171 -> a
+    70:70:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.lang.Iterable,com.android.tools.r8.graph.DexClass):275:275 -> a
+    70:70:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):171 -> a
+    71:74:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):173:176 -> a
+    75:80:java.util.List com.android.tools.r8.utils.IterableUtils.ensureUnmodifiableList(java.lang.Iterable):19:24 -> a
+    75:80:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.lang.Iterable,com.android.tools.r8.graph.DexClass):275 -> a
+    75:80:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):176 -> a
+    81:81:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.lang.Iterable,com.android.tools.r8.graph.DexClass):275:275 -> a
+    81:81:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):176 -> a
+    82:93:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):178:189 -> a
+    94:101:void rewriteNestAttributes(com.android.tools.r8.graph.DexProgramClass):196:203 -> a
+    94:101:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):190 -> a
+    102:102:void claimNestOwnership(com.android.tools.r8.graph.DexClass):228:228 -> a
+    102:102:void rewriteNestAttributes(com.android.tools.r8.graph.DexProgramClass):204 -> a
+    102:102:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):190 -> a
+    103:103:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    103:103:void claimNestOwnership(com.android.tools.r8.graph.DexClass):228 -> a
+    103:103:void rewriteNestAttributes(com.android.tools.r8.graph.DexProgramClass):204 -> a
+    103:103:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):190 -> a
+    104:107:void claimNestOwnership(com.android.tools.r8.graph.DexClass):233:236 -> a
+    104:107:void rewriteNestAttributes(com.android.tools.r8.graph.DexProgramClass):204 -> a
+    104:107:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):190 -> a
+    108:108:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    108:108:void claimNestOwnership(com.android.tools.r8.graph.DexClass):236 -> a
+    108:108:void rewriteNestAttributes(com.android.tools.r8.graph.DexProgramClass):204 -> a
+    108:108:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):190 -> a
+    109:115:void claimNestOwnership(com.android.tools.r8.graph.DexClass):238:244 -> a
+    109:115:void rewriteNestAttributes(com.android.tools.r8.graph.DexProgramClass):204 -> a
+    109:115:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):190 -> a
+    116:117:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):191:192 -> a
+    118:120:boolean verifyNoDeadFields(com.android.tools.r8.graph.DexProgramClass):381:383 -> a
+    118:120:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):192 -> a
+    121:121:boolean isTypeLive(com.android.tools.r8.graph.DexType):214:214 -> a
+    122:123:void clearDeadNestMembers(com.android.tools.r8.graph.DexClass):220:221 -> a
+    124:124:boolean lambda$clearDeadNestMembers$1(com.android.tools.r8.graph.NestMemberClassAttribute):223:223 -> a
+    125:125:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    125:125:boolean lambda$clearDeadNestMembers$1(com.android.tools.r8.graph.NestMemberClassAttribute):223 -> a
+    126:126:boolean lambda$clearDeadNestMembers$1(com.android.tools.r8.graph.NestMemberClassAttribute):224:224 -> a
+    127:130:boolean isAttributeReferencingPrunedItem(com.android.tools.r8.graph.EnclosingMethodAttribute):250:253 -> a
+    131:131:boolean isAttributeReferencingMissingOrPrunedType(com.android.tools.r8.graph.InnerClassAttribute):257:257 -> a
+    132:132:boolean isTypeMissing(com.android.tools.r8.graph.DexType):210:210 -> a
+    132:132:boolean isAttributeReferencingMissingOrPrunedType(com.android.tools.r8.graph.InnerClassAttribute):257 -> a
+    133:136:boolean isAttributeReferencingMissingOrPrunedType(com.android.tools.r8.graph.InnerClassAttribute):257:260 -> a
+    137:137:boolean isTypeMissing(com.android.tools.r8.graph.DexType):210:210 -> a
+    137:137:boolean isAttributeReferencingMissingOrPrunedType(com.android.tools.r8.graph.InnerClassAttribute):261 -> a
+    138:138:boolean isTypeLive(com.android.tools.r8.graph.DexType):214:214 -> a
+    138:138:boolean isAttributeReferencingMissingOrPrunedType(com.android.tools.r8.graph.InnerClassAttribute):261 -> a
+    139:140:int firstUnreachableIndex(java.util.List,java.util.function.Predicate):266:267 -> a
+    141:162:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):279:300 -> a
+    163:180:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):297:314 -> a
+    181:181:boolean com.android.tools.r8.graph.DexEncodedMethod.isFinal():476:476 -> a
+    181:181:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):315 -> a
+    182:184:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):315:317 -> a
+    185:185:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():492:492 -> a
+    185:185:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):318 -> a
+    186:194:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):318:326 -> a
+    195:206:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):325:336 -> a
+    207:207:boolean lambda$reachableMethods$2(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexEncodedMethod):282:282 -> a
+    208:237:com.android.tools.r8.graph.DexEncodedField[] reachableFields(java.util.List):340:369 -> a
+    238:238:boolean lambda$reachableFields$3(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexEncodedField):342:342 -> a
+    239:239:java.util.Collection getMethodsToKeepForConfigurationDebugging():377:377 -> a
+    1:1:boolean isTypeLive(com.android.tools.r8.graph.DexType):214:214 -> b
+    1:1:void retainReachableInterfacesFrom(com.android.tools.r8.graph.DexType,java.util.Set):157 -> b
+    2:8:void retainReachableInterfacesFrom(com.android.tools.r8.graph.DexType,java.util.Set):158:164 -> b
+    9:9:java.util.Set getRemovedClasses():373:373 -> b
     1:10:com.android.tools.r8.graph.DirectMappedDexApplication run():62:71 -> c
-com.android.tools.r8.shaking.TreePrunerConfiguration -> com.android.tools.r8.internal.NA:
+com.android.tools.r8.shaking.TreePrunerConfiguration -> com.android.tools.r8.internal.OA:
     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.G1:
     int $r8$clinit -> q
@@ -75579,7 +75507,7 @@
     4:4:void <init>(com.android.tools.r8.shaking.UnusedItemsPrinter$1):18:18 -> <init>
     1:2:void sort():27:28 -> a
     3:3:int lambda$sort$1(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):28:28 -> a
-    4:5:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.toReference():134:134 -> a
+    4:5:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getReference():134:134 -> a
     4:5:int lambda$sort$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedField):27 -> a
     6:6:int lambda$sort$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedField):27:27 -> a
 com.android.tools.r8.shaking.UnusedItemsPrinter$NopPrinter -> com.android.tools.r8.shaking.J1:
@@ -75685,15 +75613,15 @@
     9:24:void initializePinnedTypes(java.lang.Iterable):281 -> b
     25:43:void initializePinnedTypes(java.lang.Iterable):283:301 -> b
     44:44:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):489:489 -> b
-    45:45:boolean com.android.tools.r8.graph.DexClass.isPrivate():556:556 -> b
+    45:45:boolean com.android.tools.r8.graph.DexClass.isPrivate():560:560 -> b
     45:45:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):493 -> b
-    46:46:boolean com.android.tools.r8.graph.DexClass.isPublic():560:560 -> b
+    46:46:boolean com.android.tools.r8.graph.DexClass.isPublic():564:564 -> b
     46:46:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):493 -> b
-    47:47:boolean com.android.tools.r8.graph.DexClass.isPrivate():556:556 -> b
+    47:47:boolean com.android.tools.r8.graph.DexClass.isPrivate():560:560 -> b
     47:47:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):494 -> b
-    48:48:boolean com.android.tools.r8.graph.DexClass.isPublic():560:560 -> b
+    48:48:boolean com.android.tools.r8.graph.DexClass.isPublic():564:564 -> b
     48:48:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):494 -> b
-    49:49:boolean com.android.tools.r8.graph.DexClass.isPublic():560:560 -> b
+    49:49:boolean com.android.tools.r8.graph.DexClass.isPublic():564:564 -> b
     49:49:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):503 -> b
     50:50:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):506:506 -> b
     51:51:boolean com.android.tools.r8.graph.DexEncodedField.isPublic():187:187 -> b
@@ -75701,14 +75629,14 @@
     52:52:boolean com.android.tools.r8.graph.DexEncodedField.isPrivate():179:179 -> b
     52:52:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):507 -> b
     53:53:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):511:511 -> b
-    54:54:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():482:482 -> b
+    54:54:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():488:488 -> b
     54:54:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):512 -> b
-    55:55:boolean com.android.tools.r8.graph.DexEncodedMethod.isPrivate():478:478 -> b
+    55:55:boolean com.android.tools.r8.graph.DexEncodedMethod.isPrivate():484:484 -> b
     55:55:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):512 -> b
-    56:56:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():482:482 -> b
+    56:56:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():488:488 -> b
     56:56:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):516 -> b
     57:57:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):517:517 -> b
-    58:58:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():482:482 -> b
+    58:58:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():488:488 -> b
     58:58:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):518 -> b
     59:70:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):526:537 -> b
     1:1:com.android.tools.r8.utils.Timing access$1000(com.android.tools.r8.shaking.VerticalClassMerger):96:96 -> c
@@ -75838,40 +75766,37 @@
     118:118:void add(java.util.Map,com.android.tools.r8.graph.DexEncodedMember,com.android.tools.r8.com.google.common.base.Equivalence):1312:1312 -> c
     118:118:boolean merge():994 -> c
     119:135:boolean merge():1000:1016 -> c
-    136:136:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getReference():375:375 -> c
-    136:136:boolean merge():1016 -> c
-    137:137:boolean merge():1016:1016 -> c
-    138:138:boolean merge():1009:1009 -> c
-    139:143:void makeStatic(com.android.tools.r8.graph.DexEncodedMethod):1454:1458 -> c
-    139:143:boolean merge():1017 -> c
-    144:154:boolean merge():1020:1030 -> c
-    155:155:void add(java.util.Map,com.android.tools.r8.graph.DexEncodedMember,com.android.tools.r8.com.google.common.base.Equivalence):1312:1312 -> c
-    155:155:boolean merge():1030 -> c
-    156:157:boolean merge():1034:1035 -> c
-    158:158:void blockRedirectionOfSuperCalls(com.android.tools.r8.graph.DexMethod):1235:1235 -> c
-    158:158:boolean merge():1035 -> c
-    159:190:com.android.tools.r8.graph.DexEncodedMethod buildBridgeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1240:1271 -> c
-    159:190:boolean merge():1043 -> c
-    191:191:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean,com.android.tools.r8.cf.CfVersion):277:277 -> c
-    191:191:com.android.tools.r8.graph.DexEncodedMethod buildBridgeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1271 -> c
-    191:191:boolean merge():1043 -> c
-    192:196:com.android.tools.r8.graph.DexEncodedMethod buildBridgeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1272:1276 -> c
-    192:196:boolean merge():1043 -> c
-    197:198:boolean merge():1044:1045 -> c
-    199:199:void add(java.util.Map,com.android.tools.r8.graph.DexEncodedMember,com.android.tools.r8.com.google.common.base.Equivalence):1312:1312 -> c
-    199:199:boolean merge():1045 -> c
-    200:200:boolean merge():1048:1048 -> c
-    201:201:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.map(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):329:329 -> c
-    201:201:boolean merge():1048 -> c
-    202:207:boolean merge():1049:1054 -> c
-    208:233:boolean merge():1053:1078 -> c
-    234:243:boolean merge():1076:1085 -> c
-    244:251:boolean merge():1083:1090 -> c
-    252:254:java.util.Set mergeArrays(java.lang.Object[],java.lang.Object[]):1323:1325 -> c
-    252:254:boolean merge():1090 -> c
-    255:280:boolean merge():1093:1118 -> c
-    281:281:boolean lambda$restoreDebuggingState$6(com.android.tools.r8.graph.DexEncodedMethod):1135:1135 -> c
-    282:282:com.android.tools.r8.graph.GraphLens$MethodLookupResult lambda$redirectSuperCallsInTarget$9(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription):1205:1205 -> c
+    136:136:boolean merge():1009:1009 -> c
+    137:141:void makeStatic(com.android.tools.r8.graph.DexEncodedMethod):1454:1458 -> c
+    137:141:boolean merge():1017 -> c
+    142:152:boolean merge():1020:1030 -> c
+    153:153:void add(java.util.Map,com.android.tools.r8.graph.DexEncodedMember,com.android.tools.r8.com.google.common.base.Equivalence):1312:1312 -> c
+    153:153:boolean merge():1030 -> c
+    154:155:boolean merge():1034:1035 -> c
+    156:156:void blockRedirectionOfSuperCalls(com.android.tools.r8.graph.DexMethod):1235:1235 -> c
+    156:156:boolean merge():1035 -> c
+    157:188:com.android.tools.r8.graph.DexEncodedMethod buildBridgeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1240:1271 -> c
+    157:188:boolean merge():1043 -> c
+    189:189:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean,com.android.tools.r8.cf.CfVersion):281:281 -> c
+    189:189:com.android.tools.r8.graph.DexEncodedMethod buildBridgeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1271 -> c
+    189:189:boolean merge():1043 -> c
+    190:194:com.android.tools.r8.graph.DexEncodedMethod buildBridgeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1272:1276 -> c
+    190:194:boolean merge():1043 -> c
+    195:196:boolean merge():1044:1045 -> c
+    197:197:void add(java.util.Map,com.android.tools.r8.graph.DexEncodedMember,com.android.tools.r8.com.google.common.base.Equivalence):1312:1312 -> c
+    197:197:boolean merge():1045 -> c
+    198:198:boolean merge():1048:1048 -> c
+    199:199:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.map(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):329:329 -> c
+    199:199:boolean merge():1048 -> c
+    200:205:boolean merge():1049:1054 -> c
+    206:231:boolean merge():1053:1078 -> c
+    232:241:boolean merge():1076:1085 -> c
+    242:249:boolean merge():1083:1090 -> c
+    250:252:java.util.Set mergeArrays(java.lang.Object[],java.lang.Object[]):1323:1325 -> c
+    250:252:boolean merge():1090 -> c
+    253:278:boolean merge():1093:1118 -> c
+    279:279:boolean lambda$restoreDebuggingState$6(com.android.tools.r8.graph.DexEncodedMethod):1135:1135 -> c
+    280:280:com.android.tools.r8.graph.GraphLens$MethodLookupResult lambda$redirectSuperCallsInTarget$9(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription):1205:1205 -> c
 com.android.tools.r8.shaking.VerticalClassMerger$CollisionDetector -> com.android.tools.r8.shaking.O1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap targetProtoCache -> c
     java.util.Map seenPositions -> b
@@ -75889,7 +75814,7 @@
     19:20:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap lambda$fillSeenPositions$0(com.android.tools.r8.graph.DexString):1630:1631 -> a
     21:52:int computePositionsFor(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1650:1681 -> a
     1:22:boolean mayCollide():1597:1618 -> b
-com.android.tools.r8.shaking.VerticalClassMerger$IllegalAccessDetector -> com.android.tools.r8.internal.GC:
+com.android.tools.r8.shaking.VerticalClassMerger$IllegalAccessDetector -> com.android.tools.r8.internal.HC:
     com.android.tools.r8.graph.ProgramMethod context -> e
     com.android.tools.r8.graph.AppView appView -> f
     com.android.tools.r8.graph.DexClass source -> g
@@ -75900,7 +75825,7 @@
     1:1:boolean foundIllegalAccess():1839:1839 -> a
     2:2:void setContext(com.android.tools.r8.graph.ProgramMethod):1843:1843 -> a
     3:17:void checkMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.OptionalBool):1863:1877 -> a
-    18:18:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():482:482 -> a
+    18:18:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():488:488 -> a
     18:18:void checkMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.OptionalBool):1877 -> a
     19:19:void checkMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.OptionalBool):1878:1878 -> a
     20:23:void registerInvokeDirect(com.android.tools.r8.graph.DexMethod):1912:1915 -> a
@@ -75968,15 +75893,15 @@
     com.android.tools.r8.graph.DexMethod originalMethod -> d
     com.android.tools.r8.graph.DexMethod method -> c
     1:6:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,boolean):1991:1996 -> <init>
+    1:1:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():2017:2017 -> A
+    2:26:com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode.builder(com.android.tools.r8.graph.DexMethod):0:24 -> A
+    2:26:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():2018 -> A
+    27:34:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():2019:2026 -> A
     1:1:com.android.tools.r8.graph.DexMethod access$600(com.android.tools.r8.shaking.VerticalClassMerger$SynthesizedBridgeCode):1978:1978 -> a
     2:3:void updateMethodSignatures(java.util.function.Function):2011:2012 -> a
     4:14:void lambda$getRegistryCallback$0(com.android.tools.r8.graph.UseRegistry):2032:2042 -> a
     15:15:void lambda$getRegistryCallback$0(com.android.tools.r8.graph.UseRegistry):2034:2034 -> a
-    1:1:java.util.function.Consumer getRegistryCallback():2031:2031 -> y
-    1:1:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():2017:2017 -> z
-    2:26:com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode.builder(com.android.tools.r8.graph.DexMethod):0:24 -> z
-    2:26:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():2018 -> z
-    27:34:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():2019:2026 -> z
+    1:1:java.util.function.Consumer getRegistryCallback():2031:2031 -> z
 com.android.tools.r8.shaking.VerticalClassMerger$TreeFixer -> com.android.tools.r8.shaking.T1:
     java.util.Map protoFixupCache -> c
     com.android.tools.r8.shaking.VerticalClassMerger this$0 -> d
@@ -76099,7 +76024,7 @@
     2:2:void recordMove(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):334:334 -> b
 com.android.tools.r8.shaking.VerticalClassMergerGraphLens$GraphLensLookupResultProvider -> com.android.tools.r8.shaking.X1:
     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.PC:
+com.android.tools.r8.shaking.WhyAreYouKeepingConsumer -> com.android.tools.r8.internal.QC:
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():43:43 -> <clinit>
     1:1:void <init>(com.android.tools.r8.experimental.graphinfo.GraphConsumer):58:58 -> <init>
@@ -76136,7 +76061,7 @@
     34:38:java.lang.String getNodeString(com.android.tools.r8.experimental.graphinfo.GraphNode):230 -> d
     39:45:java.lang.String getNodeString(com.android.tools.r8.experimental.graphinfo.GraphNode):230:236 -> d
     46:46: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.PC$a:
+com.android.tools.r8.shaking.WhyAreYouKeepingConsumer$Formatter -> com.android.tools.r8.internal.QC$a:
     java.io.PrintStream output -> a
     int indentation -> b
     1:1:void <init>(java.io.PrintStream):257:257 -> <init>
@@ -76146,7 +76071,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.PC$b:
+com.android.tools.r8.shaking.WhyAreYouKeepingConsumer$GraphPath -> com.android.tools.r8.internal.QC$b:
     com.android.tools.r8.shaking.WhyAreYouKeepingConsumer$GraphPath path -> c
     boolean $assertionsDisabled -> a
     com.android.tools.r8.experimental.graphinfo.GraphNode node -> b
@@ -76162,7 +76087,7 @@
     1:1:void <init>(com.android.tools.r8.shaking.WhyAreYouNotInliningRule$1):12:12 -> <init>
     2:2:void <init>():16:16 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> d
-com.android.tools.r8.synthesis.CommittedItems -> com.android.tools.r8.internal.N6:
+com.android.tools.r8.synthesis.CommittedItems -> com.android.tools.r8.internal.O6:
     com.android.tools.r8.graph.DexApplication application -> b
     com.android.tools.r8.com.google.common.collect.ImmutableMap syntheticItems -> e
     com.android.tools.r8.com.google.common.collect.ImmutableList committedTypes -> f
@@ -76176,7 +76101,7 @@
     3:4:boolean verifyTypesAreInApp(com.android.tools.r8.graph.DexApplication,java.util.Collection):70:71 -> a
     1:1:java.util.Collection getCommittedTypes():60:60 -> b
     1:1:com.android.tools.r8.synthesis.SyntheticItems toSyntheticItems():52:52 -> c
-com.android.tools.r8.synthesis.SynthesizingContext -> com.android.tools.r8.internal.Sz:
+com.android.tools.r8.synthesis.SynthesizingContext -> com.android.tools.r8.internal.Uz:
     com.android.tools.r8.origin.Origin inputContextOrigin -> d
     com.android.tools.r8.graph.DexType inputContextType -> c
     com.android.tools.r8.graph.DexType synthesizingContextType -> b
@@ -76190,14 +76115,14 @@
     14:17:com.android.tools.r8.graph.DexType createHygienicType(int,com.android.tools.r8.graph.DexItemFactory):78:81 -> a
     18:23:com.android.tools.r8.synthesis.SynthesizingContext rewrite(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):85:90 -> a
     24:25:void registerPrefixRewriting(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):99:100 -> a
-    26:26:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():390:390 -> a
+    26:26:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():397:397 -> a
     26:26:void registerPrefixRewriting(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):100 -> a
     27:44:void registerPrefixRewriting(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):105:122 -> a
     45:48:void addIfDerivedFromMainDexClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.MainDexClasses,java.util.Set,java.util.Set):133:136 -> a
     1:1:com.android.tools.r8.graph.DexType lambda$compareTo$0(com.android.tools.r8.synthesis.SynthesizingContext):68:68 -> b
     2:2:com.android.tools.r8.graph.DexType getSynthesizingContextType():95:95 -> b
     1:1:int compareTo(java.lang.Object):28:28 -> compareTo
-com.android.tools.r8.synthesis.SyntheticClassBuilder -> com.android.tools.r8.internal.Xz:
+com.android.tools.r8.synthesis.SyntheticClassBuilder -> com.android.tools.r8.internal.Zz:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.DexTypeList interfaces -> f
     com.android.tools.r8.origin.Origin origin -> d
@@ -76217,9 +76142,9 @@
     6:53:com.android.tools.r8.graph.DexProgramClass build():68:115 -> a
     1:1:com.android.tools.r8.graph.DexItemFactory getFactory():48:48 -> b
     1:1:com.android.tools.r8.graph.DexType getType():52:52 -> c
-com.android.tools.r8.synthesis.SyntheticDefinitionsProvider -> com.android.tools.r8.internal.Yz:
+com.android.tools.r8.synthesis.SyntheticDefinitionsProvider -> com.android.tools.r8.internal.aA:
     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.internal.aA:
+com.android.tools.r8.synthesis.SyntheticFinalization -> com.android.tools.r8.internal.cA:
     com.android.tools.r8.com.google.common.collect.ImmutableMap syntheticItems -> d
     com.android.tools.r8.utils.InternalOptions options -> b
     boolean $assertionsDisabled -> a
@@ -76263,41 +76188,33 @@
     169:197:void lambda$buildLensAndProgram$5(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory,java.util.List,com.android.tools.r8.graph.GraphLens$Builder,com.android.tools.r8.shaking.MainDexClasses,java.util.Set,java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):292:320 -> a
     198:198:void lambda$buildLensAndProgram$5(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory,java.util.List,com.android.tools.r8.graph.GraphLens$Builder,com.android.tools.r8.shaking.MainDexClasses,java.util.Set,java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):319:319 -> a
     199:205:void lambda$buildLensAndProgram$5(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory,java.util.List,com.android.tools.r8.graph.GraphLens$Builder,com.android.tools.r8.shaking.MainDexClasses,java.util.Set,java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):316:322 -> a
-    206:208:void lambda$buildLensAndProgram$4(com.android.tools.r8.synthesis.SyntheticMethodDefinition,com.android.tools.r8.synthesis.SyntheticMethodBuilder):284:286 -> a
-    209:209:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getReference():375:375 -> a
-    209:209:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexEncodedMethod.getProto():371 -> a
-    209:209:void lambda$buildLensAndProgram$4(com.android.tools.r8.synthesis.SyntheticMethodDefinition,com.android.tools.r8.synthesis.SyntheticMethodBuilder):287 -> a
-    210:210:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexEncodedMethod.getProto():371:371 -> a
-    210:210:void lambda$buildLensAndProgram$4(com.android.tools.r8.synthesis.SyntheticMethodDefinition,com.android.tools.r8.synthesis.SyntheticMethodBuilder):287 -> a
-    211:212:void lambda$buildLensAndProgram$4(com.android.tools.r8.synthesis.SyntheticMethodDefinition,com.android.tools.r8.synthesis.SyntheticMethodBuilder):287:288 -> a
-    213:213:com.android.tools.r8.graph.Code lambda$buildLensAndProgram$3(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):288:288 -> a
-    214:242:java.util.Map computeActualEquivalences(java.util.Collection,com.android.tools.r8.graph.DexItemFactory):340:368 -> a
-    243:243:java.util.List lambda$computeActualEquivalences$6(com.android.tools.r8.graph.DexType):357:357 -> a
-    244:246:void lambda$computeActualEquivalences$9(com.android.tools.r8.graph.DexItemFactory,java.util.Map,com.android.tools.r8.graph.DexType,java.util.List):370:372 -> a
-    247:249:com.android.tools.r8.graph.DexType com.android.tools.r8.synthesis.SyntheticFinalization.createExternalType(com.android.tools.r8.graph.DexType,int,com.android.tools.r8.graph.DexItemFactory):395:397 -> a
-    247:249:void lambda$computeActualEquivalences$9(com.android.tools.r8.graph.DexItemFactory,java.util.Map,com.android.tools.r8.graph.DexType,java.util.List):373 -> a
-    250:250:com.android.tools.r8.graph.DexType com.android.tools.r8.synthesis.SyntheticFinalization.createExternalType(com.android.tools.r8.graph.DexType,int,com.android.tools.r8.graph.DexItemFactory):396:396 -> a
-    250:250:void lambda$computeActualEquivalences$9(com.android.tools.r8.graph.DexItemFactory,java.util.Map,com.android.tools.r8.graph.DexType,java.util.List):373 -> a
-    251:251:com.android.tools.r8.graph.DexType com.android.tools.r8.synthesis.SyntheticFinalization.createExternalType(com.android.tools.r8.graph.DexType,int,com.android.tools.r8.graph.DexItemFactory):395:395 -> a
-    251:251:void lambda$computeActualEquivalences$9(com.android.tools.r8.graph.DexItemFactory,java.util.Map,com.android.tools.r8.graph.DexType,java.util.List):373 -> a
-    252:252:void lambda$computeActualEquivalences$9(com.android.tools.r8.graph.DexItemFactory,java.util.Map,com.android.tools.r8.graph.DexType,java.util.List):374:374 -> a
-    253:256:com.android.tools.r8.synthesis.SyntheticDefinition com.android.tools.r8.synthesis.SyntheticFinalization.findDeterministicRepresentative(java.util.List):383:386 -> a
-    253:256:void lambda$computeActualEquivalences$8(java.util.Map,java.util.List):344 -> a
-    257:269:void lambda$computeActualEquivalences$8(java.util.Map,java.util.List):345:357 -> a
-    270:270:void lambda$computeActualEquivalences$8(java.util.Map,java.util.List):356:356 -> a
-    271:271:void com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup.<init>(com.android.tools.r8.synthesis.SyntheticDefinition):55:55 -> a
-    271:271:void lambda$computeActualEquivalences$8(java.util.Map,java.util.List):356 -> a
-    272:278:void lambda$computeActualEquivalences$8(java.util.Map,java.util.List):358:364 -> a
-    279:281:void lambda$computeActualEquivalences$8(java.util.Map,java.util.List):363:365 -> a
-    282:287:java.util.Collection computePotentialEquivalences(java.util.List):404:409 -> a
-    288:288:java.util.List lambda$computePotentialEquivalences$10(com.android.tools.r8.com.google.common.hash.HashCode):407:407 -> a
-    289:291:java.util.List lookupSyntheticMethodDefinitions(com.android.tools.r8.graph.DexApplication):414:416 -> a
-    292:298:com.android.tools.r8.synthesis.SyntheticDefinition com.android.tools.r8.synthesis.SyntheticMethodReference.lookupDefinition(java.util.function.Function):39:45 -> a
-    292:298:java.util.List lookupSyntheticMethodDefinitions(com.android.tools.r8.graph.DexApplication):416 -> a
-    299:304:java.util.List lookupSyntheticMethodDefinitions(com.android.tools.r8.graph.DexApplication):423:428 -> a
-    305:305:java.util.List lookupSyntheticMethodDefinitions(com.android.tools.r8.graph.DexApplication):419:419 -> a
-    1:1:java.util.List lambda$computeActualEquivalences$7(com.android.tools.r8.graph.DexType):364:364 -> b
-com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup -> com.android.tools.r8.internal.Zz:
+    206:210:void lambda$buildLensAndProgram$4(com.android.tools.r8.synthesis.SyntheticMethodDefinition,com.android.tools.r8.synthesis.SyntheticMethodBuilder):284:288 -> a
+    211:211:com.android.tools.r8.graph.Code lambda$buildLensAndProgram$3(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):288:288 -> a
+    212:230:java.util.Map computeActualEquivalences(java.util.Collection,com.android.tools.r8.graph.DexItemFactory):340:358 -> a
+    231:231:java.util.List lambda$computeActualEquivalences$6(com.android.tools.r8.graph.DexType):352:352 -> a
+    232:234:void lambda$computeActualEquivalences$8(com.android.tools.r8.graph.DexItemFactory,java.util.Map,com.android.tools.r8.graph.DexType,java.util.List):360:362 -> a
+    235:237:com.android.tools.r8.graph.DexType com.android.tools.r8.synthesis.SyntheticFinalization.createExternalType(com.android.tools.r8.graph.DexType,int,com.android.tools.r8.graph.DexItemFactory):407:409 -> a
+    235:237:void lambda$computeActualEquivalences$8(com.android.tools.r8.graph.DexItemFactory,java.util.Map,com.android.tools.r8.graph.DexType,java.util.List):363 -> a
+    238:238:com.android.tools.r8.graph.DexType com.android.tools.r8.synthesis.SyntheticFinalization.createExternalType(com.android.tools.r8.graph.DexType,int,com.android.tools.r8.graph.DexItemFactory):408:408 -> a
+    238:238:void lambda$computeActualEquivalences$8(com.android.tools.r8.graph.DexItemFactory,java.util.Map,com.android.tools.r8.graph.DexType,java.util.List):363 -> a
+    239:239:com.android.tools.r8.graph.DexType com.android.tools.r8.synthesis.SyntheticFinalization.createExternalType(com.android.tools.r8.graph.DexType,int,com.android.tools.r8.graph.DexItemFactory):407:407 -> a
+    239:239:void lambda$computeActualEquivalences$8(com.android.tools.r8.graph.DexItemFactory,java.util.Map,com.android.tools.r8.graph.DexType,java.util.List):363 -> a
+    240:240:void lambda$computeActualEquivalences$8(com.android.tools.r8.graph.DexItemFactory,java.util.Map,com.android.tools.r8.graph.DexType,java.util.List):364:364 -> a
+    241:255:java.util.List com.android.tools.r8.synthesis.SyntheticFinalization.groupEquivalent(java.util.List):372:386 -> a
+    241:255:void lambda$computeActualEquivalences$7(java.util.Map,java.util.List):343 -> a
+    256:256:void lambda$computeActualEquivalences$7(java.util.Map,java.util.List):344:344 -> a
+    257:260:com.android.tools.r8.synthesis.SyntheticDefinition com.android.tools.r8.synthesis.SyntheticFinalization.findDeterministicRepresentative(java.util.List):395:398 -> a
+    257:260:void lambda$computeActualEquivalences$7(java.util.Map,java.util.List):345 -> a
+    261:265:void lambda$computeActualEquivalences$7(java.util.Map,java.util.List):347:351 -> a
+    266:269:void lambda$computeActualEquivalences$7(java.util.Map,java.util.List):350:353 -> a
+    270:275:java.util.Collection computePotentialEquivalences(java.util.List):416:421 -> a
+    276:276:java.util.List lambda$computePotentialEquivalences$9(com.android.tools.r8.com.google.common.hash.HashCode):419:419 -> a
+    277:279:java.util.List lookupSyntheticMethodDefinitions(com.android.tools.r8.graph.DexApplication):426:428 -> a
+    280:286:com.android.tools.r8.synthesis.SyntheticDefinition com.android.tools.r8.synthesis.SyntheticMethodReference.lookupDefinition(java.util.function.Function):39:45 -> a
+    280:286:java.util.List lookupSyntheticMethodDefinitions(com.android.tools.r8.graph.DexApplication):428 -> a
+    287:292:java.util.List lookupSyntheticMethodDefinitions(com.android.tools.r8.graph.DexApplication):435:440 -> a
+    293:293:java.util.List lookupSyntheticMethodDefinitions(com.android.tools.r8.graph.DexApplication):431:431 -> a
+com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup -> com.android.tools.r8.internal.bA:
     java.util.List members -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():50:50 -> <clinit>
@@ -76308,11 +76225,11 @@
     1:1:int compareTo(java.lang.Object):50:50 -> compareTo
     2:2:int com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup.compareTo(com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):74:74 -> compareTo
     2:2:int compareTo(java.lang.Object):50 -> compareTo
-com.android.tools.r8.synthesis.SyntheticFinalization$Result -> com.android.tools.r8.internal.aA$a:
+com.android.tools.r8.synthesis.SyntheticFinalization$Result -> com.android.tools.r8.internal.cA$a:
     com.android.tools.r8.synthesis.CommittedItems commit -> a
     com.android.tools.r8.com.google.common.collect.ImmutableSet removedSyntheticClasses -> b
     1:3:void <init>(com.android.tools.r8.synthesis.CommittedItems,com.android.tools.r8.com.google.common.collect.ImmutableSet):44:46 -> <init>
-com.android.tools.r8.synthesis.SyntheticItems -> com.android.tools.r8.internal.bA:
+com.android.tools.r8.synthesis.SyntheticItems -> com.android.tools.r8.internal.dA:
     java.util.Map legacyPendingClasses -> c
     java.util.concurrent.ConcurrentHashMap pendingDefinitions -> e
     com.android.tools.r8.com.google.common.collect.ImmutableMap nonLecacySyntheticItems -> f
@@ -76375,7 +76292,7 @@
     1:1:boolean hasPendingSyntheticClasses():211:211 -> c
     2:5:boolean isSyntheticClass(com.android.tools.r8.graph.DexType):233:236 -> c
     1:1:boolean verifyNotInternalSynthetic(com.android.tools.r8.graph.DexType):57:57 -> d
-com.android.tools.r8.synthesis.SyntheticMethodBuilder -> com.android.tools.r8.internal.dA:
+com.android.tools.r8.synthesis.SyntheticMethodBuilder -> com.android.tools.r8.internal.fA:
     com.android.tools.r8.synthesis.SyntheticClassBuilder parent -> b
     com.android.tools.r8.graph.DexProto proto -> d
     boolean $assertionsDisabled -> a
@@ -76389,10 +76306,10 @@
     2:2:com.android.tools.r8.synthesis.SyntheticMethodBuilder setCode(com.android.tools.r8.synthesis.SyntheticMethodBuilder$SyntheticCodeGenerator):38:38 -> a
     3:3:com.android.tools.r8.synthesis.SyntheticMethodBuilder setAccessFlags(com.android.tools.r8.graph.MethodAccessFlags):43:43 -> a
     4:5:boolean isValidSyntheticMethod(com.android.tools.r8.graph.DexEncodedMethod):70:71 -> a
-    6:6:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():482:482 -> a
+    6:6:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():488:488 -> a
     6:6:boolean isValidSyntheticMethod(com.android.tools.r8.graph.DexEncodedMethod):72 -> a
     7:7:boolean isValidSyntheticMethod(com.android.tools.r8.graph.DexEncodedMethod):73:73 -> a
-    8:8:com.android.tools.r8.graph.ParameterAnnotationsList com.android.tools.r8.graph.DexEncodedMethod.getParameterAnnotations():842:842 -> a
+    8:8:com.android.tools.r8.graph.ParameterAnnotationsList com.android.tools.r8.graph.DexEncodedMethod.getParameterAnnotations():848:848 -> a
     8:8:boolean isValidSyntheticMethod(com.android.tools.r8.graph.DexEncodedMethod):74 -> a
     9:9:boolean isValidSyntheticMethod(com.android.tools.r8.graph.DexEncodedMethod):74:74 -> a
     10:10:com.android.tools.r8.graph.DexMethod com.android.tools.r8.synthesis.SyntheticMethodBuilder.getMethodSignature():78:78 -> a
@@ -76403,12 +76320,12 @@
     13:15:com.android.tools.r8.graph.DexEncodedMethod build():54:56 -> a
     16:16:com.android.tools.r8.graph.Code com.android.tools.r8.synthesis.SyntheticMethodBuilder.getCodeObject(com.android.tools.r8.graph.DexMethod):86:86 -> a
     16:16:com.android.tools.r8.graph.DexEncodedMethod build():57 -> a
-    17:17:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):257:257 -> a
+    17:17:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):261:261 -> a
     17:17:com.android.tools.r8.graph.DexEncodedMethod build():57 -> a
     18:18:com.android.tools.r8.graph.DexEncodedMethod build():59:59 -> a
-com.android.tools.r8.synthesis.SyntheticMethodBuilder$SyntheticCodeGenerator -> com.android.tools.r8.internal.cA:
+com.android.tools.r8.synthesis.SyntheticMethodBuilder$SyntheticCodeGenerator -> com.android.tools.r8.internal.eA:
     com.android.tools.r8.graph.Code generate(com.android.tools.r8.graph.DexMethod) -> a
-com.android.tools.r8.synthesis.SyntheticMethodDefinition -> com.android.tools.r8.internal.eA:
+com.android.tools.r8.synthesis.SyntheticMethodDefinition -> com.android.tools.r8.internal.gA:
     com.android.tools.r8.synthesis.SynthesizingContext com.android.tools.r8.synthesis.SyntheticDefinition.context -> a
     com.android.tools.r8.graph.ProgramMethod method -> b
     1:2:void com.android.tools.r8.synthesis.SyntheticDefinition.<init>(com.android.tools.r8.synthesis.SynthesizingContext):17:18 -> <init>
@@ -76419,7 +76336,7 @@
     1:1:com.android.tools.r8.synthesis.SynthesizingContext com.android.tools.r8.synthesis.SyntheticDefinition.getContext():24:24 -> b
     1:1:com.android.tools.r8.synthesis.SynthesizingContext com.android.tools.r8.synthesis.SyntheticDefinition.getContext():0 -> b
     2:6:boolean isEquivalentTo(com.android.tools.r8.synthesis.SyntheticDefinition):52:56 -> b
-    7:7:boolean com.android.tools.r8.graph.DexEncodedMethod.isSyntheticContentEqual(com.android.tools.r8.graph.DexEncodedMethod):339:339 -> b
+    7:7:boolean com.android.tools.r8.graph.DexEncodedMethod.isSyntheticContentEqual(com.android.tools.r8.graph.DexEncodedMethod):343:343 -> b
     7:7:boolean isEquivalentTo(com.android.tools.r8.synthesis.SyntheticDefinition):56 -> b
     1:1:com.android.tools.r8.graph.DexProgramClass getHolder():40:40 -> c
     2:2:com.android.tools.r8.graph.DexEncodedMethod lambda$compareTo$0(com.android.tools.r8.synthesis.SyntheticMethodDefinition):63:63 -> c
@@ -76430,12 +76347,13 @@
     2:2:com.android.tools.r8.synthesis.SynthesizingContext com.android.tools.r8.synthesis.SyntheticDefinition.getContext():0 -> e
     2:2:com.android.tools.r8.synthesis.SyntheticReference toReference():35 -> e
     3:3:com.android.tools.r8.synthesis.SyntheticReference toReference():35:35 -> e
-com.android.tools.r8.synthesis.SyntheticMethodReference -> com.android.tools.r8.internal.fA:
+    1:1:java.lang.String toString():69:69 -> toString
+com.android.tools.r8.synthesis.SyntheticMethodReference -> com.android.tools.r8.internal.hA:
     com.android.tools.r8.graph.DexMethod method -> c
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():19:19 -> <clinit>
     1:2:void <init>(com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexMethod):23:24 -> <init>
-com.android.tools.r8.synthesis.SyntheticReference -> com.android.tools.r8.internal.gA:
+com.android.tools.r8.synthesis.SyntheticReference -> com.android.tools.r8.internal.iA:
     com.android.tools.r8.synthesis.SynthesizingContext context -> a
     1:2:void <init>(com.android.tools.r8.synthesis.SynthesizingContext):20:21 -> <init>
     1:1:com.android.tools.r8.synthesis.SynthesizingContext getContext():29:29 -> a
@@ -76447,75 +76365,52 @@
     void printPackageNames(java.util.List) -> a
     1:1:java.lang.String get():33:33 -> a
     2:2:void append(java.lang.String):37:37 -> a
-    3:6:void printArguments(com.android.tools.r8.references.MethodReference):49:49 -> a
-    7:14:void format(com.android.tools.r8.tracereferences.TraceReferencesResult):106:113 -> a
-    15:30:int print(java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Set):123:138 -> a
-    31:31:void printReturn(com.android.tools.r8.references.MethodReference):88:88 -> a
-    31:31:void printMethodError(com.android.tools.r8.references.MethodReference):76 -> a
-    31:31:int print(java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Set):138 -> a
-    32:32:void append(java.lang.String):37:37 -> a
-    32:32:void printReturn(com.android.tools.r8.references.MethodReference):88 -> a
-    32:32:void printMethodError(com.android.tools.r8.references.MethodReference):76 -> a
-    32:32:int print(java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Set):138 -> a
-    33:33:void append(java.lang.String):37:37 -> a
-    33:33:void printMethodError(com.android.tools.r8.references.MethodReference):77 -> a
-    33:33:int print(java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Set):138 -> a
-    34:34:void printMethodError(com.android.tools.r8.references.MethodReference):78:78 -> a
-    34:34:int print(java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Set):138 -> a
-    35:35:void append(java.lang.String):37:37 -> a
-    35:35:void printMethodError(com.android.tools.r8.references.MethodReference):78 -> a
-    35:35:int print(java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Set):138 -> a
-    36:36:void append(java.lang.String):37:37 -> a
-    36:36:void printMethodError(com.android.tools.r8.references.MethodReference):79 -> a
-    36:36:int print(java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Set):138 -> a
-    37:37:void printMethodError(com.android.tools.r8.references.MethodReference):80:80 -> a
-    37:37:int print(java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Set):138 -> a
-    38:38:void append(java.lang.String):37:37 -> a
-    38:38:void printMethodError(com.android.tools.r8.references.MethodReference):80 -> a
-    38:38:int print(java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Set):138 -> a
-    39:39:void printMethodError(com.android.tools.r8.references.MethodReference):81:81 -> a
-    39:39:int print(java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Set):138 -> a
-    40:40:void appendLine():45:45 -> a
-    40:40:void printMethodError(com.android.tools.r8.references.MethodReference):82 -> a
-    40:40:int print(java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Set):138 -> a
-    41:45:int print(java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Set):142:146 -> a
-    46:56:int print(java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Set):145:155 -> a
-    57:62:int print(java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Set):154:159 -> a
-    63:69:void printFieldError(com.android.tools.r8.references.FieldReference):67:67 -> a
-    63:69:int print(java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Set):159 -> a
-    70:80:int print(java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Set):163:173 -> a
-    81:81:java.lang.String lambda$print$0(com.android.tools.r8.tracereferences.TraceReferencesConsumer$TracedClass):124:124 -> a
-    82:82:java.lang.String lambda$print$1(com.android.tools.r8.tracereferences.TraceReferencesConsumer$TracedMethod):146:146 -> a
-    83:83:java.lang.String lambda$print$2(com.android.tools.r8.tracereferences.TraceReferencesConsumer$TracedField):155:155 -> a
+    3:6:void printArguments(com.android.tools.r8.references.MethodReference):45:45 -> a
+    7:7:void format(com.android.tools.r8.tracereferences.TraceReferencesResult):79:79 -> a
+    8:28:void print(java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Set):93:113 -> a
+    29:49:void print(java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Set):112:132 -> a
+    50:50:java.lang.String lambda$print$0(com.android.tools.r8.tracereferences.TraceReferencesConsumer$TracedClass):94:94 -> a
+    51:51:java.lang.String lambda$print$1(com.android.tools.r8.tracereferences.TraceReferencesConsumer$TracedMethod):113:113 -> a
+    52:52:java.lang.String lambda$print$2(com.android.tools.r8.tracereferences.TraceReferencesConsumer$TracedField):118:118 -> a
     void printConstructorName(com.android.tools.r8.references.MethodReference) -> b
     void printField(com.android.tools.r8.tracereferences.TraceReferencesConsumer$TracedField) -> b
     void printMethod(com.android.tools.r8.tracereferences.TraceReferencesConsumer$TracedMethod) -> b
     void printTypeFooter() -> b
     void printTypeHeader(com.android.tools.r8.tracereferences.TraceReferencesConsumer$TracedClass) -> b
     1:1:void appendLine(java.lang.String):41:41 -> b
-    1:1:void printError(java.lang.String):59:59 -> c
-    2:2:void append(java.lang.String):37:37 -> c
-    2:2:void printError(java.lang.String):59 -> c
-    3:4:void printNameAndReturn(com.android.tools.r8.references.MethodReference):92:93 -> c
-    5:5:void printReturn(com.android.tools.r8.references.MethodReference):88:88 -> c
-    5:5:void printNameAndReturn(com.android.tools.r8.references.MethodReference):95 -> c
-    6:6:void append(java.lang.String):37:37 -> c
-    6:6:void printReturn(com.android.tools.r8.references.MethodReference):88 -> c
-    6:6:void printNameAndReturn(com.android.tools.r8.references.MethodReference):95 -> c
+    1:2:void printNameAndReturn(com.android.tools.r8.references.MethodReference):65:66 -> c
+    3:3:void printReturn(com.android.tools.r8.references.MethodReference):61:61 -> c
+    3:3:void printNameAndReturn(com.android.tools.r8.references.MethodReference):68 -> c
+    4:4:void append(java.lang.String):37:37 -> c
+    4:4:void printReturn(com.android.tools.r8.references.MethodReference):61 -> c
+    4:4:void printNameAndReturn(com.android.tools.r8.references.MethodReference):68 -> c
+    5:5:void append(java.lang.String):37:37 -> c
+    5:5:void printNameAndReturn(com.android.tools.r8.references.MethodReference):69 -> c
+    6:6:void printNameAndReturn(com.android.tools.r8.references.MethodReference):70:70 -> c
     7:7:void append(java.lang.String):37:37 -> c
-    7:7:void printNameAndReturn(com.android.tools.r8.references.MethodReference):96 -> c
-    8:8:void printNameAndReturn(com.android.tools.r8.references.MethodReference):97:97 -> c
-    9:9:void append(java.lang.String):37:37 -> c
-    9:9:void printNameAndReturn(com.android.tools.r8.references.MethodReference):97 -> c
+    7:7:void printNameAndReturn(com.android.tools.r8.references.MethodReference):70 -> c
 com.android.tools.r8.tracereferences.KeepRuleFormatter -> com.android.tools.r8.tracereferences.b:
     boolean allowObfuscation -> c
     1:2:void <init>(boolean):16:17 -> <init>
-    1:2:void printPackageNames(java.util.List):71:72 -> a
-    1:7:void printTypeHeader(com.android.tools.r8.tracereferences.TraceReferencesConsumer$TracedClass):22:28 -> b
-    8:8:void printConstructorName(com.android.tools.r8.references.MethodReference):34:34 -> b
-    9:16:void printField(com.android.tools.r8.tracereferences.TraceReferencesConsumer$TracedField):39:39 -> b
-    17:33:void printMethod(com.android.tools.r8.tracereferences.TraceReferencesConsumer$TracedMethod):50:66 -> b
-    34:34:void printTypeFooter():78:78 -> b
+    1:2:void printPackageNames(java.util.List):75:76 -> a
+    1:11:void printTypeHeader(com.android.tools.r8.tracereferences.TraceReferencesConsumer$TracedClass):22:32 -> b
+    12:12:void printConstructorName(com.android.tools.r8.references.MethodReference):38:38 -> b
+    13:20:void printField(com.android.tools.r8.tracereferences.TraceReferencesConsumer$TracedField):43:43 -> b
+    21:37:void printMethod(com.android.tools.r8.tracereferences.TraceReferencesConsumer$TracedMethod):54:70 -> b
+    38:38:void printTypeFooter():82:82 -> b
+com.android.tools.r8.tracereferences.MissingDefinitionsDiagnostic -> com.android.tools.r8.tracereferences.MissingDefinitionsDiagnostic:
+    java.util.Set missingFields -> c
+    java.util.Set missingMethods -> d
+    java.util.Set missingClasses -> b
+    boolean $assertionsDisabled -> a
+    1:1:void <clinit>():17:17 -> <clinit>
+    1:4:void <init>(java.util.Set,java.util.Set,java.util.Set):27:30 -> <init>
+    1:3:void lambda$getDiagnosticMessage$0(java.lang.StringBuilder,com.android.tools.r8.tracereferences.Tracer$TracedClassImpl):70:72 -> a
+    4:6:void lambda$getDiagnosticMessage$1(java.lang.StringBuilder,com.android.tools.r8.tracereferences.Tracer$TracedFieldImpl):77:79 -> a
+    7:9:void lambda$getDiagnosticMessage$2(java.lang.StringBuilder,com.android.tools.r8.tracereferences.Tracer$TracedMethodImpl):84:86 -> a
+    1:43:java.lang.String getDiagnosticMessage():45:87 -> getDiagnosticMessage
+    1:1:com.android.tools.r8.origin.Origin getOrigin():35:35 -> getOrigin
+    1:1:com.android.tools.r8.position.Position getPosition():40:40 -> getPosition
 com.android.tools.r8.tracereferences.PrintUsesFormatter -> com.android.tools.r8.tracereferences.c:
     1:1:void <init>():12:12 -> <init>
     void printPackageNames(java.util.List) -> a
@@ -76526,118 +76421,149 @@
     12:18:void printField(com.android.tools.r8.tracereferences.TraceReferencesConsumer$TracedField):48:48 -> b
 com.android.tools.r8.tracereferences.TraceReferences -> com.android.tools.r8.tracereferences.TraceReferences:
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():25:25 -> <clinit>
-    1:1:void <init>():26:26 -> <init>
-    1:36:void runInternal(com.android.tools.r8.tracereferences.TraceReferencesCommand):40:75 -> a
-    37:53:void runInternal(com.android.tools.r8.tracereferences.TraceReferencesCommand):68:84 -> a
-    54:54:void runInternal(com.android.tools.r8.tracereferences.TraceReferencesCommand):50:50 -> a
-    55:55:void runInternal(com.android.tools.r8.tracereferences.TraceReferencesCommand):47:47 -> a
-    56:56:void runInternal(com.android.tools.r8.tracereferences.TraceReferencesCommand):44:44 -> a
-    57:57:void runInternal(com.android.tools.r8.tracereferences.TraceReferencesCommand):41:41 -> a
-    58:58:void lambda$runInternal$0(java.util.Set,com.android.tools.r8.ClassFileResourceProvider):59:59 -> a
-    59:59:void lambda$main$1(java.lang.String[]):101:101 -> a
-    1:1:void main(java.lang.String[]):101:101 -> main
-    1:6:void run(com.android.tools.r8.tracereferences.TraceReferencesCommand):30:35 -> run
-    7:7:void run(com.android.tools.r8.tracereferences.TraceReferencesCommand):32:32 -> run
-    8:17:void run(java.lang.String[]):88:97 -> run
-com.android.tools.r8.tracereferences.TraceReferencesAbortException -> com.android.tools.r8.internal.FA:
-    1:1:void <init>():6:6 -> <init>
+    1:1:void <clinit>():26:26 -> <clinit>
+    1:1:void <init>():27:27 -> <init>
+    1:1:void lambda$run$0(com.android.tools.r8.tracereferences.TraceReferencesCommand):30:30 -> a
+    2:2:void lambda$runInternal$1(java.util.Set,com.android.tools.r8.ClassFileResourceProvider):42:42 -> a
+    3:3:void lambda$main$2(java.lang.String[]):93:93 -> a
+    1:22:void runInternal(com.android.tools.r8.tracereferences.TraceReferencesCommand):35:56 -> b
+    23:39:void runInternal(com.android.tools.r8.tracereferences.TraceReferencesCommand):49:65 -> b
+    1:5:void main(java.lang.String[]):89:93 -> main
+    1:1:void run(com.android.tools.r8.tracereferences.TraceReferencesCommand):30:30 -> run
+    2:12:void run(java.lang.String[]):69:79 -> run
 com.android.tools.r8.tracereferences.TraceReferencesCommand -> com.android.tools.r8.tracereferences.TraceReferencesCommand:
-    com.android.tools.r8.DiagnosticsHandler diagnosticsHandler -> c
     com.android.tools.r8.tracereferences.TraceReferencesConsumer consumer -> g
     com.android.tools.r8.com.google.common.collect.ImmutableList traceSource -> f
     com.android.tools.r8.com.google.common.collect.ImmutableList traceTarget -> e
     boolean printHelp -> a
     boolean printVersion -> b
     com.android.tools.r8.com.google.common.collect.ImmutableList library -> d
-    1:8:void <init>(boolean,boolean,com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.tracereferences.TraceReferencesConsumer):45:52 -> <init>
-    1:1:com.android.tools.r8.tracereferences.TraceReferencesConsumer getConsumer():236:236 -> a
-    1:1:com.android.tools.r8.DiagnosticsHandler getDiagnosticsHandler():220:220 -> b
-    1:1:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder builder(com.android.tools.r8.DiagnosticsHandler):61:61 -> builder
-    2:2:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder builder():69:69 -> builder
-    1:1:java.util.List getLibrary():224:224 -> c
-    1:1:java.util.List getSource():232:232 -> d
-    1:1:java.util.List getTarget():228:228 -> e
-    1:1:boolean isPrintHelp():81:81 -> isPrintHelp
-    1:1:boolean isPrintVersion():85:85 -> isPrintVersion
-    1:1:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin):73:73 -> parse
-    2:2:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.DiagnosticsHandler):77:77 -> parse
+    com.android.tools.r8.utils.Reporter reporter -> c
+    1:8:void <init>(boolean,boolean,com.android.tools.r8.utils.Reporter,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.tracereferences.TraceReferencesConsumer):49:56 -> <init>
+    9:16:void <init>(boolean,boolean):59:66 -> <init>
+    1:1:com.android.tools.r8.tracereferences.TraceReferencesConsumer getConsumer():286:286 -> a
+    1:1:java.util.List getLibrary():274:274 -> b
+    1:1:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder builder(com.android.tools.r8.DiagnosticsHandler):75:75 -> builder
+    2:2:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder builder():83:83 -> builder
+    1:1:com.android.tools.r8.utils.Reporter getReporter():270:270 -> c
+    1:1:java.util.List getSource():282:282 -> d
+    1:1:java.util.List getTarget():278:278 -> e
+    1:1:boolean isPrintHelp():95:95 -> isPrintHelp
+    1:1:boolean isPrintVersion():99:99 -> isPrintVersion
+    1:1:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin):87:87 -> parse
+    2:2:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.DiagnosticsHandler):91:91 -> parse
 com.android.tools.r8.tracereferences.TraceReferencesCommand$1 -> com.android.tools.r8.tracereferences.TraceReferencesCommand$a:
-    1:1:void <init>():69:69 -> <init>
 com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder -> com.android.tools.r8.tracereferences.TraceReferencesCommand$b:
-    com.android.tools.r8.DiagnosticsHandler diagnosticsHandler -> c
     com.android.tools.r8.tracereferences.TraceReferencesConsumer consumer -> g
     com.android.tools.r8.com.google.common.collect.ImmutableList$Builder traceSourceBuilder -> f
     com.android.tools.r8.com.google.common.collect.ImmutableList$Builder traceTargetBuilder -> e
     com.android.tools.r8.com.google.common.collect.ImmutableList$Builder libraryBuilder -> d
     boolean printHelp -> a
     boolean printVersion -> b
-    1:1:void <init>(com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.tracereferences.TraceReferencesCommand$1):88:88 -> <init>
-    2:2:void <init>(com.android.tools.r8.DiagnosticsHandler):101:101 -> <init>
-    3:15:void <init>(com.android.tools.r8.DiagnosticsHandler):90:102 -> <init>
-    1:1:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder setPrintHelp(boolean):106:106 -> a
-    2:12:void addLibraryOrTargetFile(java.nio.file.Path,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):123:133 -> a
-    13:15:void error(com.android.tools.r8.Diagnostic):213:215 -> a
-    13:15:void addLibraryOrTargetFile(java.nio.file.Path,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):133 -> a
-    16:16:void addLibraryOrTargetFile(java.nio.file.Path,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):136:136 -> a
-    17:19:void error(com.android.tools.r8.Diagnostic):213:215 -> a
-    17:19:void addLibraryOrTargetFile(java.nio.file.Path,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):136 -> a
-    20:22:void addLibraryOrTargetFile(java.nio.file.Path,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):124:126 -> a
-    23:25:void error(com.android.tools.r8.Diagnostic):213:215 -> a
-    23:25:void addLibraryOrTargetFile(java.nio.file.Path,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):126 -> a
-    26:26:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder addLibraryResourceProvider(com.android.tools.r8.ClassFileResourceProvider):154:154 -> a
-    27:27:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder addLibraryFiles(java.nio.file.Path[]):159:159 -> a
-    28:29:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder addLibraryFiles(java.util.Collection):164:165 -> a
-    28:29:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder addLibraryFiles(java.nio.file.Path[]):159 -> a
-    30:30:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder setConsumer(com.android.tools.r8.tracereferences.TraceReferencesConsumer):195:195 -> a
-    31:37:com.android.tools.r8.tracereferences.TraceReferencesCommand build():200:206 -> a
-    38:40:void error(com.android.tools.r8.Diagnostic):213:215 -> a
-    1:1:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder setPrintVersion(boolean):117:117 -> b
-    2:2:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder addSourceFiles(java.nio.file.Path[]):183:183 -> b
-    3:3:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder addSourceFiles(java.util.Collection):188:188 -> b
-    3:3:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder addSourceFiles(java.nio.file.Path[]):183 -> b
-    4:12:void addSourceFile(java.nio.file.Path):141:149 -> b
-    4:12:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder addSourceFiles(java.util.Collection):189 -> b
-    4:12:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder addSourceFiles(java.nio.file.Path[]):183 -> b
-    13:15:void error(com.android.tools.r8.Diagnostic):213:215 -> b
-    13:15:void addSourceFile(java.nio.file.Path):149 -> b
-    13:15:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder addSourceFiles(java.util.Collection):189 -> b
-    13:15:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder addSourceFiles(java.nio.file.Path[]):183 -> b
-    16:18:void addSourceFile(java.nio.file.Path):142:144 -> b
-    16:18:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder addSourceFiles(java.util.Collection):189 -> b
-    16:18:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder addSourceFiles(java.nio.file.Path[]):183 -> b
-    19:21:void error(com.android.tools.r8.Diagnostic):213:215 -> b
-    19:21:void addSourceFile(java.nio.file.Path):144 -> b
-    19:21:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder addSourceFiles(java.util.Collection):189 -> b
-    19:21:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder addSourceFiles(java.nio.file.Path[]):183 -> b
-    1:1:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder addTargetFiles(java.nio.file.Path[]):171:171 -> c
-    2:3:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder addTargetFiles(java.util.Collection):176:177 -> c
-    2:3:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder addTargetFiles(java.nio.file.Path[]):171 -> c
+    com.android.tools.r8.utils.Reporter reporter -> c
+    1:1:void <init>(com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.tracereferences.TraceReferencesCommand$1):102:102 -> <init>
+    2:2:void <init>(com.android.tools.r8.tracereferences.TraceReferencesCommand$1):102:102 -> <init>
+    3:3:void <init>():116:116 -> <init>
+    4:4:void <init>(com.android.tools.r8.DiagnosticsHandler):119:119 -> <init>
+    5:21:void <init>(com.android.tools.r8.DiagnosticsHandler):104:120 -> <init>
+    1:1:boolean isPrintHelp():129:129 -> a
+    1:1:com.android.tools.r8.tracereferences.TraceReferencesCommand makeCommand():228 -> a
+    1:1:void lambda$build$0(com.android.tools.r8.utils.Box):257 -> a
+    2:2:boolean isPrintVersion():140:140 -> a
+    2:2:com.android.tools.r8.tracereferences.TraceReferencesCommand makeCommand():228 -> a
+    2:2:void lambda$build$0(com.android.tools.r8.utils.Box):257 -> a
+    3:8:com.android.tools.r8.tracereferences.TraceReferencesCommand makeCommand():232:237 -> a
+    3:8:void lambda$build$0(com.android.tools.r8.utils.Box):257 -> a
+    9:9:void error(com.android.tools.r8.Diagnostic):264:264 -> a
+    9:9:com.android.tools.r8.tracereferences.TraceReferencesCommand makeCommand():237 -> a
+    9:9:void lambda$build$0(com.android.tools.r8.utils.Box):257 -> a
+    10:14:com.android.tools.r8.tracereferences.TraceReferencesCommand makeCommand():239:243 -> a
+    10:14:void lambda$build$0(com.android.tools.r8.utils.Box):257 -> a
+    15:15:void error(com.android.tools.r8.Diagnostic):264:264 -> a
+    15:15:com.android.tools.r8.tracereferences.TraceReferencesCommand makeCommand():243 -> a
+    15:15:void lambda$build$0(com.android.tools.r8.utils.Box):257 -> a
+    16:17:com.android.tools.r8.tracereferences.TraceReferencesCommand makeCommand():245:246 -> a
+    16:17:void lambda$build$0(com.android.tools.r8.utils.Box):257 -> a
+    18:18:void error(com.android.tools.r8.Diagnostic):264:264 -> a
+    18:18:com.android.tools.r8.tracereferences.TraceReferencesCommand makeCommand():246 -> a
+    18:18:void lambda$build$0(com.android.tools.r8.utils.Box):257 -> a
+    19:19:com.android.tools.r8.tracereferences.TraceReferencesCommand makeCommand():248:248 -> a
+    19:19:void lambda$build$0(com.android.tools.r8.utils.Box):257 -> a
+    20:20:com.android.tools.r8.tracereferences.TraceReferencesCommand makeCommand():229:229 -> a
+    20:20:void lambda$build$0(com.android.tools.r8.utils.Box):257 -> a
+    21:21:boolean isPrintVersion():140:140 -> a
+    21:21:com.android.tools.r8.tracereferences.TraceReferencesCommand makeCommand():229 -> a
+    21:21:void lambda$build$0(com.android.tools.r8.utils.Box):257 -> a
+    22:22:com.android.tools.r8.tracereferences.TraceReferencesCommand makeCommand():229:229 -> a
+    22:22:void lambda$build$0(com.android.tools.r8.utils.Box):257 -> a
+    23:24:void lambda$build$0(com.android.tools.r8.utils.Box):257:258 -> a
+    25:25:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder setPrintHelp(boolean):134:134 -> a
+    26:29:void addLibraryOrTargetFile(java.nio.file.Path,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):151:154 -> a
+    30:30:void error(com.android.tools.r8.Diagnostic):264:264 -> a
+    30:30:void addLibraryOrTargetFile(java.nio.file.Path,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):154 -> a
+    31:36:void addLibraryOrTargetFile(java.nio.file.Path,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):156:161 -> a
+    37:37:void error(com.android.tools.r8.Diagnostic):264:264 -> a
+    37:37:void addLibraryOrTargetFile(java.nio.file.Path,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):161 -> a
+    38:38:void addLibraryOrTargetFile(java.nio.file.Path,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):164:164 -> a
+    39:39:void error(com.android.tools.r8.Diagnostic):264:264 -> a
+    39:39:void addLibraryOrTargetFile(java.nio.file.Path,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):164 -> a
+    40:40:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder addLibraryResourceProvider(com.android.tools.r8.ClassFileResourceProvider):182:182 -> a
+    41:41:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder addLibraryFiles(java.nio.file.Path[]):187:187 -> a
+    42:43:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder addLibraryFiles(java.util.Collection):192:193 -> a
+    42:43:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder addLibraryFiles(java.nio.file.Path[]):187 -> a
+    44:44:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder setConsumer(com.android.tools.r8.tracereferences.TraceReferencesConsumer):223:223 -> a
+    45:52:com.android.tools.r8.tracereferences.TraceReferencesCommand build():253:260 -> a
+    53:53:void error(com.android.tools.r8.Diagnostic):264:264 -> a
+    1:1:com.android.tools.r8.utils.Reporter getReporter():124:124 -> b
+    2:2:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder setPrintVersion(boolean):145:145 -> b
+    3:3:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder addSourceFiles(java.nio.file.Path[]):211:211 -> b
+    4:4:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder addSourceFiles(java.util.Collection):216:216 -> b
+    4:4:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder addSourceFiles(java.nio.file.Path[]):211 -> b
+    5:8:void addSourceFile(java.nio.file.Path):169:172 -> b
+    5:8:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder addSourceFiles(java.util.Collection):217 -> b
+    5:8:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder addSourceFiles(java.nio.file.Path[]):211 -> b
+    9:9:void error(com.android.tools.r8.Diagnostic):264:264 -> b
+    9:9:void addSourceFile(java.nio.file.Path):172 -> b
+    9:9:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder addSourceFiles(java.util.Collection):217 -> b
+    9:9:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder addSourceFiles(java.nio.file.Path[]):211 -> b
+    10:13:void addSourceFile(java.nio.file.Path):174:177 -> b
+    10:13:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder addSourceFiles(java.util.Collection):217 -> b
+    10:13:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder addSourceFiles(java.nio.file.Path[]):211 -> b
+    14:14:void error(com.android.tools.r8.Diagnostic):264:264 -> b
+    14:14:void addSourceFile(java.nio.file.Path):177 -> b
+    14:14:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder addSourceFiles(java.util.Collection):217 -> b
+    14:14:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder addSourceFiles(java.nio.file.Path[]):211 -> b
+    1:1:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder addTargetFiles(java.nio.file.Path[]):199:199 -> c
+    2:3:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder addTargetFiles(java.util.Collection):204:205 -> c
+    2:3:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder addTargetFiles(java.nio.file.Path[]):199 -> c
+com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder$1 -> com.android.tools.r8.tracereferences.TraceReferencesCommand$b$a:
+    1:1:void <init>():116:116 -> <init>
 com.android.tools.r8.tracereferences.TraceReferencesCommandParser -> com.android.tools.r8.tracereferences.e:
     java.util.Set OPTIONS_WITH_PARAMETER -> a
     java.lang.String USAGE_MESSAGE -> b
-    1:6:void <clinit>():25:30 -> <clinit>
-    7:7:void <clinit>():28:28 -> <clinit>
-    1:1:void <init>():22:22 -> <init>
-    1:1:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin):50:50 -> a
-    2:3:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.DiagnosticsHandler):65:66 -> a
-    4:25:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder):71:92 -> a
-    26:26:void addLibraryArgument(com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder,com.android.tools.r8.origin.Origin,java.lang.String):162:162 -> a
-    26:26:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder):93 -> a
-    27:38:boolean isJdkHome(java.nio.file.Path):143:154 -> a
-    27:38:void addLibraryArgument(com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder,com.android.tools.r8.origin.Origin,java.lang.String):163 -> a
-    27:38:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder):93 -> a
-    39:44:void addLibraryArgument(com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder,com.android.tools.r8.origin.Origin,java.lang.String):165:170 -> a
-    39:44:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder):93 -> a
-    45:71:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder):94:120 -> a
+    1:21:void <clinit>():27:47 -> <clinit>
+    22:22:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable,java.lang.Iterable):449:449 -> <clinit>
+    22:22:void <clinit>():32 -> <clinit>
+    23:23:void <clinit>():30:30 -> <clinit>
+    1:1:void <init>():24:24 -> <init>
+    1:1:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin):60:60 -> a
+    2:3:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.DiagnosticsHandler):75:76 -> a
+    4:25:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder):81:102 -> a
+    26:26:void addLibraryArgument(com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder,com.android.tools.r8.origin.Origin,java.lang.String):185:185 -> a
+    26:26:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder):103 -> a
+    27:38:boolean isJdkHome(java.nio.file.Path):166:177 -> a
+    27:38:void addLibraryArgument(com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder,com.android.tools.r8.origin.Origin,java.lang.String):186 -> a
+    27:38:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder):103 -> a
+    39:44:void addLibraryArgument(com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder,com.android.tools.r8.origin.Origin,java.lang.String):188:193 -> a
+    39:44:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder):103 -> a
+    45:72:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder):104:131 -> a
+    73:86:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder):130:143 -> a
 com.android.tools.r8.tracereferences.TraceReferencesCommandParser$1 -> com.android.tools.r8.tracereferences.d:
     java.nio.file.Path val$finalOutput -> e
     com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder val$builder -> f
-    1:1:void <init>(com.android.tools.r8.tracereferences.TraceReferencesCommandParser,com.android.tools.r8.tracereferences.TraceReferencesFormattingConsumer$OutputFormat,java.nio.file.Path,com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder):121:121 -> <init>
-    1:9:void finished():124:132 -> finished
-com.android.tools.r8.tracereferences.TraceReferencesException -> com.android.tools.r8.tracereferences.f:
-    1:1:void <init>(java.lang.String):8:8 -> <init>
-com.android.tools.r8.tracereferences.TraceReferencesFormattingConsumer -> com.android.tools.r8.tracereferences.g:
+    1:1:void <init>(com.android.tools.r8.tracereferences.TraceReferencesCommandParser,com.android.tools.r8.tracereferences.TraceReferencesFormattingConsumer$OutputFormat,java.nio.file.Path,com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder):144:144 -> <init>
+    1:9:void finished():147:155 -> finished
+com.android.tools.r8.tracereferences.TraceReferencesFormattingConsumer -> com.android.tools.r8.tracereferences.f:
     com.android.tools.r8.tracereferences.TraceReferencesResult$Builder builder -> c
     boolean $assertionsDisabled -> a
     com.android.tools.r8.tracereferences.TraceReferencesFormattingConsumer$OutputFormat format -> b
@@ -76653,7 +76579,7 @@
     1:2:void acceptPackage(com.android.tools.r8.references.PackageReference):50:51 -> acceptPackage
     1:2:void acceptType(com.android.tools.r8.tracereferences.TraceReferencesConsumer$TracedClass):32:33 -> acceptType
     1:2:void finished():56:57 -> finished
-com.android.tools.r8.tracereferences.TraceReferencesFormattingConsumer$OutputFormat -> com.android.tools.r8.tracereferences.g$a:
+com.android.tools.r8.tracereferences.TraceReferencesFormattingConsumer$OutputFormat -> com.android.tools.r8.tracereferences.f$a:
     com.android.tools.r8.tracereferences.TraceReferencesFormattingConsumer$OutputFormat KEEP_RULES_WITH_ALLOWOBFUSCATION -> c
     com.android.tools.r8.tracereferences.TraceReferencesFormattingConsumer$OutputFormat[] $VALUES -> d
     com.android.tools.r8.tracereferences.TraceReferencesFormattingConsumer$OutputFormat KEEP_RULES -> b
@@ -76661,7 +76587,7 @@
     1:7:void <clinit>():13:19 -> <clinit>
     8:8:void <clinit>():11:11 -> <clinit>
     1:1:void <init>(java.lang.String,int):11:11 -> <init>
-com.android.tools.r8.tracereferences.TraceReferencesResult -> com.android.tools.r8.tracereferences.h:
+com.android.tools.r8.tracereferences.TraceReferencesResult -> com.android.tools.r8.tracereferences.g:
     java.util.Map fields -> b
     java.util.Map methods -> c
     java.util.Set keepPackageNames -> d
@@ -76669,7 +76595,7 @@
     java.util.Set types -> a
     1:6:void <init>(java.util.Set,java.util.Map,java.util.Map,java.util.Set,java.util.Set):31:36 -> <init>
     1:1:com.android.tools.r8.tracereferences.TraceReferencesResult$Builder builder():40:40 -> a
-com.android.tools.r8.tracereferences.TraceReferencesResult$Builder -> com.android.tools.r8.tracereferences.h$a:
+com.android.tools.r8.tracereferences.TraceReferencesResult$Builder -> com.android.tools.r8.tracereferences.g$a:
     java.util.Map fields -> c
     java.util.Map methods -> d
     java.util.Set missingDefinition -> e
@@ -76686,54 +76612,51 @@
     1:1:void acceptPackage(com.android.tools.r8.references.PackageReference):78:78 -> acceptPackage
     1:3:void acceptType(com.android.tools.r8.tracereferences.TraceReferencesConsumer$TracedClass):52:54 -> acceptType
     1:1:java.util.Set lambda$acceptMethod$1(com.android.tools.r8.references.ClassReference):70:70 -> b
-com.android.tools.r8.tracereferences.Tracer -> com.android.tools.r8.tracereferences.s:
+com.android.tools.r8.tracereferences.Tracer -> com.android.tools.r8.tracereferences.m:
     com.android.tools.r8.DiagnosticsHandler diagnostics -> b
     com.android.tools.r8.graph.DirectMappedDexApplication application -> c
     com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfo -> d
     java.util.Set descriptors -> a
-    1:11:void <init>(java.util.Set,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.DiagnosticsHandler):229:239 -> <init>
-    12:12:void <init>(java.util.Set,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.DiagnosticsHandler):236:236 -> <init>
-    1:1:java.util.Set access$200(com.android.tools.r8.tracereferences.Tracer):50:50 -> a
-    2:12:void run(com.android.tools.r8.tracereferences.TraceReferencesConsumer):243:253 -> a
-    13:13:void lambda$run$0(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.ProgramMethod):250:250 -> a
-    14:14:void lambda$run$1(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.DexEncodedField):251:251 -> a
-    1:1:com.android.tools.r8.graph.AppInfoWithClassHierarchy access$300(com.android.tools.r8.tracereferences.Tracer):50:50 -> b
-com.android.tools.r8.tracereferences.Tracer$1 -> com.android.tools.r8.tracereferences.i:
-com.android.tools.r8.tracereferences.Tracer$AccessFlagsImpl -> com.android.tools.r8.tracereferences.j:
+    1:10:void <init>(java.util.Set,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.DiagnosticsHandler):229:238 -> <init>
+    11:11:void <init>(java.util.Set,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.DiagnosticsHandler):235:235 -> <init>
+    1:1:java.util.Set access$300(com.android.tools.r8.tracereferences.Tracer):50:50 -> a
+    2:13:void run(com.android.tools.r8.tracereferences.TraceReferencesConsumer):242:253 -> a
+    14:14:void lambda$run$0(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.ProgramMethod):249:249 -> a
+    15:15:void lambda$run$1(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.DexEncodedField):250:250 -> a
+    1:1:com.android.tools.r8.graph.AppInfoWithClassHierarchy access$400(com.android.tools.r8.tracereferences.Tracer):50:50 -> b
+com.android.tools.r8.tracereferences.Tracer$1 -> com.android.tools.r8.tracereferences.h:
+com.android.tools.r8.tracereferences.Tracer$AccessFlagsImpl -> com.android.tools.r8.tracereferences.i:
     com.android.tools.r8.graph.AccessFlags accessFlags -> a
     1:2:void <init>(com.android.tools.r8.graph.AccessFlags):56:57 -> <init>
     1:1:boolean isPrivate():77:77 -> isPrivate
     1:1:boolean isProtected():72:72 -> isProtected
     1:1:boolean isPublic():67:67 -> isPublic
     1:1:boolean isStatic():62:62 -> isStatic
-com.android.tools.r8.tracereferences.Tracer$ClassAccessFlagsImpl -> com.android.tools.r8.tracereferences.k:
+com.android.tools.r8.tracereferences.Tracer$ClassAccessFlagsImpl -> com.android.tools.r8.tracereferences.j:
     1:1:void <init>(com.android.tools.r8.graph.ClassAccessFlags):85:85 -> <init>
     1:1:boolean isEnum():95:95 -> isEnum
     1:1:boolean isInterface():90:90 -> isInterface
-com.android.tools.r8.tracereferences.Tracer$FieldAccessFlagsImpl -> com.android.tools.r8.tracereferences.l:
+com.android.tools.r8.tracereferences.Tracer$FieldAccessFlagsImpl -> com.android.tools.r8.tracereferences.k:
     1:1:void <init>(com.android.tools.r8.graph.FieldAccessFlags):103:103 -> <init>
-com.android.tools.r8.tracereferences.Tracer$MethodAccessFlagsImpl -> com.android.tools.r8.tracereferences.m:
+com.android.tools.r8.tracereferences.Tracer$MethodAccessFlagsImpl -> com.android.tools.r8.tracereferences.l:
     1:1:void <init>(com.android.tools.r8.graph.MethodAccessFlags):111:111 -> <init>
-com.android.tools.r8.tracereferences.Tracer$TracedClassImpl -> com.android.tools.r8.tracereferences.n:
+com.android.tools.r8.tracereferences.Tracer$TracedClassImpl -> com.android.tools.r8.tracereferences.m$a:
     1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.tracereferences.Tracer$1):160:160 -> <init>
     2:3:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):164:165 -> <init>
     4:4:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):163:163 -> <init>
-    java.lang.String getKindName() -> a
     1:1:java.lang.String toString():176:176 -> toString
-com.android.tools.r8.tracereferences.Tracer$TracedFieldImpl -> com.android.tools.r8.tracereferences.o:
+com.android.tools.r8.tracereferences.Tracer$TracedFieldImpl -> com.android.tools.r8.tracereferences.m$b:
     1:1:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.tracereferences.Tracer$1):180:180 -> <init>
     2:6:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedField):183:187 -> <init>
     7:11:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedField):184:188 -> <init>
     12:12:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedField):183:183 -> <init>
-    java.lang.String getKindName() -> a
     1:1:java.lang.String toString():199:199 -> toString
-com.android.tools.r8.tracereferences.Tracer$TracedMethodImpl -> com.android.tools.r8.tracereferences.p:
+com.android.tools.r8.tracereferences.Tracer$TracedMethodImpl -> com.android.tools.r8.tracereferences.m$c:
     1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.tracereferences.Tracer$1):203:203 -> <init>
     2:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):207:208 -> <init>
     4:4:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):206:206 -> <init>
-    java.lang.String getKindName() -> a
     1:1:java.lang.String toString():219:219 -> toString
-com.android.tools.r8.tracereferences.Tracer$TracedReferenceBase -> com.android.tools.r8.tracereferences.q:
+com.android.tools.r8.tracereferences.Tracer$TracedReferenceBase -> com.android.tools.r8.tracereferences.n:
     java.lang.Object reference -> b
     java.lang.Object accessFlags -> c
     boolean $assertionsDisabled -> a
@@ -76741,86 +76664,96 @@
     1:1:void <clinit>():115:115 -> <clinit>
     1:1:void <init>(java.lang.Object,java.lang.Object,boolean,com.android.tools.r8.tracereferences.Tracer$1):115:115 -> <init>
     2:6:void <init>(java.lang.Object,java.lang.Object,boolean):120:124 -> <init>
-    java.lang.String getKindName() -> a
     1:4:boolean equals(java.lang.Object):151:154 -> equals
     1:1:java.lang.Object getAccessFlags():139:139 -> getAccessFlags
     1:1:java.lang.Object getReference():129:129 -> getReference
     1:1:int hashCode():145:145 -> hashCode
     1:1:boolean isMissingDefinition():134:134 -> isMissingDefinition
-com.android.tools.r8.tracereferences.Tracer$UseCollector -> com.android.tools.r8.tracereferences.r:
-    com.android.tools.r8.tracereferences.TraceReferencesConsumer consumer -> c
-    com.android.tools.r8.tracereferences.Tracer this$0 -> g
-    com.android.tools.r8.DiagnosticsHandler diagnostics -> e
-    java.util.Set missingDefinitionReported -> f
-    com.android.tools.r8.graph.DexProgramClass context -> d
-    1:2:void <init>(com.android.tools.r8.tracereferences.Tracer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.tracereferences.TraceReferencesConsumer,com.android.tools.r8.DiagnosticsHandler):264:265 -> <init>
-    3:9:void <init>(com.android.tools.r8.tracereferences.Tracer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.tracereferences.TraceReferencesConsumer,com.android.tools.r8.DiagnosticsHandler):261:267 -> <init>
-    1:419:void registerField(com.android.tools.r8.graph.DexEncodedField):0:418 -> a
-    1:419:void access$700(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.DexEncodedField):256 -> a
-    420:420:void registerTypeReference(com.android.tools.r8.graph.DexType):409:409 -> a
-    420:420:void registerField(com.android.tools.r8.graph.DexEncodedField):418 -> a
-    420:420:void access$700(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.DexEncodedField):256 -> a
-    421:421:void access$100(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):256:256 -> a
-    422:425:void checkDiagnostics(com.android.tools.r8.tracereferences.Tracer$TracedReferenceBase):322:325 -> a
-    426:426:void checkDiagnostics(com.android.tools.r8.tracereferences.Tracer$TracedReferenceBase):323:323 -> a
-    427:427:void setContext(com.android.tools.r8.graph.DexProgramClass):330:330 -> a
-    428:428:void registerInvokeDirect(com.android.tools.r8.graph.DexMethod):353:353 -> a
-    429:429:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getReference():375:375 -> a
-    429:429:boolean lambda$registerCallSite$1(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexEncodedMethod):470 -> a
-    430:430:boolean lambda$registerCallSite$1(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexEncodedMethod):470:470 -> a
-    431:431:void registerInstanceFieldRead(com.android.tools.r8.graph.DexField):389:389 -> a
-    432:432:void registerTypeReference(com.android.tools.r8.graph.DexType):409:409 -> a
-    432:432:void registerSuperType(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):445 -> a
-    433:433:void registerSuperType(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):447:447 -> a
-    434:441:void registerMethod(com.android.tools.r8.graph.ProgramMethod):422:429 -> a
-    434:441:void access$800(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.ProgramMethod):256 -> a
-    442:442:void registerTypeReference(com.android.tools.r8.graph.DexType):409:409 -> a
-    442:442:void registerMethod(com.android.tools.r8.graph.ProgramMethod):430 -> a
-    442:442:void access$800(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.ProgramMethod):256 -> a
-    443:447:void registerMethod(com.android.tools.r8.graph.ProgramMethod):432:436 -> a
-    443:447:void access$800(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.ProgramMethod):256 -> a
-    448:448:void registerTypeReference(com.android.tools.r8.graph.DexType):409:409 -> a
-    448:448:void registerMethod(com.android.tools.r8.graph.ProgramMethod):436 -> a
-    448:448:void access$800(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.ProgramMethod):256 -> a
-    449:449:void registerMethod(com.android.tools.r8.graph.ProgramMethod):440:440 -> a
-    449:449:void access$800(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.ProgramMethod):256 -> a
-    450:450:void registerTypeReference(com.android.tools.r8.graph.DexType):409:409 -> a
-    450:450:void registerMethod(com.android.tools.r8.graph.ProgramMethod):440 -> a
-    450:450:void access$800(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.ProgramMethod):256 -> a
-    451:451:void registerMethod(com.android.tools.r8.graph.ProgramMethod):441:441 -> a
-    451:451:void access$800(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.ProgramMethod):256 -> a
-    452:459:void registerMethod(com.android.tools.r8.graph.ProgramMethod):422:429 -> a
-    460:460:void registerTypeReference(com.android.tools.r8.graph.DexType):409:409 -> a
-    460:460:void registerMethod(com.android.tools.r8.graph.ProgramMethod):430 -> a
-    461:465:void registerMethod(com.android.tools.r8.graph.ProgramMethod):432:436 -> a
-    466:466:void registerTypeReference(com.android.tools.r8.graph.DexType):409:409 -> a
-    466:466:void registerMethod(com.android.tools.r8.graph.ProgramMethod):436 -> a
-    467:467:void registerMethod(com.android.tools.r8.graph.ProgramMethod):440:440 -> a
-    468:468:void registerTypeReference(com.android.tools.r8.graph.DexType):409:409 -> a
-    468:468:void registerMethod(com.android.tools.r8.graph.ProgramMethod):440 -> a
-    469:469:void registerMethod(com.android.tools.r8.graph.ProgramMethod):441:441 -> a
-    470:474:void lambda$registerSuperType$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):449:453 -> a
-    475:484:void registerCallSite(com.android.tools.r8.graph.DexCallSite):460:469 -> a
-    1:1:void registerInvokeInterface(com.android.tools.r8.graph.DexMethod):369:369 -> b
-    1:6:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):358:363 -> c
-    7:7:void registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):384:384 -> c
-    1:1:void registerInitClass(com.android.tools.r8.graph.DexType):335:335 -> d
-    2:6:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):374:378 -> d
-    1:8:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):340:347 -> e
-    9:9:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):399:399 -> e
-    10:10:void registerInstanceOf(com.android.tools.r8.graph.DexType):414:414 -> e
-    1:7:void addMethod(com.android.tools.r8.graph.DexMethod):304:310 -> f
-    8:97:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):0:89 -> f
-    8:97:void addMethod(com.android.tools.r8.graph.DexMethod):310 -> f
-    98:103:void addMethod(com.android.tools.r8.graph.DexMethod):311:316 -> f
-    104:104:void registerNewInstance(com.android.tools.r8.graph.DexType):394:394 -> f
-    1:1:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):404:404 -> g
-    2:2:void registerTypeReference(com.android.tools.r8.graph.DexType):409:409 -> g
-    1:1:boolean isTargetType(com.android.tools.r8.graph.DexType):271:271 -> h
-    1:1:void addType(com.android.tools.r8.graph.DexType):275 -> h
-    2:7:void addType(com.android.tools.r8.graph.DexType):276:281 -> h
-    1:1:boolean isTargetType(com.android.tools.r8.graph.DexType):271:271 -> i
-    2:13:void addField(com.android.tools.r8.graph.DexField):287:298 -> i
+com.android.tools.r8.tracereferences.Tracer$UseCollector -> com.android.tools.r8.tracereferences.o:
+    java.util.Set missingClasses -> g
+    com.android.tools.r8.graph.DexItemFactory factory -> c
+    java.util.Set missingFields -> h
+    java.util.Set missingMethods -> i
+    com.android.tools.r8.tracereferences.TraceReferencesConsumer consumer -> d
+    com.android.tools.r8.DiagnosticsHandler diagnostics -> f
+    com.android.tools.r8.tracereferences.Tracer this$0 -> j
+    com.android.tools.r8.graph.DexProgramClass context -> e
+    1:2:void <init>(com.android.tools.r8.tracereferences.Tracer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.tracereferences.TraceReferencesConsumer,com.android.tools.r8.DiagnosticsHandler):267:268 -> <init>
+    3:12:void <init>(com.android.tools.r8.tracereferences.Tracer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.tracereferences.TraceReferencesConsumer,com.android.tools.r8.DiagnosticsHandler):262:271 -> <init>
+    1:451:void registerField(com.android.tools.r8.graph.DexEncodedField):0:450 -> a
+    1:451:void access$800(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.DexEncodedField):256 -> a
+    452:452:void registerTypeReference(com.android.tools.r8.graph.DexType):441:441 -> a
+    452:452:void registerField(com.android.tools.r8.graph.DexEncodedField):450 -> a
+    452:452:void access$800(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.DexEncodedField):256 -> a
+    453:453:void access$100(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):256:256 -> a
+    454:455:void collectMissing(com.android.tools.r8.tracereferences.Tracer$TracedReferenceBase,java.util.Set):349:350 -> a
+    456:457:void reportMissingDefinitions():355:356 -> a
+    456:457:void access$200(com.android.tools.r8.tracereferences.Tracer$UseCollector):256 -> a
+    458:458:void setContext(com.android.tools.r8.graph.DexProgramClass):362:362 -> a
+    459:459:void registerInvokeDirect(com.android.tools.r8.graph.DexMethod):385:385 -> a
+    460:460:void registerInstanceFieldRead(com.android.tools.r8.graph.DexField):421:421 -> a
+    461:461:void registerTypeReference(com.android.tools.r8.graph.DexType):441:441 -> a
+    461:461:void registerSuperType(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):477 -> a
+    462:462:void registerSuperType(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):479:479 -> a
+    463:470:void registerMethod(com.android.tools.r8.graph.ProgramMethod):454:461 -> a
+    463:470:void access$900(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.ProgramMethod):256 -> a
+    471:471:void registerTypeReference(com.android.tools.r8.graph.DexType):441:441 -> a
+    471:471:void registerMethod(com.android.tools.r8.graph.ProgramMethod):462 -> a
+    471:471:void access$900(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.ProgramMethod):256 -> a
+    472:476:void registerMethod(com.android.tools.r8.graph.ProgramMethod):464:468 -> a
+    472:476:void access$900(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.ProgramMethod):256 -> a
+    477:477:void registerTypeReference(com.android.tools.r8.graph.DexType):441:441 -> a
+    477:477:void registerMethod(com.android.tools.r8.graph.ProgramMethod):468 -> a
+    477:477:void access$900(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.ProgramMethod):256 -> a
+    478:478:void registerMethod(com.android.tools.r8.graph.ProgramMethod):472:472 -> a
+    478:478:void access$900(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.ProgramMethod):256 -> a
+    479:479:void registerTypeReference(com.android.tools.r8.graph.DexType):441:441 -> a
+    479:479:void registerMethod(com.android.tools.r8.graph.ProgramMethod):472 -> a
+    479:479:void access$900(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.ProgramMethod):256 -> a
+    480:480:void registerMethod(com.android.tools.r8.graph.ProgramMethod):473:473 -> a
+    480:480:void access$900(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.ProgramMethod):256 -> a
+    481:488:void registerMethod(com.android.tools.r8.graph.ProgramMethod):454:461 -> a
+    489:489:void registerTypeReference(com.android.tools.r8.graph.DexType):441:441 -> a
+    489:489:void registerMethod(com.android.tools.r8.graph.ProgramMethod):462 -> a
+    490:494:void registerMethod(com.android.tools.r8.graph.ProgramMethod):464:468 -> a
+    495:495:void registerTypeReference(com.android.tools.r8.graph.DexType):441:441 -> a
+    495:495:void registerMethod(com.android.tools.r8.graph.ProgramMethod):468 -> a
+    496:496:void registerMethod(com.android.tools.r8.graph.ProgramMethod):472:472 -> a
+    497:497:void registerTypeReference(com.android.tools.r8.graph.DexType):441:441 -> a
+    497:497:void registerMethod(com.android.tools.r8.graph.ProgramMethod):472 -> a
+    498:498:void registerMethod(com.android.tools.r8.graph.ProgramMethod):473:473 -> a
+    499:503:void lambda$registerSuperType$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):481:485 -> a
+    504:513:void registerCallSite(com.android.tools.r8.graph.DexCallSite):492:501 -> a
+    514:514:boolean lambda$registerCallSite$1(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexEncodedMethod):502:502 -> a
+    1:1:void registerInvokeInterface(com.android.tools.r8.graph.DexMethod):401:401 -> b
+    1:6:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):390:395 -> c
+    7:7:void registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):416:416 -> c
+    1:1:void registerInitClass(com.android.tools.r8.graph.DexType):367:367 -> d
+    2:6:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):406:410 -> d
+    1:8:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):372:379 -> e
+    9:9:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):431:431 -> e
+    10:10:void registerInstanceOf(com.android.tools.r8.graph.DexType):446:446 -> e
+    1:6:void addMethod(com.android.tools.r8.graph.DexMethod):317:322 -> f
+    7:96:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):0:89 -> f
+    7:96:void addMethod(com.android.tools.r8.graph.DexMethod):322 -> f
+    97:100:void addMethod(com.android.tools.r8.graph.DexMethod):323:326 -> f
+    101:101:void checkMissingDefinition(com.android.tools.r8.tracereferences.Tracer$TracedMethodImpl):344:344 -> f
+    101:101:void addMethod(com.android.tools.r8.graph.DexMethod):327 -> f
+    102:104:void addMethod(com.android.tools.r8.graph.DexMethod):328:330 -> f
+    105:105:void registerNewInstance(com.android.tools.r8.graph.DexType):426:426 -> f
+    1:1:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):436:436 -> g
+    2:2:void registerTypeReference(com.android.tools.r8.graph.DexType):441:441 -> g
+    1:9:void addType(com.android.tools.r8.graph.DexType):279:287 -> h
+    10:10:void checkMissingDefinition(com.android.tools.r8.tracereferences.Tracer$TracedClassImpl):336:336 -> h
+    10:10:void addType(com.android.tools.r8.graph.DexType):288 -> h
+    11:11:boolean isTargetType(com.android.tools.r8.graph.DexType):275:275 -> h
+    11:11:void addType(com.android.tools.r8.graph.DexType):289 -> h
+    12:16:void addType(com.android.tools.r8.graph.DexType):289:293 -> h
+    1:1:boolean isTargetType(com.android.tools.r8.graph.DexType):275:275 -> i
+    2:8:void addField(com.android.tools.r8.graph.DexField):299:305 -> i
+    9:9:void checkMissingDefinition(com.android.tools.r8.tracereferences.Tracer$TracedFieldImpl):340:340 -> i
+    9:9:void addField(com.android.tools.r8.graph.DexField):306 -> i
+    10:14:void addField(com.android.tools.r8.graph.DexField):307:311 -> i
 com.android.tools.r8.utils.AarArchiveResourceProvider -> com.android.tools.r8.utils.a:
     java.nio.file.Path archive -> c
     com.android.tools.r8.origin.Origin origin -> b
@@ -76938,121 +76871,122 @@
     com.android.tools.r8.com.google.common.collect.ImmutableList classpathResourceProviders -> d
     1:1:void <clinit>():82:82 -> <clinit>
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.StringResource,com.android.tools.r8.StringResource,java.util.List,java.util.List,com.android.tools.r8.utils.AndroidApp$1):82:82 -> <init>
-    2:13:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.StringResource,com.android.tools.r8.StringResource,java.util.List,java.util.List):185:196 -> <init>
+    2:13:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.StringResource,com.android.tools.r8.StringResource,java.util.List,java.util.List):186:197 -> <init>
     java.util.zip.ZipOutputStream lambda$dumpClassFileResources$3(java.util.zip.ZipOutputStream,java.lang.String) -> a
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList access$200(com.android.tools.r8.utils.AndroidApp):82:82 -> a
-    2:5:void printClassFileProviders(java.lang.StringBuilder,java.util.Collection):157:160 -> a
-    6:12:void printProgramResource(java.lang.StringBuilder,com.android.tools.r8.ProgramResource):166:172 -> a
-    13:14:boolean verifyInternalProvidersInCloseSet(com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableList):202:203 -> a
-    15:15:boolean lambda$verifyInternalProvidersInCloseSet$0(com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.ClassFileResourceProvider):204:204 -> a
-    16:16:com.android.tools.r8.utils.AndroidApp$Builder builder(com.android.tools.r8.utils.Reporter):220:220 -> a
-    17:17:com.android.tools.r8.utils.AndroidApp$Builder builder(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.Reporter):232:232 -> a
-    18:20:int applicationSize():237:237 -> a
-    22:30:int applicationSize():239:239 -> a
-    37:37:int applicationSize():246:246 -> a
-    38:38:void $closeResource(java.lang.Throwable,java.lang.AutoCloseable):246:246 -> a
-    39:43:java.util.List filter(java.util.List,com.android.tools.r8.ProgramResource$Kind):332:336 -> a
-    44:47:void write(java.nio.file.Path,com.android.tools.r8.OutputMode):404:407 -> a
-    48:49:java.lang.String getPrimaryClassDescriptor(com.android.tools.r8.Resource):452:453 -> a
-    50:54:void dump(java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):458:462 -> a
-    55:60:void dump(java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):461:466 -> a
-    61:70:void dump(java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):463:472 -> a
-    71:75:java.util.Map dumpFeatureSplitFileNames(com.android.tools.r8.features.FeatureSplitConfiguration):93:97 -> a
-    71:75:void dump(java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):475 -> a
-    76:76:void dump(java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):473:473 -> a
-    77:78:int dumpClasspathResources(int,java.util.zip.ZipOutputStream):505:506 -> a
-    77:78:void dump(java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):479 -> a
-    79:80:int dumpLibraryResources(int,java.util.zip.ZipOutputStream):498:499 -> a
-    79:80:void dump(java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):480 -> a
-    81:81:void dump(java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):481:481 -> a
-    82:104:void dump(java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):460:482 -> a
-    105:108:java.lang.String getBuildPropertiesContents(com.android.tools.r8.utils.InternalOptions):487:490 -> a
-    109:109:boolean com.android.tools.r8.utils.InternalOptions.isTreeShakingEnabled():537:537 -> a
-    109:109:java.lang.String getBuildPropertiesContents(com.android.tools.r8.utils.InternalOptions):492 -> a
-    110:110:java.lang.String getBuildPropertiesContents(com.android.tools.r8.utils.InternalOptions):492:492 -> a
-    111:111:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():542:542 -> a
-    111:111:java.lang.String getBuildPropertiesContents(com.android.tools.r8.utils.InternalOptions):493 -> a
-    112:112:java.lang.String getBuildPropertiesContents(com.android.tools.r8.utils.InternalOptions):493:493 -> a
-    113:113:java.lang.String getBuildPropertiesContents(com.android.tools.r8.utils.InternalOptions):489:489 -> a
-    114:114:java.lang.String getBuildPropertiesContents(com.android.tools.r8.utils.InternalOptions):487:487 -> a
-    115:133:int dumpProgramResources(java.lang.String,java.util.Map,int,java.util.zip.ZipOutputStream,com.android.tools.r8.utils.InternalOptions):542:560 -> a
-    134:134:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap.<init>():119:119 -> a
-    134:134:int dumpProgramResources(java.lang.String,java.util.Map,int,java.util.zip.ZipOutputStream,com.android.tools.r8.utils.InternalOptions):560 -> a
-    135:141:int dumpProgramResources(java.lang.String,java.util.Map,int,java.util.zip.ZipOutputStream,com.android.tools.r8.utils.InternalOptions):561:567 -> a
-    142:175:int dumpProgramResources(java.lang.String,java.util.Map,int,java.util.zip.ZipOutputStream,com.android.tools.r8.utils.InternalOptions):564:597 -> a
-    176:185:int dumpProgramResources(java.lang.String,java.util.Map,int,java.util.zip.ZipOutputStream,com.android.tools.r8.utils.InternalOptions):594:603 -> a
-    186:216:int dumpProgramResources(java.lang.String,java.util.Map,int,java.util.zip.ZipOutputStream,com.android.tools.r8.utils.InternalOptions):559:589 -> a
-    217:262:int dumpProgramResources(java.lang.String,java.util.Map,int,java.util.zip.ZipOutputStream,com.android.tools.r8.utils.InternalOptions):558:603 -> a
-    263:266:java.util.zip.ZipOutputStream lambda$dumpProgramResources$2(com.android.tools.r8.features.FeatureSplitConfiguration,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.features.ClassToFeatureSplitMap,java.util.Map,java.util.zip.ZipOutputStream,java.lang.String):577:580 -> a
-    267:280:void closeOutputStreams(java.util.Collection):611:624 -> a
-    281:281:void closeOutputStreams(java.util.Collection):621:621 -> a
-    282:284:int dumpClassFileResources(java.lang.String,int,java.util.zip.ZipOutputStream,com.android.tools.r8.com.google.common.collect.ImmutableList):634:636 -> a
-    285:285:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap.<init>():119:119 -> a
-    285:285:int dumpClassFileResources(java.lang.String,int,java.util.zip.ZipOutputStream,com.android.tools.r8.com.google.common.collect.ImmutableList):636 -> a
-    286:302:int dumpClassFileResources(java.lang.String,int,java.util.zip.ZipOutputStream,com.android.tools.r8.com.google.common.collect.ImmutableList):637:653 -> a
-    303:319:int dumpClassFileResources(java.lang.String,int,java.util.zip.ZipOutputStream,com.android.tools.r8.com.google.common.collect.ImmutableList):635:651 -> a
-    320:339:int dumpClassFileResources(java.lang.String,int,java.util.zip.ZipOutputStream,com.android.tools.r8.com.google.common.collect.ImmutableList):634:653 -> a
-    340:346:int dumpProgramResource(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,int,java.util.function.Function,java.util.zip.ZipOutputStream,com.android.tools.r8.ProgramResource):664:670 -> a
-    347:348:java.lang.String extractClassDescriptor(byte[]):709:710 -> a
-    347:348:int dumpProgramResource(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,int,java.util.function.Function,java.util.zip.ZipOutputStream,com.android.tools.r8.ProgramResource):669 -> a
-    349:349:void com.android.tools.r8.org.objectweb.asm.ClassReader.accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):401:401 -> a
-    349:349:java.lang.String extractClassDescriptor(byte[]):711 -> a
-    349:349:int dumpProgramResource(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,int,java.util.function.Function,java.util.zip.ZipOutputStream,com.android.tools.r8.ProgramResource):669 -> a
-    350:350:java.lang.String extractClassDescriptor(byte[]):716:716 -> a
-    350:350:int dumpProgramResource(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,int,java.util.function.Function,java.util.zip.ZipOutputStream,com.android.tools.r8.ProgramResource):669 -> a
-    351:356:int dumpProgramResource(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,int,java.util.function.Function,java.util.zip.ZipOutputStream,com.android.tools.r8.ProgramResource):671:676 -> a
-    357:362:int dumpProgramResource(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,int,java.util.function.Function,java.util.zip.ZipOutputStream,com.android.tools.r8.ProgramResource):675:680 -> a
+    2:5:void printClassFileProviders(java.lang.StringBuilder,java.util.Collection):158:161 -> a
+    6:12:void printProgramResource(java.lang.StringBuilder,com.android.tools.r8.ProgramResource):167:173 -> a
+    13:14:boolean verifyInternalProvidersInCloseSet(com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableList):203:204 -> a
+    15:15:boolean lambda$verifyInternalProvidersInCloseSet$0(com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.ClassFileResourceProvider):205:205 -> a
+    16:16:com.android.tools.r8.utils.AndroidApp$Builder builder(com.android.tools.r8.utils.Reporter):221:221 -> a
+    17:17:com.android.tools.r8.utils.AndroidApp$Builder builder(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.Reporter):233:233 -> a
+    18:20:int applicationSize():238:238 -> a
+    22:30:int applicationSize():240:240 -> a
+    37:37:int applicationSize():247:247 -> a
+    38:38:void $closeResource(java.lang.Throwable,java.lang.AutoCloseable):247:247 -> a
+    39:43:java.util.List filter(java.util.List,com.android.tools.r8.ProgramResource$Kind):333:337 -> a
+    44:47:void write(java.nio.file.Path,com.android.tools.r8.OutputMode):405:408 -> a
+    48:49:java.lang.String getPrimaryClassDescriptor(com.android.tools.r8.Resource):453:454 -> a
+    50:54:void dump(java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):459:463 -> a
+    55:60:void dump(java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):462:467 -> a
+    61:70:void dump(java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):464:473 -> a
+    71:86:void dump(java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):470:485 -> a
+    87:91:java.util.Map dumpFeatureSplitFileNames(com.android.tools.r8.features.FeatureSplitConfiguration):94:98 -> a
+    87:91:void dump(java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):488 -> a
+    92:92:void dump(java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):486:486 -> a
+    93:94:int dumpClasspathResources(int,java.util.zip.ZipOutputStream):518:519 -> a
+    93:94:void dump(java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):492 -> a
+    95:96:int dumpLibraryResources(int,java.util.zip.ZipOutputStream):511:512 -> a
+    95:96:void dump(java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):493 -> a
+    97:97:void dump(java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):494:494 -> a
+    98:132:void dump(java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):461:495 -> a
+    133:136:java.lang.String getBuildPropertiesContents(com.android.tools.r8.utils.InternalOptions):500:503 -> a
+    137:137:boolean com.android.tools.r8.utils.InternalOptions.isTreeShakingEnabled():544:544 -> a
+    137:137:java.lang.String getBuildPropertiesContents(com.android.tools.r8.utils.InternalOptions):505 -> a
+    138:138:java.lang.String getBuildPropertiesContents(com.android.tools.r8.utils.InternalOptions):505:505 -> a
+    139:139:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():549:549 -> a
+    139:139:java.lang.String getBuildPropertiesContents(com.android.tools.r8.utils.InternalOptions):506 -> a
+    140:140:java.lang.String getBuildPropertiesContents(com.android.tools.r8.utils.InternalOptions):506:506 -> a
+    141:141:java.lang.String getBuildPropertiesContents(com.android.tools.r8.utils.InternalOptions):502:502 -> a
+    142:142:java.lang.String getBuildPropertiesContents(com.android.tools.r8.utils.InternalOptions):500:500 -> a
+    143:161:int dumpProgramResources(java.lang.String,java.util.Map,int,java.util.zip.ZipOutputStream,com.android.tools.r8.utils.InternalOptions):555:573 -> a
+    162:162:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap.<init>():119:119 -> a
+    162:162:int dumpProgramResources(java.lang.String,java.util.Map,int,java.util.zip.ZipOutputStream,com.android.tools.r8.utils.InternalOptions):573 -> a
+    163:169:int dumpProgramResources(java.lang.String,java.util.Map,int,java.util.zip.ZipOutputStream,com.android.tools.r8.utils.InternalOptions):574:580 -> a
+    170:203:int dumpProgramResources(java.lang.String,java.util.Map,int,java.util.zip.ZipOutputStream,com.android.tools.r8.utils.InternalOptions):577:610 -> a
+    204:213:int dumpProgramResources(java.lang.String,java.util.Map,int,java.util.zip.ZipOutputStream,com.android.tools.r8.utils.InternalOptions):607:616 -> a
+    214:244:int dumpProgramResources(java.lang.String,java.util.Map,int,java.util.zip.ZipOutputStream,com.android.tools.r8.utils.InternalOptions):572:602 -> a
+    245:290:int dumpProgramResources(java.lang.String,java.util.Map,int,java.util.zip.ZipOutputStream,com.android.tools.r8.utils.InternalOptions):571:616 -> a
+    291:294:java.util.zip.ZipOutputStream lambda$dumpProgramResources$2(com.android.tools.r8.features.FeatureSplitConfiguration,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.features.ClassToFeatureSplitMap,java.util.Map,java.util.zip.ZipOutputStream,java.lang.String):590:593 -> a
+    295:308:void closeOutputStreams(java.util.Collection):624:637 -> a
+    309:309:void closeOutputStreams(java.util.Collection):634:634 -> a
+    310:312:int dumpClassFileResources(java.lang.String,int,java.util.zip.ZipOutputStream,com.android.tools.r8.com.google.common.collect.ImmutableList):647:649 -> a
+    313:313:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap.<init>():119:119 -> a
+    313:313:int dumpClassFileResources(java.lang.String,int,java.util.zip.ZipOutputStream,com.android.tools.r8.com.google.common.collect.ImmutableList):649 -> a
+    314:330:int dumpClassFileResources(java.lang.String,int,java.util.zip.ZipOutputStream,com.android.tools.r8.com.google.common.collect.ImmutableList):650:666 -> a
+    331:347:int dumpClassFileResources(java.lang.String,int,java.util.zip.ZipOutputStream,com.android.tools.r8.com.google.common.collect.ImmutableList):648:664 -> a
+    348:367:int dumpClassFileResources(java.lang.String,int,java.util.zip.ZipOutputStream,com.android.tools.r8.com.google.common.collect.ImmutableList):647:666 -> a
+    368:374:int dumpProgramResource(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,int,java.util.function.Function,java.util.zip.ZipOutputStream,com.android.tools.r8.ProgramResource):677:683 -> a
+    375:376:java.lang.String extractClassDescriptor(byte[]):722:723 -> a
+    375:376:int dumpProgramResource(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,int,java.util.function.Function,java.util.zip.ZipOutputStream,com.android.tools.r8.ProgramResource):682 -> a
+    377:377:void com.android.tools.r8.org.objectweb.asm.ClassReader.accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):401:401 -> a
+    377:377:java.lang.String extractClassDescriptor(byte[]):724 -> a
+    377:377:int dumpProgramResource(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,int,java.util.function.Function,java.util.zip.ZipOutputStream,com.android.tools.r8.ProgramResource):682 -> a
+    378:378:java.lang.String extractClassDescriptor(byte[]):729:729 -> a
+    378:378:int dumpProgramResource(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,int,java.util.function.Function,java.util.zip.ZipOutputStream,com.android.tools.r8.ProgramResource):682 -> a
+    379:384:int dumpProgramResource(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,int,java.util.function.Function,java.util.zip.ZipOutputStream,com.android.tools.r8.ProgramResource):684:689 -> a
+    385:390:int dumpProgramResource(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,int,java.util.function.Function,java.util.zip.ZipOutputStream,com.android.tools.r8.ProgramResource):688:693 -> a
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList access$300(com.android.tools.r8.utils.AndroidApp):82:82 -> b
-    2:2:com.android.tools.r8.utils.Reporter defaultReporter():208:208 -> b
-    2:2:com.android.tools.r8.utils.AndroidApp$Builder builder():215 -> b
-    3:3:com.android.tools.r8.utils.AndroidApp$Builder builder():215:215 -> b
-    4:13:void writeToDirectory(java.nio.file.Path,com.android.tools.r8.OutputMode):415:424 -> b
+    2:2:com.android.tools.r8.utils.Reporter defaultReporter():209:209 -> b
+    2:2:com.android.tools.r8.utils.AndroidApp$Builder builder():216 -> b
+    3:3:com.android.tools.r8.utils.AndroidApp$Builder builder():216:216 -> b
+    4:13:void writeToDirectory(java.nio.file.Path,com.android.tools.r8.OutputMode):416:425 -> b
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList access$400(com.android.tools.r8.utils.AndroidApp):82:82 -> c
-    2:3:void closeInternalArchiveProviders():118:119 -> c
-    4:6:void writeToZip(java.nio.file.Path,com.android.tools.r8.OutputMode):431:433 -> c
-    7:16:void writeToZip(java.nio.file.Path,com.android.tools.r8.OutputMode):432:441 -> c
-    17:20:void writeToZip(java.nio.file.Path,com.android.tools.r8.OutputMode):440:443 -> c
-    21:31:void writeToZip(java.nio.file.Path,com.android.tools.r8.OutputMode):436:446 -> c
+    2:3:void closeInternalArchiveProviders():119:120 -> c
+    4:6:void writeToZip(java.nio.file.Path,com.android.tools.r8.OutputMode):432:434 -> c
+    7:16:void writeToZip(java.nio.file.Path,com.android.tools.r8.OutputMode):433:442 -> c
+    17:20:void writeToZip(java.nio.file.Path,com.android.tools.r8.OutputMode):441:444 -> c
+    21:31:void writeToZip(java.nio.file.Path,com.android.tools.r8.OutputMode):437:447 -> c
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList access$500(com.android.tools.r8.utils.AndroidApp):82:82 -> d
-    2:4:java.util.Collection computeAllProgramResources():252:254 -> d
+    2:4:java.util.Collection computeAllProgramResources():253:255 -> d
     1:1:java.util.List access$600(com.android.tools.r8.utils.AndroidApp):82:82 -> e
-    2:7:java.util.List getClassProgramResourcesForTesting():275:280 -> e
+    2:7:java.util.List getClassProgramResourcesForTesting():276:281 -> e
     1:1:java.util.List access$700(com.android.tools.r8.utils.AndroidApp):82:82 -> f
-    2:2:java.util.List getClasspathResourceProviders():322:322 -> f
+    2:2:java.util.List getClasspathResourceProviders():323:323 -> f
     1:1:com.android.tools.r8.StringResource access$800(com.android.tools.r8.utils.AndroidApp):82:82 -> g
-    2:6:java.util.Set getDataEntryResourcesForTesting():286:290 -> g
-    1:1:com.android.tools.r8.utils.Reporter defaultReporter():208:208 -> h
-    1:1:com.android.tools.r8.utils.AndroidApp$Builder builder(com.android.tools.r8.utils.AndroidApp):227 -> h
-    2:2:com.android.tools.r8.utils.AndroidApp$Builder builder(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.Reporter):232:232 -> h
-    2:2:com.android.tools.r8.utils.AndroidApp$Builder builder(com.android.tools.r8.utils.AndroidApp):227 -> h
-    3:8:java.util.List getDexProgramResourcesForTesting():262:267 -> h
-    1:1:java.util.List getLibraryResourceProviders():327:327 -> i
-    1:1:java.util.List getMainDexClasses():383:383 -> j
-    1:1:java.util.List getMainDexListResources():376:376 -> k
-    1:1:java.util.List getProgramResourceProviders():317:317 -> l
-    1:1:com.android.tools.r8.StringResource getProguardMapInputData():355:355 -> m
-    1:1:com.android.tools.r8.StringResource getProguardMapOutputData():350:350 -> n
-    1:1:boolean hasMainDexList():362:362 -> o
-    1:1:boolean hasMainDexListResources():369:369 -> p
-    1:10:com.android.tools.r8.utils.AndroidApp withoutMainDexList():388:397 -> q
-    1:5:java.lang.String toString():125:129 -> toString
-    6:8:void printProgramResourceProviders(java.lang.StringBuilder,java.util.Collection):148:150 -> toString
-    6:8:java.lang.String toString():129 -> toString
-    9:20:java.lang.String toString():131:142 -> toString
+    2:6:java.util.Set getDataEntryResourcesForTesting():287:291 -> g
+    1:1:com.android.tools.r8.utils.Reporter defaultReporter():209:209 -> h
+    1:1:com.android.tools.r8.utils.AndroidApp$Builder builder(com.android.tools.r8.utils.AndroidApp):228 -> h
+    2:2:com.android.tools.r8.utils.AndroidApp$Builder builder(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.Reporter):233:233 -> h
+    2:2:com.android.tools.r8.utils.AndroidApp$Builder builder(com.android.tools.r8.utils.AndroidApp):228 -> h
+    3:8:java.util.List getDexProgramResourcesForTesting():263:268 -> h
+    1:1:java.util.List getLibraryResourceProviders():328:328 -> i
+    1:1:java.util.List getMainDexClasses():384:384 -> j
+    1:1:java.util.List getMainDexListResources():377:377 -> k
+    1:1:java.util.List getProgramResourceProviders():318:318 -> l
+    1:1:com.android.tools.r8.StringResource getProguardMapInputData():356:356 -> m
+    1:1:com.android.tools.r8.StringResource getProguardMapOutputData():351:351 -> n
+    1:1:boolean hasMainDexList():363:363 -> o
+    1:1:boolean hasMainDexListResources():370:370 -> p
+    1:10:com.android.tools.r8.utils.AndroidApp withoutMainDexList():389:398 -> q
+    1:5:java.lang.String toString():126:130 -> toString
+    6:8:void printProgramResourceProviders(java.lang.StringBuilder,java.util.Collection):149:151 -> toString
+    6:8:java.lang.String toString():130 -> toString
+    9:20:java.lang.String toString():132:143 -> toString
 com.android.tools.r8.utils.AndroidApp$1 -> com.android.tools.r8.utils.b$a:
     java.util.Set val$out -> a
-    1:1:void <init>(com.android.tools.r8.utils.AndroidApp,java.util.Set):291:291 -> <init>
-    1:6:void visit(com.android.tools.r8.DataEntryResource):301:306 -> visit
+    1:1:void <init>(com.android.tools.r8.utils.AndroidApp,java.util.Set):292:292 -> <init>
+    1:6:void visit(com.android.tools.r8.DataEntryResource):302:307 -> visit
 com.android.tools.r8.utils.AndroidApp$1ClassNameExtractor -> com.android.tools.r8.utils.c:
     java.lang.String className -> c
-    1:1:void <init>():690:690 -> <init>
-    1:1:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):701:701 -> a
-    1:1:java.lang.String getDescriptor():705:705 -> b
+    1:1:void <init>():703:703 -> <init>
+    1:1:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):714:714 -> a
+    1:1:java.lang.String getDescriptor():718:718 -> b
 com.android.tools.r8.utils.AndroidApp$2 -> com.android.tools.r8.utils.d:
     java.util.Map val$classPathResources -> a
-    1:1:void <init>(java.util.Map):513:513 -> <init>
-    1:1:java.util.Set getClassDescriptors():516:516 -> getClassDescriptors
-    1:1:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):521:521 -> getProgramResource
+    1:1:void <init>(java.util.Map):526:526 -> <init>
+    1:1:java.util.Set getClassDescriptors():529:529 -> getClassDescriptors
+    1:1:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):534:534 -> getProgramResource
 com.android.tools.r8.utils.AndroidApp$Builder -> com.android.tools.r8.utils.b$b:
     boolean ignoreDexInArchive -> k
     com.android.tools.r8.StringResource proguardMapOutputData -> l
@@ -77068,123 +77002,123 @@
     java.util.List libraryResourceProviders -> g
     boolean $assertionsDisabled -> a
     java.util.Map programResourcesMainDescriptor -> e
-    1:1:void <clinit>():722:722 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.AndroidApp$1):722:722 -> <init>
-    2:2:void <init>(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.AndroidApp$1):722:722 -> <init>
-    3:3:void <init>(com.android.tools.r8.utils.Reporter):742:742 -> <init>
-    4:23:void <init>(com.android.tools.r8.utils.Reporter):724:743 -> <init>
-    24:31:void <init>(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.AndroidApp):748:755 -> <init>
-    1:5:void lambda$addDump$0(com.android.tools.r8.origin.Origin,java.util.zip.ZipEntry,java.io.InputStream):768:772 -> a
-    6:20:void readProgramDump(com.android.tools.r8.origin.Origin,java.io.InputStream):819:833 -> a
-    6:20:void lambda$addDump$0(com.android.tools.r8.origin.Origin,java.util.zip.ZipEntry,java.io.InputStream):773 -> a
-    21:31:void readProgramDump(com.android.tools.r8.origin.Origin,java.io.InputStream):829:839 -> a
-    21:31:void lambda$addDump$0(com.android.tools.r8.origin.Origin,java.util.zip.ZipEntry,java.io.InputStream):773 -> a
-    32:39:void readProgramDump(com.android.tools.r8.origin.Origin,java.io.InputStream):838:845 -> a
-    32:39:void lambda$addDump$0(com.android.tools.r8.origin.Origin,java.util.zip.ZipEntry,java.io.InputStream):773 -> a
-    40:46:void readProgramDump(com.android.tools.r8.origin.Origin,java.io.InputStream):844:850 -> a
-    40:46:void lambda$addDump$0(com.android.tools.r8.origin.Origin,java.util.zip.ZipEntry,java.io.InputStream):773 -> a
-    47:74:void readProgramDump(com.android.tools.r8.origin.Origin,java.io.InputStream):821:848 -> a
-    47:74:void lambda$addDump$0(com.android.tools.r8.origin.Origin,java.util.zip.ZipEntry,java.io.InputStream):773 -> a
-    75:80:void lambda$addDump$0(com.android.tools.r8.origin.Origin,java.util.zip.ZipEntry,java.io.InputStream):774:779 -> a
-    81:94:void readClassFileDump(com.android.tools.r8.origin.Origin,java.io.InputStream,java.util.function.Consumer,java.lang.String):791:804 -> a
-    95:108:void readClassFileDump(com.android.tools.r8.origin.Origin,java.io.InputStream,java.util.function.Consumer,java.lang.String):800:813 -> a
+    1:1:void <clinit>():735:735 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.AndroidApp$1):735:735 -> <init>
+    2:2:void <init>(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.AndroidApp$1):735:735 -> <init>
+    3:3:void <init>(com.android.tools.r8.utils.Reporter):755:755 -> <init>
+    4:23:void <init>(com.android.tools.r8.utils.Reporter):737:756 -> <init>
+    24:31:void <init>(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.AndroidApp):761:768 -> <init>
+    1:5:void lambda$addDump$0(com.android.tools.r8.origin.Origin,java.util.zip.ZipEntry,java.io.InputStream):781:785 -> a
+    6:20:void readProgramDump(com.android.tools.r8.origin.Origin,java.io.InputStream):832:846 -> a
+    6:20:void lambda$addDump$0(com.android.tools.r8.origin.Origin,java.util.zip.ZipEntry,java.io.InputStream):786 -> a
+    21:31:void readProgramDump(com.android.tools.r8.origin.Origin,java.io.InputStream):842:852 -> a
+    21:31:void lambda$addDump$0(com.android.tools.r8.origin.Origin,java.util.zip.ZipEntry,java.io.InputStream):786 -> a
+    32:39:void readProgramDump(com.android.tools.r8.origin.Origin,java.io.InputStream):851:858 -> a
+    32:39:void lambda$addDump$0(com.android.tools.r8.origin.Origin,java.util.zip.ZipEntry,java.io.InputStream):786 -> a
+    40:46:void readProgramDump(com.android.tools.r8.origin.Origin,java.io.InputStream):857:863 -> a
+    40:46:void lambda$addDump$0(com.android.tools.r8.origin.Origin,java.util.zip.ZipEntry,java.io.InputStream):786 -> a
+    47:74:void readProgramDump(com.android.tools.r8.origin.Origin,java.io.InputStream):834:861 -> a
+    47:74:void lambda$addDump$0(com.android.tools.r8.origin.Origin,java.util.zip.ZipEntry,java.io.InputStream):786 -> a
+    75:80:void lambda$addDump$0(com.android.tools.r8.origin.Origin,java.util.zip.ZipEntry,java.io.InputStream):787:792 -> a
+    81:94:void readClassFileDump(com.android.tools.r8.origin.Origin,java.io.InputStream,java.util.function.Consumer,java.lang.String):804:817 -> a
+    95:108:void readClassFileDump(com.android.tools.r8.origin.Origin,java.io.InputStream,java.util.function.Consumer,java.lang.String):813:826 -> a
     109:109:com.android.tools.r8.ClassFileResourceProvider com.android.tools.r8.utils.AndroidApp.access$900(java.util.Map):0:0 -> a
-    109:109:void readClassFileDump(com.android.tools.r8.origin.Origin,java.io.InputStream,java.util.function.Consumer,java.lang.String):814 -> a
-    110:110:com.android.tools.r8.ClassFileResourceProvider com.android.tools.r8.utils.AndroidApp.createClassFileResourceProvider(java.util.Map):513:513 -> a
+    109:109:void readClassFileDump(com.android.tools.r8.origin.Origin,java.io.InputStream,java.util.function.Consumer,java.lang.String):827 -> a
+    110:110:com.android.tools.r8.ClassFileResourceProvider com.android.tools.r8.utils.AndroidApp.createClassFileResourceProvider(java.util.Map):526:526 -> a
     110:110:com.android.tools.r8.ClassFileResourceProvider com.android.tools.r8.utils.AndroidApp.access$900(java.util.Map):82 -> a
-    110:110:void readClassFileDump(com.android.tools.r8.origin.Origin,java.io.InputStream,java.util.function.Consumer,java.lang.String):814 -> a
-    111:111:void readClassFileDump(com.android.tools.r8.origin.Origin,java.io.InputStream,java.util.function.Consumer,java.lang.String):814:814 -> a
-    112:132:void readClassFileDump(com.android.tools.r8.origin.Origin,java.io.InputStream,java.util.function.Consumer,java.lang.String):792:812 -> a
-    133:133:void $closeResource(java.lang.Throwable,java.lang.AutoCloseable):812:812 -> a
-    134:135:com.android.tools.r8.utils.AndroidApp$Builder addProgramResourceProvider(com.android.tools.r8.ProgramResourceProvider):906:907 -> a
-    136:136:com.android.tools.r8.utils.AndroidApp$Builder addClasspathFiles(java.nio.file.Path[]):913:913 -> a
-    137:137:com.android.tools.r8.utils.AndroidApp$Builder addClasspathFiles(java.util.Collection):918:918 -> a
-    137:137:com.android.tools.r8.utils.AndroidApp$Builder addClasspathFiles(java.nio.file.Path[]):913 -> a
-    138:138:com.android.tools.r8.utils.AndroidApp$Builder addClasspathFile(java.nio.file.Path):926:926 -> a
-    138:138:com.android.tools.r8.utils.AndroidApp$Builder addClasspathFiles(java.util.Collection):919 -> a
-    138:138:com.android.tools.r8.utils.AndroidApp$Builder addClasspathFiles(java.nio.file.Path[]):913 -> a
-    139:139:com.android.tools.r8.utils.AndroidApp$Builder addClasspathFile(java.nio.file.Path):926:926 -> a
-    140:140:com.android.tools.r8.utils.AndroidApp$Builder addClasspathResourceProvider(com.android.tools.r8.ClassFileResourceProvider):934:934 -> a
-    141:143:com.android.tools.r8.utils.AndroidApp$Builder addDexProgramData(byte[],java.util.Set):995:995 -> a
-    144:144:com.android.tools.r8.utils.AndroidApp$Builder addDexProgramData(byte[],java.util.Set,java.lang.String):1008:1008 -> a
-    145:148:com.android.tools.r8.utils.AndroidApp$Builder addDexProgramData(byte[],java.util.Set,java.lang.String):1007:1010 -> a
-    149:149:com.android.tools.r8.utils.AndroidApp$Builder addClassProgramData(byte[][]):1034:1034 -> a
-    150:151:com.android.tools.r8.utils.AndroidApp$Builder addClassProgramData(java.util.Collection):1039:1040 -> a
-    152:152:com.android.tools.r8.utils.AndroidApp$Builder addClassProgramData(byte[],com.android.tools.r8.origin.Origin):1049:1049 -> a
-    153:153:com.android.tools.r8.utils.AndroidApp$Builder addClassProgramData(byte[],com.android.tools.r8.origin.Origin,java.util.Set):1053:1053 -> a
-    154:154:com.android.tools.r8.utils.AndroidApp$Builder addDataResource(com.android.tools.r8.DataResource):1059:1059 -> a
-    155:155:void addDataResources(com.android.tools.r8.DataResource[]):1208:1208 -> a
-    155:155:com.android.tools.r8.utils.AndroidApp$Builder addDataResource(com.android.tools.r8.DataResource):1059 -> a
-    156:156:void addDataResources(java.util.Collection):1212:1212 -> a
-    156:156:void addDataResources(com.android.tools.r8.DataResource[]):1208 -> a
-    156:156:com.android.tools.r8.utils.AndroidApp$Builder addDataResource(com.android.tools.r8.DataResource):1059 -> a
-    157:157:com.android.tools.r8.utils.AndroidApp$Builder setProguardMapOutputData(java.lang.String):1070:1070 -> a
-    158:158:com.android.tools.r8.utils.AndroidApp$Builder addMainDexClasses(java.lang.String[]):1102:1102 -> a
-    159:159:com.android.tools.r8.utils.AndroidApp$Builder addMainDexClasses(java.util.Collection):1109:1109 -> a
-    159:159:com.android.tools.r8.utils.AndroidApp$Builder addMainDexClasses(java.lang.String[]):1102 -> a
-    160:160:com.android.tools.r8.utils.AndroidApp$Builder setIgnoreDexInArchive(boolean):1125:1125 -> a
-    161:200:com.android.tools.r8.utils.AndroidApp build():1133:1172 -> a
-    201:201:void addProgramResources(com.android.tools.r8.ProgramResource[]):1200:1200 -> a
-    202:202:void addProgramResources(java.util.Collection):1204:1204 -> a
-    202:202:void addProgramResources(com.android.tools.r8.ProgramResource[]):1200 -> a
-    203:206:void addClasspathOrLibraryProvider(java.nio.file.Path,java.util.List):1217:1220 -> a
-    207:222:void addClasspathOrLibraryProvider(java.nio.file.Path,java.util.List):1218:1233 -> a
+    110:110:void readClassFileDump(com.android.tools.r8.origin.Origin,java.io.InputStream,java.util.function.Consumer,java.lang.String):827 -> a
+    111:111:void readClassFileDump(com.android.tools.r8.origin.Origin,java.io.InputStream,java.util.function.Consumer,java.lang.String):827:827 -> a
+    112:132:void readClassFileDump(com.android.tools.r8.origin.Origin,java.io.InputStream,java.util.function.Consumer,java.lang.String):805:825 -> a
+    133:133:void $closeResource(java.lang.Throwable,java.lang.AutoCloseable):825:825 -> a
+    134:135:com.android.tools.r8.utils.AndroidApp$Builder addProgramResourceProvider(com.android.tools.r8.ProgramResourceProvider):919:920 -> a
+    136:136:com.android.tools.r8.utils.AndroidApp$Builder addClasspathFiles(java.nio.file.Path[]):926:926 -> a
+    137:137:com.android.tools.r8.utils.AndroidApp$Builder addClasspathFiles(java.util.Collection):931:931 -> a
+    137:137:com.android.tools.r8.utils.AndroidApp$Builder addClasspathFiles(java.nio.file.Path[]):926 -> a
+    138:138:com.android.tools.r8.utils.AndroidApp$Builder addClasspathFile(java.nio.file.Path):939:939 -> a
+    138:138:com.android.tools.r8.utils.AndroidApp$Builder addClasspathFiles(java.util.Collection):932 -> a
+    138:138:com.android.tools.r8.utils.AndroidApp$Builder addClasspathFiles(java.nio.file.Path[]):926 -> a
+    139:139:com.android.tools.r8.utils.AndroidApp$Builder addClasspathFile(java.nio.file.Path):939:939 -> a
+    140:140:com.android.tools.r8.utils.AndroidApp$Builder addClasspathResourceProvider(com.android.tools.r8.ClassFileResourceProvider):947:947 -> a
+    141:143:com.android.tools.r8.utils.AndroidApp$Builder addDexProgramData(byte[],java.util.Set):1008:1008 -> a
+    144:144:com.android.tools.r8.utils.AndroidApp$Builder addDexProgramData(byte[],java.util.Set,java.lang.String):1021:1021 -> a
+    145:148:com.android.tools.r8.utils.AndroidApp$Builder addDexProgramData(byte[],java.util.Set,java.lang.String):1020:1023 -> a
+    149:149:com.android.tools.r8.utils.AndroidApp$Builder addClassProgramData(byte[][]):1047:1047 -> a
+    150:151:com.android.tools.r8.utils.AndroidApp$Builder addClassProgramData(java.util.Collection):1052:1053 -> a
+    152:152:com.android.tools.r8.utils.AndroidApp$Builder addClassProgramData(byte[],com.android.tools.r8.origin.Origin):1062:1062 -> a
+    153:153:com.android.tools.r8.utils.AndroidApp$Builder addClassProgramData(byte[],com.android.tools.r8.origin.Origin,java.util.Set):1066:1066 -> a
+    154:154:com.android.tools.r8.utils.AndroidApp$Builder addDataResource(com.android.tools.r8.DataResource):1072:1072 -> a
+    155:155:void addDataResources(com.android.tools.r8.DataResource[]):1221:1221 -> a
+    155:155:com.android.tools.r8.utils.AndroidApp$Builder addDataResource(com.android.tools.r8.DataResource):1072 -> a
+    156:156:void addDataResources(java.util.Collection):1225:1225 -> a
+    156:156:void addDataResources(com.android.tools.r8.DataResource[]):1221 -> a
+    156:156:com.android.tools.r8.utils.AndroidApp$Builder addDataResource(com.android.tools.r8.DataResource):1072 -> a
+    157:157:com.android.tools.r8.utils.AndroidApp$Builder setProguardMapOutputData(java.lang.String):1083:1083 -> a
+    158:158:com.android.tools.r8.utils.AndroidApp$Builder addMainDexClasses(java.lang.String[]):1115:1115 -> a
+    159:159:com.android.tools.r8.utils.AndroidApp$Builder addMainDexClasses(java.util.Collection):1122:1122 -> a
+    159:159:com.android.tools.r8.utils.AndroidApp$Builder addMainDexClasses(java.lang.String[]):1115 -> a
+    160:160:com.android.tools.r8.utils.AndroidApp$Builder setIgnoreDexInArchive(boolean):1138:1138 -> a
+    161:200:com.android.tools.r8.utils.AndroidApp build():1146:1185 -> a
+    201:201:void addProgramResources(com.android.tools.r8.ProgramResource[]):1213:1213 -> a
+    202:202:void addProgramResources(java.util.Collection):1217:1217 -> a
+    202:202:void addProgramResources(com.android.tools.r8.ProgramResource[]):1213 -> a
+    203:206:void addClasspathOrLibraryProvider(java.nio.file.Path,java.util.List):1230:1233 -> a
+    207:222:void addClasspathOrLibraryProvider(java.nio.file.Path,java.util.List):1231:1246 -> a
     223:223:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    223:223:void addClasspathOrLibraryProvider(java.nio.file.Path,java.util.List):1233 -> a
-    224:224:void addClasspathOrLibraryProvider(java.nio.file.Path,java.util.List):1233:1233 -> a
-    1:4:com.android.tools.r8.utils.AndroidApp$Builder addDump(java.nio.file.Path):763:766 -> b
-    5:5:com.android.tools.r8.utils.AndroidApp$Builder addDump(java.nio.file.Path):765:765 -> b
-    6:6:com.android.tools.r8.utils.AndroidApp$Builder addLibraryFiles(java.nio.file.Path[]):940:940 -> b
-    7:8:com.android.tools.r8.utils.AndroidApp$Builder addLibraryFiles(java.util.Collection):945:946 -> b
-    7:8:com.android.tools.r8.utils.AndroidApp$Builder addLibraryFiles(java.nio.file.Path[]):940 -> b
-    9:12:com.android.tools.r8.utils.AndroidApp$Builder addLibraryResourceProvider(com.android.tools.r8.ClassFileResourceProvider):984:987 -> b
-    13:13:com.android.tools.r8.utils.AndroidApp$Builder addDexProgramData(byte[],com.android.tools.r8.origin.Origin):1018:1018 -> b
-    14:15:com.android.tools.r8.utils.AndroidApp$Builder addDexProgramData(java.util.Collection):1026:1027 -> b
-    16:16:java.util.List getProgramResourceProviders():1238:1238 -> b
-    1:1:com.android.tools.r8.utils.Reporter getReporter():759:759 -> c
-    2:2:com.android.tools.r8.utils.AndroidApp$Builder addProgramFiles(java.nio.file.Path[]):876:876 -> c
-    3:3:com.android.tools.r8.utils.AndroidApp$Builder addLibraryFile(java.nio.file.Path):953:953 -> c
-    4:19:com.android.tools.r8.utils.AndroidApp$Builder addFilteredLibraryArchives(java.util.Collection):959:974 -> c
-    20:20:com.android.tools.r8.utils.AndroidApp$Builder addFilteredLibraryArchives(java.util.Collection):970:970 -> c
-    1:11:com.android.tools.r8.utils.AndroidApp$Builder addFilteredProgramArchives(java.util.Collection):889:899 -> d
-    12:12:com.android.tools.r8.utils.AndroidApp$Builder addFilteredProgramArchives(java.util.Collection):895:895 -> d
-    13:13:boolean hasMainDexList():1114:1114 -> d
-    14:22:com.android.tools.r8.utils.AndroidApp$Builder addProgramFile(java.nio.file.Path):1180:1188 -> d
+    223:223:void addClasspathOrLibraryProvider(java.nio.file.Path,java.util.List):1246 -> a
+    224:224:void addClasspathOrLibraryProvider(java.nio.file.Path,java.util.List):1246:1246 -> a
+    1:4:com.android.tools.r8.utils.AndroidApp$Builder addDump(java.nio.file.Path):776:779 -> b
+    5:5:com.android.tools.r8.utils.AndroidApp$Builder addDump(java.nio.file.Path):778:778 -> b
+    6:6:com.android.tools.r8.utils.AndroidApp$Builder addLibraryFiles(java.nio.file.Path[]):953:953 -> b
+    7:8:com.android.tools.r8.utils.AndroidApp$Builder addLibraryFiles(java.util.Collection):958:959 -> b
+    7:8:com.android.tools.r8.utils.AndroidApp$Builder addLibraryFiles(java.nio.file.Path[]):953 -> b
+    9:12:com.android.tools.r8.utils.AndroidApp$Builder addLibraryResourceProvider(com.android.tools.r8.ClassFileResourceProvider):997:1000 -> b
+    13:13:com.android.tools.r8.utils.AndroidApp$Builder addDexProgramData(byte[],com.android.tools.r8.origin.Origin):1031:1031 -> b
+    14:15:com.android.tools.r8.utils.AndroidApp$Builder addDexProgramData(java.util.Collection):1039:1040 -> b
+    16:16:java.util.List getProgramResourceProviders():1251:1251 -> b
+    1:1:com.android.tools.r8.utils.Reporter getReporter():772:772 -> c
+    2:2:com.android.tools.r8.utils.AndroidApp$Builder addProgramFiles(java.nio.file.Path[]):889:889 -> c
+    3:3:com.android.tools.r8.utils.AndroidApp$Builder addLibraryFile(java.nio.file.Path):966:966 -> c
+    4:19:com.android.tools.r8.utils.AndroidApp$Builder addFilteredLibraryArchives(java.util.Collection):972:987 -> c
+    20:20:com.android.tools.r8.utils.AndroidApp$Builder addFilteredLibraryArchives(java.util.Collection):983:983 -> c
+    1:11:com.android.tools.r8.utils.AndroidApp$Builder addFilteredProgramArchives(java.util.Collection):902:912 -> d
+    12:12:com.android.tools.r8.utils.AndroidApp$Builder addFilteredProgramArchives(java.util.Collection):908:908 -> d
+    13:13:boolean hasMainDexList():1127:1127 -> d
+    14:22:com.android.tools.r8.utils.AndroidApp$Builder addProgramFile(java.nio.file.Path):1193:1201 -> d
     23:24:boolean com.android.tools.r8.utils.FileUtils.isAarFile(java.nio.file.Path):73:74 -> d
-    23:24:com.android.tools.r8.utils.AndroidApp$Builder addProgramFile(java.nio.file.Path):1189 -> d
+    23:24:com.android.tools.r8.utils.AndroidApp$Builder addProgramFile(java.nio.file.Path):1202 -> d
     25:25:com.android.tools.r8.utils.AarArchiveResourceProvider com.android.tools.r8.utils.AarArchiveResourceProvider.fromArchive(java.nio.file.Path):38:38 -> d
-    25:25:com.android.tools.r8.utils.AndroidApp$Builder addProgramFile(java.nio.file.Path):1190 -> d
-    26:30:com.android.tools.r8.utils.AndroidApp$Builder addProgramFile(java.nio.file.Path):1190:1194 -> d
+    25:25:com.android.tools.r8.utils.AndroidApp$Builder addProgramFile(java.nio.file.Path):1203 -> d
+    26:30:com.android.tools.r8.utils.AndroidApp$Builder addProgramFile(java.nio.file.Path):1203:1207 -> d
     31:31:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> d
-    31:31:com.android.tools.r8.utils.AndroidApp$Builder addProgramFile(java.nio.file.Path):1194 -> d
-    32:32:com.android.tools.r8.utils.AndroidApp$Builder addProgramFile(java.nio.file.Path):1194:1194 -> d
-    1:1:com.android.tools.r8.utils.AndroidApp$Builder setProguardMapInputData(java.nio.file.Path):1075:1075 -> e
-    2:2:com.android.tools.r8.utils.AndroidApp$Builder addMainDexClasses(java.util.Collection):1109:1109 -> e
-    1:7:com.android.tools.r8.utils.AndroidApp$Builder addMainDexListFiles(java.util.Collection):1087:1093 -> f
-    8:8:com.android.tools.r8.utils.AndroidApp$Builder addMainDexListFiles(java.util.Collection):1089:1089 -> f
-    1:2:com.android.tools.r8.utils.AndroidApp$Builder addProgramFiles(java.util.Collection):881:882 -> g
+    31:31:com.android.tools.r8.utils.AndroidApp$Builder addProgramFile(java.nio.file.Path):1207 -> d
+    32:32:com.android.tools.r8.utils.AndroidApp$Builder addProgramFile(java.nio.file.Path):1207:1207 -> d
+    1:1:com.android.tools.r8.utils.AndroidApp$Builder setProguardMapInputData(java.nio.file.Path):1088:1088 -> e
+    2:2:com.android.tools.r8.utils.AndroidApp$Builder addMainDexClasses(java.util.Collection):1122:1122 -> e
+    1:7:com.android.tools.r8.utils.AndroidApp$Builder addMainDexListFiles(java.util.Collection):1100:1106 -> f
+    8:8:com.android.tools.r8.utils.AndroidApp$Builder addMainDexListFiles(java.util.Collection):1102:1102 -> f
+    1:2:com.android.tools.r8.utils.AndroidApp$Builder addProgramFiles(java.util.Collection):894:895 -> g
 com.android.tools.r8.utils.AndroidApp$Builder$1 -> com.android.tools.r8.utils.f:
     java.util.List val$dataResources -> b
     java.util.List val$programResources -> a
-    1:1:void <init>(com.android.tools.r8.utils.AndroidApp$Builder,java.util.List,java.util.List):851:851 -> <init>
-    1:3:com.android.tools.r8.DataResourceProvider getDataResourceProvider():859:861 -> getDataResourceProvider
-    1:1:java.util.Collection getProgramResources():854:854 -> getProgramResources
+    1:1:void <init>(com.android.tools.r8.utils.AndroidApp$Builder,java.util.List,java.util.List):864:864 -> <init>
+    1:3:com.android.tools.r8.DataResourceProvider getDataResourceProvider():872:874 -> getDataResourceProvider
+    1:1:java.util.Collection getProgramResources():867:867 -> getProgramResources
 com.android.tools.r8.utils.AndroidApp$Builder$1$1 -> com.android.tools.r8.utils.e:
     com.android.tools.r8.utils.AndroidApp$Builder$1 this$1 -> a
-    1:1:void <init>(com.android.tools.r8.utils.AndroidApp$Builder$1):861:861 -> <init>
-    1:2:void accept(com.android.tools.r8.DataResourceProvider$Visitor):864:865 -> accept
+    1:1:void <init>(com.android.tools.r8.utils.AndroidApp$Builder$1):874:874 -> <init>
+    1:2:void accept(com.android.tools.r8.DataResourceProvider$Visitor):877:878 -> accept
 com.android.tools.r8.utils.AndroidApp$Builder$2 -> com.android.tools.r8.utils.b$b$a:
     java.util.List val$finalDataResources -> b
     java.util.List val$finalProgramResources -> a
-    1:1:void <init>(com.android.tools.r8.utils.AndroidApp$Builder,java.util.List,java.util.List):1138:1138 -> <init>
-    1:2:com.android.tools.r8.DataResourceProvider getDataResourceProvider():1146:1147 -> getDataResourceProvider
-    1:1:java.util.Collection getProgramResources():1141:1141 -> getProgramResources
+    1:1:void <init>(com.android.tools.r8.utils.AndroidApp$Builder,java.util.List,java.util.List):1151:1151 -> <init>
+    1:2:com.android.tools.r8.DataResourceProvider getDataResourceProvider():1159:1160 -> getDataResourceProvider
+    1:1:java.util.Collection getProgramResources():1154:1154 -> getProgramResources
 com.android.tools.r8.utils.AndroidApp$Builder$2$1 -> com.android.tools.r8.utils.g:
     com.android.tools.r8.utils.AndroidApp$Builder$2 this$1 -> b
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():1147:1147 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.utils.AndroidApp$Builder$2):1147:1147 -> <init>
-    1:6:void accept(com.android.tools.r8.DataResourceProvider$Visitor):1150:1155 -> accept
+    1:1:void <clinit>():1160:1160 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.utils.AndroidApp$Builder$2):1160:1160 -> <init>
+    1:6:void accept(com.android.tools.r8.DataResourceProvider$Visitor):1163:1168 -> accept
 com.android.tools.r8.utils.AndroidAppConsumers -> com.android.tools.r8.utils.h:
     com.android.tools.r8.utils.AndroidApp$Builder builder -> b
     com.android.tools.r8.StringConsumer proguardMapConsumer -> e
@@ -77588,7 +77522,7 @@
     1:2:void collectClass(com.android.tools.r8.graph.DexType,java.util.function.Consumer):132:133 -> a
     3:3:java.util.Collection collectTypes():139:139 -> a
     1:1:java.lang.String toString():144:144 -> toString
-com.android.tools.r8.utils.ClasspathClassCollection -> com.android.tools.r8.internal.p6:
+com.android.tools.r8.utils.ClasspathClassCollection -> com.android.tools.r8.internal.q6:
     1:1:void <init>(com.android.tools.r8.utils.ClassProvider):14:14 -> <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
@@ -77605,7 +77539,7 @@
     6:6:com.android.tools.r8.graph.DexClass resolveClassConflict(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):12 -> a
     1:1:com.android.tools.r8.graph.ClassKind getClassKind():29:29 -> c
     1:1:java.lang.String toString():34:34 -> toString
-com.android.tools.r8.utils.ComparatorUtils -> com.android.tools.r8.internal.Q6:
+com.android.tools.r8.utils.ComparatorUtils -> com.android.tools.r8.internal.R6:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():9:9 -> <clinit>
     1:3:int lambda$listComparator$0(java.util.Comparator,java.util.List,java.util.List):17:19 -> a
@@ -77616,9 +77550,9 @@
     15:15:java.util.Comparator arrayComparator(java.util.Comparator):56:56 -> a
     16:18:int lambda$arrayComparator$1(java.util.Comparator,java.lang.Object[],java.lang.Object[]):57:59 -> a
     1:1:java.util.Comparator listComparator(java.util.Comparator):16:16 -> b
-com.android.tools.r8.utils.Consumer3 -> com.android.tools.r8.internal.m7:
+com.android.tools.r8.utils.Consumer3 -> com.android.tools.r8.internal.n7:
     void accept(java.lang.Object,java.lang.Object,java.lang.Object) -> a
-com.android.tools.r8.utils.ConsumerUtils -> com.android.tools.r8.internal.n7:
+com.android.tools.r8.utils.ConsumerUtils -> com.android.tools.r8.internal.o7:
     void lambda$emptyBiConsumer$4(java.lang.Object,java.lang.Object) -> a
     void lambda$emptyConsumer$3(java.lang.Object) -> a
     1:1:java.util.function.Consumer acceptIfNotSeen(java.util.function.Consumer,java.util.Set):23:23 -> a
@@ -77627,7 +77561,7 @@
     void lambda$emptyThrowingConsumer$5(java.lang.Object) -> b
     1:1:java.util.function.Consumer emptyConsumer():31:31 -> b
     1:1:com.android.tools.r8.utils.ThrowingConsumer emptyThrowingConsumer():39:39 -> c
-com.android.tools.r8.utils.DescriptorUtils -> com.android.tools.r8.internal.X7:
+com.android.tools.r8.utils.DescriptorUtils -> com.android.tools.r8.internal.Y7:
     java.util.Map typeNameToLetterMap -> a
     boolean $assertionsDisabled -> b
     int $r8$clinit -> c
@@ -77699,13 +77633,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.X7$a:
+com.android.tools.r8.utils.DescriptorUtils$ModuleAndDescriptor -> com.android.tools.r8.internal.Y7$a:
     java.lang.String module -> a
     java.lang.String descriptor -> b
     1:3:void <init>(java.lang.String,java.lang.String):590:592 -> <init>
     1:1:java.lang.String getDescriptor():600:600 -> a
     1:1:java.lang.String getModule():596:596 -> b
-com.android.tools.r8.utils.DexVersion -> com.android.tools.r8.internal.K8:
+com.android.tools.r8.utils.DexVersion -> com.android.tools.r8.internal.L8:
     com.android.tools.r8.utils.DexVersion[] $VALUES -> e
     int dexVersion -> f
     com.android.tools.r8.utils.DexVersion V35 -> a
@@ -77731,7 +77665,7 @@
     5:5:java.util.Optional getDexVersion(int):87:87 -> b
     6:6:java.util.Optional getDexVersion(int):85:85 -> b
     7:7:java.util.Optional getDexVersion(int):83:83 -> b
-com.android.tools.r8.utils.DirectoryBuilder -> com.android.tools.r8.internal.N8:
+com.android.tools.r8.utils.DirectoryBuilder -> com.android.tools.r8.internal.O8:
     com.android.tools.r8.origin.Origin origin -> b
     java.nio.file.Path root -> a
     1:3:void <init>(java.nio.file.Path):24:26 -> <init>
@@ -77745,7 +77679,7 @@
     24:24:void addIndexedClassFile(int,java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):73:73 -> a
     25:25:java.nio.file.Path getPath():83:83 -> a
     1:1:com.android.tools.r8.origin.Origin getOrigin():78:78 -> getOrigin
-com.android.tools.r8.utils.DisjointSets -> com.android.tools.r8.internal.P8:
+com.android.tools.r8.utils.DisjointSets -> com.android.tools.r8.internal.Q8:
     java.util.Map parent -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():16:16 -> <clinit>
@@ -77761,7 +77695,7 @@
     1:1:java.util.Set lambda$collectSets$0(java.lang.Object):143:143 -> e
     1:3:java.lang.Object makeSet(java.lang.Object):27:29 -> f
     1:12:java.lang.String toString():150:161 -> toString
-com.android.tools.r8.utils.EncodedValueUtils -> com.android.tools.r8.internal.n9:
+com.android.tools.r8.utils.EncodedValueUtils -> com.android.tools.r8.internal.o9:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():9:9 -> <clinit>
     1:6:int putBitsFromRightZeroExtended(com.android.tools.r8.dex.DexOutputBuffer,long,int):84:89 -> a
@@ -77790,7 +77724,7 @@
     1:1:java.lang.String getDiagnosticMessage():65:65 -> getDiagnosticMessage
     1:1:com.android.tools.r8.origin.Origin getOrigin():51:51 -> getOrigin
     1:1:com.android.tools.r8.position.Position getPosition():56:56 -> getPosition
-com.android.tools.r8.utils.ExceptionUtils -> com.android.tools.r8.internal.ca:
+com.android.tools.r8.utils.ExceptionUtils -> com.android.tools.r8.internal.da:
     void com.android.tools.r8.utils.ForEachableUtils.lambda$empty$0(java.util.function.Consumer) -> a
     1:1:com.android.tools.r8.utils.ForEachable com.android.tools.r8.utils.ForEachableUtils.empty():10:10 -> a
     2:3:java.lang.Object com.android.tools.r8.utils.PredicateUtils.findFirst(java.lang.Object[],java.util.function.Predicate):13:14 -> a
@@ -77799,70 +77733,65 @@
     7:7:boolean com.android.tools.r8.utils.PredicateUtils.lambda$not$0(java.util.function.Predicate,java.lang.Object):22:22 -> a
     8:8:java.util.function.Predicate com.android.tools.r8.utils.PredicateUtils.not(java.util.function.Predicate):22:22 -> a
     9:13:void com.android.tools.r8.utils.MapUtils.lambda$map$0(java.util.function.Function,java.util.function.Function,java.util.Map,java.util.function.BiFunction,java.lang.Object,java.lang.Object):24:28 -> a
-    14:14:com.android.tools.r8.origin.Origin access$000(java.lang.Throwable):25:25 -> a
+    14:14:com.android.tools.r8.origin.Origin access$000(java.lang.Throwable):26:26 -> a
     15:15:java.util.function.Predicate com.android.tools.r8.utils.PredicateUtils.isNull(java.util.function.Function):26:26 -> a
     16:16:boolean com.android.tools.r8.utils.PredicateUtils.lambda$isNull$1(java.util.function.Function,java.lang.Object):26:26 -> a
-    17:17:void lambda$withConsumeResourceHandler$0(com.android.tools.r8.StringConsumer,java.lang.String,com.android.tools.r8.DiagnosticsHandler):31:31 -> a
-    18:18:void withConsumeResourceHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.StringConsumer,java.lang.String):31:31 -> a
-    19:23:void com.android.tools.r8.utils.ExceptionUtils.withConsumeResourceHandler(com.android.tools.r8.utils.Reporter,java.util.function.Consumer):41:45 -> a
-    19:23:void withConsumeResourceHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.StringConsumer,java.lang.String):31 -> a
+    17:17:void lambda$withConsumeResourceHandler$0(com.android.tools.r8.StringConsumer,java.lang.String,com.android.tools.r8.DiagnosticsHandler):32:32 -> a
+    18:18:void withConsumeResourceHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.StringConsumer,java.lang.String):32:32 -> a
+    19:23:void com.android.tools.r8.utils.ExceptionUtils.withConsumeResourceHandler(com.android.tools.r8.utils.Reporter,java.util.function.Consumer):42:46 -> a
+    19:23:void withConsumeResourceHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.StringConsumer,java.lang.String):32 -> a
     24:38:java.lang.String[] com.android.tools.r8.utils.FlagFile.expandFlagFiles(java.lang.String[],java.util.function.Consumer):34:48 -> a
     39:39:boolean com.android.tools.r8.utils.MapUtils.lambda$removeIdentityMappings$1(java.util.Map$Entry):35:35 -> a
     40:40:void com.android.tools.r8.utils.MapUtils.removeIdentityMappings(java.util.Map):35:35 -> a
-    41:41:void withFinishedResourceHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.StringConsumer):35:35 -> a
-    42:46:void com.android.tools.r8.utils.ExceptionUtils.withConsumeResourceHandler(com.android.tools.r8.utils.Reporter,java.util.function.Consumer):41:45 -> a
-    42:46:void withFinishedResourceHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.StringConsumer):35 -> a
-    47:48:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):70:71 -> a
-    49:94:com.android.tools.r8.CompilationFailedException com.android.tools.r8.utils.ExceptionUtils.failCompilation(com.android.tools.r8.utils.Reporter,java.lang.Throwable):81:126 -> a
-    49:94:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):73 -> a
-    95:95:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.concat(java.lang.Object,java.lang.Object[]):88:88 -> a
-    95:95:com.android.tools.r8.CompilationFailedException com.android.tools.r8.utils.ExceptionUtils.failCompilation(com.android.tools.r8.utils.Reporter,java.lang.Throwable):126 -> a
-    95:95:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):73 -> a
-    96:101:java.lang.Object[] com.android.tools.r8.com.google.common.collect.Platform.newArray(java.lang.Object[],int):37:42 -> a
-    96:101:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.newArray(java.lang.Object[],int):60 -> a
-    96:101:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.concat(java.lang.Object,java.lang.Object[]):88 -> a
-    96:101:com.android.tools.r8.CompilationFailedException com.android.tools.r8.utils.ExceptionUtils.failCompilation(com.android.tools.r8.utils.Reporter,java.lang.Throwable):126 -> a
-    96:101:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):73 -> a
-    102:103:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.concat(java.lang.Object,java.lang.Object[]):89:90 -> a
-    102:103:com.android.tools.r8.CompilationFailedException com.android.tools.r8.utils.ExceptionUtils.failCompilation(com.android.tools.r8.utils.Reporter,java.lang.Throwable):126 -> a
-    102:103:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):73 -> a
-    104:104:com.android.tools.r8.CompilationFailedException com.android.tools.r8.utils.ExceptionUtils.failCompilation(com.android.tools.r8.utils.Reporter,java.lang.Throwable):126:126 -> a
-    104:104:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):73 -> a
-    105:105:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):73:73 -> a
-    106:110:void withMainProgramHandler(com.android.tools.r8.utils.ExceptionUtils$MainAction):168:172 -> a
-    111:111:void withMainProgramHandler(com.android.tools.r8.utils.ExceptionUtils$MainAction):170:170 -> a
-    112:112:boolean com.android.tools.r8.utils.ExceptionUtils.isExpectedException(java.lang.Throwable):190:190 -> a
-    112:112:java.lang.RuntimeException exitWithError(java.lang.Throwable,java.lang.Throwable):177 -> a
-    113:120:java.lang.RuntimeException exitWithError(java.lang.Throwable,java.lang.Throwable):179:186 -> a
-    121:121:java.lang.RuntimeException unwrapExecutionException(java.util.concurrent.ExecutionException):207:207 -> a
-    122:122:void withOriginAndPositionAttachmentHandler(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.Runnable):220:220 -> a
-    123:125:java.lang.Object com.android.tools.r8.utils.ExceptionUtils.withOriginAndPositionAttachmentHandler(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.util.function.Supplier):232:234 -> a
-    123:125:void withOriginAndPositionAttachmentHandler(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.Runnable):220 -> a
-    126:126:java.lang.Object lambda$withOriginAndPositionAttachmentHandler$1(java.lang.Runnable):224:224 -> a
-    127:129:java.lang.Object withOriginAndPositionAttachmentHandler(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.util.function.Supplier):232:234 -> a
+    41:41:void withFinishedResourceHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.StringConsumer):36:36 -> a
+    42:46:void com.android.tools.r8.utils.ExceptionUtils.withConsumeResourceHandler(com.android.tools.r8.utils.Reporter,java.util.function.Consumer) -> a
+    42:46:void withFinishedResourceHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.StringConsumer):36 -> a
+    47:50:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):71:74 -> a
+    51:51:com.android.tools.r8.CompilationFailedException failCompilation(com.android.tools.r8.utils.Reporter,java.lang.Throwable):80:80 -> a
+    52:96:java.lang.Exception failWithFakeEntry(com.android.tools.r8.DiagnosticsHandler,java.lang.Throwable,java.util.function.BiFunction,java.lang.Class):91:135 -> a
+    97:97:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.concat(java.lang.Object,java.lang.Object[]):88:88 -> a
+    97:97:java.lang.Exception failWithFakeEntry(com.android.tools.r8.DiagnosticsHandler,java.lang.Throwable,java.util.function.BiFunction,java.lang.Class):135 -> a
+    98:103:java.lang.Object[] com.android.tools.r8.com.google.common.collect.Platform.newArray(java.lang.Object[],int):37:42 -> a
+    98:103:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.newArray(java.lang.Object[],int):60 -> a
+    98:103:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.concat(java.lang.Object,java.lang.Object[]):88 -> a
+    98:103:java.lang.Exception failWithFakeEntry(com.android.tools.r8.DiagnosticsHandler,java.lang.Throwable,java.util.function.BiFunction,java.lang.Class):135 -> a
+    104:105:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.concat(java.lang.Object,java.lang.Object[]):89:90 -> a
+    104:105:java.lang.Exception failWithFakeEntry(com.android.tools.r8.DiagnosticsHandler,java.lang.Throwable,java.util.function.BiFunction,java.lang.Class):135 -> a
+    106:106:java.lang.Exception failWithFakeEntry(com.android.tools.r8.DiagnosticsHandler,java.lang.Throwable,java.util.function.BiFunction,java.lang.Class):135:135 -> a
+    107:111:void withMainProgramHandler(com.android.tools.r8.utils.ExceptionUtils$MainAction):177:181 -> a
+    112:112:void withMainProgramHandler(com.android.tools.r8.utils.ExceptionUtils$MainAction):179:179 -> a
+    113:113:boolean com.android.tools.r8.utils.ExceptionUtils.isExpectedException(java.lang.Throwable):199:199 -> a
+    113:113:java.lang.RuntimeException exitWithError(java.lang.Throwable,java.lang.Throwable):186 -> a
+    114:121:java.lang.RuntimeException exitWithError(java.lang.Throwable,java.lang.Throwable):188:195 -> a
+    122:122:java.lang.RuntimeException unwrapExecutionException(java.util.concurrent.ExecutionException):216:216 -> a
+    123:123:void withOriginAndPositionAttachmentHandler(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.Runnable):229:229 -> a
+    124:126:java.lang.Object com.android.tools.r8.utils.ExceptionUtils.withOriginAndPositionAttachmentHandler(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.util.function.Supplier):241:243 -> a
+    124:126:void withOriginAndPositionAttachmentHandler(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.Runnable):229 -> a
+    127:127:java.lang.Object lambda$withOriginAndPositionAttachmentHandler$1(java.lang.Runnable):233:233 -> a
+    128:130:java.lang.Object withOriginAndPositionAttachmentHandler(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.util.function.Supplier):241:243 -> a
     1:1:boolean com.android.tools.r8.utils.IdentifierUtils.isDexIdentifierPart(int):14:14 -> b
     1:1:boolean com.android.tools.r8.utils.IdentifierUtils.isDexIdentifierStart(int):10 -> b
-    2:2:com.android.tools.r8.position.Position access$100(java.lang.Throwable):25:25 -> b
+    2:2:com.android.tools.r8.position.Position access$100(java.lang.Throwable):26:26 -> b
     3:3:java.lang.String com.android.tools.r8.utils.MapUtils.lambda$toString$2(java.util.Map$Entry):40:40 -> b
     4:4:java.lang.String com.android.tools.r8.utils.MapUtils.toString(java.util.Map):40:40 -> b
     5:5:java.lang.String com.android.tools.r8.utils.MapUtils.toString(java.util.Map):39:39 -> b
     1:2:boolean com.android.tools.r8.utils.IdentifierUtils.isRelaxedDexIdentifierPart(int):18:19 -> c
-    3:4:com.android.tools.r8.origin.Origin getOrigin(java.lang.Throwable):131:132 -> c
-    5:11:com.android.tools.r8.origin.Origin com.android.tools.r8.utils.ExceptionUtils.extractIOExceptionOrigin(java.io.IOException):197:203 -> c
-    5:11:com.android.tools.r8.origin.Origin getOrigin(java.lang.Throwable):132 -> c
-    12:24:com.android.tools.r8.origin.Origin getOrigin(java.lang.Throwable):134:146 -> c
+    3:4:com.android.tools.r8.origin.Origin getOrigin(java.lang.Throwable):140:141 -> c
+    5:11:com.android.tools.r8.origin.Origin com.android.tools.r8.utils.ExceptionUtils.extractIOExceptionOrigin(java.io.IOException):206:212 -> c
+    5:11:com.android.tools.r8.origin.Origin getOrigin(java.lang.Throwable):141 -> c
+    12:24:com.android.tools.r8.origin.Origin getOrigin(java.lang.Throwable):143:155 -> c
     boolean com.android.tools.r8.utils.IdentifierUtils.isSimpleNameChar(int) -> d
-    1:10:com.android.tools.r8.position.Position getPosition(java.lang.Throwable):150:159 -> d
+    1:10:com.android.tools.r8.position.Position getPosition(java.lang.Throwable):159:168 -> d
     boolean com.android.tools.r8.utils.IdentifierUtils.isUnicodeSpace(int) -> e
-com.android.tools.r8.utils.ExceptionUtils$CompileAction -> com.android.tools.r8.internal.ca$a:
-com.android.tools.r8.utils.ExceptionUtils$MainAction -> com.android.tools.r8.internal.ca$b:
-com.android.tools.r8.utils.ExceptionUtils$OriginAttachmentException -> com.android.tools.r8.internal.da:
+com.android.tools.r8.utils.ExceptionUtils$CompileAction -> com.android.tools.r8.internal.da$a:
+com.android.tools.r8.utils.ExceptionUtils$MainAction -> com.android.tools.r8.internal.da$b:
+com.android.tools.r8.utils.ExceptionUtils$OriginAttachmentException -> com.android.tools.r8.internal.ea:
     com.android.tools.r8.origin.Origin origin -> a
     com.android.tools.r8.position.Position position -> b
-    1:3:void <init>(java.lang.RuntimeException,com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position):249:251 -> <init>
-    1:5:boolean com.android.tools.r8.utils.ExceptionUtils$OriginAttachmentException.needsAttachment(java.lang.RuntimeException,com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position):255:259 -> a
-    1:5:java.lang.RuntimeException wrap(java.lang.RuntimeException,com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position):243 -> a
-    6:6:java.lang.RuntimeException wrap(java.lang.RuntimeException,com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position):244:244 -> a
+    1:3:void <init>(java.lang.RuntimeException,com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position):258:260 -> <init>
+    1:5:boolean com.android.tools.r8.utils.ExceptionUtils$OriginAttachmentException.needsAttachment(java.lang.RuntimeException,com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position):264:268 -> a
+    1:5:java.lang.RuntimeException wrap(java.lang.RuntimeException,com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position):252 -> a
+    6:6:java.lang.RuntimeException wrap(java.lang.RuntimeException,com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position):253:253 -> a
 com.android.tools.r8.utils.FeatureClassMapping -> com.android.tools.r8.utils.FeatureClassMapping:
     java.util.Map parsedRules -> a
     java.util.Map parseNonClassRules -> b
@@ -77922,7 +77851,7 @@
 com.android.tools.r8.utils.FeatureClassMapping$SpecificationOrigin -> com.android.tools.r8.utils.FeatureClassMapping$e:
     1:1:void <init>(java.nio.file.Path):72:72 -> <init>
     1:1:java.lang.String part():77:77 -> part
-com.android.tools.r8.utils.FieldSignatureEquivalence -> com.android.tools.r8.internal.Ga:
+com.android.tools.r8.utils.FieldSignatureEquivalence -> com.android.tools.r8.internal.Ha:
     com.android.tools.r8.utils.FieldSignatureEquivalence INSTANCE_IGNORE_NAME -> b
     boolean ignoreName -> c
     com.android.tools.r8.utils.FieldSignatureEquivalence INSTANCE -> a
@@ -77936,7 +77865,7 @@
     7:10:int doHash(java.lang.Object):14 -> a
     11:11:com.android.tools.r8.utils.FieldSignatureEquivalence get():28:28 -> a
     1:1:com.android.tools.r8.utils.FieldSignatureEquivalence getEquivalenceIgnoreName():32:32 -> b
-com.android.tools.r8.utils.FileUtils -> com.android.tools.r8.internal.Ma:
+com.android.tools.r8.utils.FileUtils -> com.android.tools.r8.internal.Na:
     boolean isAndroid -> a
     boolean $assertionsDisabled -> b
     1:16:void <clinit>():21:36 -> <clinit>
@@ -77960,12 +77889,12 @@
 com.android.tools.r8.utils.FilteredArchiveClassFileProvider -> com.android.tools.r8.utils.m:
     1:1:void <init>(com.android.tools.r8.shaking.FilteredClassPath):13:13 -> <init>
     1:1:boolean lambda$new$0(com.android.tools.r8.shaking.FilteredClassPath,java.lang.String):13:13 -> a
-com.android.tools.r8.utils.FlagFile$FlagFileOrigin -> com.android.tools.r8.internal.Ta:
+com.android.tools.r8.utils.FlagFile$FlagFileOrigin -> com.android.tools.r8.internal.Ua:
     java.nio.file.Path path -> e
     1:2:void <init>(java.nio.file.Path):23:24 -> <init>
     1:1:java.lang.String part():29:29 -> part
-com.android.tools.r8.utils.ForEachable -> com.android.tools.r8.internal.eb:
-com.android.tools.r8.utils.HeapUtils -> com.android.tools.r8.internal.dc:
+com.android.tools.r8.utils.ForEachable -> com.android.tools.r8.internal.fb:
+com.android.tools.r8.utils.HeapUtils -> com.android.tools.r8.internal.ec:
     com.sun.management.HotSpotDiagnosticMXBean hotSpotDiagnosticMXBean -> a
     1:3:void com.android.tools.r8.utils.HeapUtils.initHotSpotMBean():19:21 -> a
     1:3:void dumpHeap(java.nio.file.Path,boolean):35 -> a
@@ -77975,29 +77904,29 @@
     6:8:void com.android.tools.r8.utils.HeapUtils.initHotSpotMBean():22:24 -> a
     6:8:void dumpHeap(java.nio.file.Path,boolean):35 -> a
     9:9:void dumpHeap(java.nio.file.Path,boolean):36:36 -> a
-com.android.tools.r8.utils.IROrdering -> com.android.tools.r8.internal.qc:
+com.android.tools.r8.utils.IROrdering -> com.android.tools.r8.internal.rc:
     java.lang.Iterable order(java.lang.Iterable) -> a
-com.android.tools.r8.utils.IROrdering$IdentityIROrdering -> com.android.tools.r8.internal.qc$a:
+com.android.tools.r8.utils.IROrdering$IdentityIROrdering -> com.android.tools.r8.internal.rc$a:
     com.android.tools.r8.utils.IROrdering$IdentityIROrdering INSTANCE -> a
     1:1:void <clinit>():25:25 -> <clinit>
     1:1:void <init>():27:27 -> <init>
     java.lang.Iterable order(java.lang.Iterable) -> a
     1:1:com.android.tools.r8.utils.IROrdering$IdentityIROrdering getInstance():30:30 -> a
-com.android.tools.r8.utils.IROrdering$NondeterministicIROrdering -> com.android.tools.r8.internal.qc$b:
+com.android.tools.r8.utils.IROrdering$NondeterministicIROrdering -> com.android.tools.r8.internal.rc$b:
     com.android.tools.r8.utils.IROrdering$NondeterministicIROrdering INSTANCE -> a
     1:1:void <clinit>():51:51 -> <clinit>
     1:1:void <init>():53:53 -> <init>
     1:1:com.android.tools.r8.utils.IROrdering$NondeterministicIROrdering getInstance():56:56 -> a
     2:3:java.util.List com.android.tools.r8.utils.IROrdering$NondeterministicIROrdering.order(java.lang.Iterable):61:62 -> a
     2:3:java.lang.Iterable order(java.lang.Iterable):49 -> a
-com.android.tools.r8.utils.IntBox -> com.android.tools.r8.internal.lf:
+com.android.tools.r8.utils.IntBox -> com.android.tools.r8.internal.mf:
     int value -> a
     1:1:void <init>():11:11 -> <init>
     2:3:void <init>(int):13:14 -> <init>
     1:1:int get():18:18 -> a
     2:2:void set(int):30:30 -> a
     1:1:int getAndIncrement():22:22 -> b
-com.android.tools.r8.utils.IntObjConsumer -> com.android.tools.r8.internal.Ef:
+com.android.tools.r8.utils.IntObjConsumer -> com.android.tools.r8.internal.Ff:
     void accept(int,java.lang.Object) -> a
 com.android.tools.r8.utils.InternalArchiveClassFileProvider -> com.android.tools.r8.utils.n:
     java.util.zip.ZipFile openedZipFile -> e
@@ -78022,7 +77951,7 @@
     25:25:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> getProgramResource
     25:25:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):96 -> getProgramResource
     26:26:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):96:96 -> getProgramResource
-com.android.tools.r8.utils.InternalOptions -> com.android.tools.r8.internal.dg:
+com.android.tools.r8.utils.InternalOptions -> com.android.tools.r8.internal.eg:
     boolean enableInitializedClassesInInstanceMethodsAnalysis -> f0
     boolean enableTreeShakingOfLibraryMethodOverrides -> P
     com.android.tools.r8.dex.Marker marker -> u0
@@ -78149,264 +78078,262 @@
     com.android.tools.r8.utils.OffOrAuto interfaceMethodDesugaring -> H0
     1:19:void <clinit>():92:110 -> <clinit>
     1:1:void <init>():140:140 -> <init>
-    2:674:void <init>():132:804 -> <init>
-    675:679:void <init>():141:145 -> <init>
-    680:680:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):149:149 -> <init>
-    681:1353:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):132:804 -> <init>
-    1354:1361:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):150:157 -> <init>
-    1362:1362:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):161:161 -> <init>
-    1363:2035:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):132:804 -> <init>
-    2036:2050:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):162:176 -> <init>
+    2:681:void <init>():132:811 -> <init>
+    682:686:void <init>():141:145 -> <init>
+    687:687:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):149:149 -> <init>
+    688:1367:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):132:811 -> <init>
+    1368:1375:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):150:157 -> <init>
+    1376:1376:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):161:161 -> <init>
+    1377:2056:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):132:811 -> <init>
+    2057:2071:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):162:176 -> <init>
     1:3:void disableAllOptimizations():191:193 -> A
     1:17:void disableGlobalOptimizations():197:213 -> B
-    1:1:void disableNameReflectionOptimization():1378:1378 -> C
+    1:1:void disableNameReflectionOptimization():1385:1385 -> C
     1:5:void enableProtoShrinking():181:185 -> D
-    1:9:java.util.Set getExtensiveInterfaceMethodMinifierLoggingFilter():656:664 -> E
-    1:9:java.util.Set getExtensiveLoggingFilter():630:638 -> F
-    1:1:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():378:378 -> G
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexIndexed():417:417 -> G
-    2:2:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():379 -> G
-    3:3:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():380:380 -> G
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():421:421 -> G
-    4:4:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():381 -> G
-    5:5:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():382:382 -> G
-    6:6:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():425:425 -> G
-    6:6:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():383 -> G
-    7:9:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():384:386 -> G
+    1:9:java.util.Set getExtensiveInterfaceMethodMinifierLoggingFilter():663:671 -> E
+    1:9:java.util.Set getExtensiveLoggingFilter():637:645 -> F
+    1:1:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():385:385 -> G
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexIndexed():424:424 -> G
+    2:2:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():386 -> G
+    3:3:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():387:387 -> G
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():428:428 -> G
+    4:4:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():388 -> G
+    5:5:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():389:389 -> G
+    6:6:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> G
+    6:6:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():390 -> G
+    7:9:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():391:393 -> G
     1:1:com.android.tools.r8.shaking.ProguardConfiguration getProguardConfiguration():125:125 -> H
-    1:1:boolean hasConsumer():374:374 -> I
-    1:1:boolean hasMethodsFilter():1096:1096 -> J
+    1:1:boolean hasConsumer():381:381 -> I
+    1:1:boolean hasMethodsFilter():1103:1103 -> J
     1:1:boolean hasProguardConfiguration():121:121 -> K
-    1:1:boolean hasUsageInformationConsumer():751:751 -> L
-    1:1:boolean isDesugaredLibraryCompilation():390:390 -> M
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():425:425 -> N
-    1:1:boolean isDesugaring():429 -> N
-    2:2:boolean isDesugaring():429:429 -> N
-    1:1:boolean isGeneratingClassFiles():425:425 -> O
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexIndexed():417:417 -> P
-    1:1:boolean isGeneratingDex():413 -> P
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():421:421 -> P
-    2:2:boolean isGeneratingDex():413 -> P
-    1:6:boolean isInterfaceMethodDesugaringEnabled():1458:1463 -> Q
-    1:1:boolean isKeepAttributesSignatureEnabled():558:558 -> R
-    1:3:boolean isMinifying():530:530 -> S
-    5:5:boolean isMinifying():532:532 -> S
-    1:1:boolean isRelease():520:520 -> T
-    1:2:boolean isRepackagingEnabled():547:548 -> U
-    1:3:boolean isShrinking():524:524 -> V
-    5:5:boolean isShrinking():526:526 -> V
-    1:1:boolean isStringSwitchConversionEnabled():1467:1467 -> W
-    1:2:boolean keepInnerClassStructure():576:577 -> X
-    1:1:com.android.tools.r8.utils.InternalOptions$KotlinOptimizationOptions kotlinOptimizationOptions():622:622 -> Y
-    1:32:boolean printWarnings():1021:1052 -> Z
-    33:72:boolean printWarnings():1048:1087 -> Z
+    1:1:boolean hasUsageInformationConsumer():758:758 -> L
+    1:1:boolean isDesugaredLibraryCompilation():397:397 -> M
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> N
+    1:1:boolean isDesugaring():436 -> N
+    2:2:boolean isDesugaring():436:436 -> N
+    1:1:boolean isGeneratingClassFiles():432:432 -> O
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexIndexed():424:424 -> P
+    1:1:boolean isGeneratingDex():420 -> P
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():428:428 -> P
+    2:2:boolean isGeneratingDex():420 -> P
+    1:6:boolean isInterfaceMethodDesugaringEnabled():1465:1470 -> Q
+    1:1:boolean isKeepAttributesSignatureEnabled():565:565 -> R
+    1:3:boolean isMinifying():537:537 -> S
+    5:5:boolean isMinifying():539:539 -> S
+    1:1:boolean isRelease():527:527 -> T
+    1:2:boolean isRepackagingEnabled():554:555 -> U
+    1:3:boolean isShrinking():531:531 -> V
+    5:5:boolean isShrinking():533:533 -> V
+    1:1:boolean isStringSwitchConversionEnabled():1474:1474 -> W
+    1:2:boolean keepInnerClassStructure():583:584 -> X
+    1:1:com.android.tools.r8.utils.InternalOptions$KotlinOptimizationOptions kotlinOptimizationOptions():629:629 -> Y
+    1:32:boolean printWarnings():1028:1059 -> Z
+    33:72:boolean printWarnings():1055:1094 -> Z
     boolean lambda$new$0(java.lang.String,java.lang.Long) -> a
-    1:2:void setMarker(com.android.tools.r8.dex.Marker):333:334 -> a
-    3:4:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):338:339 -> a
-    5:11:com.android.tools.r8.dex.Marker com.android.tools.r8.utils.InternalOptions.createMarker(com.android.tools.r8.dex.Marker$Tool):346:352 -> a
-    5:11:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):341 -> a
-    12:12:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():425:425 -> a
-    12:12:com.android.tools.r8.dex.Marker com.android.tools.r8.utils.InternalOptions.createMarker(com.android.tools.r8.dex.Marker$Tool):353 -> a
-    12:12:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):341 -> a
-    13:28:com.android.tools.r8.dex.Marker com.android.tools.r8.utils.InternalOptions.createMarker(com.android.tools.r8.dex.Marker$Tool):353:368 -> a
-    13:28:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):341 -> a
-    29:29:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getReference():375:375 -> a
-    29:29:com.android.tools.r8.references.MethodReference lambda$warningInvalidLibrarySuperclassForDesugar$1(com.android.tools.r8.graph.DexEncodedMethod):962 -> a
-    30:30:com.android.tools.r8.references.MethodReference lambda$warningInvalidLibrarySuperclassForDesugar$1(com.android.tools.r8.graph.DexEncodedMethod):962:962 -> a
-    31:31:boolean assertionsEnabled():791:791 -> a
-    32:32:void errorMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):807:807 -> a
-    33:33:void errorMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):829:829 -> a
-    34:40: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):923:929 -> a
-    41:41: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):924:924 -> a
-    42:43:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):936:937 -> a
-    44:44:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():580:580 -> a
-    44:44:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):939 -> a
-    45:51:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):939:945 -> a
-    52:52:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):937:937 -> a
-    53:60:void warningInvalidLibrarySuperclassForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String,java.util.Set):955:962 -> a
-    61:61:void warningInvalidLibrarySuperclassForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String,java.util.Set):956:956 -> a
-    62:65:void warningMissingEnclosingMember(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,com.android.tools.r8.cf.CfVersion):967:970 -> a
-    66:70:void warningInvalidParameterAnnotations(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.origin.Origin,int,int):975:979 -> a
-    71:77:void warningInvalidDebugInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):984:990 -> a
-    78:78:void warningInvalidDebugInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):985:985 -> a
-    79:79:java.util.List lambda$warningInvalidDebugInfo$4(com.android.tools.r8.origin.Origin):989:989 -> a
-    80:80:boolean hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1382:1382 -> a
-    81:81:boolean canUseConstClassInstructions(com.android.tools.r8.cf.CfVersion):1402:1402 -> a
-    82:82:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():425:425 -> a
-    82:82:boolean canUseConstClassInstructions(com.android.tools.r8.cf.CfVersion):1402 -> a
-    83:84:boolean canUseConstClassInstructions(com.android.tools.r8.cf.CfVersion):1402:1403 -> a
-    1:1:com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions protoShrinking():618:618 -> a0
-    1:1:com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions callSiteOptimizationOptions():614:614 -> b
-    2:4:java.lang.String messageErrorMissingNestHost(com.android.tools.r8.graph.DexClass):863:865 -> b
-    5:10:java.lang.String messageErrorIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):879:884 -> b
+    1:2:void setMarker(com.android.tools.r8.dex.Marker):340:341 -> a
+    3:4:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):345:346 -> a
+    5:11:com.android.tools.r8.dex.Marker com.android.tools.r8.utils.InternalOptions.createMarker(com.android.tools.r8.dex.Marker$Tool):353:359 -> a
+    5:11:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):348 -> a
+    12:12:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> a
+    12:12:com.android.tools.r8.dex.Marker com.android.tools.r8.utils.InternalOptions.createMarker(com.android.tools.r8.dex.Marker$Tool):360 -> a
+    12:12:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):348 -> a
+    13:28:com.android.tools.r8.dex.Marker com.android.tools.r8.utils.InternalOptions.createMarker(com.android.tools.r8.dex.Marker$Tool):360:375 -> a
+    13:28:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):348 -> a
+    29:29:boolean assertionsEnabled():798:798 -> a
+    30:30:void errorMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):814:814 -> a
+    31:31:void errorMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):836:836 -> a
+    32:38: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):930:936 -> a
+    39:39: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):931:931 -> a
+    40:41:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):943:944 -> a
+    42:42:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():584:584 -> a
+    42:42:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):946 -> a
+    43:49:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):946:952 -> a
+    50:50:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):944:944 -> a
+    51:58:void warningInvalidLibrarySuperclassForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String,java.util.Set):962:969 -> a
+    59:59:void warningInvalidLibrarySuperclassForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String,java.util.Set):963:963 -> a
+    60:60:com.android.tools.r8.references.MethodReference lambda$warningInvalidLibrarySuperclassForDesugar$1(com.android.tools.r8.graph.DexEncodedMethod):969:969 -> a
+    61:64:void warningMissingEnclosingMember(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,com.android.tools.r8.cf.CfVersion):974:977 -> a
+    65:69:void warningInvalidParameterAnnotations(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.origin.Origin,int,int):982:986 -> a
+    70:76:void warningInvalidDebugInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):991:997 -> a
+    77:77:void warningInvalidDebugInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):992:992 -> a
+    78:78:java.util.List lambda$warningInvalidDebugInfo$4(com.android.tools.r8.origin.Origin):996:996 -> a
+    79:79:boolean hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1389:1389 -> a
+    80:80:boolean canUseConstClassInstructions(com.android.tools.r8.cf.CfVersion):1409:1409 -> a
+    81:81:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> a
+    81:81:boolean canUseConstClassInstructions(com.android.tools.r8.cf.CfVersion):1409 -> a
+    82:83:boolean canUseConstClassInstructions(com.android.tools.r8.cf.CfVersion):1409:1410 -> a
+    1:1:com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions protoShrinking():625:625 -> a0
+    1:1:com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions callSiteOptimizationOptions():621:621 -> b
+    2:4:java.lang.String messageErrorMissingNestHost(com.android.tools.r8.graph.DexClass):870:872 -> b
+    5:10:java.lang.String messageErrorIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):886:891 -> b
     11:11:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> b
-    11:11:java.lang.String messageErrorIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):884 -> b
-    12:12:java.lang.String messageErrorIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):886:886 -> b
+    11:11:java.lang.String messageErrorIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):891 -> b
+    12:12:java.lang.String messageErrorIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):893:893 -> b
     13:13:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> b
-    13:13:java.lang.String messageErrorIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):887 -> b
-    14:18:java.lang.String messageErrorIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):888:892 -> b
+    13:13:java.lang.String messageErrorIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):894 -> b
+    14:18:java.lang.String messageErrorIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):895:899 -> b
     19:19:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> b
-    19:19:java.lang.String messageErrorIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):892 -> b
-    20:41:java.lang.String messageErrorIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):892:913 -> b
-    42:42:java.util.List lambda$warningInvalidParameterAnnotations$3(com.android.tools.r8.origin.Origin):978:978 -> b
-    43:48:boolean methodMatchesFilter(com.android.tools.r8.graph.DexEncodedMethod):1101:1106 -> b
-    1:1:com.android.tools.r8.cf.CfVersion requiredCfVersionForConstClassInstructions():1407:1407 -> b0
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():425:425 -> b0
-    2:2:com.android.tools.r8.cf.CfVersion requiredCfVersionForConstClassInstructions():1407 -> b0
-    3:4:com.android.tools.r8.cf.CfVersion requiredCfVersionForConstClassInstructions():1407:1408 -> b0
-    1:1:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):845:845 -> c
+    19:19:java.lang.String messageErrorIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):899 -> b
+    20:41:java.lang.String messageErrorIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):899:920 -> b
+    42:42:java.util.List lambda$warningInvalidParameterAnnotations$3(com.android.tools.r8.origin.Origin):985:985 -> b
+    43:48:boolean methodMatchesFilter(com.android.tools.r8.graph.DexEncodedMethod):1108:1113 -> b
+    1:1:com.android.tools.r8.cf.CfVersion requiredCfVersionForConstClassInstructions():1414:1414 -> b0
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> b0
+    2:2:com.android.tools.r8.cf.CfVersion requiredCfVersionForConstClassInstructions():1414 -> b0
+    3:4:com.android.tools.r8.cf.CfVersion requiredCfVersionForConstClassInstructions():1414:1415 -> b0
+    1:1:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):852:852 -> c
     2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> c
-    2:2:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):846 -> c
-    3:3:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):847:847 -> c
+    2:2:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):853 -> c
+    3:3:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):854:854 -> c
     4:4:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> c
-    4:4:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):849 -> c
-    5:5:void com.android.tools.r8.utils.InternalOptions.errorMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):829:829 -> c
-    5:5:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):850 -> c
-    6:7:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):854:855 -> c
-    8:8:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():580:580 -> c
-    8:8:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):857 -> c
-    9:9:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):857:857 -> c
-    10:10:java.lang.String com.android.tools.r8.utils.InternalOptions.messageWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):917:917 -> c
-    10:10:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):859 -> c
-    11:11:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):859:859 -> c
-    12:12:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):855:855 -> c
-    13:15:java.lang.String messageWarningMissingNestHost(com.android.tools.r8.graph.DexClass):872:874 -> c
-    16:16:java.util.List lambda$warningMissingEnclosingMember$2(com.android.tools.r8.origin.Origin):969:969 -> c
-    17:17:boolean canHaveArtCheckCastVerifierBug():1792:1792 -> c
-    1:1:boolean shouldBackportMethods():398:398 -> c0
+    4:4:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):856 -> c
+    5:5:void com.android.tools.r8.utils.InternalOptions.errorMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):836:836 -> c
+    5:5:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):857 -> c
+    6:7:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):861:862 -> c
+    8:8:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():584:584 -> c
+    8:8:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):864 -> c
+    9:9:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):864:864 -> c
+    10:10:java.lang.String com.android.tools.r8.utils.InternalOptions.messageWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):924:924 -> c
+    10:10:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):866 -> c
+    11:11:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):866:866 -> c
+    12:12:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):862:862 -> c
+    13:15:java.lang.String messageWarningMissingNestHost(com.android.tools.r8.graph.DexClass):879:881 -> c
+    16:16:java.util.List lambda$warningMissingEnclosingMember$2(com.android.tools.r8.origin.Origin):976:976 -> c
+    17:17:boolean canHaveArtCheckCastVerifierBug():1799:1799 -> c
+    1:1:boolean shouldBackportMethods():405:405 -> c0
     1:1:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> d
-    1:1:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):818 -> d
-    2:2:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):821:821 -> d
-    3:3:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():580:580 -> d
-    3:3:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):823 -> d
-    4:6:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):823:825 -> d
-    7:7:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):821:821 -> d
-    8:8:void com.android.tools.r8.utils.InternalOptions.errorMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):807:807 -> d
-    8:8:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):819 -> d
-    9:9:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):833:833 -> d
+    1:1:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):825 -> d
+    2:2:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):828:828 -> d
+    3:3:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():584:584 -> d
+    3:3:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):830 -> d
+    4:6:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):830:832 -> d
+    7:7:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):828:828 -> d
+    8:8:void com.android.tools.r8.utils.InternalOptions.errorMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):814:814 -> d
+    8:8:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):826 -> d
+    9:9:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):840:840 -> d
     10:10:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> d
-    10:10:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):834 -> d
+    10:10:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):841 -> d
     11:11:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> d
-    11:11:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):835 -> d
-    12:12:void com.android.tools.r8.utils.InternalOptions.errorMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):829:829 -> d
-    12:12:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):836 -> d
-    13:13:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):840:840 -> d
-    14:14:java.lang.String com.android.tools.r8.utils.InternalOptions.messageWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):917:917 -> d
-    14:14:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):840 -> d
-    15:15:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):840:840 -> d
-    16:17:boolean canHaveArtInstanceOfVerifierBug():1747:1748 -> d
-    1:4:boolean shouldDesugarNests():467:470 -> d0
+    11:11:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):842 -> d
+    12:12:void com.android.tools.r8.utils.InternalOptions.errorMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):836:836 -> d
+    12:12:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):843 -> d
+    13:13:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):847:847 -> d
+    14:14:java.lang.String com.android.tools.r8.utils.InternalOptions.messageWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):924:924 -> d
+    14:14:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):847 -> d
+    15:15:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):847:847 -> d
+    16:17:boolean canHaveArtInstanceOfVerifierBug():1754:1755 -> d
+    1:4:boolean shouldDesugarNests():474:477 -> d0
     1:1:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> e
-    1:1:void warningMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):811 -> e
-    2:2:void warningMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):814:814 -> e
-    3:3:void com.android.tools.r8.utils.InternalOptions.errorMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):807:807 -> e
-    3:3:void warningMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):812 -> e
-    4:4:boolean canHaveDalvikAbstractMethodOnNonAbstractClassVerificationBug():1824:1824 -> e
-    1:1:boolean shouldKeepStackMapTable():402:402 -> e0
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isRelocatorCompilation():394:394 -> e0
-    2:2:boolean shouldKeepStackMapTable():402 -> e0
-    3:4:boolean shouldKeepStackMapTable():402:403 -> e0
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.isRelocatorCompilation():394:394 -> e0
-    5:5:boolean shouldKeepStackMapTable():404 -> e0
-    6:6:boolean shouldKeepStackMapTable():405:405 -> e0
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():425:425 -> f
-    1:1:boolean canHaveDalvikCatchHandlerVerificationBug():1816 -> f
-    2:2:boolean canHaveDalvikCatchHandlerVerificationBug():1816:1816 -> f
-    1:1:boolean shouldRerunEnqueuer():409:409 -> f0
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():425:425 -> g
-    1:1:boolean canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():1838 -> g
-    2:2:boolean canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():1838:1838 -> g
-    1:18:void signalFinishedToConsumers():445:462 -> g0
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():425:425 -> h
-    1:1:boolean canInitCauseAfterAssertionErrorObjectConstructor():1494 -> h
-    2:2:boolean canInitCauseAfterAssertionErrorObjectConstructor():1494:1494 -> h
-    1:1:boolean canLeaveStaticInterfaceMethodInvokes():1440:1440 -> i
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():425:425 -> j
-    1:1:boolean canUseAssertionErrorTwoArgumentConstructor():1484 -> j
-    2:2:boolean canUseAssertionErrorTwoArgumentConstructor():1484:1484 -> j
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():425:425 -> k
-    1:1:boolean canUseConstantMethodHandle():1420 -> k
-    2:2:boolean canUseConstantMethodHandle():1420:1420 -> k
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():425:425 -> l
-    1:1:boolean canUseConstantMethodType():1424 -> l
-    2:2:boolean canUseConstantMethodType():1424:1424 -> l
-    1:1:boolean canUseDefaultAndStaticInterfaceMethods():1432:1432 -> m
-    1:2:boolean canUseFilledNewArrayOfObjects():1506:1507 -> n
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():425:425 -> o
-    1:1:boolean canUseInvokeCustom():1428 -> o
-    2:2:boolean canUseInvokeCustom():1428:1428 -> o
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():425:425 -> p
-    1:1:boolean canUseInvokePolymorphic():1416 -> p
-    2:2:boolean canUseInvokePolymorphic():1416:1416 -> p
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():425:425 -> q
-    1:1:boolean canUseInvokePolymorphicOnVarHandle():1412 -> q
-    2:2:boolean canUseInvokePolymorphicOnVarHandle():1412:1412 -> q
-    1:2:boolean canUseMultidex():1471:1472 -> r
-    1:1:boolean canUseNestBasedAccess():1436:1436 -> s
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():425:425 -> t
-    1:1:boolean canUseNotInstruction():1542 -> t
-    2:2:boolean canUseNotInstruction():1542:1542 -> t
-    1:1:boolean canUsePrivateInterfaceMethods():1448:1448 -> u
-    1:1:boolean canUseRequireNonNull():1476:1476 -> v
-    1:2:boolean canUseSameArrayAndResultRegisterInArrayGetWide():1515:1516 -> w
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():425:425 -> x
-    1:1:boolean canUseSuppressedExceptions():1480 -> x
-    2:2:boolean canUseSuppressedExceptions():1480:1480 -> x
-    1:1:boolean canUseTwrCloseResourceMethod():1444:1444 -> y
+    1:1:void warningMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):818 -> e
+    2:2:void warningMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):821:821 -> e
+    3:3:void com.android.tools.r8.utils.InternalOptions.errorMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):814:814 -> e
+    3:3:void warningMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):819 -> e
+    4:4:boolean canHaveDalvikAbstractMethodOnNonAbstractClassVerificationBug():1831:1831 -> e
+    1:1:boolean shouldKeepStackMapTable():409:409 -> e0
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isRelocatorCompilation():401:401 -> e0
+    2:2:boolean shouldKeepStackMapTable():409 -> e0
+    3:4:boolean shouldKeepStackMapTable():409:410 -> e0
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.isRelocatorCompilation():401:401 -> e0
+    5:5:boolean shouldKeepStackMapTable():411 -> e0
+    6:6:boolean shouldKeepStackMapTable():412:412 -> e0
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> f
+    1:1:boolean canHaveDalvikCatchHandlerVerificationBug():1823 -> f
+    2:2:boolean canHaveDalvikCatchHandlerVerificationBug():1823:1823 -> f
+    1:1:boolean shouldRerunEnqueuer():416:416 -> f0
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> g
+    1:1:boolean canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():1845 -> g
+    2:2:boolean canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():1845:1845 -> g
+    1:18:void signalFinishedToConsumers():452:469 -> g0
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> h
+    1:1:boolean canInitCauseAfterAssertionErrorObjectConstructor():1501 -> h
+    2:2:boolean canInitCauseAfterAssertionErrorObjectConstructor():1501:1501 -> h
+    1:1:boolean canLeaveStaticInterfaceMethodInvokes():1447:1447 -> i
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> j
+    1:1:boolean canUseAssertionErrorTwoArgumentConstructor():1491 -> j
+    2:2:boolean canUseAssertionErrorTwoArgumentConstructor():1491:1491 -> j
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> k
+    1:1:boolean canUseConstantMethodHandle():1427 -> k
+    2:2:boolean canUseConstantMethodHandle():1427:1427 -> k
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> l
+    1:1:boolean canUseConstantMethodType():1431 -> l
+    2:2:boolean canUseConstantMethodType():1431:1431 -> l
+    1:1:boolean canUseDefaultAndStaticInterfaceMethods():1439:1439 -> m
+    1:2:boolean canUseFilledNewArrayOfObjects():1513:1514 -> n
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> o
+    1:1:boolean canUseInvokeCustom():1435 -> o
+    2:2:boolean canUseInvokeCustom():1435:1435 -> o
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> p
+    1:1:boolean canUseInvokePolymorphic():1423 -> p
+    2:2:boolean canUseInvokePolymorphic():1423:1423 -> p
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> q
+    1:1:boolean canUseInvokePolymorphicOnVarHandle():1419 -> q
+    2:2:boolean canUseInvokePolymorphicOnVarHandle():1419:1419 -> q
+    1:2:boolean canUseMultidex():1478:1479 -> r
+    1:1:boolean canUseNestBasedAccess():1443:1443 -> s
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> t
+    1:1:boolean canUseNotInstruction():1549 -> t
+    2:2:boolean canUseNotInstruction():1549:1549 -> t
+    1:1:boolean canUsePrivateInterfaceMethods():1455:1455 -> u
+    1:1:boolean canUseRequireNonNull():1483:1483 -> v
+    1:2:boolean canUseSameArrayAndResultRegisterInArrayGetWide():1522:1523 -> w
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> x
+    1:1:boolean canUseSuppressedExceptions():1487 -> x
+    2:2:boolean canUseSuppressedExceptions():1487:1487 -> x
+    1:1:boolean canUseTwrCloseResourceMethod():1451:1451 -> y
     1:1:com.android.tools.r8.graph.DexItemFactory dexItemFactory():117:117 -> z
-com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions -> com.android.tools.r8.internal.dg$a:
+com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions -> com.android.tools.r8.internal.eg$a:
     boolean $assertionsDisabled -> a
     boolean enableConstantPropagation -> b
     boolean enableTypePropagation -> c
-    1:1:void <clinit>():1160:1160 -> <clinit>
-    1:11:void <init>():1160:1170 -> <init>
-    1:2:void com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions.disableOptimization():1173:1174 -> a
-    1:2:void access$000(com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions):1160 -> a
-    3:3:void disableTypePropagationForTesting():1178:1178 -> a
-    4:5:void enableConstantPropagationForTesting(com.android.tools.r8.utils.InternalOptions):1184:1185 -> a
-    1:1:boolean isConstantPropagationEnabled():1197:1197 -> b
-    1:1:boolean isEnabled():1193:1193 -> c
-    1:1:boolean isTypePropagationEnabled():1201:1201 -> d
-com.android.tools.r8.utils.InternalOptions$DesugarState -> com.android.tools.r8.internal.dg$b:
+    1:1:void <clinit>():1167:1167 -> <clinit>
+    1:11:void <init>():1167:1177 -> <init>
+    1:2:void com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions.disableOptimization():1180:1181 -> a
+    1:2:void access$000(com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions):1167 -> a
+    3:3:void disableTypePropagationForTesting():1185:1185 -> a
+    4:5:void enableConstantPropagationForTesting(com.android.tools.r8.utils.InternalOptions):1191:1192 -> a
+    1:1:boolean isConstantPropagationEnabled():1204:1204 -> b
+    1:1:boolean isEnabled():1200:1200 -> c
+    1:1:boolean isTypePropagationEnabled():1208:1208 -> d
+com.android.tools.r8.utils.InternalOptions$DesugarState -> com.android.tools.r8.internal.eg$b:
     com.android.tools.r8.utils.InternalOptions$DesugarState ON -> b
     com.android.tools.r8.utils.InternalOptions$DesugarState OFF -> a
     1:2:void <clinit>():104:105 -> <clinit>
     1:1:void <init>(java.lang.String,int):103:103 -> <init>
-com.android.tools.r8.utils.InternalOptions$InvalidParameterAnnotationInfo -> com.android.tools.r8.internal.dg$c:
+com.android.tools.r8.utils.InternalOptions$InvalidParameterAnnotationInfo -> com.android.tools.r8.internal.eg$c:
     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):708:711 -> <init>
-com.android.tools.r8.utils.InternalOptions$KotlinOptimizationOptions -> com.android.tools.r8.internal.dg$d:
+    1:4:void <init>(com.android.tools.r8.graph.DexMethod,int,int):715:718 -> <init>
+com.android.tools.r8.utils.InternalOptions$KotlinOptimizationOptions -> com.android.tools.r8.internal.eg$d:
     boolean disableKotlinSpecificOptimizations -> a
-    1:3:void <init>():1155:1157 -> <init>
-com.android.tools.r8.utils.InternalOptions$LineNumberOptimization -> com.android.tools.r8.internal.dg$e:
+    1:3:void <init>():1162:1164 -> <init>
+com.android.tools.r8.utils.InternalOptions$LineNumberOptimization -> com.android.tools.r8.internal.eg$e:
     com.android.tools.r8.utils.InternalOptions$LineNumberOptimization ON -> b
     com.android.tools.r8.utils.InternalOptions$LineNumberOptimization OFF -> a
     1:2:void <clinit>():99:100 -> <clinit>
     1:1:void <init>(java.lang.String,int):98:98 -> <init>
-com.android.tools.r8.utils.InternalOptions$OutlineOptions -> com.android.tools.r8.internal.dg$f:
+com.android.tools.r8.utils.InternalOptions$OutlineOptions -> com.android.tools.r8.internal.eg$f:
     int threshold -> d
     boolean enabled -> a
     int minSize -> b
     int maxSize -> c
-    1:9:void <init>():1144:1152 -> <init>
-com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode -> com.android.tools.r8.internal.dg$g:
+    1:9:void <init>():1151:1159 -> <init>
+com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode -> com.android.tools.r8.internal.eg$g:
     com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode FLATTEN -> c
     com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode REPACKAGE -> b
     com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode NONE -> a
-    1:5:void <clinit>():1121:1125 -> <clinit>
-    1:1:void <init>(java.lang.String,int):1119:1119 -> <init>
-    1:1:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isNone():1128:1128 -> a
-    1:1:boolean isSome():1140 -> a
-com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions -> com.android.tools.r8.internal.dg$h:
+    1:5:void <clinit>():1128:1132 -> <clinit>
+    1:1:void <init>(java.lang.String,int):1126:1126 -> <init>
+    1:1:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isNone():1135:1135 -> a
+    1:1:boolean isSome():1147 -> a
+com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions -> com.android.tools.r8.internal.eg$h:
     boolean enableGeneratedExtensionRegistryShrinking -> a
     boolean enableGeneratedMessageLiteShrinking -> b
     boolean enableGeneratedMessageLiteBuilderShrinking -> c
     boolean traverseOneOfAndRepeatedProtoFields -> d
-    1:6:void <init>():1205:1210 -> <init>
-    1:1:boolean isProtoShrinkingEnabled():1214:1214 -> a
-com.android.tools.r8.utils.InternalOptions$TestingOptions -> com.android.tools.r8.internal.dg$i:
+    1:6:void <init>():1212:1217 -> <init>
+    1:1:boolean isProtoShrinkingEnabled():1221:1221 -> a
+com.android.tools.r8.utils.InternalOptions$TestingOptions -> com.android.tools.r8.internal.eg$i:
     boolean allowCheckDiscardedErrors -> m
     java.util.function.BiConsumer unboxedEnumsConsumer -> i
     boolean assertConsistentRenamingOfSignature -> P
@@ -78467,29 +78394,23 @@
     java.util.function.Consumer waveModifier -> k
     boolean placeExceptionalBlocksLast -> B
     java.util.function.Consumer callSiteOptimizationInfoInspector -> g0
-    1:151:void <init>():1221:1371 -> <init>
+    1:151:void <init>():1228:1378 -> <init>
     void lambda$new$1(java.util.Deque) -> a
-    1:2:com.android.tools.r8.repackaging.Repackaging$RepackagingConfiguration lambda$new$0(com.android.tools.r8.graph.AppView):1243:1244 -> a
-com.android.tools.r8.utils.InternalOptions$TestingOptions$MinifierTestingOptions -> com.android.tools.r8.internal.dg$i$a:
+    1:2:com.android.tools.r8.repackaging.Repackaging$RepackagingConfiguration lambda$new$0(com.android.tools.r8.graph.AppView):1250:1251 -> a
+com.android.tools.r8.utils.InternalOptions$TestingOptions$MinifierTestingOptions -> com.android.tools.r8.internal.eg$i$a:
     java.util.Comparator interfaceMethodOrdering -> a
-    1:3:void <init>():1345:1347 -> <init>
-    1:2:java.util.Comparator getInterfaceMethodOrderingOrDefault(java.util.Comparator):1351:1352 -> 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):1353:1353 -> a
-    4:4:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getReference():375:375 -> a
-    4:4:int lambda$getInterfaceMethodOrderingOrDefault$0(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):1353 -> a
-    5:5:int lambda$getInterfaceMethodOrderingOrDefault$0(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):1353:1353 -> a
-    6:6:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getReference():375:375 -> a
-    6:6:int lambda$getInterfaceMethodOrderingOrDefault$0(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):1353 -> a
-    7:7:int lambda$getInterfaceMethodOrderingOrDefault$0(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):1353:1353 -> a
-com.android.tools.r8.utils.InternalOptions$TestingOptions$ProguardIfRuleEvaluationData -> com.android.tools.r8.internal.dg$i$b:
+    1:3:void <init>():1352:1354 -> <init>
+    1:2:java.util.Comparator getInterfaceMethodOrderingOrDefault(java.util.Comparator):1358:1359 -> 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):1360:1360 -> a
+com.android.tools.r8.utils.InternalOptions$TestingOptions$ProguardIfRuleEvaluationData -> com.android.tools.r8.internal.eg$i$b:
     int numberOfProguardIfRuleMemberEvaluations -> b
     int numberOfProguardIfRuleClassEvaluations -> a
-    1:4:void <init>():1363:1366 -> <init>
-com.android.tools.r8.utils.InternalOptions$TypeVersionPair -> com.android.tools.r8.internal.dg$j:
+    1:4:void <init>():1370:1373 -> <init>
+com.android.tools.r8.utils.InternalOptions$TypeVersionPair -> com.android.tools.r8.internal.eg$j:
     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):720:722 -> <init>
-com.android.tools.r8.utils.InternalOutputMode -> com.android.tools.r8.internal.eg:
+    1:3:void <init>(com.android.tools.r8.cf.CfVersion,com.android.tools.r8.graph.DexType):727:729 -> <init>
+com.android.tools.r8.utils.InternalOutputMode -> com.android.tools.r8.internal.fg:
     com.android.tools.r8.utils.InternalOutputMode DexIndexed -> a
     com.android.tools.r8.utils.InternalOutputMode DexFilePerClassFile -> b
     com.android.tools.r8.utils.InternalOutputMode ClassFile -> c
@@ -78497,7 +78418,7 @@
     1:1:void <init>(java.lang.String,int):7:7 -> <init>
     1:1:boolean isGeneratingClassFiles():13:13 -> a
     1:1:boolean isGeneratingDex():17:17 -> b
-com.android.tools.r8.utils.IterableUtils -> com.android.tools.r8.internal.Cg:
+com.android.tools.r8.utils.IterableUtils -> com.android.tools.r8.internal.Dg:
     1:1:java.lang.Iterable filter(java.lang.Iterable,java.util.function.Predicate):39:39 -> a
     2:2:int size(java.lang.Iterable):44:44 -> a
     3:3:java.util.Iterator lambda$singleton$1(java.lang.Object):61:61 -> a
@@ -78509,7 +78430,7 @@
     1:1:java.util.Iterator lambda$filter$0(java.lang.Iterable,java.util.function.Predicate):39:39 -> c
     2:23:java.util.Iterator com.android.tools.r8.utils.IteratorUtils.filter(java.util.Iterator,java.util.function.Predicate):0:21 -> c
     2:23:java.util.Iterator lambda$filter$0(java.lang.Iterable,java.util.function.Predicate):39 -> c
-com.android.tools.r8.utils.IteratorUtils -> com.android.tools.r8.internal.Hg:
+com.android.tools.r8.utils.IteratorUtils -> com.android.tools.r8.internal.Ig:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:java.util.Iterator filter(java.util.Iterator,java.util.function.Predicate):21:21 -> a
@@ -78517,7 +78438,7 @@
     6:18:boolean anyRemainingMatch(java.util.ListIterator,java.util.function.Predicate):104:116 -> a
     1:3:java.lang.Object peekPrevious(java.util.ListIterator):54:56 -> b
     4:7:void removeIf(java.util.Iterator,java.util.function.Predicate):81:84 -> b
-com.android.tools.r8.utils.IteratorUtils$1 -> com.android.tools.r8.internal.Gg:
+com.android.tools.r8.utils.IteratorUtils$1 -> com.android.tools.r8.internal.Hg:
     java.util.Iterator val$iterator -> b
     java.util.function.Predicate val$predicate -> c
     java.lang.Object next -> a
@@ -78526,7 +78447,7 @@
     1:3:java.lang.Object advance():27:29 -> l
     1:5:java.lang.Object next():43:47 -> next
     6:6:java.lang.Object next():45:45 -> next
-com.android.tools.r8.utils.LRUCacheTable -> com.android.tools.r8.internal.jl:
+com.android.tools.r8.utils.LRUCacheTable -> com.android.tools.r8.internal.kl:
     int columnCapacity -> b
     int rowCapacity -> a
     1:3:void <init>(int,int,float):31:33 -> <init>
@@ -78534,15 +78455,15 @@
     2:3:java.lang.Object put(java.lang.Object,java.lang.Object,java.lang.Object):46:47 -> a
     1:1:com.android.tools.r8.utils.LRUCacheTable create(int,int):37:37 -> b
     1:1:boolean removeEldestEntry(java.util.Map$Entry):42:42 -> removeEldestEntry
-com.android.tools.r8.utils.LRUCacheTable$LRUCacheRow -> com.android.tools.r8.internal.il:
+com.android.tools.r8.utils.LRUCacheTable$LRUCacheRow -> com.android.tools.r8.internal.jl:
     int columnCapacity -> a
     1:2:void <init>(int,float):17:18 -> <init>
     1:1:boolean removeEldestEntry(java.util.Map$Entry):23:23 -> removeEldestEntry
-com.android.tools.r8.utils.LazyBox -> com.android.tools.r8.internal.Sl:
+com.android.tools.r8.utils.LazyBox -> com.android.tools.r8.internal.Tl:
     java.util.function.Supplier supplier -> b
     1:2:void <init>(java.util.function.Supplier):13:14 -> <init>
     1:1:java.lang.Object computeIfAbsent():18:18 -> c
-com.android.tools.r8.utils.LebUtils -> com.android.tools.r8.internal.am:
+com.android.tools.r8.utils.LebUtils -> com.android.tools.r8.internal.bm:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():10:10 -> <clinit>
     1:6:int parseSleb128(com.android.tools.r8.dex.BinaryReader):65:70 -> a
@@ -78553,7 +78474,7 @@
     17:21:void putUleb128(com.android.tools.r8.dex.DexOutputBuffer,int):48:52 -> b
     1:1:int sizeAsSleb128(int):110:110 -> c
     1:1:int sizeAsUleb128(int):57:57 -> d
-com.android.tools.r8.utils.LibraryClassCollection -> com.android.tools.r8.internal.cm:
+com.android.tools.r8.utils.LibraryClassCollection -> com.android.tools.r8.internal.dm:
     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
@@ -78563,7 +78484,7 @@
     6:6:com.android.tools.r8.graph.DexClass resolveClassConflict(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):13 -> a
     1:1:com.android.tools.r8.graph.ClassKind getClassKind():34:34 -> c
     1:1:java.lang.String toString():39:39 -> toString
-com.android.tools.r8.utils.LineNumberOptimizer -> com.android.tools.r8.internal.wm:
+com.android.tools.r8.utils.LineNumberOptimizer -> com.android.tools.r8.internal.xm:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():63:63 -> <clinit>
     1:1:void access$1200(int,int,com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):63:63 -> a
@@ -78575,7 +78496,7 @@
     33: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):306:324 -> a
     52:52:boolean com.android.tools.r8.utils.LineNumberOptimizer.verifyMethodsAreKeptDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,java.util.List):456:456 -> a
     52:52:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):324 -> a
-    53:53:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():425:425 -> a
+    53:53:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> a
     53:53:boolean com.android.tools.r8.utils.LineNumberOptimizer.verifyMethodsAreKeptDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,java.util.List):456 -> a
     53:53:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):324 -> a
     54:65:boolean com.android.tools.r8.utils.LineNumberOptimizer.verifyMethodsAreKeptDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,java.util.List):459:470 -> a
@@ -78583,7 +78504,7 @@
     66:66: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):0:0 -> a
     66:66:boolean com.android.tools.r8.utils.LineNumberOptimizer.verifyMethodsAreKeptDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,java.util.List):470 -> a
     66:66:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):324 -> a
-    67:67:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():542:542 -> a
+    67:67:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():549:549 -> a
     67:67: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):154 -> a
     67:67:boolean com.android.tools.r8.utils.LineNumberOptimizer.verifyMethodsAreKeptDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,java.util.List):470 -> a
     67:67:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):324 -> a
@@ -78593,7 +78514,7 @@
     69:84:boolean com.android.tools.r8.utils.LineNumberOptimizer.verifyMethodsAreKeptDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,java.util.List):474:489 -> a
     69: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):324 -> a
     85:104:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):328:347 -> a
-    105:105:boolean com.android.tools.r8.utils.InternalOptions.canUseDexPcAsDebugInformation():1453:1453 -> a
+    105:105:boolean com.android.tools.r8.utils.InternalOptions.canUseDexPcAsDebugInformation():1460:1460 -> a
     105:105:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):347 -> a
     106:106:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):347:347 -> a
     107:110:void com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositionsForPc(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):731:734 -> a
@@ -78640,7 +78561,7 @@
     445:447:boolean doesContainPositions(com.android.tools.r8.graph.CfCode):605:607 -> a
     1:4:com.android.tools.r8.ir.code.Position remapAndAdd(com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):822:825 -> b
     5:8:void remapAndAddForPc(int,int,com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):837:840 -> b
-com.android.tools.r8.utils.LineNumberOptimizer$1 -> com.android.tools.r8.internal.om:
+com.android.tools.r8.utils.LineNumberOptimizer$1 -> com.android.tools.r8.internal.pm:
     com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper val$positionRemapper -> j
     com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter val$positionEventEmitter -> i
     com.android.tools.r8.utils.Box val$inlinedOriginalPosition -> l
@@ -78658,7 +78579,7 @@
     20:21:void visit(com.android.tools.r8.graph.DexDebugEvent$EndLocal):698:699 -> a
     22:23:void visit(com.android.tools.r8.graph.DexDebugEvent$RestartLocal):704:705 -> a
     1:3:void flushPc():644:646 -> f
-com.android.tools.r8.utils.LineNumberOptimizer$2 -> com.android.tools.r8.internal.pm:
+com.android.tools.r8.utils.LineNumberOptimizer$2 -> com.android.tools.r8.internal.qm:
     com.android.tools.r8.utils.Pair val$lastPosition -> h
     com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper val$positionRemapper -> i
     java.util.List val$mappedPositions -> j
@@ -78668,11 +78589,11 @@
     1:7:void visit(com.android.tools.r8.graph.DexDebugEvent$Default):740:746 -> a
     8:21:void visit(com.android.tools.r8.graph.DexDebugEvent$Default):743:756 -> a
     22:22:void visit(com.android.tools.r8.graph.DexDebugEvent$Default):751:751 -> a
-com.android.tools.r8.utils.LineNumberOptimizer$IdentityPositionRemapper -> com.android.tools.r8.internal.qm:
+com.android.tools.r8.utils.LineNumberOptimizer$IdentityPositionRemapper -> com.android.tools.r8.internal.rm:
     1:1:void <init>():71:71 -> <init>
     2:2:void <init>(com.android.tools.r8.utils.LineNumberOptimizer$1):71:71 -> <init>
     1:1:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):75:75 -> a
-com.android.tools.r8.utils.LineNumberOptimizer$KotlinInlineFunctionPositionRemapper -> com.android.tools.r8.internal.rm:
+com.android.tools.r8.utils.LineNumberOptimizer$KotlinInlineFunctionPositionRemapper -> com.android.tools.r8.internal.sm:
     com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result parsedData -> h
     com.android.tools.r8.graph.DexItemFactory factory -> c
     java.util.Map parsedKotlinSourceDebugExtensions -> d
@@ -78703,7 +78624,7 @@
     40:42:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):158 -> a
     43:53:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):159:169 -> a
     54:68:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):166:180 -> a
-com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition -> com.android.tools.r8.internal.sm:
+com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition -> com.android.tools.r8.internal.tm:
     int obfuscatedLine -> d
     int originalLine -> b
     com.android.tools.r8.ir.code.Position caller -> c
@@ -78714,7 +78635,7 @@
     1:1:int access$400(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):251:251 -> b
     1:1:com.android.tools.r8.graph.DexMethod access$500(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):251:251 -> c
     1:1:com.android.tools.r8.ir.code.Position access$600(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):251:251 -> d
-com.android.tools.r8.utils.LineNumberOptimizer$OptimizingPositionRemapper -> com.android.tools.r8.internal.tm:
+com.android.tools.r8.utils.LineNumberOptimizer$OptimizingPositionRemapper -> com.android.tools.r8.internal.um:
     int previousSourceLine -> d
     int nextOptimizedLineNumber -> e
     boolean $assertionsDisabled -> a
@@ -78724,7 +78645,7 @@
     1:1:void <init>(com.android.tools.r8.utils.InternalOptions):85:85 -> <init>
     2:10:void <init>(com.android.tools.r8.utils.InternalOptions):81:89 -> <init>
     1:15:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):94:108 -> a
-com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter -> com.android.tools.r8.internal.um:
+com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter -> com.android.tools.r8.internal.vm:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.DexMethod method -> d
     int previousPc -> e
@@ -78742,13 +78663,14 @@
     3:16:void access$1000(com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter,int,com.android.tools.r8.ir.code.Position):207 -> a
     17:18:int com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter.getStartLine():245:246 -> a
     17:18:int access$1100(com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter):207 -> a
-com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper -> com.android.tools.r8.internal.vm:
+com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper -> com.android.tools.r8.internal.wm:
     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.Em:
+com.android.tools.r8.utils.ListUtils -> com.android.tools.r8.internal.Fm:
     1:1:java.lang.Object first(java.util.List):17:17 -> a
     2:3:int lastIndexMatching(java.util.List,java.util.function.Predicate):34:35 -> a
     4:6:java.util.List map(java.util.Collection,java.util.function.Function):43:45 -> a
-com.android.tools.r8.utils.LongInterval -> com.android.tools.r8.internal.gn:
+    1:1:java.lang.Object last(java.util.List):30:30 -> b
+com.android.tools.r8.utils.LongInterval -> com.android.tools.r8.internal.hn:
     long min -> b
     long max -> c
     boolean $assertionsDisabled -> a
@@ -78764,7 +78686,7 @@
     1:2:boolean equals(java.lang.Object):66:67 -> equals
     1:1:int hashCode():58:58 -> hashCode
     1:1:java.lang.String toString():74:74 -> toString
-com.android.tools.r8.utils.MainDexListParser -> com.android.tools.r8.internal.wn:
+com.android.tools.r8.utils.MainDexListParser -> com.android.tools.r8.internal.xn:
     1:9:com.android.tools.r8.graph.DexType parseEntry(java.lang.String,com.android.tools.r8.graph.DexItemFactory):21:29 -> a
     10:10:com.android.tools.r8.graph.DexType parseEntry(java.lang.String,com.android.tools.r8.graph.DexItemFactory):26:26 -> a
     11:11:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
@@ -78779,7 +78701,7 @@
     36:36:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
     36:36:java.util.Set parseList(com.android.tools.r8.StringResource,com.android.tools.r8.graph.DexItemFactory):37 -> a
     37:37:java.util.Set parseList(com.android.tools.r8.StringResource,com.android.tools.r8.graph.DexItemFactory) -> a
-com.android.tools.r8.utils.MethodJavaSignatureEquivalence -> com.android.tools.r8.internal.zo:
+com.android.tools.r8.utils.MethodJavaSignatureEquivalence -> com.android.tools.r8.internal.Ao:
     com.android.tools.r8.utils.MethodJavaSignatureEquivalence INSTANCE -> a
     com.android.tools.r8.utils.MethodJavaSignatureEquivalence INSTANCE_IGNORE_NAME -> b
     boolean ignoreName -> c
@@ -78793,7 +78715,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.MethodSignatureEquivalence -> com.android.tools.r8.internal.Io:
+com.android.tools.r8.utils.MethodSignatureEquivalence -> com.android.tools.r8.internal.Jo:
     com.android.tools.r8.utils.MethodSignatureEquivalence INSTANCE_IGNORE_NAME -> b
     com.android.tools.r8.utils.MethodSignatureEquivalence INSTANCE -> a
     boolean ignoreName -> c
@@ -78807,7 +78729,7 @@
     7:10:int doHash(java.lang.Object):14 -> a
     11:11:com.android.tools.r8.utils.MethodSignatureEquivalence get():28:28 -> a
     1:1:com.android.tools.r8.utils.MethodSignatureEquivalence getEquivalenceIgnoreName():32:32 -> b
-com.android.tools.r8.utils.OffOrAuto -> com.android.tools.r8.internal.Er:
+com.android.tools.r8.utils.OffOrAuto -> com.android.tools.r8.internal.Gr:
     com.android.tools.r8.utils.OffOrAuto Auto -> b
     com.android.tools.r8.utils.OffOrAuto Off -> a
     com.android.tools.r8.utils.OffOrAuto[] $VALUES -> c
@@ -78828,7 +78750,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.Mr:
+com.android.tools.r8.utils.OptionalBool -> com.android.tools.r8.internal.Or:
     com.android.tools.r8.utils.OptionalBool UNKNOWN -> e
     com.android.tools.r8.utils.OptionalBool TRUE -> c
     com.android.tools.r8.utils.OptionalBool FALSE -> d
@@ -78837,15 +78759,15 @@
     com.android.tools.r8.utils.OptionalBool asOptionalBool() -> a
     1:1:com.android.tools.r8.utils.OptionalBool of(boolean):54:54 -> a
     1:1:int hashCode():73:73 -> hashCode
-com.android.tools.r8.utils.OptionalBool$1 -> com.android.tools.r8.internal.Mr$a:
+com.android.tools.r8.utils.OptionalBool$1 -> com.android.tools.r8.internal.Or$a:
     1:1:void <init>():10:10 -> <init>
     boolean isTrue() -> f
-com.android.tools.r8.utils.OptionalBool$2 -> com.android.tools.r8.internal.Mr$b:
+com.android.tools.r8.utils.OptionalBool$2 -> com.android.tools.r8.internal.Or$b:
     1:1:void <init>():24:24 -> <init>
     boolean isFalse() -> c
-com.android.tools.r8.utils.OptionalBool$3 -> com.android.tools.r8.internal.Mr$c:
+com.android.tools.r8.utils.OptionalBool$3 -> com.android.tools.r8.internal.Or$c:
     1:1:void <init>():38:38 -> <init>
-com.android.tools.r8.utils.OptionsParsing -> com.android.tools.r8.internal.Nr:
+com.android.tools.r8.utils.OptionsParsing -> com.android.tools.r8.internal.Pr:
     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
@@ -78853,14 +78775,14 @@
     19:19:java.lang.String tryParseSingle(com.android.tools.r8.utils.OptionsParsing$ParseContext,java.lang.String,java.lang.String):41:41 -> a
     20:27:java.lang.Boolean tryParseBoolean(com.android.tools.r8.utils.OptionsParsing$ParseContext,java.lang.String):60:67 -> a
     1:11:java.util.List tryParseMulti(com.android.tools.r8.utils.OptionsParsing$ParseContext,java.lang.String):18:28 -> b
-com.android.tools.r8.utils.OptionsParsing$ParseContext -> com.android.tools.r8.internal.Nr$a:
+com.android.tools.r8.utils.OptionsParsing$ParseContext -> com.android.tools.r8.internal.Pr$a:
     java.lang.String[] args -> a
     int nextIndex -> b
     1:1:void <init>(java.lang.String[]):76:76 -> <init>
     2:5:void <init>(java.lang.String[]):74:77 -> <init>
     1:1:java.lang.String head():81:81 -> a
     1:5:java.lang.String next():85:89 -> b
-com.android.tools.r8.utils.OriginWithPosition -> com.android.tools.r8.internal.Qr:
+com.android.tools.r8.utils.OriginWithPosition -> com.android.tools.r8.internal.Sr:
     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>
@@ -78868,14 +78790,14 @@
     1:1:com.android.tools.r8.position.Position getPosition():24:24 -> b
     1:3:boolean equals(java.lang.Object):34:36 -> equals
     1:1:int hashCode():29:29 -> hashCode
-com.android.tools.r8.utils.OutputBuilder -> com.android.tools.r8.internal.ds:
+com.android.tools.r8.utils.OutputBuilder -> com.android.tools.r8.internal.fs:
     void addDirectory(java.lang.String,com.android.tools.r8.DiagnosticsHandler) -> a
     void addFile(java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler) -> a
     void addFile(java.lang.String,com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler) -> a
     void addIndexedClassFile(int,java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler) -> a
     void close(com.android.tools.r8.DiagnosticsHandler) -> a
     java.nio.file.Path getPath() -> a
-com.android.tools.r8.utils.Pair -> com.android.tools.r8.internal.js:
+com.android.tools.r8.utils.Pair -> com.android.tools.r8.internal.ls:
     java.lang.Object second -> b
     java.lang.Object first -> a
     1:3:void <init>(java.lang.Object,java.lang.Object):23:25 -> <init>
@@ -78885,7 +78807,7 @@
     2:2:void setSecond(java.lang.Object):41:41 -> b
     1:1:boolean equals(java.lang.Object):51:51 -> equals
     1:1:int hashCode():46:46 -> hashCode
-com.android.tools.r8.utils.PredicateSet -> com.android.tools.r8.internal.Hs:
+com.android.tools.r8.utils.PredicateSet -> com.android.tools.r8.internal.Js:
     java.util.List predicates -> b
     java.util.Set elements -> a
     1:4:void <init>():14:17 -> <init>
@@ -78893,7 +78815,7 @@
     2:2:void addPredicate(java.util.function.Predicate):24:24 -> a
     3:9:com.android.tools.r8.utils.PredicateSet rewriteItems(java.util.function.Function):28:34 -> a
     1:5:boolean contains(java.lang.Object):39:43 -> b
-com.android.tools.r8.utils.PreloadedClassFileProvider -> com.android.tools.r8.internal.Ss:
+com.android.tools.r8.utils.PreloadedClassFileProvider -> com.android.tools.r8.internal.Us:
     java.util.Map content -> a
     1:1:void <init>(java.util.Map,com.android.tools.r8.utils.PreloadedClassFileProvider$1):19:19 -> <init>
     2:3:void <init>(java.util.Map):37:38 -> <init>
@@ -78912,8 +78834,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.Ss$a:
-com.android.tools.r8.utils.PreloadedClassFileProvider$Builder -> com.android.tools.r8.internal.Ss$b:
+com.android.tools.r8.utils.PreloadedClassFileProvider$1 -> com.android.tools.r8.internal.Us$a:
+com.android.tools.r8.utils.PreloadedClassFileProvider$Builder -> com.android.tools.r8.internal.Us$b:
     java.util.Map content -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():74:74 -> <clinit>
@@ -78922,11 +78844,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.Ss$c:
+com.android.tools.r8.utils.PreloadedClassFileProvider$ClassDescriptorOrigin -> com.android.tools.r8.internal.Us$c:
     java.lang.String descriptor -> e
     1:2:void <init>(java.lang.String):25:26 -> <init>
     1:1:java.lang.String part():31:31 -> part
-com.android.tools.r8.utils.ProgramClassCollection -> com.android.tools.r8.internal.at:
+com.android.tools.r8.utils.ProgramClassCollection -> com.android.tools.r8.internal.ct:
     com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver conflictResolver -> e
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():18:18 -> <clinit>
@@ -78951,13 +78873,13 @@
     23:23:com.android.tools.r8.graph.DexProgramClass lambda$defaultConflictResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):69 -> a
     24:24:com.android.tools.r8.graph.DexProgramClass lambda$defaultConflictResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):71:71 -> a
     1:3:java.lang.RuntimeException reportDuplicateTypes(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):77:79 -> b
-    4:4:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():580:580 -> b
+    4:4:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():584:584 -> b
     4:4:java.lang.RuntimeException reportDuplicateTypes(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):80 -> b
     5:5:java.lang.RuntimeException reportDuplicateTypes(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):80:80 -> b
     6:6:java.lang.RuntimeException reportDuplicateTypes(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):77:77 -> b
     1:1:com.android.tools.r8.graph.ClassKind getClassKind():57:57 -> c
     1:1:java.lang.String toString():42:42 -> toString
-com.android.tools.r8.utils.ProgramMethodEquivalence -> com.android.tools.r8.internal.gt:
+com.android.tools.r8.utils.ProgramMethodEquivalence -> com.android.tools.r8.internal.it:
     com.android.tools.r8.utils.ProgramMethodEquivalence INSTANCE -> a
     1:1:void <clinit>():12:12 -> <clinit>
     1:1:void <init>():14:14 -> <init>
@@ -78968,7 +78890,7 @@
     4:4:int com.android.tools.r8.utils.ProgramMethodEquivalence.doHash(com.android.tools.r8.graph.ProgramMethod):27:27 -> a
     4:4:int doHash(java.lang.Object):10 -> a
     5:5:com.android.tools.r8.utils.ProgramMethodEquivalence get():17:17 -> a
-com.android.tools.r8.utils.Reporter -> com.android.tools.r8.internal.Yw:
+com.android.tools.r8.utils.Reporter -> com.android.tools.r8.internal.ax:
     java.util.List diagnosticsLevelMapping -> b
     com.android.tools.r8.DiagnosticsHandler clientHandler -> a
     com.android.tools.r8.utils.AbortException abort -> c
@@ -78991,15 +78913,15 @@
     1:1:void error(com.android.tools.r8.Diagnostic):102:102 -> error
     1:1:void info(com.android.tools.r8.Diagnostic):84:84 -> info
     1:1:void warning(com.android.tools.r8.Diagnostic):93:93 -> warning
-com.android.tools.r8.utils.Reporter$1 -> com.android.tools.r8.internal.Yw$a:
+com.android.tools.r8.utils.Reporter$1 -> com.android.tools.r8.internal.ax$a:
     1:1:void <init>():49:49 -> <init>
-com.android.tools.r8.utils.Reporter$DiagnosticsLevelMapping -> com.android.tools.r8.internal.Yw$b:
+com.android.tools.r8.utils.Reporter$DiagnosticsLevelMapping -> com.android.tools.r8.internal.ax$b:
     com.android.tools.r8.DiagnosticsLevel from -> a
     com.android.tools.r8.DiagnosticsLevel to -> b
     java.lang.String diagnosticsClassName -> c
     1:4:void <init>(com.android.tools.r8.DiagnosticsLevel,com.android.tools.r8.DiagnosticsLevel,java.lang.String):25:28 -> <init>
     1:7:com.android.tools.r8.DiagnosticsLevel map(com.android.tools.r8.DiagnosticsLevel,com.android.tools.r8.Diagnostic):32:38 -> a
-com.android.tools.r8.utils.SegmentTree -> com.android.tools.r8.internal.wx:
+com.android.tools.r8.utils.SegmentTree -> com.android.tools.r8.internal.yx:
     java.util.TreeMap internalTree -> b
     int size -> d
     boolean $assertionsDisabled -> a
@@ -79012,7 +78934,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.xx:
+com.android.tools.r8.utils.SemanticVersion -> com.android.tools.r8.internal.zx:
     int minor -> b
     int patch -> c
     int major -> a
@@ -79028,11 +78950,11 @@
     1:5:boolean equals(java.lang.Object):68:72 -> equals
     1:1:int hashCode():77:77 -> hashCode
     1:1:java.lang.String toString():82:82 -> toString
-com.android.tools.r8.utils.SingletonEquivalence -> com.android.tools.r8.internal.ey:
+com.android.tools.r8.utils.SingletonEquivalence -> com.android.tools.r8.internal.gy:
     1:1:void <init>():11:11 -> <init>
     boolean doEquivalent(java.lang.Object,java.lang.Object) -> a
     int doHash(java.lang.Object) -> a
-com.android.tools.r8.utils.StreamUtils -> com.android.tools.r8.internal.Py:
+com.android.tools.r8.utils.StreamUtils -> com.android.tools.r8.internal.Ry:
     1:2:byte[] StreamToByteArrayClose(java.io.InputStream):16:17 -> a
 com.android.tools.r8.utils.StringDiagnostic -> com.android.tools.r8.utils.StringDiagnostic:
     com.android.tools.r8.origin.Origin origin -> b
@@ -79046,7 +78968,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.pz:
+com.android.tools.r8.utils.StringUtils -> com.android.tools.r8.internal.rz:
     char[] EMPTY_CHAR_ARRAY -> a
     java.lang.String LINE_SEPARATOR -> c
     java.lang.String[] EMPTY_ARRAY -> b
@@ -79084,7 +79006,7 @@
     1:9:java.lang.String toASCIIString(java.lang.String):53:61 -> c
     1:9:java.lang.String trim(java.lang.String):292:300 -> d
     1:5:java.lang.String withNativeLineSeparator(java.lang.String):159:163 -> e
-com.android.tools.r8.utils.StringUtils$BraceType -> com.android.tools.r8.internal.pz$a:
+com.android.tools.r8.utils.StringUtils$BraceType -> com.android.tools.r8.internal.rz$a:
     com.android.tools.r8.utils.StringUtils$BraceType SQUARE -> b
     com.android.tools.r8.utils.StringUtils$BraceType TUBORG -> c
     com.android.tools.r8.utils.StringUtils$BraceType PARENS -> a
@@ -79093,7 +79015,7 @@
     1:4:void <clinit>():26:29 -> <clinit>
     5:5:void <clinit>():25:25 -> <clinit>
     1:1:void <init>(java.lang.String,int):25:25 -> <init>
-com.android.tools.r8.utils.SymbolGenerationUtils -> com.android.tools.r8.internal.Mz:
+com.android.tools.r8.utils.SymbolGenerationUtils -> com.android.tools.r8.internal.Oz:
     char[] IDENTIFIER_CHARACTERS -> b
     boolean $assertionsDisabled -> e
     java.util.Set PRIMITIVE_TYPE_NAMES -> a
@@ -79102,7 +79024,7 @@
     1:15:void <clinit>():13:27 -> <clinit>
     1:1:java.lang.String numberToIdentifier(int,com.android.tools.r8.utils.SymbolGenerationUtils$MixedCasing):31:31 -> a
     2:35:java.lang.String numberToIdentifier(int,com.android.tools.r8.utils.SymbolGenerationUtils$MixedCasing,char[],boolean):43:76 -> a
-com.android.tools.r8.utils.SymbolGenerationUtils$MixedCasing -> com.android.tools.r8.internal.Mz$a:
+com.android.tools.r8.utils.SymbolGenerationUtils$MixedCasing -> com.android.tools.r8.internal.Oz$a:
     com.android.tools.r8.utils.SymbolGenerationUtils$MixedCasing DONT_USE_MIXED_CASE -> b
     com.android.tools.r8.utils.SymbolGenerationUtils$MixedCasing USE_MIXED_CASE -> a
     1:2:void <clinit>():16:17 -> <clinit>
@@ -79139,32 +79061,32 @@
     2:2:java.util.concurrent.ExecutorService getExecutorServiceForProcessors(int):159:159 -> b
     3:3:java.util.concurrent.ExecutorService getExecutorServiceForThreads(int):166:166 -> b
     3:3:java.util.concurrent.ExecutorService getExecutorServiceForProcessors(int):160 -> b
-com.android.tools.r8.utils.ThrowingBiConsumer -> com.android.tools.r8.internal.mA:
-com.android.tools.r8.utils.ThrowingBiFunction -> com.android.tools.r8.internal.nA:
-com.android.tools.r8.utils.ThrowingCharIterator -> com.android.tools.r8.internal.oA:
+com.android.tools.r8.utils.ThrowingBiConsumer -> com.android.tools.r8.internal.oA:
+com.android.tools.r8.utils.ThrowingBiFunction -> com.android.tools.r8.internal.pA:
+com.android.tools.r8.utils.ThrowingCharIterator -> com.android.tools.r8.internal.qA:
     char nextChar() -> a
-com.android.tools.r8.utils.ThrowingConsumer -> com.android.tools.r8.internal.pA:
-com.android.tools.r8.utils.ThrowingFunction -> com.android.tools.r8.internal.qA:
-com.android.tools.r8.utils.ThrowingIntIterator -> com.android.tools.r8.internal.rA:
+com.android.tools.r8.utils.ThrowingConsumer -> com.android.tools.r8.internal.rA:
+com.android.tools.r8.utils.ThrowingFunction -> com.android.tools.r8.internal.sA:
+com.android.tools.r8.utils.ThrowingIntIterator -> com.android.tools.r8.internal.tA:
     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.sA:
+com.android.tools.r8.utils.ThrowingIntSupplier -> com.android.tools.r8.internal.uA:
     int getAsInt() -> a
-com.android.tools.r8.utils.ThrowingIterator -> com.android.tools.r8.internal.tA:
+com.android.tools.r8.utils.ThrowingIterator -> com.android.tools.r8.internal.vA:
     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.uA:
-com.android.tools.r8.utils.ThrowingReferenceIntFunction -> com.android.tools.r8.internal.vA:
+com.android.tools.r8.utils.ThrowingReferenceIntConsumer -> com.android.tools.r8.internal.wA:
+com.android.tools.r8.utils.ThrowingReferenceIntFunction -> com.android.tools.r8.internal.xA:
     java.lang.Object apply(java.lang.Object,int) -> a
-com.android.tools.r8.utils.ThrowingSupplier -> com.android.tools.r8.internal.wA:
-com.android.tools.r8.utils.Timing -> com.android.tools.r8.internal.yA:
+com.android.tools.r8.utils.ThrowingSupplier -> com.android.tools.r8.internal.yA:
+com.android.tools.r8.utils.Timing -> com.android.tools.r8.internal.AA:
     java.util.Stack stack -> d
     com.android.tools.r8.utils.Timing EMPTY -> a
     com.android.tools.r8.utils.Timing$Node top -> c
@@ -79209,20 +79131,20 @@
     1:1:boolean access$800(com.android.tools.r8.utils.Timing):25:25 -> c
     2:3:void end():374:375 -> c
     1:6:void report():379:384 -> d
-com.android.tools.r8.utils.Timing$1 -> com.android.tools.r8.internal.yA$a:
+com.android.tools.r8.utils.Timing$1 -> com.android.tools.r8.internal.AA$a:
     1:1:void <init>(java.lang.String,boolean):30:30 -> <init>
     void begin(java.lang.String) -> a
     1:1:com.android.tools.r8.utils.Timing$TimingMerger beginMerger(java.lang.String,int):33:33 -> a
     void end() -> c
     void report() -> d
-com.android.tools.r8.utils.Timing$1$1 -> com.android.tools.r8.internal.xA:
+com.android.tools.r8.utils.Timing$1$1 -> com.android.tools.r8.internal.zA:
     1:1:void <init>(com.android.tools.r8.utils.Timing$1,java.lang.String,int,com.android.tools.r8.utils.Timing):33:33 -> <init>
     void add(java.util.Collection) -> a
     void end() -> a
-com.android.tools.r8.utils.Timing$MemInfo -> com.android.tools.r8.internal.yA$b:
+com.android.tools.r8.utils.Timing$MemInfo -> com.android.tools.r8.internal.AA$b:
     long used -> a
     1:2:void <init>(long):101:102 -> <init>
-com.android.tools.r8.utils.Timing$Node -> com.android.tools.r8.internal.yA$c:
+com.android.tools.r8.utils.Timing$Node -> com.android.tools.r8.internal.AA$c:
     java.util.Map children -> d
     long start_time -> f
     long duration -> e
@@ -79285,7 +79207,7 @@
     4:4:java.lang.String com.android.tools.r8.utils.Timing.access$300(long):25 -> toString
     4:4:java.lang.String toString():156 -> toString
     5:5:java.lang.String toString():156:156 -> toString
-com.android.tools.r8.utils.Timing$TimingMerger -> com.android.tools.r8.internal.yA$d:
+com.android.tools.r8.utils.Timing$TimingMerger -> com.android.tools.r8.internal.AA$d:
     com.android.tools.r8.utils.Timing$Node merged -> c
     int taskCount -> d
     com.android.tools.r8.utils.Timing$Node slowest -> e
@@ -79301,7 +79223,7 @@
     24:24:com.android.tools.r8.utils.Timing$Node lambda$add$0(boolean,java.lang.String):305:305 -> a
     25:26:void end():315:316 -> a
     1:1:int access$900(com.android.tools.r8.utils.Timing$TimingMerger):225:225 -> b
-com.android.tools.r8.utils.Timing$TimingMerger$1 -> com.android.tools.r8.internal.zA:
+com.android.tools.r8.utils.Timing$TimingMerger$1 -> com.android.tools.r8.internal.BA:
     boolean $assertionsDisabled -> i
     int val$numberOfThreads -> j
     com.android.tools.r8.utils.Timing$TimingMerger this$0 -> k
@@ -79320,24 +79242,24 @@
     39:39:void lambda$report$0(int,java.lang.String,com.android.tools.r8.utils.Timing$Node):259:259 -> a
     1:1:void lambda$report$1(int,java.lang.String,com.android.tools.r8.utils.Timing$Node):264:264 -> b
     1:1:java.lang.String toString():270:270 -> toString
-com.android.tools.r8.utils.Timing$TimingMerger$Item -> com.android.tools.r8.internal.AA:
+com.android.tools.r8.utils.Timing$TimingMerger$Item -> com.android.tools.r8.internal.CA:
     com.android.tools.r8.utils.Timing$Node mergeTarget -> a
     com.android.tools.r8.utils.Timing$Node mergeSource -> b
     1:3:void <init>(com.android.tools.r8.utils.Timing$Node,com.android.tools.r8.utils.Timing$Node):279:281 -> <init>
-com.android.tools.r8.utils.TraversalContinuation -> com.android.tools.r8.internal.LA:
+com.android.tools.r8.utils.TraversalContinuation -> com.android.tools.r8.internal.MA:
     com.android.tools.r8.utils.TraversalContinuation CONTINUE -> a
     com.android.tools.r8.utils.TraversalContinuation BREAK -> b
     1:2:void <clinit>():8:9 -> <clinit>
     1:1:void <init>(java.lang.String,int):7:7 -> <init>
     1:1:boolean shouldBreak():12:12 -> a
     1:1:boolean shouldContinue():16:16 -> b
-com.android.tools.r8.utils.TriConsumer -> com.android.tools.r8.internal.OA:
+com.android.tools.r8.utils.TriConsumer -> com.android.tools.r8.internal.PA:
     void accept(java.lang.Object,java.lang.Object,java.lang.Object) -> a
-com.android.tools.r8.utils.TriFunction -> com.android.tools.r8.internal.PA:
+com.android.tools.r8.utils.TriFunction -> com.android.tools.r8.internal.QA:
     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.QA:
+com.android.tools.r8.utils.TriPredicate -> com.android.tools.r8.internal.RA:
     boolean test(java.lang.Object,java.lang.Object,java.lang.Object) -> a
-com.android.tools.r8.utils.VersionProperties -> com.android.tools.r8.internal.zC:
+com.android.tools.r8.utils.VersionProperties -> com.android.tools.r8.internal.AC:
     com.android.tools.r8.utils.VersionProperties INSTANCE -> a
     java.lang.String sha -> c
     boolean $assertionsDisabled -> b
@@ -79356,7 +79278,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.NC:
+com.android.tools.r8.utils.Visibility -> com.android.tools.r8.internal.OC:
     com.android.tools.r8.utils.Visibility[] $VALUES -> e
     com.android.tools.r8.utils.Visibility PUBLIC -> a
     com.android.tools.r8.utils.Visibility PROTECTED -> b
@@ -79367,7 +79289,7 @@
     1:1:void <init>(java.lang.String,int):9:9 -> <init>
     1:1:com.android.tools.r8.utils.Visibility[] values():9:9 -> a
     1:15:java.lang.String toString():33:47 -> toString
-com.android.tools.r8.utils.WorkList -> com.android.tools.r8.internal.dD:
+com.android.tools.r8.utils.WorkList -> com.android.tools.r8.internal.eD:
     java.util.Deque workingList -> b
     java.util.Set seen -> c
     boolean $assertionsDisabled -> a
@@ -79387,7 +79309,7 @@
     1:2:com.android.tools.r8.utils.WorkList newEqualityWorkList(java.lang.Iterable):24:25 -> d
     3:4:java.lang.Object next():92:93 -> d
     1:2:com.android.tools.r8.utils.WorkList newIdentityWorkList(java.lang.Iterable):40:41 -> e
-com.android.tools.r8.utils.WorkList$EqualityTest -> com.android.tools.r8.internal.dD$a:
+com.android.tools.r8.utils.WorkList$EqualityTest -> com.android.tools.r8.internal.eD$a:
     com.android.tools.r8.utils.WorkList$EqualityTest IDENTITY -> b
     com.android.tools.r8.utils.WorkList$EqualityTest HASH -> a
     1:2:void <clinit>():101:102 -> <clinit>
@@ -79440,7 +79362,7 @@
     1:1:java.util.Set keySet():33:33 -> c
     2:2:boolean hasValue(java.lang.Object):41:41 -> c
     1:1:java.util.Set lambda$put$1(java.lang.Object):70:70 -> d
-com.android.tools.r8.utils.collections.ImmutableDeque -> com.android.tools.r8.internal.Ec:
+com.android.tools.r8.utils.collections.ImmutableDeque -> com.android.tools.r8.internal.Fc:
     boolean isClosed -> a
     1:1:void <init>(java.util.Collection):20:20 -> <init>
     2:2:void <init>(java.util.Collection):17:17 -> <init>
@@ -79464,7 +79386,7 @@
     1:1:boolean removeIf(java.util.function.Predicate):73:73 -> removeIf
     1:1:java.lang.Object removeLast():83:83 -> removeLast
     1:1:boolean removeLastOccurrence(java.lang.Object):78:78 -> removeLastOccurrence
-com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap -> com.android.tools.r8.internal.Kc:
+com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap -> com.android.tools.r8.internal.Lc:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap sortedMap -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap$1):17:17 -> <init>
     2:3:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap):21:22 -> <init>
@@ -79530,13 +79452,13 @@
     1:1:java.util.SortedMap tailMap(java.lang.Object):17:17 -> tailMap
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap.tailMap(java.lang.Integer):135:135 -> tailMap
     2:2:java.util.SortedMap tailMap(java.lang.Object):17 -> tailMap
-com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap$1 -> com.android.tools.r8.internal.Ic:
-com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap$Builder -> com.android.tools.r8.internal.Jc:
+com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap$1 -> com.android.tools.r8.internal.Jc:
+com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap$Builder -> com.android.tools.r8.internal.Kc:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap sortedMap -> a
     1:3:void <init>():41:43 -> <init>
     1:1:com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap$Builder put(int,java.lang.Object):46:46 -> a
     2:2:com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap build():51:51 -> a
-com.android.tools.r8.utils.collections.LongLivedProgramMethodMultisetBuilder -> com.android.tools.r8.internal.jn:
+com.android.tools.r8.utils.collections.LongLivedProgramMethodMultisetBuilder -> com.android.tools.r8.internal.kn:
     com.android.tools.r8.com.google.common.collect.Multiset backing -> a
     1:1:void <init>():19:19 -> <init>
     2:2:void <init>():17:17 -> <init>
@@ -79550,7 +79472,7 @@
     7:7:void lambda$build$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.ProgramMethodMultiset,com.android.tools.r8.graph.DexMethod,int):38 -> a
     8:9:void lambda$build$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.ProgramMethodMultiset,com.android.tools.r8.graph.DexMethod,int):38:39 -> a
     1:1:int size():30:30 -> b
-com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder -> com.android.tools.r8.internal.kn:
+com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder -> com.android.tools.r8.internal.ln:
     java.util.Set methods -> b
     java.util.function.IntFunction factory -> a
     1:3:void <init>(java.util.function.IntFunction,java.util.Set):22:24 -> <init>
@@ -79566,7 +79488,7 @@
     4:9:void rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):51:56 -> b
     1:2:com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder createForSortedSet():33:34 -> c
     1:1:boolean isEmpty():74:74 -> d
-com.android.tools.r8.utils.collections.ProgramFieldSet -> com.android.tools.r8.internal.et:
+com.android.tools.r8.utils.collections.ProgramFieldSet -> com.android.tools.r8.internal.gt:
     java.util.Map backing -> b
     boolean $assertionsDisabled -> a
     1:3:void <clinit>():19:21 -> <clinit>
@@ -79577,7 +79499,7 @@
     4:4:boolean add(com.android.tools.r8.graph.ProgramField):39 -> a
     5:5:boolean add(com.android.tools.r8.graph.ProgramField):39:39 -> a
     1:1:java.util.Iterator iterator():73:73 -> iterator
-com.android.tools.r8.utils.collections.ProgramMethodMultiset -> com.android.tools.r8.internal.ht:
+com.android.tools.r8.utils.collections.ProgramMethodMultiset -> com.android.tools.r8.internal.jt:
     com.android.tools.r8.com.google.common.collect.Multiset backing -> a
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.Multiset):20:21 -> <init>
     1:1:com.android.tools.r8.utils.collections.ProgramMethodMultiset createHash():25:25 -> a
@@ -79587,7 +79509,7 @@
     4:4:void createAndAdd(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,int):29:29 -> a
     5:5:void forEachEntry(java.util.function.ObjIntConsumer):33:33 -> a
     6:6:void lambda$forEachEntry$0(java.util.function.ObjIntConsumer,com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,int):33:33 -> a
-com.android.tools.r8.utils.collections.ProgramMethodSet -> com.android.tools.r8.internal.it:
+com.android.tools.r8.utils.collections.ProgramMethodSet -> com.android.tools.r8.internal.kt:
     java.util.function.Supplier backingFactory -> d
     java.util.Map backing -> c
     com.android.tools.r8.utils.collections.ProgramMethodSet EMPTY -> a
@@ -79601,16 +79523,12 @@
     5:5:void addAll(com.android.tools.r8.utils.collections.ProgramMethodSet):79:79 -> a
     6:6:boolean createAndAdd(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):83:83 -> a
     7:7:boolean contains(com.android.tools.r8.graph.DexEncodedMethod):87:87 -> a
-    8:8:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getReference():375:375 -> a
-    8:8:boolean contains(com.android.tools.r8.graph.DexEncodedMethod):87 -> a
-    9:9:boolean contains(com.android.tools.r8.graph.DexEncodedMethod):87:87 -> a
-    10:11:com.android.tools.r8.utils.collections.ProgramMethodSet rewrittenWithLens(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens):117:118 -> a
-    12:14:void lambda$rewrittenWithLens$0(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.ProgramMethod):120:122 -> a
-    15:15:void lambda$toDefinitionSet$1(java.util.Set,com.android.tools.r8.graph.ProgramMethod):139:139 -> a
+    8:9:com.android.tools.r8.utils.collections.ProgramMethodSet rewrittenWithLens(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens):117:118 -> a
+    10:12:void lambda$rewrittenWithLens$0(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.ProgramMethod):120:122 -> a
+    13:13:void lambda$toDefinitionSet$1(java.util.Set,com.android.tools.r8.graph.ProgramMethod):139:139 -> a
     1:1:com.android.tools.r8.utils.collections.ProgramMethodSet createConcurrent():57:57 -> b
     2:2:boolean contains(com.android.tools.r8.graph.ProgramMethod):91:91 -> b
-    3:3:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getReference():375:375 -> b
-    3:3:boolean remove(com.android.tools.r8.graph.DexEncodedMethod):113 -> b
+    3:3:boolean remove(com.android.tools.r8.graph.DexEncodedMethod):113:113 -> b
     4:4:boolean com.android.tools.r8.utils.collections.ProgramMethodSet.remove(com.android.tools.r8.graph.DexMethod):108:108 -> b
     4:4:boolean remove(com.android.tools.r8.graph.DexEncodedMethod):113 -> b
     1:1:com.android.tools.r8.utils.collections.ProgramMethodSet createLinked():61:61 -> c
@@ -79622,15 +79540,13 @@
     1:1:java.util.Iterator iterator():104:104 -> iterator
     1:1:int size():129:129 -> size
     1:1:java.util.stream.Stream stream():133:133 -> stream
-com.android.tools.r8.utils.collections.SortedProgramMethodSet -> com.android.tools.r8.internal.py:
+com.android.tools.r8.utils.collections.SortedProgramMethodSet -> com.android.tools.r8.internal.ry:
     1:1:void <init>(java.util.function.Supplier):23:23 -> <init>
     1:1:com.android.tools.r8.utils.collections.ProgramMethodSet rewrittenWithLens(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens):20:20 -> a
     2:4:com.android.tools.r8.utils.collections.SortedProgramMethodSet create(com.android.tools.r8.utils.ForEachable):37:39 -> a
     5:5:void lambda$rewrittenWithLens$1(java.util.function.Consumer,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.ProgramMethod):47:47 -> a
     6:6:void lambda$rewrittenWithLens$2(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Consumer):47:47 -> a
-    7:8:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getReference():375:375 -> a
-    7:8:int lambda$toDefinitionSet$3(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):53 -> a
-    9:9:int lambda$toDefinitionSet$3(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):53:53 -> a
+    7:7:int lambda$toDefinitionSet$3(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):53:53 -> a
     1:1:com.android.tools.r8.utils.collections.SortedProgramMethodSet rewrittenWithLens(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens):46:46 -> b
     2:2:void lambda$toDefinitionSet$4(java.util.Set,com.android.tools.r8.graph.ProgramMethod):55:55 -> b
     1:4:java.util.Set toDefinitionSet():52:55 -> e