Update D8 and R8 to 2.0.12-dev

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

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

Test: TARGET_PRODUCT=aosp_arm64 m -j core-oj
Change-Id: I6831abacb9047a7db6d7f3c5e631a97fac5b4e9a
diff --git a/r8.jar b/r8.jar
index e260111..4dda0c7 100644
--- a/r8.jar
+++ b/r8.jar
Binary files differ
diff --git a/r8.jar.map b/r8.jar.map
index 70d1646..e2e3d4b 100644
--- a/r8.jar.map
+++ b/r8.jar.map
@@ -1,7 +1,7 @@
 # compiler: R8
-# compiler_version: 2.0.10-dev
+# compiler_version: 2.0.12-dev
 # compiler_hash: engineering
-# pg_map_id: a0bd12f
+# pg_map_id: 5553c36
 # common_typos_disable
 com.android.tools.r8.ApiLevelException -> com.android.tools.r8.a:
     boolean $assertionsDisabled -> c
@@ -71,6 +71,70 @@
     1:1:boolean includeDexEntries(java.lang.String):47:47 -> includeDexEntries
 com.android.tools.r8.ArchiveProgramResourceProvider$ArchiveEntryConsumer -> com.android.tools.r8.ArchiveProgramResourceProvider$a:
     void accept(com.android.tools.r8.origin.ArchiveEntryOrigin,java.io.InputStream) -> a
+com.android.tools.r8.AssertionsConfiguration -> com.android.tools.r8.AssertionsConfiguration:
+    java.util.List entries -> a
+    1:1:void <init>(java.util.List,com.android.tools.r8.AssertionsConfiguration$1):11:11 -> <init>
+    2:3:void <init>(java.util.List):69:70 -> <init>
+    1:1:java.util.List access$000(com.android.tools.r8.AssertionsConfiguration):11:11 -> a
+    1:2:com.android.tools.r8.AssertionsConfiguration$Builder builder(com.android.tools.r8.AssertionsConfiguration):74:75 -> b
+com.android.tools.r8.AssertionsConfiguration$1 -> com.android.tools.r8.AssertionsConfiguration$a:
+com.android.tools.r8.AssertionsConfiguration$AssertionTransformation -> com.android.tools.r8.AssertionsConfiguration$AssertionTransformation:
+    com.android.tools.r8.AssertionsConfiguration$AssertionTransformation[] $VALUES -> a
+    1:8:void <clinit>():17:24 -> <clinit>
+    9:9:void <clinit>():14:14 -> <clinit>
+    1:1:void <init>(java.lang.String,int):15:15 -> <init>
+    1:1:com.android.tools.r8.AssertionsConfiguration$AssertionTransformation valueOf(java.lang.String):14:14 -> valueOf
+    1:1:com.android.tools.r8.AssertionsConfiguration$AssertionTransformation[] values():14:14 -> values
+com.android.tools.r8.AssertionsConfiguration$Builder -> com.android.tools.r8.AssertionsConfiguration$Builder:
+    java.util.List entries -> a
+    boolean $assertionsDisabled -> b
+    1:1:void <clinit>():84:84 -> <clinit>
+    1:1:void <init>(java.util.List,com.android.tools.r8.AssertionsConfiguration$1):85:85 -> <init>
+    2:4:void <init>(java.util.List):88:90 -> <init>
+    1:4:com.android.tools.r8.AssertionsConfiguration$Builder setDefault(com.android.tools.r8.AssertionsConfiguration$AssertionTransformation):108:111 -> a
+    1:1:com.android.tools.r8.AssertionsConfiguration build():208:208 -> build
+    1:1:com.android.tools.r8.AssertionsConfiguration$Builder disable():130:130 -> disable
+    1:1:com.android.tools.r8.AssertionsConfiguration$Builder disableForClass(java.lang.String):199:199 -> disableForClass
+    1:1:com.android.tools.r8.AssertionsConfiguration$Builder disableForPackage(java.lang.String):170:170 -> disableForPackage
+    1:1:com.android.tools.r8.AssertionsConfiguration$Builder enable():121:121 -> enable
+    1:1:com.android.tools.r8.AssertionsConfiguration$Builder enableForClass(java.lang.String):190:190 -> enableForClass
+    1:1:com.android.tools.r8.AssertionsConfiguration$Builder enableForPackage(java.lang.String):157:157 -> enableForPackage
+    1:1:com.android.tools.r8.AssertionsConfiguration$Builder passthrough():136:136 -> passthrough
+    1:1:com.android.tools.r8.AssertionsConfiguration$Builder passthroughForClass(java.lang.String):203:203 -> passthroughForClass
+    1:1:com.android.tools.r8.AssertionsConfiguration$Builder passthroughForPackage(java.lang.String):174:174 -> passthroughForPackage
+    1:1:com.android.tools.r8.AssertionsConfiguration$Builder setTransformation(com.android.tools.r8.AssertionsConfiguration$AssertionTransformation):101:101 -> setTransformation
+    2:2:void addEntry(com.android.tools.r8.AssertionsConfiguration$AssertionTransformation,com.android.tools.r8.AssertionsConfiguration$ConfigurationType,java.lang.String):95:95 -> setTransformation
+    2:2:com.android.tools.r8.AssertionsConfiguration$Builder setTransformation(com.android.tools.r8.AssertionsConfiguration$AssertionTransformation):101 -> setTransformation
+    1:1:com.android.tools.r8.AssertionsConfiguration$Builder setTransformationForClass(java.lang.String,com.android.tools.r8.AssertionsConfiguration$AssertionTransformation):180:180 -> setTransformationForClass
+    2:2:void addEntry(com.android.tools.r8.AssertionsConfiguration$AssertionTransformation,com.android.tools.r8.AssertionsConfiguration$ConfigurationType,java.lang.String):95:95 -> setTransformationForClass
+    2:2:com.android.tools.r8.AssertionsConfiguration$Builder setTransformationForClass(java.lang.String,com.android.tools.r8.AssertionsConfiguration$AssertionTransformation):180 -> setTransformationForClass
+    1:1:com.android.tools.r8.AssertionsConfiguration$Builder setTransformationForPackage(java.lang.String,com.android.tools.r8.AssertionsConfiguration$AssertionTransformation):143:143 -> setTransformationForPackage
+    2:2:void addEntry(com.android.tools.r8.AssertionsConfiguration$AssertionTransformation,com.android.tools.r8.AssertionsConfiguration$ConfigurationType,java.lang.String):95:95 -> setTransformationForPackage
+    2:2:com.android.tools.r8.AssertionsConfiguration$Builder setTransformationForPackage(java.lang.String,com.android.tools.r8.AssertionsConfiguration$AssertionTransformation):143 -> setTransformationForPackage
+com.android.tools.r8.AssertionsConfiguration$ConfigurationEntry -> com.android.tools.r8.AssertionsConfiguration$b:
+    com.android.tools.r8.AssertionsConfiguration$ConfigurationType type -> b
+    com.android.tools.r8.AssertionsConfiguration$AssertionTransformation transformation -> a
+    java.lang.String value -> c
+    boolean $assertionsDisabled -> d
+    1:1:void <clinit>():33:33 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.AssertionsConfiguration$AssertionTransformation,com.android.tools.r8.AssertionsConfiguration$ConfigurationType,java.lang.String,com.android.tools.r8.AssertionsConfiguration$1):33:33 -> <init>
+    2:6:void <init>(com.android.tools.r8.AssertionsConfiguration$AssertionTransformation,com.android.tools.r8.AssertionsConfiguration$ConfigurationType,java.lang.String):39:43 -> <init>
+    1:1:com.android.tools.r8.AssertionsConfiguration$ConfigurationType access$300(com.android.tools.r8.AssertionsConfiguration$ConfigurationEntry):33:33 -> a
+    2:2:com.android.tools.r8.AssertionsConfiguration$AssertionTransformation getTransformation():47:47 -> a
+    1:1:com.android.tools.r8.AssertionsConfiguration$ConfigurationType getType():51:51 -> b
+    1:1:java.lang.String getValue():55:55 -> c
+com.android.tools.r8.AssertionsConfiguration$ConfigurationType -> com.android.tools.r8.AssertionsConfiguration$c:
+    com.android.tools.r8.AssertionsConfiguration$ConfigurationType PACKAGE -> b
+    com.android.tools.r8.AssertionsConfiguration$ConfigurationType ALL -> a
+    com.android.tools.r8.AssertionsConfiguration$ConfigurationType CLASS -> c
+    com.android.tools.r8.AssertionsConfiguration$ConfigurationType[] $VALUES -> d
+    1:3:void <clinit>():28:30 -> <clinit>
+    4:4:void <clinit>():27:27 -> <clinit>
+    1:1:void <init>(java.lang.String,int):27:27 -> <init>
+com.android.tools.r8.AssertionsConfiguration$InternalAssertionConfiguration -> com.android.tools.r8.AssertionsConfiguration$d:
+    1:12:void com.android.tools.r8.CompatDxHelper.run(com.android.tools.r8.D8Command,java.lang.Boolean):13:24 -> a
+    13:13:void com.android.tools.r8.CompatDxHelper.ignoreDexInArchive(com.android.tools.r8.BaseCommand$Builder):28:28 -> a
+    14:14:java.util.List getConfiguration(com.android.tools.r8.AssertionsConfiguration):63:63 -> a
 com.android.tools.r8.BaseCommand -> com.android.tools.r8.BaseCommand:
     com.android.tools.r8.utils.AndroidApp app -> c
     boolean printHelp -> a
@@ -157,7 +221,8 @@
 com.android.tools.r8.BaseCommand$ProgramInputOrigin -> com.android.tools.r8.BaseCommand$c:
     1:1:void <init>(java.nio.file.Path):86:86 -> <init>
 com.android.tools.r8.BaseCompilerCommand -> com.android.tools.r8.BaseCompilerCommand:
-    boolean $assertionsDisabled -> n
+    boolean $assertionsDisabled -> o
+    com.android.tools.r8.AssertionsConfiguration assertionsConfiguration -> n
     com.android.tools.r8.utils.Reporter reporter -> i
     boolean enableDesugaring -> j
     int minApiLevel -> h
@@ -167,83 +232,88 @@
     com.android.tools.r8.StringConsumer mainDexListConsumer -> g
     com.android.tools.r8.ProgramConsumer programConsumer -> f
     com.android.tools.r8.CompilationMode mode -> e
-    1:1:void <clinit>():29:29 -> <clinit>
-    1:10:void <init>(boolean,boolean):43:52 -> <init>
-    11:22: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,boolean,boolean,boolean,java.util.function.BiPredicate):66:77 -> <init>
+    1:1:void <clinit>():31:31 -> <clinit>
+    1:11:void <init>(boolean,boolean):46:56 -> <init>
+    12: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,boolean,boolean,boolean,java.util.function.BiPredicate,com.android.tools.r8.AssertionsConfiguration):71:83 -> <init>
     boolean lambda$new$0(java.lang.String,java.lang.Long) -> a
-    1:1:com.android.tools.r8.utils.Reporter getReporter():133:133 -> b
-    1:1:java.util.function.BiPredicate getDexClassChecksumFilter():121:121 -> getDexClassChecksumFilter
-    1:1:boolean getEnableDesugaring():111:111 -> getEnableDesugaring
-    1:1:boolean getIncludeClassesChecksum():116:116 -> getIncludeClassesChecksum
-    1:1:com.android.tools.r8.StringConsumer getMainDexListConsumer():106:106 -> getMainDexListConsumer
-    1:1:int getMinApiLevel():90:90 -> getMinApiLevel
-    1:1:com.android.tools.r8.CompilationMode getMode():85:85 -> getMode
-    1:1:com.android.tools.r8.ProgramConsumer getProgramConsumer():99:99 -> getProgramConsumer
-    1:1:boolean isOptimizeMultidexForLinearAlloc():129:129 -> isOptimizeMultidexForLinearAlloc
+    1:3:com.android.tools.r8.AssertionsConfiguration getAssertionsConfiguration(com.android.tools.r8.AssertionsConfiguration$AssertionTransformation):140:142 -> a
+    1:1:com.android.tools.r8.utils.Reporter getReporter():146:146 -> b
+    1:1:java.util.function.BiPredicate getDexClassChecksumFilter():127:127 -> getDexClassChecksumFilter
+    1:1:boolean getEnableDesugaring():117:117 -> getEnableDesugaring
+    1:1:boolean getIncludeClassesChecksum():122:122 -> getIncludeClassesChecksum
+    1:1:com.android.tools.r8.StringConsumer getMainDexListConsumer():112:112 -> getMainDexListConsumer
+    1:1:int getMinApiLevel():96:96 -> getMinApiLevel
+    1:1:com.android.tools.r8.CompilationMode getMode():91:91 -> getMode
+    1:1:com.android.tools.r8.ProgramConsumer getProgramConsumer():105:105 -> getProgramConsumer
+    1:1:boolean isOptimizeMultidexForLinearAlloc():135:135 -> isOptimizeMultidexForLinearAlloc
 com.android.tools.r8.BaseCompilerCommand$Builder -> com.android.tools.r8.BaseCompilerCommand$Builder:
     boolean includeClassesChecksum -> n
     java.util.function.BiPredicate dexClassChecksumFilter -> p
     boolean optimizeMultidexForLinearAlloc -> o
     java.nio.file.Path outputPath -> h
     int minApiLevel -> k
-    com.android.tools.r8.CompilationMode mode -> j
     boolean disableDesugaring -> l
+    com.android.tools.r8.OutputMode outputMode -> i
+    boolean $assertionsDisabled -> r
+    com.android.tools.r8.CompilationMode mode -> j
+    com.android.tools.r8.AssertionsConfiguration assertionsConfiguration -> q
     com.android.tools.r8.StringConsumer mainDexListConsumer -> g
     com.android.tools.r8.ProgramConsumer programConsumer -> f
-    com.android.tools.r8.OutputMode outputMode -> i
-    boolean $assertionsDisabled -> q
     java.util.List desugaredLibraryConfigurationResources -> m
-    1:1:void <clinit>():143:143 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.DiagnosticsHandler):169:169 -> <init>
-    2:25:void <init>(com.android.tools.r8.DiagnosticsHandler):147:170 -> <init>
-    26:26:void <init>(com.android.tools.r8.utils.AndroidApp):175:175 -> <init>
-    27:56:void <init>(com.android.tools.r8.utils.AndroidApp):147:176 -> <init>
-    57:57:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.DiagnosticsHandler):181:181 -> <init>
-    58:93:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.DiagnosticsHandler):147:182 -> <init>
+    1:1:void <clinit>():156:156 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.DiagnosticsHandler):183:183 -> <init>
+    2:26:void <init>(com.android.tools.r8.DiagnosticsHandler):160:184 -> <init>
+    27:27:void <init>(com.android.tools.r8.utils.AndroidApp):189:189 -> <init>
+    28:58:void <init>(com.android.tools.r8.utils.AndroidApp):160:190 -> <init>
+    59:59:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.DiagnosticsHandler):195:195 -> <init>
+    60:96:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.DiagnosticsHandler):160:196 -> <init>
     boolean lambda$new$0(java.lang.String,java.lang.Long) -> a
-    1:33:com.android.tools.r8.InternalProgramOutputPathConsumer createProgramOutputConsumer(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):348:380 -> a
-    34:45:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration getDesugaredLibraryConfiguration(com.android.tools.r8.graph.DexItemFactory,boolean):450:461 -> a
-    46:46:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration getDesugaredLibraryConfiguration(com.android.tools.r8.graph.DexItemFactory,boolean):454:454 -> a
+    1:33:com.android.tools.r8.InternalProgramOutputPathConsumer createProgramOutputConsumer(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):362:394 -> a
+    34:45:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration getDesugaredLibraryConfiguration(com.android.tools.r8.graph.DexItemFactory,boolean):464:475 -> a
+    46:46:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration getDesugaredLibraryConfiguration(com.android.tools.r8.graph.DexItemFactory,boolean):468:468 -> a
     47:47:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    47:47:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration getDesugaredLibraryConfiguration(com.android.tools.r8.graph.DexItemFactory,boolean):454 -> a
+    47:47:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration getDesugaredLibraryConfiguration(com.android.tools.r8.graph.DexItemFactory,boolean):468 -> a
     48:48:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
     48:48:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    48:48:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration getDesugaredLibraryConfiguration(com.android.tools.r8.graph.DexItemFactory,boolean):454 -> a
-    49:49:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration getDesugaredLibraryConfiguration(com.android.tools.r8.graph.DexItemFactory,boolean):454:454 -> a
-    1:2:com.android.tools.r8.BaseCompilerCommand$Builder addDesugaredLibraryConfiguration(java.lang.String):437:438 -> addDesugaredLibraryConfiguration
-    3:5:com.android.tools.r8.BaseCompilerCommand$Builder addDesugaredLibraryConfiguration(java.lang.String):437:439 -> addDesugaredLibraryConfiguration
-    6:7:com.android.tools.r8.BaseCompilerCommand$Builder addDesugaredLibraryConfiguration(com.android.tools.r8.StringResource):444:445 -> addDesugaredLibraryConfiguration
-    1:1:com.android.tools.r8.BaseCompilerCommand$Builder addSpecialLibraryConfiguration(java.lang.String):431:431 -> addSpecialLibraryConfiguration
-    1:29:void validate():481:509 -> e
+    48:48:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration getDesugaredLibraryConfiguration(com.android.tools.r8.graph.DexItemFactory,boolean):468 -> a
+    49:49:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration getDesugaredLibraryConfiguration(com.android.tools.r8.graph.DexItemFactory,boolean):468:468 -> a
+    1:3:com.android.tools.r8.BaseCompilerCommand$Builder addAssertionsConfiguration(java.util.function.Function):497:499 -> addAssertionsConfiguration
+    4:6:com.android.tools.r8.BaseCompilerCommand$Builder addAssertionsConfiguration(java.util.function.Function):498:500 -> addAssertionsConfiguration
+    1:2:com.android.tools.r8.BaseCompilerCommand$Builder addDesugaredLibraryConfiguration(java.lang.String):451:452 -> addDesugaredLibraryConfiguration
+    3:5:com.android.tools.r8.BaseCompilerCommand$Builder addDesugaredLibraryConfiguration(java.lang.String):451:453 -> addDesugaredLibraryConfiguration
+    6:7:com.android.tools.r8.BaseCompilerCommand$Builder addDesugaredLibraryConfiguration(com.android.tools.r8.StringResource):458:459 -> addDesugaredLibraryConfiguration
+    1:1:com.android.tools.r8.BaseCompilerCommand$Builder addSpecialLibraryConfiguration(java.lang.String):445:445 -> addSpecialLibraryConfiguration
+    1:29:void validate():509:537 -> e
     com.android.tools.r8.CompilationMode defaultCompilationMode() -> f
-    1:1:boolean hasDesugaredLibraryConfiguration():465:465 -> g
-    1:1:java.util.function.BiPredicate getDexClassChecksumFilter():243:243 -> getDexClassChecksumFilter
-    1:1:boolean getDisableDesugaring():426:426 -> getDisableDesugaring
-    1:1:boolean getIncludeClassesChecksum():476:476 -> getIncludeClassesChecksum
-    1:1:com.android.tools.r8.StringConsumer getMainDexListConsumer():236:236 -> getMainDexListConsumer
-    1:1:int getMinApiLevel():385:385 -> getMinApiLevel
-    1:1:com.android.tools.r8.CompilationMode getMode():189:189 -> getMode
-    1:1:com.android.tools.r8.OutputMode getOutputMode():218:218 -> getOutputMode
-    1:1:java.nio.file.Path getOutputPath():208:208 -> getOutputPath
-    1:1:com.android.tools.r8.ProgramConsumer getProgramConsumer():229:229 -> getProgramConsumer
-    1:1:boolean isMinApiLevelSet():389:389 -> h
-    1:1:boolean isOptimizeMultidexForLinearAlloc():261:261 -> i
-    1:3:com.android.tools.r8.BaseCompilerCommand$Builder setDexClassChecksumFilter(java.util.function.BiPredicate):339:341 -> setDexClassChecksumFilter
-    1:2:com.android.tools.r8.BaseCompilerCommand$Builder setDisableDesugaring(boolean):420:421 -> setDisableDesugaring
-    1:2:com.android.tools.r8.BaseCompilerCommand$Builder setEnableDesugaring(boolean):404:405 -> setEnableDesugaring
-    1:2:com.android.tools.r8.BaseCompilerCommand$Builder setIncludeClassesChecksum(boolean):470:471 -> setIncludeClassesChecksum
-    1:2:com.android.tools.r8.BaseCompilerCommand$Builder setMainDexListConsumer(com.android.tools.r8.StringConsumer):304:305 -> setMainDexListConsumer
-    1:2:com.android.tools.r8.BaseCompilerCommand$Builder setMainDexListOutputPath(java.nio.file.Path):291:292 -> setMainDexListOutputPath
-    1:5:com.android.tools.r8.BaseCompilerCommand$Builder setMinApiLevel(int):395:399 -> setMinApiLevel
-    1:3:com.android.tools.r8.BaseCompilerCommand$Builder setMode(com.android.tools.r8.CompilationMode):196:198 -> setMode
-    1:2:com.android.tools.r8.BaseCompilerCommand$Builder setOptimizeMultidexForLinearAlloc(boolean):252:253 -> setOptimizeMultidexForLinearAlloc
-    1:1:com.android.tools.r8.BaseCompilerCommand$Builder setOutput(java.nio.file.Path,com.android.tools.r8.OutputMode):319:319 -> setOutput
-    2:7:com.android.tools.r8.BaseCompilerCommand$Builder setOutput(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):324:329 -> setOutput
-    1:4:com.android.tools.r8.BaseCompilerCommand$Builder setProgramConsumer(com.android.tools.r8.ProgramConsumer):275:278 -> setProgramConsumer
+    1:1:boolean hasDesugaredLibraryConfiguration():479:479 -> g
+    1:1:com.android.tools.r8.AssertionsConfiguration getAssertionsConfiguration():504:504 -> getAssertionsConfiguration
+    1:1:java.util.function.BiPredicate getDexClassChecksumFilter():257:257 -> getDexClassChecksumFilter
+    1:1:boolean getDisableDesugaring():440:440 -> getDisableDesugaring
+    1:1:boolean getIncludeClassesChecksum():490:490 -> getIncludeClassesChecksum
+    1:1:com.android.tools.r8.StringConsumer getMainDexListConsumer():250:250 -> getMainDexListConsumer
+    1:1:int getMinApiLevel():399:399 -> getMinApiLevel
+    1:1:com.android.tools.r8.CompilationMode getMode():203:203 -> getMode
+    1:1:com.android.tools.r8.OutputMode getOutputMode():232:232 -> getOutputMode
+    1:1:java.nio.file.Path getOutputPath():222:222 -> getOutputPath
+    1:1:com.android.tools.r8.ProgramConsumer getProgramConsumer():243:243 -> getProgramConsumer
+    1:1:boolean isMinApiLevelSet():403:403 -> h
+    1:1:boolean isOptimizeMultidexForLinearAlloc():275:275 -> i
+    1:3:com.android.tools.r8.BaseCompilerCommand$Builder setDexClassChecksumFilter(java.util.function.BiPredicate):353:355 -> setDexClassChecksumFilter
+    1:2:com.android.tools.r8.BaseCompilerCommand$Builder setDisableDesugaring(boolean):434:435 -> setDisableDesugaring
+    1:2:com.android.tools.r8.BaseCompilerCommand$Builder setEnableDesugaring(boolean):418:419 -> setEnableDesugaring
+    1:2:com.android.tools.r8.BaseCompilerCommand$Builder setIncludeClassesChecksum(boolean):484:485 -> setIncludeClassesChecksum
+    1:2:com.android.tools.r8.BaseCompilerCommand$Builder setMainDexListConsumer(com.android.tools.r8.StringConsumer):318:319 -> setMainDexListConsumer
+    1:2:com.android.tools.r8.BaseCompilerCommand$Builder setMainDexListOutputPath(java.nio.file.Path):305:306 -> setMainDexListOutputPath
+    1:5:com.android.tools.r8.BaseCompilerCommand$Builder setMinApiLevel(int):409:413 -> setMinApiLevel
+    1:3:com.android.tools.r8.BaseCompilerCommand$Builder setMode(com.android.tools.r8.CompilationMode):210:212 -> setMode
+    1:2:com.android.tools.r8.BaseCompilerCommand$Builder setOptimizeMultidexForLinearAlloc(boolean):266:267 -> setOptimizeMultidexForLinearAlloc
+    1:1:com.android.tools.r8.BaseCompilerCommand$Builder setOutput(java.nio.file.Path,com.android.tools.r8.OutputMode):333:333 -> setOutput
+    2:7:com.android.tools.r8.BaseCompilerCommand$Builder setOutput(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):338:343 -> setOutput
+    1:4:com.android.tools.r8.BaseCompilerCommand$Builder setProgramConsumer(com.android.tools.r8.ProgramConsumer):289:292 -> setProgramConsumer
 com.android.tools.r8.BaseCompilerCommand$Builder$1 -> com.android.tools.r8.BaseCompilerCommand$Builder$a:
-    1:1:void <init>(com.android.tools.r8.BaseCompilerCommand$Builder,java.nio.file.Path,boolean):355:355 -> <init>
+    1:1:void <init>(com.android.tools.r8.BaseCompilerCommand$Builder,java.nio.file.Path,boolean):369:369 -> <init>
 com.android.tools.r8.BaseCompilerCommand$Builder$2 -> com.android.tools.r8.BaseCompilerCommand$Builder$b:
-    1:1:void <init>(com.android.tools.r8.BaseCompilerCommand$Builder,java.nio.file.Path,boolean):362:362 -> <init>
+    1:1:void <init>(com.android.tools.r8.BaseCompilerCommand$Builder,java.nio.file.Path,boolean):376:376 -> <init>
 com.android.tools.r8.BaseCompilerCommandParser -> com.android.tools.r8.b:
     1:1:void <init>():14:14 -> <init>
     1:10:void parseMinApi(com.android.tools.r8.BaseCompilerCommand$Builder,java.lang.String,com.android.tools.r8.origin.Origin):19:28 -> a
@@ -308,9 +378,6 @@
     1:2:void accept(com.android.tools.r8.ByteDataView,java.lang.String,com.android.tools.r8.DiagnosticsHandler):71:72 -> accept
     1:2:void finished(com.android.tools.r8.DiagnosticsHandler):78:79 -> finished
     1:1:com.android.tools.r8.DataResourceConsumer getDataResourceConsumer():66:66 -> getDataResourceConsumer
-com.android.tools.r8.CompatDxHelper -> com.android.tools.r8.c:
-    1:12:void run(com.android.tools.r8.D8Command,java.lang.Boolean):13:24 -> a
-    13:13:void ignoreDexInArchive(com.android.tools.r8.BaseCommand$Builder):28:28 -> a
 com.android.tools.r8.CompatProguardCommandBuilder -> com.android.tools.r8.CompatProguardCommandBuilder:
     1:1:void <init>():11:11 -> <init>
     2:6:void <init>(boolean,com.android.tools.r8.DiagnosticsHandler):16:20 -> <init>
@@ -337,13 +404,13 @@
     19:19:void $closeResource(java.lang.Throwable,java.lang.AutoCloseable):187:187 -> a
     20:20:void lambda$run$4(java.lang.String):197:197 -> a
     21:23:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):243:245 -> a
-    24:24:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):370:370 -> a
+    24:24:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):371:371 -> a
     24:24:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):245 -> a
     25:29:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):246:250 -> a
     1:1:void lambda$run$1(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):102:102 -> b
     1:3:void lambda$runForTesting$3(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):141:143 -> c
     1:27:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):150:176 -> d
-    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):366:366 -> d
+    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):367:367 -> d
     28:28:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):176 -> d
     29:39:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):177:187 -> d
     40:44:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):183:187 -> d
@@ -357,63 +424,63 @@
     11:11:void com.android.tools.r8.utils.ExceptionUtils.withD8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):50:50 -> run
     11:11:void run(com.android.tools.r8.D8Command,java.util.concurrent.ExecutorService):99 -> run
 com.android.tools.r8.D8Command -> com.android.tools.r8.D8Command:
-    com.android.tools.r8.graph.DexItemFactory factory -> s
-    boolean intermediate -> o
-    com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration libraryConfiguration -> r
-    boolean $assertionsDisabled -> u
-    com.android.tools.r8.DesugarGraphConsumer desugarGraphConsumer -> p
-    com.android.tools.r8.StringConsumer desugaredLibraryKeepRuleConsumer -> q
-    java.lang.String USAGE_MESSAGE -> t
-    1:194:void <clinit>():32:225 -> <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,boolean,boolean,boolean,boolean,java.util.function.BiPredicate,com.android.tools.r8.DesugarGraphConsumer,com.android.tools.r8.StringConsumer,com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.D8Command$1):33:33 -> <init>
-    2:2:void <init>(boolean,boolean,com.android.tools.r8.D8Command$1):33:33 -> <init>
-    3:18: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,boolean,boolean,boolean,boolean,java.util.function.BiPredicate,com.android.tools.r8.DesugarGraphConsumer,com.android.tools.r8.StringConsumer,com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration,com.android.tools.r8.graph.DexItemFactory):289:304 -> <init>
-    19:24:void <init>(boolean,boolean):308:313 -> <init>
-    1:1:com.android.tools.r8.D8Command$Builder builder(com.android.tools.r8.utils.AndroidApp):243:243 -> a
-    2:42:com.android.tools.r8.utils.InternalOptions getInternalOptions():318:358 -> a
-    1:1:com.android.tools.r8.D8Command$Builder builder():234:234 -> builder
-    2:2:com.android.tools.r8.D8Command$Builder builder(com.android.tools.r8.DiagnosticsHandler):238:238 -> builder
-    1:1:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin):256:256 -> parse
-    2:2:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.DiagnosticsHandler):270:270 -> parse
+    com.android.tools.r8.graph.DexItemFactory factory -> t
+    boolean intermediate -> p
+    com.android.tools.r8.DesugarGraphConsumer desugarGraphConsumer -> q
+    boolean $assertionsDisabled -> v
+    com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration libraryConfiguration -> s
+    java.lang.String USAGE_MESSAGE -> u
+    com.android.tools.r8.StringConsumer desugaredLibraryKeepRuleConsumer -> r
+    1:195:void <clinit>():33:227 -> <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,boolean,boolean,boolean,boolean,java.util.function.BiPredicate,com.android.tools.r8.DesugarGraphConsumer,com.android.tools.r8.StringConsumer,com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration,com.android.tools.r8.AssertionsConfiguration,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.D8Command$1):34:34 -> <init>
+    2:2:void <init>(boolean,boolean,com.android.tools.r8.D8Command$1):34:34 -> <init>
+    3:19: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,boolean,boolean,boolean,boolean,java.util.function.BiPredicate,com.android.tools.r8.DesugarGraphConsumer,com.android.tools.r8.StringConsumer,com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration,com.android.tools.r8.AssertionsConfiguration,com.android.tools.r8.graph.DexItemFactory):292:308 -> <init>
+    20:25:void <init>(boolean,boolean):312:317 -> <init>
+    1:1:com.android.tools.r8.D8Command$Builder builder(com.android.tools.r8.utils.AndroidApp):245:245 -> a
+    2:47:com.android.tools.r8.utils.InternalOptions getInternalOptions():322:367 -> a
+    1:1:com.android.tools.r8.D8Command$Builder builder():236:236 -> builder
+    2:2:com.android.tools.r8.D8Command$Builder builder(com.android.tools.r8.DiagnosticsHandler):240:240 -> builder
+    1:1:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin):258:258 -> parse
+    2:2:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.DiagnosticsHandler):272:272 -> 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:
-    com.android.tools.r8.DesugarGraphConsumer desugarGraphConsumer -> s
-    boolean intermediate -> r
-    com.android.tools.r8.StringConsumer desugaredLibraryKeepRuleConsumer -> t
-    1:1:void <init>(com.android.tools.r8.D8Command$1):65:65 -> <init>
-    2:2:void <init>(com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.D8Command$1):65:65 -> <init>
-    3:3:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.D8Command$1):65:65 -> <init>
-    4:4:void <init>():72:72 -> <init>
-    5:5:void <init>(com.android.tools.r8.DiagnosticsHandler):76:76 -> <init>
-    6:8:void <init>(com.android.tools.r8.DiagnosticsHandler):67:69 -> <init>
-    9:9:void <init>(com.android.tools.r8.utils.AndroidApp):80:80 -> <init>
-    10:12:void <init>(com.android.tools.r8.utils.AndroidApp):67:69 -> <init>
-    1:1:void lambda$addDexProgramData$0(byte[],com.android.tools.r8.origin.Origin):88:88 -> a
-    1:1:com.android.tools.r8.BaseCommand$Builder addClasspathFiles(java.util.Collection):64:64 -> addClasspathFiles
-    2:2:com.android.tools.r8.BaseCommand$Builder addClasspathFiles(java.nio.file.Path[]):64:64 -> addClasspathFiles
-    3:3:com.android.tools.r8.D8Command$Builder addClasspathFiles(java.nio.file.Path[]):97:97 -> addClasspathFiles
-    4:4:com.android.tools.r8.D8Command$Builder addClasspathFiles(java.util.Collection):105:105 -> addClasspathFiles
-    1:1:com.android.tools.r8.BaseCommand$Builder addClasspathResourceProvider(com.android.tools.r8.ClassFileResourceProvider):64:64 -> addClasspathResourceProvider
-    2:2:com.android.tools.r8.D8Command$Builder addClasspathResourceProvider(com.android.tools.r8.ClassFileResourceProvider):113:113 -> addClasspathResourceProvider
-    1:1:com.android.tools.r8.BaseCommand$Builder addDexProgramData(byte[],com.android.tools.r8.origin.Origin):64:64 -> addDexProgramData
-    2:2:com.android.tools.r8.D8Command$Builder addDexProgramData(byte[],com.android.tools.r8.origin.Origin):88:88 -> addDexProgramData
-    1:1:com.android.tools.r8.BaseCommand makeCommand():64:64 -> c
-    2:24:com.android.tools.r8.D8Command makeCommand():196:218 -> c
-    25:25:com.android.tools.r8.D8Command makeCommand():197:197 -> c
+    com.android.tools.r8.DesugarGraphConsumer desugarGraphConsumer -> t
+    com.android.tools.r8.StringConsumer desugaredLibraryKeepRuleConsumer -> u
+    boolean intermediate -> s
+    1:1:void <init>(com.android.tools.r8.D8Command$1):66:66 -> <init>
+    2:2:void <init>(com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.D8Command$1):66:66 -> <init>
+    3:3:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.D8Command$1):66:66 -> <init>
+    4:4:void <init>():73:73 -> <init>
+    5:5:void <init>(com.android.tools.r8.DiagnosticsHandler):77:77 -> <init>
+    6:8:void <init>(com.android.tools.r8.DiagnosticsHandler):68:70 -> <init>
+    9:9:void <init>(com.android.tools.r8.utils.AndroidApp):81:81 -> <init>
+    10:12:void <init>(com.android.tools.r8.utils.AndroidApp):68:70 -> <init>
+    1:1:void lambda$addDexProgramData$0(byte[],com.android.tools.r8.origin.Origin):89:89 -> a
+    1:1:com.android.tools.r8.BaseCommand$Builder addClasspathFiles(java.util.Collection):65:65 -> addClasspathFiles
+    2:2:com.android.tools.r8.BaseCommand$Builder addClasspathFiles(java.nio.file.Path[]):65:65 -> addClasspathFiles
+    3:3:com.android.tools.r8.D8Command$Builder addClasspathFiles(java.nio.file.Path[]):98:98 -> addClasspathFiles
+    4:4:com.android.tools.r8.D8Command$Builder addClasspathFiles(java.util.Collection):106:106 -> addClasspathFiles
+    1:1:com.android.tools.r8.BaseCommand$Builder addClasspathResourceProvider(com.android.tools.r8.ClassFileResourceProvider):65:65 -> addClasspathResourceProvider
+    2:2:com.android.tools.r8.D8Command$Builder addClasspathResourceProvider(com.android.tools.r8.ClassFileResourceProvider):114:114 -> addClasspathResourceProvider
+    1:1:com.android.tools.r8.BaseCommand$Builder addDexProgramData(byte[],com.android.tools.r8.origin.Origin):65:65 -> addDexProgramData
+    2:2:com.android.tools.r8.D8Command$Builder addDexProgramData(byte[],com.android.tools.r8.origin.Origin):89:89 -> addDexProgramData
+    1:1:com.android.tools.r8.BaseCommand makeCommand():65:65 -> c
+    2:27:com.android.tools.r8.D8Command makeCommand():197:222 -> c
+    28:28:com.android.tools.r8.D8Command makeCommand():198:198 -> c
     com.android.tools.r8.BaseCommand$Builder self() -> d
-    1:19:void validate():166:184 -> e
-    20:29:void validate():182:191 -> e
-    1:1:com.android.tools.r8.CompilationMode defaultCompilationMode():161:161 -> f
-    1:1:com.android.tools.r8.DesugarGraphConsumer getDesugarGraphConsumer():141:141 -> getDesugarGraphConsumer
-    1:1:com.android.tools.r8.D8Command$Builder setDesugarGraphConsumer(com.android.tools.r8.DesugarGraphConsumer):150:150 -> setDesugarGraphConsumer
-    1:1:com.android.tools.r8.D8Command$Builder setDesugaredLibraryKeepRuleConsumer(com.android.tools.r8.StringConsumer):133:133 -> setDesugaredLibraryKeepRuleConsumer
-    1:1:com.android.tools.r8.D8Command$Builder setIntermediate(boolean):122:122 -> setIntermediate
+    1:19:void validate():167:185 -> e
+    20:29:void validate():183:192 -> e
+    1:1:com.android.tools.r8.CompilationMode defaultCompilationMode():162:162 -> f
+    1:1:com.android.tools.r8.DesugarGraphConsumer getDesugarGraphConsumer():142:142 -> getDesugarGraphConsumer
+    1:1:com.android.tools.r8.D8Command$Builder setDesugarGraphConsumer(com.android.tools.r8.DesugarGraphConsumer):151:151 -> setDesugarGraphConsumer
+    1:1:com.android.tools.r8.D8Command$Builder setDesugaredLibraryKeepRuleConsumer(com.android.tools.r8.StringConsumer):134:134 -> setDesugaredLibraryKeepRuleConsumer
+    1:1:com.android.tools.r8.D8Command$Builder setIntermediate(boolean):123:123 -> setIntermediate
 com.android.tools.r8.D8Command$DefaultD8DiagnosticsHandler -> com.android.tools.r8.D8Command$b:
-    1:1:void <init>():42:42 -> <init>
-    2:2:void <init>(com.android.tools.r8.D8Command$1):42:42 -> <init>
-    1:6:void error(com.android.tools.r8.Diagnostic):46:51 -> error
-    7:13:void error(com.android.tools.r8.Diagnostic):49:55 -> error
-com.android.tools.r8.D8CommandParser -> com.android.tools.r8.d:
+    1:1:void <init>():43:43 -> <init>
+    2:2:void <init>(com.android.tools.r8.D8Command$1):43:43 -> <init>
+    1:6:void error(com.android.tools.r8.Diagnostic):47:52 -> error
+    7:13:void error(com.android.tools.r8.Diagnostic):50:56 -> error
+com.android.tools.r8.D8CommandParser -> com.android.tools.r8.c:
     java.util.Set OPTIONS_WITH_PARAMETER -> a
     java.lang.String USAGE_MESSAGE -> b
     1:96:void <clinit>():26:121 -> <clinit>
@@ -431,8 +498,8 @@
     106:106:boolean com.android.tools.r8.D8CommandParser$OrderedClassFileResourceProvider$Builder.isEmpty():63:63 -> a
     106:106:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.D8Command$Builder):256 -> a
     107:118:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.D8Command$Builder):257:268 -> a
-com.android.tools.r8.D8CommandParser$1 -> com.android.tools.r8.d$a:
-com.android.tools.r8.D8CommandParser$OrderedClassFileResourceProvider -> com.android.tools.r8.d$b:
+com.android.tools.r8.D8CommandParser$1 -> com.android.tools.r8.c$a:
+com.android.tools.r8.D8CommandParser$OrderedClassFileResourceProvider -> com.android.tools.r8.c$b:
     java.util.List providers -> a
     java.util.Set descriptors -> b
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.D8CommandParser$1):46:46 -> <init>
@@ -442,7 +509,7 @@
     2:2:com.android.tools.r8.D8CommandParser$OrderedClassFileResourceProvider$Builder builder():77:77 -> a
     1:1:java.util.Set getClassDescriptors():82:82 -> getClassDescriptors
     1:3:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):89:91 -> getProgramResource
-com.android.tools.r8.D8CommandParser$OrderedClassFileResourceProvider$Builder -> com.android.tools.r8.d$b$a:
+com.android.tools.r8.D8CommandParser$OrderedClassFileResourceProvider$Builder -> com.android.tools.r8.c$b$a:
     boolean empty -> b
     com.android.tools.r8.com.google.common.collect.ImmutableList$Builder builder -> a
     1:4:void <init>():47:50 -> <init>
@@ -522,7 +589,7 @@
     1:3:java.io.InputStream getByteStream():94:96 -> getByteStream
     1:1:java.lang.String getName():88:88 -> getName
     1:1:com.android.tools.r8.origin.Origin getOrigin():83:83 -> getOrigin
-com.android.tools.r8.DexFileMergerHelper -> com.android.tools.r8.e:
+com.android.tools.r8.DexFileMergerHelper -> com.android.tools.r8.d:
     java.util.Map inputOrdering -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():28:28 -> <clinit>
@@ -534,10 +601,10 @@
     5:45:void runInternal(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):74:114 -> a
     46:51:void runInternal(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):109:114 -> a
     52:54:void runD8ForTesting(com.android.tools.r8.D8Command,boolean):120:122 -> a
-    55:55:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():716:716 -> a
+    55:55:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():766:766 -> a
     55:55:com.android.tools.r8.graph.DexProgramClass keepFirstProgramClassConflictResolver(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):38 -> a
     56:56:com.android.tools.r8.graph.DexProgramClass keepFirstProgramClassConflictResolver(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):38:38 -> a
-    57:57:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():716:716 -> a
+    57:57:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():766:766 -> a
     57:57:com.android.tools.r8.graph.DexProgramClass keepFirstProgramClassConflictResolver(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):39 -> a
     58:75:com.android.tools.r8.graph.DexProgramClass keepFirstProgramClassConflictResolver(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):39:56 -> a
     76:87:com.android.tools.r8.graph.DexProgramClass keepFirstProgramClassConflictResolver(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):43:54 -> a
@@ -696,10 +763,10 @@
     2:2:java.util.Set getClassDescriptors():38:38 -> getClassDescriptors
     1:6:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):63:68 -> getProgramResource
     1:1:java.nio.file.Path getRoot():73:73 -> getRoot
-com.android.tools.r8.Disassemble -> com.android.tools.r8.f:
+com.android.tools.r8.Disassemble -> com.android.tools.r8.e:
     1:18:void disassemble(com.android.tools.r8.Disassemble$DisassembleCommand):219:236 -> a
-com.android.tools.r8.Disassemble$1 -> com.android.tools.r8.f$a:
-com.android.tools.r8.Disassemble$DisassembleCommand -> com.android.tools.r8.f$b:
+com.android.tools.r8.Disassemble$1 -> com.android.tools.r8.e$a:
+com.android.tools.r8.Disassemble$DisassembleCommand -> com.android.tools.r8.e$b:
     java.nio.file.Path outputPath -> e
     boolean useIr -> i
     com.android.tools.r8.StringResource proguardMap -> f
@@ -716,7 +783,7 @@
     1:1:com.android.tools.r8.Disassemble$DisassembleCommand$Builder builder():107:107 -> builder
     1:1:boolean useIr():191:191 -> c
     1:1:boolean useSmali():187:187 -> d
-com.android.tools.r8.Disassemble$DisassembleCommand$Builder -> com.android.tools.r8.f$b$a:
+com.android.tools.r8.Disassemble$DisassembleCommand$Builder -> com.android.tools.r8.e$b$a:
     boolean allInfo -> i
     java.nio.file.Path proguardMapFile -> g
     java.nio.file.Path outputPath -> f
@@ -753,7 +820,7 @@
     int index -> a
     1:2:void <init>(com.android.tools.r8.origin.Origin,int):36:37 -> <init>
     1:1:java.lang.String part():42:42 -> part
-com.android.tools.r8.ExtractMarkerCommand -> com.android.tools.r8.h:
+com.android.tools.r8.ExtractMarkerCommand -> com.android.tools.r8.g:
     java.lang.String USAGE_MESSAGE -> g
     java.util.List programFiles -> f
     boolean csv -> e
@@ -783,8 +850,8 @@
     1:1:boolean getSummary():153:153 -> d
     1:1:boolean getVerbose():149:149 -> e
     1:1:boolean isPrintHelp():137:137 -> f
-com.android.tools.r8.ExtractMarkerCommand$1 -> com.android.tools.r8.g:
-com.android.tools.r8.ExtractMarkerCommand$Builder -> com.android.tools.r8.h$a:
+com.android.tools.r8.ExtractMarkerCommand$1 -> com.android.tools.r8.f:
+com.android.tools.r8.ExtractMarkerCommand$Builder -> com.android.tools.r8.g$a:
     java.util.List programFiles -> f
     boolean csv -> e
     boolean printHelp -> a
@@ -821,7 +888,7 @@
     1:1:com.android.tools.r8.FeatureSplit$Builder addProgramResourceProvider(com.android.tools.r8.ProgramResourceProvider):87:87 -> addProgramResourceProvider
     1:1:com.android.tools.r8.FeatureSplit build():93:93 -> build
     1:1:com.android.tools.r8.FeatureSplit$Builder setProgramConsumer(com.android.tools.r8.ProgramConsumer):77:77 -> setProgramConsumer
-com.android.tools.r8.GenerateLintFiles -> com.android.tools.r8.i:
+com.android.tools.r8.GenerateLintFiles -> com.android.tools.r8.h:
     com.android.tools.r8.utils.InternalOptions options -> c
     java.util.Set parallelMethods -> f
     boolean $assertionsDisabled -> g
@@ -869,7 +936,7 @@
     223:227:void main(java.lang.String[]):375:379 -> a
     1:1:java.util.List lambda$collectSupportedMethods$1(com.android.tools.r8.graph.DexClass):239:239 -> b
     1:1:java.util.List lambda$collectSupportedMethods$2(com.android.tools.r8.graph.DexClass):253:253 -> c
-com.android.tools.r8.GenerateLintFiles$SupportedMethods -> com.android.tools.r8.i$a:
+com.android.tools.r8.GenerateLintFiles$SupportedMethods -> com.android.tools.r8.h$a:
     java.util.Map supportedMethods -> b
     java.util.Set classesWithAllMethodsSupported -> a
     1:3:void <init>(java.util.Set,java.util.Map):190:192 -> <init>
@@ -884,7 +951,7 @@
     59:59:java.lang.String lambda$run$0(com.android.tools.r8.graph.DexType):72:72 -> a
     60:64:java.lang.Iterable lambda$run$2(com.android.tools.r8.shaking.MainDexClasses,com.android.tools.r8.graph.AppView):84:88 -> a
     65:67:void lambda$run$3(com.android.tools.r8.utils.Box,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):154:156 -> a
-    68:68:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    68:68:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     68:68:void lambda$run$1(com.android.tools.r8.graph.AppView,java.util.ArrayList,com.android.tools.r8.graph.DexType):90 -> a
     69:70:void lambda$run$1(com.android.tools.r8.graph.AppView,java.util.ArrayList,com.android.tools.r8.graph.DexType):91:92 -> a
     1:13:void main(java.lang.String[]):163:175 -> main
@@ -940,7 +1007,7 @@
     1:1:com.android.tools.r8.GenerateMainDexListCommand$Builder setMainDexKeptGraphConsumer(com.android.tools.r8.experimental.graphinfo.GraphConsumer):132:132 -> setMainDexKeptGraphConsumer
     1:1:com.android.tools.r8.GenerateMainDexListCommand$Builder setMainDexListConsumer(com.android.tools.r8.StringConsumer):100:100 -> setMainDexListConsumer
     1:1:com.android.tools.r8.GenerateMainDexListCommand$Builder setMainDexListOutputPath(java.nio.file.Path):94:94 -> setMainDexListOutputPath
-com.android.tools.r8.InternalProgramOutputPathConsumer -> com.android.tools.r8.j:
+com.android.tools.r8.InternalProgramOutputPathConsumer -> com.android.tools.r8.i:
 com.android.tools.r8.JdkClassFileProvider -> com.android.tools.r8.JdkClassFileProvider:
     com.android.tools.r8.origin.Origin origin -> a
     java.util.Map descriptorToModule -> c
@@ -982,7 +1049,7 @@
     5:10: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:97 -> a
     11:41:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):103:133 -> a
     11:41:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):89 -> a
-    42:42:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():357:357 -> a
+    42:42:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():349:349 -> a
     42:42:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):135 -> a
     42:42:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):89 -> a
     43:51:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):135:143 -> a
@@ -994,61 +1061,62 @@
     7:11:void run(com.android.tools.r8.L8Command,java.util.concurrent.ExecutorService):58:62 -> run
     12:12:void run(com.android.tools.r8.L8Command,java.util.concurrent.ExecutorService):57:57 -> run
 com.android.tools.r8.L8Command -> com.android.tools.r8.L8Command:
-    com.android.tools.r8.graph.DexItemFactory factory -> r
-    com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration libraryConfiguration -> q
-    com.android.tools.r8.R8Command r8Command -> p
-    com.android.tools.r8.D8Command d8Command -> o
-    boolean $assertionsDisabled -> s
-    1:1:void <clinit>():23:23 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.R8Command,com.android.tools.r8.D8Command,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.CompilationMode,com.android.tools.r8.ProgramConsumer,com.android.tools.r8.StringConsumer,int,com.android.tools.r8.utils.Reporter,com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.L8Command$1):24:24 -> <init>
-    2:2:void <init>(boolean,boolean,com.android.tools.r8.L8Command$1):24:24 -> <init>
-    3:17:void <init>(com.android.tools.r8.R8Command,com.android.tools.r8.D8Command,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.CompilationMode,com.android.tools.r8.ProgramConsumer,com.android.tools.r8.StringConsumer,int,com.android.tools.r8.utils.Reporter,com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration,com.android.tools.r8.graph.DexItemFactory):54:68 -> <init>
-    18:22:void <init>(boolean,boolean):72:76 -> <init>
+    com.android.tools.r8.graph.DexItemFactory factory -> s
+    com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration libraryConfiguration -> r
+    com.android.tools.r8.D8Command d8Command -> p
+    boolean $assertionsDisabled -> t
+    com.android.tools.r8.R8Command r8Command -> q
+    1:1:void <clinit>():24:24 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.R8Command,com.android.tools.r8.D8Command,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.CompilationMode,com.android.tools.r8.ProgramConsumer,com.android.tools.r8.StringConsumer,int,com.android.tools.r8.utils.Reporter,com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.L8Command$1):25:25 -> <init>
+    2:2:void <init>(boolean,boolean,com.android.tools.r8.L8Command$1):25:25 -> <init>
+    3:14:void <init>(com.android.tools.r8.R8Command,com.android.tools.r8.D8Command,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.CompilationMode,com.android.tools.r8.ProgramConsumer,com.android.tools.r8.StringConsumer,int,com.android.tools.r8.utils.Reporter,com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration,com.android.tools.r8.graph.DexItemFactory):55:66 -> <init>
+    15:30:void <init>(com.android.tools.r8.R8Command,com.android.tools.r8.D8Command,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.CompilationMode,com.android.tools.r8.ProgramConsumer,com.android.tools.r8.StringConsumer,int,com.android.tools.r8.utils.Reporter,com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration,com.android.tools.r8.graph.DexItemFactory):55:70 -> <init>
+    31:35:void <init>(boolean,boolean):74:78 -> <init>
     boolean lambda$new$0(java.lang.String,java.lang.Long) -> a
-    1:37:com.android.tools.r8.utils.InternalOptions getInternalOptions():105:141 -> a
-    1:1:com.android.tools.r8.L8Command$Builder builder():96:96 -> builder
-    2:2:com.android.tools.r8.L8Command$Builder builder(com.android.tools.r8.DiagnosticsHandler):100:100 -> builder
-    1:1:com.android.tools.r8.D8Command getD8Command():36:36 -> c
-    1:1:com.android.tools.r8.R8Command getR8Command():40:40 -> d
-    1:1:boolean isShrinking():32:32 -> e
+    1:42:com.android.tools.r8.utils.InternalOptions getInternalOptions():107:148 -> a
+    1:1:com.android.tools.r8.L8Command$Builder builder():98:98 -> builder
+    2:2:com.android.tools.r8.L8Command$Builder builder(com.android.tools.r8.DiagnosticsHandler):102:102 -> builder
+    1:1:com.android.tools.r8.D8Command getD8Command():37:37 -> c
+    1:1:com.android.tools.r8.R8Command getR8Command():41:41 -> d
+    1:1:boolean isShrinking():33:33 -> e
 com.android.tools.r8.L8Command$1 -> com.android.tools.r8.L8Command$a:
 com.android.tools.r8.L8Command$Builder -> com.android.tools.r8.L8Command$Builder:
-    java.util.List proguardConfigStrings -> r
-    java.util.List proguardConfigFiles -> s
-    1:1:void <init>(com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.L8Command$1):152:152 -> <init>
-    2:2:void <init>(com.android.tools.r8.L8Command$1):152:152 -> <init>
-    3:3:void <init>():158:158 -> <init>
-    4:4:void <init>(com.android.tools.r8.DiagnosticsHandler):162:162 -> <init>
-    5:6:void <init>(com.android.tools.r8.DiagnosticsHandler):154:155 -> <init>
-    1:1:com.android.tools.r8.L8Command$Builder addProguardConfiguration(java.util.List,com.android.tools.r8.origin.Origin):194:194 -> addProguardConfiguration
-    1:1:com.android.tools.r8.L8Command$Builder addProguardConfigurationFiles(java.nio.file.Path[]):182:182 -> addProguardConfigurationFiles
-    2:2:com.android.tools.r8.L8Command$Builder addProguardConfigurationFiles(java.util.List):188:188 -> addProguardConfigurationFiles
-    1:5:com.android.tools.r8.L8Command makeCommand():220:224 -> c
-    1:5:com.android.tools.r8.BaseCommand makeCommand():151 -> c
-    6:6:com.android.tools.r8.CompilationMode defaultCompilationMode():177:177 -> c
-    6:6:com.android.tools.r8.L8Command makeCommand():225 -> c
-    6:6:com.android.tools.r8.BaseCommand makeCommand():151 -> c
-    7:35:com.android.tools.r8.L8Command makeCommand():225:253 -> c
-    7:35:com.android.tools.r8.BaseCommand makeCommand():151 -> c
-    36:61:com.android.tools.r8.L8Command makeCommand():252:277 -> c
-    36:61:com.android.tools.r8.BaseCommand makeCommand():151 -> c
-    62:62:com.android.tools.r8.L8Command makeCommand():221:221 -> c
-    62:62:com.android.tools.r8.BaseCommand makeCommand():151 -> c
+    java.util.List proguardConfigFiles -> t
+    java.util.List proguardConfigStrings -> s
+    1:1:void <init>(com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.L8Command$1):159:159 -> <init>
+    2:2:void <init>(com.android.tools.r8.L8Command$1):159:159 -> <init>
+    3:3:void <init>():165:165 -> <init>
+    4:4:void <init>(com.android.tools.r8.DiagnosticsHandler):169:169 -> <init>
+    5:6:void <init>(com.android.tools.r8.DiagnosticsHandler):161:162 -> <init>
+    1:1:com.android.tools.r8.L8Command$Builder addProguardConfiguration(java.util.List,com.android.tools.r8.origin.Origin):201:201 -> addProguardConfiguration
+    1:1:com.android.tools.r8.L8Command$Builder addProguardConfigurationFiles(java.nio.file.Path[]):189:189 -> addProguardConfigurationFiles
+    2:2:com.android.tools.r8.L8Command$Builder addProguardConfigurationFiles(java.util.List):195:195 -> addProguardConfigurationFiles
+    1:5:com.android.tools.r8.L8Command makeCommand():227:231 -> c
+    1:5:com.android.tools.r8.BaseCommand makeCommand():158 -> c
+    6:6:com.android.tools.r8.CompilationMode defaultCompilationMode():184:184 -> c
+    6:6:com.android.tools.r8.L8Command makeCommand():232 -> c
+    6:6:com.android.tools.r8.BaseCommand makeCommand():158 -> c
+    7:35:com.android.tools.r8.L8Command makeCommand():232:260 -> c
+    7:35:com.android.tools.r8.BaseCommand makeCommand():158 -> c
+    36:61:com.android.tools.r8.L8Command makeCommand():259:284 -> c
+    36:61:com.android.tools.r8.BaseCommand makeCommand():158 -> c
+    62:62:com.android.tools.r8.L8Command makeCommand():228:228 -> c
+    62:62:com.android.tools.r8.BaseCommand makeCommand():158 -> c
     com.android.tools.r8.BaseCommand$Builder self() -> d
-    1:16:void validate():200:215 -> e
-    1:1:com.android.tools.r8.CompilationMode defaultCompilationMode():177:177 -> f
-    1:1:boolean isShrinking():167:167 -> isShrinking
+    1:16:void validate():207:222 -> e
+    1:1:com.android.tools.r8.CompilationMode defaultCompilationMode():184:184 -> f
+    1:1:boolean isShrinking():174:174 -> isShrinking
 com.android.tools.r8.L8Command$DefaultL8DiagnosticsHandler -> com.android.tools.r8.L8Command$b:
-    1:1:void <init>():79:79 -> <init>
-    1:5:void error(com.android.tools.r8.Diagnostic):83:87 -> error
-    6:12:void error(com.android.tools.r8.Diagnostic):85:91 -> error
+    1:1:void <init>():81:81 -> <init>
+    1:5:void error(com.android.tools.r8.Diagnostic):85:89 -> error
+    6:12:void error(com.android.tools.r8.Diagnostic):87:93 -> error
 com.android.tools.r8.L8Command$DesugaredLibrary -> com.android.tools.r8.L8Command$c:
     java.util.List resources -> a
-    1:3:void <init>():283:285 -> <init>
-    1:3:void accept(com.android.tools.r8.ByteDataView,java.lang.String,com.android.tools.r8.DiagnosticsHandler):291:293 -> accept
-    4:4:void accept(com.android.tools.r8.ByteDataView,java.lang.String,com.android.tools.r8.DiagnosticsHandler):292:292 -> accept
-    5:5:void accept(com.android.tools.r8.ByteDataView,java.lang.String,com.android.tools.r8.DiagnosticsHandler):291:291 -> accept
-    1:1:java.util.Collection getProgramResources():298:298 -> getProgramResources
+    1:3:void <init>():290:292 -> <init>
+    1:3:void accept(com.android.tools.r8.ByteDataView,java.lang.String,com.android.tools.r8.DiagnosticsHandler):298:300 -> accept
+    4:4:void accept(com.android.tools.r8.ByteDataView,java.lang.String,com.android.tools.r8.DiagnosticsHandler):299:299 -> accept
+    5:5:void accept(com.android.tools.r8.ByteDataView,java.lang.String,com.android.tools.r8.DiagnosticsHandler):298:298 -> accept
+    1:1:java.util.Collection getProgramResources():305:305 -> getProgramResources
 com.android.tools.r8.OutputMode -> com.android.tools.r8.OutputMode:
     com.android.tools.r8.OutputMode[] $VALUES -> a
     1:16:void <clinit>():11:26 -> <clinit>
@@ -1095,174 +1163,175 @@
     com.android.tools.r8.utils.Timing timing -> a
     com.android.tools.r8.utils.InternalOptions options -> b
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():139:139 -> <clinit>
-    1:7:void <init>(com.android.tools.r8.utils.InternalOptions):145:151 -> <init>
-    1:1:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):184:184 -> a
-    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
-    2:2:void lambda$run$5(com.android.tools.r8.graph.AppView,java.util.ArrayList,com.android.tools.r8.graph.DexType):582 -> a
-    3:4:void lambda$run$5(com.android.tools.r8.graph.AppView,java.util.ArrayList,com.android.tools.r8.graph.DexType):583:584 -> a
-    5:6:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):198:199 -> a
-    7:7:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():345:345 -> a
-    7:7:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):200 -> a
-    8:8:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):201:201 -> a
-    9:9:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():357:357 -> a
-    9:9:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):203 -> a
-    10:23:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):203:216 -> a
-    24:25:java.util.Set filterMissingClasses(java.util.Set,com.android.tools.r8.shaking.ProguardClassFilter):222:223 -> a
-    26:27:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):229:230 -> a
+    1:1:void <clinit>():138:138 -> <clinit>
+    1:7:void <init>(com.android.tools.r8.utils.InternalOptions):144:150 -> <init>
+    1:1:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):183:183 -> a
+    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
+    2:2:void lambda$run$5(com.android.tools.r8.graph.AppView,java.util.ArrayList,com.android.tools.r8.graph.DexType):575 -> a
+    3:4:void lambda$run$5(com.android.tools.r8.graph.AppView,java.util.ArrayList,com.android.tools.r8.graph.DexType):576:577 -> a
+    5:6:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):197:198 -> a
+    7:7:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():337:337 -> a
+    7:7:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):199 -> a
+    8:8:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):200:200 -> a
+    9:9:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():349:349 -> a
+    9:9:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):202 -> a
+    10:23:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):202:215 -> a
+    24:25:java.util.Set filterMissingClasses(java.util.Set,com.android.tools.r8.shaking.ProguardClassFilter):221:222 -> a
+    26:27:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):228:229 -> a
     28:28:void com.android.tools.r8.utils.ExceptionUtils.withR8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):55:55 -> a
-    28:28:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):230 -> a
-    29:55:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):247:273 -> a
-    56:86:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):272:302 -> a
-    87:91:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):301:305 -> a
-    92:92:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):304:304 -> a
-    93:104:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):303:314 -> a
-    105:107:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):313:315 -> a
-    108:135:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):309:336 -> a
-    136:160:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):335:359 -> a
-    161:161:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):356:356 -> a
-    162:213:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):352:403 -> a
-    214:236:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):402:424 -> a
-    237:261:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):421:445 -> a
-    262:281:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):442:461 -> a
-    282:296:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):458:472 -> a
-    297:306:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):469:478 -> a
-    307:319:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):475:487 -> a
-    320:328:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):485:493 -> a
-    329:379:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):490:540 -> a
-    380:384:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):536:540 -> a
-    385:469:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):534:618 -> a
-    470:470:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):616:616 -> a
-    471:489:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):615:633 -> a
-    490:506:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):631:647 -> a
-    507:507:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):644:644 -> a
-    508:523:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):641:656 -> a
-    524:579:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):655:710 -> a
-    580:675:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):709:804 -> a
-    676:705:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):749:778 -> a
-    706:706:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):774:774 -> a
-    707:727:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):772:792 -> a
-    728:745:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):787:804 -> a
-    746:746:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):676:676 -> a
-    747:747:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):519:519 -> a
-    748:1181:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):371:804 -> a
-    1182:1183:void lambda$run$2(com.android.tools.r8.graph.DexType):277:278 -> a
-    1184:1184:void lambda$run$2(com.android.tools.r8.graph.DexType):277:277 -> a
-    1185:1185:void lambda$run$4(com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):345:345 -> a
-    1186:1190:java.lang.Iterable lambda$run$6(com.android.tools.r8.shaking.MainDexClasses,com.android.tools.r8.graph.AppView):576:580 -> a
-    1191:1191:com.android.tools.r8.shaking.TreePrunerConfiguration lambda$run$7(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):632:632 -> a
-    1192:1192:java.lang.Iterable lambda$run$8(com.android.tools.r8.graph.AppView):657:657 -> a
-    1193:1193:void lambda$run$9(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):688:688 -> a
-    1194:1194:void lambda$run$10(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):696:696 -> a
-    1195:1195:void lambda$run$11(java.lang.String):743:743 -> a
-    1196:1196:void lambda$run$12(com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder,com.android.tools.r8.graph.DexEncodedMethod):754:754 -> a
-    1197:1197:boolean lambda$run$13(com.android.tools.r8.graph.DexProgramClass):766:766 -> a
-    1198:1206:com.android.tools.r8.graph.AppView runEnqueuer(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView):811:819 -> a
-    1207:1215:com.android.tools.r8.graph.AppView runEnqueuer(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView):817:825 -> a
-    1216:1216:com.android.tools.r8.graph.AppView runEnqueuer(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView):823:823 -> a
-    1217:1217:com.android.tools.r8.graph.AppView runEnqueuer(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView):822:822 -> a
-    1218:1220:void processWhyAreYouKeepingAndCheckDiscarded(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.function.Supplier,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):842:844 -> a
-    1221:1243:void processWhyAreYouKeepingAndCheckDiscarded(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.function.Supplier,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):843:865 -> a
-    1244:1255:void processWhyAreYouKeepingAndCheckDiscarded(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.function.Supplier,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):863:874 -> a
-    1256:1261:void processWhyAreYouKeepingAndCheckDiscarded(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.function.Supplier,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):873:878 -> a
-    1262:1267:void processWhyAreYouKeepingAndCheckDiscarded(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.function.Supplier,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):876:881 -> a
-    1268:1268:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    1268:1268:void processWhyAreYouKeepingAndCheckDiscarded(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.function.Supplier,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):881 -> a
-    1269:1269:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    1269:1269:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    1269:1269:void processWhyAreYouKeepingAndCheckDiscarded(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.function.Supplier,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):881 -> a
-    1270:1270:void processWhyAreYouKeepingAndCheckDiscarded(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.function.Supplier,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):881:881 -> a
-    1271:1277:void computeKotlinInfoForProgramClasses(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView):885:891 -> a
-    1278:1281:boolean verifyNoJarApplicationReaders(java.util.List):896:899 -> a
-    1282:1282:void lambda$run$14(com.android.tools.r8.R8Command,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):921:921 -> a
-    1283:1283:void lambda$main$15(java.lang.String[]):937:937 -> a
+    28:28:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):229 -> a
+    29:55:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):246:272 -> a
+    56:86:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):271:301 -> a
+    87:91:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):300:304 -> a
+    92:92:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):303:303 -> a
+    93:104:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):302:313 -> a
+    105:107:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):312:314 -> a
+    108:129:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):308:329 -> a
+    130:154:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):328:352 -> a
+    155:155:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):349:349 -> a
+    156:207:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):345:396 -> a
+    208:230:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):395:417 -> a
+    231:255:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):414:438 -> a
+    256:275:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):435:454 -> a
+    276:290:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):451:465 -> a
+    291:300:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):462:471 -> a
+    301:313:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):468:480 -> a
+    314:322:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):478:486 -> a
+    323:373:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):483:533 -> a
+    374:378:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):529:533 -> a
+    379:463:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):527:611 -> a
+    464:464:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):609:609 -> a
+    465:483:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):608:626 -> a
+    484:500:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):624:640 -> a
+    501:501:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):637:637 -> a
+    502:517:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):634:649 -> a
+    518:573:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):648:703 -> a
+    574:670:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):702:798 -> a
+    671:700:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):743:772 -> a
+    701:701:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):768:768 -> a
+    702:722:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):766:786 -> a
+    723:740:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):781:798 -> a
+    741:741:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):669:669 -> a
+    742:742:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):512:512 -> a
+    743:1177:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):364:798 -> a
+    1178:1179:void lambda$run$2(com.android.tools.r8.graph.DexType):276:277 -> a
+    1180:1180:void lambda$run$2(com.android.tools.r8.graph.DexType):276:276 -> a
+    1181:1181:void lambda$run$4(com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):338:338 -> a
+    1182:1186:java.lang.Iterable lambda$run$6(com.android.tools.r8.shaking.MainDexClasses,com.android.tools.r8.graph.AppView):569:573 -> a
+    1187:1187:com.android.tools.r8.shaking.TreePrunerConfiguration lambda$run$7(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):625:625 -> a
+    1188:1188:java.lang.Iterable lambda$run$8(com.android.tools.r8.graph.AppView):650:650 -> a
+    1189:1189:void lambda$run$9(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):681:681 -> a
+    1190:1190:void lambda$run$10(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):689:689 -> a
+    1191:1191:void lambda$run$11(java.lang.String):737:737 -> a
+    1192:1192:void lambda$run$12(com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder,com.android.tools.r8.graph.DexEncodedMethod):748:748 -> a
+    1193:1193:boolean lambda$run$13(com.android.tools.r8.graph.DexProgramClass):760:760 -> a
+    1194:1202:com.android.tools.r8.graph.AppView runEnqueuer(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView):805:813 -> a
+    1203:1211:com.android.tools.r8.graph.AppView runEnqueuer(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView):811:819 -> a
+    1212:1212:com.android.tools.r8.graph.AppView runEnqueuer(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView):817:817 -> a
+    1213:1213:com.android.tools.r8.graph.AppView runEnqueuer(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView):816:816 -> a
+    1214:1216:void processWhyAreYouKeepingAndCheckDiscarded(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.function.Supplier,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):836:838 -> a
+    1217:1239:void processWhyAreYouKeepingAndCheckDiscarded(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.function.Supplier,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):837:859 -> a
+    1240:1251:void processWhyAreYouKeepingAndCheckDiscarded(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.function.Supplier,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):857:868 -> a
+    1252:1257:void processWhyAreYouKeepingAndCheckDiscarded(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.function.Supplier,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):867:872 -> a
+    1258:1263:void processWhyAreYouKeepingAndCheckDiscarded(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.function.Supplier,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):870:875 -> a
+    1264:1264:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    1264:1264:void processWhyAreYouKeepingAndCheckDiscarded(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.function.Supplier,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):875 -> a
+    1265:1265:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    1265:1265:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    1265:1265:void processWhyAreYouKeepingAndCheckDiscarded(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.function.Supplier,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):875 -> a
+    1266:1266:void processWhyAreYouKeepingAndCheckDiscarded(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.function.Supplier,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):875:875 -> a
+    1267:1273:void computeKotlinInfoForProgramClasses(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView):879:885 -> a
+    1274:1277:boolean verifyNoJarApplicationReaders(java.util.List):890:893 -> a
+    1278:1278:void lambda$run$14(com.android.tools.r8.R8Command,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):915:915 -> a
+    1279:1279:void lambda$main$15(java.lang.String[]):931:931 -> a
     boolean lambda$run$3(com.android.tools.r8.graph.DexType) -> b
-    1:3:void lambda$runForTesting$1(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):234:236 -> b
-    4:5:void run(java.lang.String[]):907:908 -> b
+    1:3:void lambda$runForTesting$1(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):233:235 -> b
+    4:5:void run(java.lang.String[]):901:902 -> b
     6:6:void com.android.tools.r8.utils.SelfRetraceTest.test():25:25 -> b
-    6:6:void run(java.lang.String[]):909 -> b
-    7:7:void run(java.lang.String[]):910:910 -> b
+    6:6:void run(java.lang.String[]):903 -> b
+    7:7:void run(java.lang.String[]):904:904 -> b
     8:8:void com.android.tools.r8.utils.SelfRetraceTest.foo3():13:13 -> b
     8:8:void com.android.tools.r8.utils.SelfRetraceTest.foo2():17 -> b
     8:8:void com.android.tools.r8.utils.SelfRetraceTest.foo1():21 -> b
     8:8:void com.android.tools.r8.utils.SelfRetraceTest.test():26 -> b
-    8:8:void run(java.lang.String[]):909 -> b
-    9:16:void run(java.lang.String[]):913:920 -> b
+    8:8:void run(java.lang.String[]):903 -> b
+    9:16:void run(java.lang.String[]):907:914 -> b
     17:17:void com.android.tools.r8.utils.ExceptionUtils.withR8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):55:55 -> b
-    17:17:void run(java.lang.String[]):920 -> b
-    18:18:void run(java.lang.String[]):923:923 -> b
-    1:1:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):243:243 -> c
-    1:5:void main(java.lang.String[]):933:937 -> main
-    1:3:void run(com.android.tools.r8.R8Command):163:165 -> run
-    4:7:void run(com.android.tools.r8.R8Command,java.util.concurrent.ExecutorService):179:182 -> run
+    17:17:void run(java.lang.String[]):914 -> b
+    18:18:void run(java.lang.String[]):917:917 -> b
+    1:1:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):242:242 -> c
+    1:5:void main(java.lang.String[]):927:931 -> main
+    1:3:void run(com.android.tools.r8.R8Command):162:164 -> run
+    4:7:void run(com.android.tools.r8.R8Command,java.util.concurrent.ExecutorService):178:181 -> run
     8:8:void com.android.tools.r8.utils.ExceptionUtils.withR8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):55:55 -> run
-    8:8:void run(com.android.tools.r8.R8Command,java.util.concurrent.ExecutorService):181 -> run
+    8:8:void run(com.android.tools.r8.R8Command,java.util.concurrent.ExecutorService):180 -> run
 com.android.tools.r8.R8Command -> com.android.tools.r8.R8Command:
-    java.util.List mainDexKeepRules -> o
-    com.android.tools.r8.StringConsumer proguardSeedsConsumer -> w
-    com.android.tools.r8.StringConsumer proguardConfigurationConsumer -> x
-    com.android.tools.r8.StringConsumer proguardMapConsumer -> u
-    com.android.tools.r8.StringConsumer proguardUsageConsumer -> v
-    com.android.tools.r8.features.FeatureSplitConfiguration featureSplitConfiguration -> D
-    boolean enableTreeShaking -> q
-    boolean enableMinification -> r
-    boolean disableVerticalClassMerging -> s
-    boolean forceProguardCompatibility -> t
-    com.android.tools.r8.experimental.graphinfo.GraphConsumer keptGraphConsumer -> y
-    com.android.tools.r8.shaking.ProguardConfiguration proguardConfiguration -> p
-    com.android.tools.r8.experimental.graphinfo.GraphConsumer mainDexKeptGraphConsumer -> z
-    java.util.function.Consumer syntheticProguardRulesConsumer -> A
-    boolean $assertionsDisabled -> F
-    com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration libraryConfiguration -> C
-    java.lang.String USAGE_MESSAGE -> E
-    com.android.tools.r8.StringConsumer desugaredLibraryKeepRuleConsumer -> B
-    1:574:void <clinit>():56:629 -> <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,boolean,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,com.android.tools.r8.R8Command$1):57:57 -> <init>
+    java.lang.String USAGE_MESSAGE -> F
+    java.util.List mainDexKeepRules -> p
+    com.android.tools.r8.StringConsumer proguardConfigurationConsumer -> y
+    boolean forceProguardCompatibility -> u
+    com.android.tools.r8.StringConsumer proguardUsageConsumer -> w
+    com.android.tools.r8.features.FeatureSplitConfiguration featureSplitConfiguration -> E
+    com.android.tools.r8.StringConsumer proguardSeedsConsumer -> x
+    com.android.tools.r8.StringConsumer proguardMapConsumer -> v
+    boolean enableTreeShaking -> r
+    boolean enableMinification -> s
+    boolean disableVerticalClassMerging -> t
+    com.android.tools.r8.shaking.ProguardConfiguration proguardConfiguration -> q
+    com.android.tools.r8.experimental.graphinfo.GraphConsumer keptGraphConsumer -> z
+    java.util.function.Consumer syntheticProguardRulesConsumer -> B
+    com.android.tools.r8.experimental.graphinfo.GraphConsumer mainDexKeptGraphConsumer -> A
+    boolean $assertionsDisabled -> G
+    com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration libraryConfiguration -> D
+    com.android.tools.r8.StringConsumer desugaredLibraryKeepRuleConsumer -> C
+    1:575:void <clinit>():56:630 -> <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,boolean,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,com.android.tools.r8.AssertionsConfiguration,com.android.tools.r8.R8Command$1):57:57 -> <init>
     2:2:void <init>(boolean,boolean,com.android.tools.r8.R8Command$1):57:57 -> <init>
-    3:31: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,boolean,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):722:750 -> <init>
-    32:48:void <init>(boolean,boolean):754:770 -> <init>
-    1:1:com.android.tools.r8.R8Command$Builder builder(com.android.tools.r8.utils.AndroidApp):660:660 -> a
-    2:2:com.android.tools.r8.R8Command$Builder builder(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.DiagnosticsHandler):665:665 -> a
-    3:55:com.android.tools.r8.utils.InternalOptions getInternalOptions():785:837 -> a
-    56:66:com.android.tools.r8.utils.InternalOptions getInternalOptions():834:844 -> a
-    67:77:com.android.tools.r8.utils.InternalOptions getInternalOptions():841:851 -> a
-    78:88:com.android.tools.r8.utils.InternalOptions getInternalOptions():848:858 -> a
-    89:106:com.android.tools.r8.utils.InternalOptions getInternalOptions():855:872 -> a
-    107:107:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():345:345 -> a
-    107:107:com.android.tools.r8.utils.InternalOptions getInternalOptions():873 -> a
-    108:108:com.android.tools.r8.utils.InternalOptions getInternalOptions():874:874 -> a
-    109:109:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():345:345 -> a
-    109:109:com.android.tools.r8.utils.InternalOptions getInternalOptions():880 -> a
-    110:124:com.android.tools.r8.utils.InternalOptions getInternalOptions():881:895 -> a
-    125:127:com.android.tools.r8.StringConsumer wrapStringConsumer(com.android.tools.r8.StringConsumer,boolean,java.nio.file.Path):904:906 -> a
-    1:1:com.android.tools.r8.R8Command$Builder builder():650:650 -> builder
+    3:32: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,boolean,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,com.android.tools.r8.AssertionsConfiguration):724:753 -> <init>
+    33:49:void <init>(boolean,boolean):757:773 -> <init>
+    1:1:com.android.tools.r8.R8Command$Builder builder(com.android.tools.r8.utils.AndroidApp):661:661 -> a
+    2:2:com.android.tools.r8.R8Command$Builder builder(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.DiagnosticsHandler):666:666 -> a
+    3:55:com.android.tools.r8.utils.InternalOptions getInternalOptions():788:840 -> a
+    56:66:com.android.tools.r8.utils.InternalOptions getInternalOptions():837:847 -> a
+    67:77:com.android.tools.r8.utils.InternalOptions getInternalOptions():844:854 -> a
+    78:88:com.android.tools.r8.utils.InternalOptions getInternalOptions():851:861 -> a
+    89:104:com.android.tools.r8.utils.InternalOptions getInternalOptions():858:873 -> a
+    105:105:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():337:337 -> a
+    105:105:com.android.tools.r8.utils.InternalOptions getInternalOptions():878 -> a
+    106:107:com.android.tools.r8.utils.InternalOptions getInternalOptions():879:880 -> a
+    108:108:com.android.tools.r8.utils.InternalOptions getInternalOptions():877:877 -> a
+    109:109:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():337:337 -> a
+    109:109:com.android.tools.r8.utils.InternalOptions getInternalOptions():885 -> a
+    110:124:com.android.tools.r8.utils.InternalOptions getInternalOptions():886:900 -> a
+    125:127:com.android.tools.r8.StringConsumer wrapStringConsumer(com.android.tools.r8.StringConsumer,boolean,java.nio.file.Path):909:911 -> a
+    1:1:com.android.tools.r8.R8Command$Builder builder():651:651 -> builder
     2:2:void com.android.tools.r8.R8Command$Builder.<init>():109:109 -> builder
-    2:2:com.android.tools.r8.R8Command$Builder builder():650 -> builder
-    3:3:com.android.tools.r8.R8Command$Builder builder(com.android.tools.r8.DiagnosticsHandler):655:655 -> builder
-    1:1:boolean getEnableMinification():780:780 -> getEnableMinification
-    1:1:boolean getEnableTreeShaking():775:775 -> getEnableTreeShaking
-    1:1:com.android.tools.r8.R8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin):678:678 -> parse
-    2:2:com.android.tools.r8.R8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.DiagnosticsHandler):692:692 -> parse
+    2:2:com.android.tools.r8.R8Command$Builder builder():651 -> builder
+    3:3:com.android.tools.r8.R8Command$Builder builder(com.android.tools.r8.DiagnosticsHandler):656:656 -> builder
+    1:1:boolean getEnableMinification():783:783 -> getEnableMinification
+    1:1:boolean getEnableTreeShaking():778:778 -> getEnableTreeShaking
+    1:1:com.android.tools.r8.R8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin):679:679 -> parse
+    2:2:com.android.tools.r8.R8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.DiagnosticsHandler):693:693 -> 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:
-    java.util.List mainDexRules -> r
-    com.android.tools.r8.experimental.graphinfo.GraphConsumer mainDexKeptGraphConsumer -> F
-    boolean $assertionsDisabled -> I
-    java.util.function.Consumer syntheticProguardRulesConsumer -> t
-    java.util.List proguardConfigs -> v
-    java.util.function.Consumer proguardConfigurationConsumerForTesting -> s
-    com.android.tools.r8.StringConsumer desugaredLibraryKeepRuleConsumer -> u
-    boolean disableTreeShaking -> w
-    boolean disableMinification -> x
-    boolean disableVerticalClassMerging -> y
-    boolean forceProguardCompatibility -> z
-    java.util.List featureSplits -> G
-    boolean allowTestProguardOptions -> H
-    com.android.tools.r8.StringConsumer proguardSeedsConsumer -> C
-    com.android.tools.r8.StringConsumer proguardConfigurationConsumer -> D
-    com.android.tools.r8.experimental.graphinfo.GraphConsumer keptGraphConsumer -> E
-    com.android.tools.r8.StringConsumer proguardMapConsumer -> A
-    com.android.tools.r8.StringConsumer proguardUsageConsumer -> B
+    com.android.tools.r8.experimental.graphinfo.GraphConsumer keptGraphConsumer -> F
+    com.android.tools.r8.experimental.graphinfo.GraphConsumer mainDexKeptGraphConsumer -> G
+    java.util.function.Consumer proguardConfigurationConsumerForTesting -> t
+    boolean allowTestProguardOptions -> I
+    boolean $assertionsDisabled -> J
+    java.util.List mainDexRules -> s
+    java.util.function.Consumer syntheticProguardRulesConsumer -> u
+    com.android.tools.r8.StringConsumer desugaredLibraryKeepRuleConsumer -> v
+    java.util.List proguardConfigs -> w
+    boolean disableTreeShaking -> x
+    boolean disableMinification -> y
+    boolean disableVerticalClassMerging -> z
+    com.android.tools.r8.StringConsumer proguardConfigurationConsumer -> E
+    java.util.List featureSplits -> H
+    boolean forceProguardCompatibility -> A
+    com.android.tools.r8.StringConsumer proguardUsageConsumer -> C
+    com.android.tools.r8.StringConsumer proguardSeedsConsumer -> D
+    com.android.tools.r8.StringConsumer proguardMapConsumer -> B
     1:1:void <clinit>():64:64 -> <clinit>
     1:1:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.R8Command$1):65:65 -> <init>
     2:2:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.R8Command$1):65:65 -> <init>
@@ -1281,8 +1350,8 @@
     9:10:void lambda$addProguardConfigurationFiles$5(java.util.List):206:207 -> a
     11:11:com.android.tools.r8.InternalProgramOutputPathConsumer createProgramOutputConsumer(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):392:392 -> a
     12:14:void lambda$makeR8Command$7(com.android.tools.r8.DataResourceProvider$Visitor,com.android.tools.r8.utils.Reporter,com.android.tools.r8.DataResourceProvider):511:513 -> a
-    15:16:void addProguardConfigurationConsumerForTesting(java.util.function.Consumer):572:573 -> a
-    17:19:void lambda$addProguardConfigurationConsumerForTesting$8(java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.shaking.ProguardConfiguration$Builder):576:578 -> a
+    15:16:void addProguardConfigurationConsumerForTesting(java.util.function.Consumer):573:574 -> a
+    17:19:void lambda$addProguardConfigurationConsumerForTesting$8(java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.shaking.ProguardConfiguration$Builder):577:579 -> a
     1:1:com.android.tools.r8.R8Command$Builder addFeatureSplit(java.util.function.Function):366:366 -> addFeatureSplit
     2:2:com.android.tools.r8.FeatureSplit$Builder com.android.tools.r8.FeatureSplit.builder(com.android.tools.r8.DiagnosticsHandler):50:50 -> addFeatureSplit
     2:2:com.android.tools.r8.R8Command$Builder addFeatureSplit(java.util.function.Function):366 -> addFeatureSplit
@@ -1300,7 +1369,7 @@
     2:3:void lambda$addProguardConfigurationFiles$4(java.nio.file.Path[]):196:197 -> b
     4:5:void lambda$addProguardConfiguration$6(java.util.List,com.android.tools.r8.origin.Origin):215:216 -> b
     6:6:void lambda$addProguardConfiguration$6(java.util.List,com.android.tools.r8.origin.Origin):215:215 -> b
-    7:9:void addSyntheticProguardRulesConsumerForTesting(java.util.function.Consumer):585:587 -> b
+    7:9:void addSyntheticProguardRulesConsumerForTesting(java.util.function.Consumer):586:588 -> b
     1:1:com.android.tools.r8.BaseCommand makeCommand():64:64 -> c
     2:5:com.android.tools.r8.R8Command makeCommand():443:446 -> c
     6:6:com.android.tools.r8.R8Command makeCommand():444:444 -> c
@@ -1309,9 +1378,9 @@
     19:44:void validate():412:437 -> e
     1:1:com.android.tools.r8.CompilationMode defaultCompilationMode():141:141 -> f
     void allowPartiallyImplementedProguardOptions() -> j
-    1:1:void allowTestProguardOptions():598:598 -> k
+    1:1:void allowTestProguardOptions():599:599 -> k
     1:1:void internalForceProguardCompatibility():127:127 -> l
-    1:113:com.android.tools.r8.R8Command makeR8Command():450:562 -> m
+    1:117:com.android.tools.r8.R8Command makeR8Command():450:566 -> m
     1:1:com.android.tools.r8.R8Command$Builder setDesugaredLibraryKeepRuleConsumer(com.android.tools.r8.StringConsumer):255:255 -> setDesugaredLibraryKeepRuleConsumer
     1:1:com.android.tools.r8.R8Command$Builder setDisableMinification(boolean):162:162 -> setDisableMinification
     1:1:com.android.tools.r8.R8Command$Builder setDisableTreeShaking(boolean):151:151 -> setDisableTreeShaking
@@ -1345,13 +1414,13 @@
     7:14:void error(com.android.tools.r8.Diagnostic):74:81 -> 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):607:608 -> <init>
-    1:1:com.android.tools.r8.DataResourceProvider getDataResourceProvider():625:625 -> getDataResourceProvider
-    1:4:java.util.Collection getProgramResources():613:616 -> getProgramResources
+    1:2:void <init>(com.android.tools.r8.ProgramResourceProvider):608:609 -> <init>
+    1:1:com.android.tools.r8.DataResourceProvider getDataResourceProvider():626:626 -> getDataResourceProvider
+    1:4:java.util.Collection getProgramResources():614:617 -> getProgramResources
 com.android.tools.r8.R8Command$StandardOutConsumer -> com.android.tools.r8.R8Command$c:
-    1:1:void <init>(com.android.tools.r8.StringConsumer):915:915 -> <init>
-    1:2:void accept(java.lang.String,com.android.tools.r8.DiagnosticsHandler):920:921 -> accept
-com.android.tools.r8.R8CommandParser -> com.android.tools.r8.m:
+    1:1:void <init>(com.android.tools.r8.StringConsumer):920:920 -> <init>
+    1:2:void accept(java.lang.String,com.android.tools.r8.DiagnosticsHandler):925:926 -> accept
+com.android.tools.r8.R8CommandParser -> com.android.tools.r8.l:
     java.util.Set OPTIONS_WITH_PARAMETER -> a
     java.lang.String USAGE_MESSAGE -> b
     1:47:void <clinit>():18:64 -> <clinit>
@@ -1366,8 +1435,8 @@
     58:103:void parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.R8Command$Builder,com.android.tools.r8.R8CommandParser$ParseState):170:215 -> a
     58:103:com.android.tools.r8.R8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.R8Command$Builder):108 -> a
     104:109:com.android.tools.r8.R8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.R8Command$Builder):109:114 -> a
-com.android.tools.r8.R8CommandParser$1 -> com.android.tools.r8.k:
-com.android.tools.r8.R8CommandParser$ParseState -> com.android.tools.r8.l:
+com.android.tools.r8.R8CommandParser$1 -> com.android.tools.r8.j:
+com.android.tools.r8.R8CommandParser$ParseState -> com.android.tools.r8.k:
     java.nio.file.Path outputPath -> c
     com.android.tools.r8.OutputMode outputMode -> b
     boolean includeDataResources -> e
@@ -1553,14 +1622,14 @@
     1:3:void <init>(com.android.tools.r8.origin.Origin,java.io.Writer,com.android.tools.r8.StringConsumer):189:191 -> <init>
     1:6:void accept(java.lang.String,com.android.tools.r8.DiagnosticsHandler):196:201 -> accept
     1:5:void finished(com.android.tools.r8.DiagnosticsHandler):207:211 -> finished
-com.android.tools.r8.StringResource -> com.android.tools.r8.n:
+com.android.tools.r8.StringResource -> com.android.tools.r8.m:
     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 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.n$a:
-com.android.tools.r8.StringResource$FileResource -> com.android.tools.r8.n$b:
+com.android.tools.r8.StringResource$1 -> com.android.tools.r8.m$a:
+com.android.tools.r8.StringResource$FileResource -> com.android.tools.r8.m$b:
     java.nio.charset.Charset charset -> b
     com.android.tools.r8.origin.Origin origin -> c
     java.nio.file.Path file -> a
@@ -1570,7 +1639,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.n$c:
+com.android.tools.r8.StringResource$StringContentResource -> com.android.tools.r8.m$c:
     com.android.tools.r8.origin.Origin origin -> a
     java.lang.String content -> b
     boolean $assertionsDisabled -> c
@@ -1591,20 +1660,20 @@
     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.bisect.Bisect -> com.android.tools.r8.o.a:
+com.android.tools.r8.bisect.Bisect -> com.android.tools.r8.n.a:
     1:4:com.android.tools.r8.graph.DexProgramClass run(com.android.tools.r8.bisect.BisectState,com.android.tools.r8.bisect.Bisect$Command,java.nio.file.Path,java.util.concurrent.ExecutorService):76:79 -> a
     5:17:void writeApp(com.android.tools.r8.graph.DexApplication,java.nio.file.Path,java.util.concurrent.ExecutorService):183:195 -> a
     5:17:com.android.tools.r8.graph.DexProgramClass run(com.android.tools.r8.bisect.BisectState,com.android.tools.r8.bisect.Bisect$Command,java.nio.file.Path,java.util.concurrent.ExecutorService):82 -> a
     18:25:com.android.tools.r8.graph.DexProgramClass run(com.android.tools.r8.bisect.BisectState,com.android.tools.r8.bisect.Bisect$Command,java.nio.file.Path,java.util.concurrent.ExecutorService):83:90 -> a
-com.android.tools.r8.bisect.Bisect$Command -> com.android.tools.r8.o.a$a:
+com.android.tools.r8.bisect.Bisect$Command -> com.android.tools.r8.n.a$a:
     com.android.tools.r8.bisect.BisectOptions$Result apply(com.android.tools.r8.graph.DexApplication) -> a
-com.android.tools.r8.bisect.BisectOptions$Result -> com.android.tools.r8.o.b:
+com.android.tools.r8.bisect.BisectOptions$Result -> com.android.tools.r8.n.b:
     com.android.tools.r8.bisect.BisectOptions$Result UNKNOWN -> a
     com.android.tools.r8.bisect.BisectOptions$Result GOOD -> b
     com.android.tools.r8.bisect.BisectOptions$Result BAD -> c
     1:1:void <clinit>():33:33 -> <clinit>
     1:1:void <init>(java.lang.String,int):33:33 -> <init>
-com.android.tools.r8.bisect.BisectState -> com.android.tools.r8.o.c:
+com.android.tools.r8.bisect.BisectState -> com.android.tools.r8.n.c:
     java.nio.file.Path stateFile -> e
     com.android.tools.r8.graph.DexApplication badApp -> b
     java.util.Map indexMap -> d
@@ -1683,7 +1752,7 @@
     8:10:void write():316 -> d
     11:16:void write():317:322 -> d
     17:27:void write():312:322 -> d
-com.android.tools.r8.bisect.BisectState$Range -> com.android.tools.r8.o.c$a:
+com.android.tools.r8.bisect.BisectState$Range -> com.android.tools.r8.n.c$a:
     int end -> b
     boolean $assertionsDisabled -> c
     int start -> a
@@ -1697,14 +1766,14 @@
     1:5:boolean equals(java.lang.Object):100:104 -> equals
     1:1:int hashCode():109:109 -> hashCode
     1:1:java.lang.String toString():95:95 -> toString
-com.android.tools.r8.bisect.BisectState$Run -> com.android.tools.r8.o.c$b:
+com.android.tools.r8.bisect.BisectState$Run -> com.android.tools.r8.n.c$b:
     boolean good -> a
     boolean $assertionsDisabled -> c
     com.android.tools.r8.bisect.BisectState$Range range -> b
     1:1:void <clinit>():117:117 -> <clinit>
     1:4:void <init>(com.android.tools.r8.bisect.BisectOptions$Result,com.android.tools.r8.bisect.BisectState$Range):121:124 -> <init>
     5:9:void <init>(java.lang.String):127:131 -> <init>
-com.android.tools.r8.cf.CfCodePrinter -> com.android.tools.r8.p.a:
+com.android.tools.r8.cf.CfCodePrinter -> com.android.tools.r8.o.a:
     boolean pendingComma -> o
     java.util.Set imports -> j
     java.lang.StringBuilder builder -> p
@@ -1822,7 +1891,7 @@
     7:7:java.lang.String memberType(com.android.tools.r8.ir.code.MemberType):216:216 -> b
     1:1:boolean lambda$type$0(java.lang.String):176:176 -> c
     2:2:java.lang.String immutableListType():182:182 -> c
-com.android.tools.r8.cf.CfPrinter -> com.android.tools.r8.p.b:
+com.android.tools.r8.cf.CfPrinter -> com.android.tools.r8.o.b:
     java.util.List sortedLabels -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap labelToIndex -> c
     boolean $assertionsDisabled -> i
@@ -1964,7 +2033,7 @@
     17:18:void instructionIndex():668:669 -> b
     1:2:void newline():662:663 -> c
     1:1:java.lang.String toString():743:743 -> toString
-com.android.tools.r8.cf.CfRegisterAllocator -> com.android.tools.r8.p.d:
+com.android.tools.r8.cf.CfRegisterAllocator -> com.android.tools.r8.o.d:
     boolean $assertionsDisabled -> n
     int maxRegisterNumber -> l
     com.android.tools.r8.graph.AppView appView -> a
@@ -2059,12 +2128,12 @@
     87:96:com.android.tools.r8.cf.CfRegisterAllocator$TypesAtBlockEntry lambda$getTypesAtBlockEntry$0(com.android.tools.r8.ir.code.BasicBlock):368:377 -> b
     97:108:void mergeBlocks(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):383:394 -> b
     1:1:int registersUsed():123:123 -> c
-com.android.tools.r8.cf.CfRegisterAllocator$TypesAtBlockEntry -> com.android.tools.r8.p.c:
+com.android.tools.r8.cf.CfRegisterAllocator$TypesAtBlockEntry -> com.android.tools.r8.o.c:
     java.util.List stack -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap registers -> a
     1:3:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,java.util.List):71:73 -> <init>
     1:11:java.lang.String toString():78:88 -> toString
-com.android.tools.r8.cf.FixedLocalValue -> com.android.tools.r8.p.e:
+com.android.tools.r8.cf.FixedLocalValue -> com.android.tools.r8.o.e:
     com.android.tools.r8.ir.code.Phi phi -> r
     1:2:void <init>(com.android.tools.r8.ir.code.Phi):21:22 -> <init>
     boolean isConstant() -> L
@@ -2074,7 +2143,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 -> i0
     1:1:java.lang.String toString():45:45 -> toString
-com.android.tools.r8.cf.LoadStoreHelper -> com.android.tools.r8.p.g:
+com.android.tools.r8.cf.LoadStoreHelper -> com.android.tools.r8.o.g:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Map clonableConstants -> d
     boolean $assertionsDisabled -> f
@@ -2151,11 +2220,11 @@
     87:89:void 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
     87:89:void storeOutValue(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):206 -> b
     90:92: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.p.f:
+com.android.tools.r8.cf.LoadStoreHelper$PhiMove -> com.android.tools.r8.o.f:
     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.p.m:
+com.android.tools.r8.cf.TypeVerificationHelper -> com.android.tools.r8.o.m:
     boolean computingVerificationTypes -> i
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.AppView appView -> e
@@ -2170,14 +2239,14 @@
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):115:115 -> <init>
     2:15:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):110:123 -> <init>
     1:8:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo createInitializedType(com.android.tools.r8.graph.DexType):127:134 -> a
-    9:9:boolean com.android.tools.r8.graph.DexType.isFloatType():211:211 -> a
+    9:9:boolean com.android.tools.r8.graph.DexType.isFloatType():217:217 -> a
     9:9:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo createInitializedType(com.android.tools.r8.graph.DexType):136 -> a
     10:12:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo createInitializedType(com.android.tools.r8.graph.DexType):137:139 -> a
-    13:13:boolean com.android.tools.r8.graph.DexType.isByteType():195:195 -> a
+    13:13:boolean com.android.tools.r8.graph.DexType.isByteType():201:201 -> a
     13:13:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo createInitializedType(com.android.tools.r8.graph.DexType):140 -> a
-    14:14:boolean com.android.tools.r8.graph.DexType.isCharType():199:199 -> a
+    14:14:boolean com.android.tools.r8.graph.DexType.isCharType():205:205 -> a
     14:14:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo createInitializedType(com.android.tools.r8.graph.DexType):141 -> a
-    15:15:boolean com.android.tools.r8.graph.DexType.isShortType():203:203 -> a
+    15:15:boolean com.android.tools.r8.graph.DexType.isShortType():209:209 -> a
     15:15:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo createInitializedType(com.android.tools.r8.graph.DexType):142 -> a
     16:16:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo createInitializedType(com.android.tools.r8.graph.DexType):143:143 -> a
     17:22:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo createInitializedType(com.android.tools.r8.graph.DexType):139:144 -> a
@@ -2208,8 +2277,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.p.h:
-com.android.tools.r8.cf.TypeVerificationHelper$InitializedTypeInfo -> com.android.tools.r8.p.i:
+com.android.tools.r8.cf.TypeVerificationHelper$1 -> com.android.tools.r8.o.h:
+com.android.tools.r8.cf.TypeVerificationHelper$InitializedTypeInfo -> com.android.tools.r8.o.i:
     com.android.tools.r8.graph.DexType type -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():41:41 -> <clinit>
@@ -2217,7 +2286,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.p.j:
+com.android.tools.r8.cf.TypeVerificationHelper$NewInstanceInfo -> com.android.tools.r8.o.j:
     com.android.tools.r8.ir.code.NewInstance newInstance -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():60:60 -> <clinit>
@@ -2227,7 +2296,7 @@
     2:2:com.android.tools.r8.graph.DexType 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.p.k:
+com.android.tools.r8.cf.TypeVerificationHelper$ThisInstanceInfo -> com.android.tools.r8.o.k:
     com.android.tools.r8.ir.code.Argument thisArgument -> b
     com.android.tools.r8.graph.DexType type -> a
     boolean $assertionsDisabled -> c
@@ -2238,9 +2307,9 @@
     2:2:com.android.tools.r8.graph.DexType 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.p.l:
+com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo -> com.android.tools.r8.o.l:
     com.android.tools.r8.graph.DexType getDexType() -> a
-com.android.tools.r8.cf.code.CfArithmeticBinop -> com.android.tools.r8.p.n.a:
+com.android.tools.r8.cf.code.CfArithmeticBinop -> com.android.tools.r8.o.n.a:
     com.android.tools.r8.ir.code.NumericType type -> b
     com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode opcode -> a
     boolean $assertionsDisabled -> c
@@ -2277,17 +2346,17 @@
     48:48:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):156:156 -> a
     49:49:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):153:153 -> a
     50:50:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):150:150 -> a
-    1:1:boolean canThrow():139:139 -> g
-    1:13:int getAsmOpcode():98:110 -> t
-    14:14:int getAsmOpcode():108:108 -> t
-    15:15:int getAsmOpcode():106:106 -> t
-    16:16:int getAsmOpcode():104:104 -> t
-    17:17:int getAsmOpcode():102:102 -> t
-    18:18:int getAsmOpcode():100:100 -> t
-    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getOpcode():43:43 -> u
-    1:1:com.android.tools.r8.ir.code.NumericType getType():47:47 -> v
-    1:1:int getAsmOpcodeTypeOffset():115:115 -> w
-com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode -> com.android.tools.r8.p.n.a$a:
+    1:1:boolean canThrow():139:139 -> e
+    1:13:int getAsmOpcode():98:110 -> q
+    14:14:int getAsmOpcode():108:108 -> q
+    15:15:int getAsmOpcode():106:106 -> q
+    16:16:int getAsmOpcode():104:104 -> q
+    17:17:int getAsmOpcode():102:102 -> q
+    18:18:int getAsmOpcode():100:100 -> q
+    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getOpcode():43:43 -> r
+    1:1:com.android.tools.r8.ir.code.NumericType getType():47:47 -> s
+    1:1:int getAsmOpcodeTypeOffset():115:115 -> t
+com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode -> com.android.tools.r8.o.n.a$a:
     com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode[] $VALUES -> f
     com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode Sub -> b
     com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode Add -> a
@@ -2297,7 +2366,7 @@
     1:5:void <clinit>():25:29 -> <clinit>
     6:6:void <clinit>():24:24 -> <clinit>
     1:1:void <init>(java.lang.String,int):24:24 -> <init>
-com.android.tools.r8.cf.code.CfArrayLength -> com.android.tools.r8.p.n.b:
+com.android.tools.r8.cf.code.CfArrayLength -> com.android.tools.r8.o.n.b:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():20:20 -> <clinit>
     1:1:void <init>():20:20 -> <init>
@@ -2307,8 +2376,8 @@
     7:7:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):41:41 -> a
     8:8:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forArrayLength():67:67 -> a
     8:8:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView):51 -> a
-    boolean canThrow() -> g
-com.android.tools.r8.cf.code.CfArrayLoad -> com.android.tools.r8.p.n.c:
+    boolean canThrow() -> e
+com.android.tools.r8.cf.code.CfArrayLoad -> com.android.tools.r8.o.n.c:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.ir.code.MemberType type -> a
     1:1:void <clinit>():23:23 -> <clinit>
@@ -2333,9 +2402,9 @@
     51:59:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.ValueType.fromMemberType(com.android.tools.r8.ir.code.MemberType):42:50 -> a
     51:59:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):80 -> a
     60:66:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):81:87 -> a
-    boolean canThrow() -> g
-    1:1:com.android.tools.r8.ir.code.MemberType getType():33:33 -> t
-com.android.tools.r8.cf.code.CfArrayStore -> com.android.tools.r8.p.n.d:
+    boolean canThrow() -> e
+    1:1:com.android.tools.r8.ir.code.MemberType getType():33:33 -> q
+com.android.tools.r8.cf.code.CfArrayStore -> com.android.tools.r8.o.n.d:
     com.android.tools.r8.ir.code.MemberType type -> a
     1:2:void <init>(com.android.tools.r8.ir.code.MemberType):26:27 -> <init>
     1:19:int getStoreType():35:53 -> a
@@ -2345,9 +2414,9 @@
     22:22:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forArrayPut():71:71 -> a
     22:22:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView):86 -> a
     23:26:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):74:77 -> a
-    boolean canThrow() -> g
-    1:1:com.android.tools.r8.ir.code.MemberType getType():31:31 -> t
-com.android.tools.r8.cf.code.CfCheckCast -> com.android.tools.r8.p.n.e:
+    boolean canThrow() -> e
+    1:1:com.android.tools.r8.ir.code.MemberType getType():31:31 -> q
+com.android.tools.r8.cf.code.CfCheckCast -> com.android.tools.r8.o.n.e:
     com.android.tools.r8.graph.DexType type -> a
     1:2:void <init>(com.android.tools.r8.graph.DexType):25:26 -> <init>
     1:1:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens):35:35 -> a
@@ -2355,9 +2424,9 @@
     3:3:void registerUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexType):45:45 -> a
     4:6:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):56:58 -> a
     7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView):67:67 -> a
-    boolean canThrow() -> g
-    1:1:com.android.tools.r8.graph.DexType getType():30:30 -> t
-com.android.tools.r8.cf.code.CfCmp -> com.android.tools.r8.p.n.f:
+    boolean canThrow() -> e
+    1:1:com.android.tools.r8.graph.DexType getType():30:30 -> q
+com.android.tools.r8.cf.code.CfCmp -> com.android.tools.r8.o.n.f:
     com.android.tools.r8.ir.code.Cmp$Bias bias -> a
     com.android.tools.r8.ir.code.NumericType type -> b
     boolean $assertionsDisabled -> c
@@ -2374,12 +2443,12 @@
     8:8:void print(com.android.tools.r8.cf.CfPrinter):79:79 -> a
     9:9:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens):84:84 -> a
     10:12:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):89:91 -> a
-    1:9:int getAsmOpcode():65:73 -> t
-    10:10:int getAsmOpcode():71:71 -> t
-    11:11:int getAsmOpcode():69:69 -> t
-    1:1:com.android.tools.r8.ir.code.Cmp$Bias getBias():40:40 -> u
-    1:1:com.android.tools.r8.ir.code.NumericType getType():44:44 -> v
-com.android.tools.r8.cf.code.CfConstClass -> com.android.tools.r8.p.n.g:
+    1:9:int getAsmOpcode():65:73 -> q
+    10:10:int getAsmOpcode():71:71 -> q
+    11:11:int getAsmOpcode():69:69 -> q
+    1:1:com.android.tools.r8.ir.code.Cmp$Bias getBias():40:40 -> r
+    1:1:com.android.tools.r8.ir.code.NumericType getType():44:44 -> s
+com.android.tools.r8.cf.code.CfConstClass -> com.android.tools.r8.o.n.g:
     com.android.tools.r8.graph.DexType type -> a
     1:2:void <init>(com.android.tools.r8.graph.DexType):25:26 -> <init>
     1:1:void print(com.android.tools.r8.cf.CfPrinter):40:40 -> a
@@ -2391,9 +2460,9 @@
     26:26:void registerUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexType):76:76 -> a
     27:27:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):81:81 -> a
     28:28:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView):90:90 -> a
-    boolean canThrow() -> g
-    1:1:com.android.tools.r8.graph.DexType getType():30:30 -> t
-com.android.tools.r8.cf.code.CfConstMethodHandle -> com.android.tools.r8.p.n.h:
+    boolean canThrow() -> e
+    1:1:com.android.tools.r8.graph.DexType getType():30:30 -> q
+com.android.tools.r8.cf.code.CfConstMethodHandle -> com.android.tools.r8.o.n.h:
     com.android.tools.r8.graph.DexMethodHandle handle -> a
     1:2:void <init>(com.android.tools.r8.graph.DexMethodHandle):25:26 -> <init>
     1:1:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens):35:35 -> a
@@ -2403,9 +2472,9 @@
     6:6:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):56:56 -> a
     7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forConstMethodHandle():275:275 -> a
     7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView):66 -> a
-    boolean canThrow() -> g
-    1:1:com.android.tools.r8.graph.DexMethodHandle getHandle():30:30 -> t
-com.android.tools.r8.cf.code.CfConstMethodType -> com.android.tools.r8.p.n.i:
+    boolean canThrow() -> e
+    1:1:com.android.tools.r8.graph.DexMethodHandle getHandle():30:30 -> q
+com.android.tools.r8.cf.code.CfConstMethodType -> com.android.tools.r8.o.n.i:
     com.android.tools.r8.graph.DexProto type -> a
     1:2:void <init>(com.android.tools.r8.graph.DexProto):25:26 -> <init>
     1:1:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens):35:35 -> a
@@ -2415,16 +2484,16 @@
     6:6:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):56:56 -> a
     7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forConstMethodType():279:279 -> a
     7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView):66 -> a
-    boolean canThrow() -> g
-    1:1:com.android.tools.r8.graph.DexProto getType():30:30 -> t
-com.android.tools.r8.cf.code.CfConstNull -> com.android.tools.r8.p.n.j:
+    boolean canThrow() -> e
+    1:1:com.android.tools.r8.graph.DexProto getType():30:30 -> q
+com.android.tools.r8.cf.code.CfConstNull -> com.android.tools.r8.o.n.j:
     1:1:void <init>():20:20 -> <init>
     1:1:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens):24:24 -> a
     2:2:void print(com.android.tools.r8.cf.CfPrinter):29:29 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):34:34 -> a
     4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forConstInstruction():92:92 -> a
     4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView):43 -> a
-com.android.tools.r8.cf.code.CfConstNumber -> com.android.tools.r8.p.n.k:
+com.android.tools.r8.cf.code.CfConstNumber -> com.android.tools.r8.o.n.k:
     com.android.tools.r8.ir.code.ValueType type -> b
     long value -> a
     boolean $assertionsDisabled -> c
@@ -2460,13 +2529,13 @@
     117:117:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.code.ValueType.toPrimitiveTypeLattice():127:127 -> a
     117:117:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):132 -> a
     118:118:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):132:132 -> a
-    1:2:double getDoubleValue():55:56 -> t
-    1:2:float getFloatValue():50:51 -> u
-    1:2:int getIntValue():40:41 -> v
-    1:2:long getLongValue():45:46 -> w
-    1:1:long getRawValue():36:36 -> x
-    1:1:com.android.tools.r8.ir.code.ValueType getType():32:32 -> y
-com.android.tools.r8.cf.code.CfConstString -> com.android.tools.r8.p.n.l:
+    1:2:double getDoubleValue():55:56 -> q
+    1:2:float getFloatValue():50:51 -> r
+    1:2:int getIntValue():40:41 -> s
+    1:2:long getLongValue():45:46 -> t
+    1:1:long getRawValue():36:36 -> u
+    1:1:com.android.tools.r8.ir.code.ValueType getType():32:32 -> v
+com.android.tools.r8.cf.code.CfConstString -> com.android.tools.r8.o.n.l:
     com.android.tools.r8.graph.DexString string -> a
     1:2:void <init>(com.android.tools.r8.graph.DexString):23:24 -> <init>
     com.android.tools.r8.cf.code.CfConstString asConstString() -> a
@@ -2477,10 +2546,10 @@
     6:6:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):63:63 -> a
     7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forConstInstruction():92:92 -> a
     7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView):73 -> a
-    boolean canThrow() -> g
-    boolean isConstString() -> k
-    1:1:com.android.tools.r8.graph.DexString getString():28:28 -> t
-com.android.tools.r8.cf.code.CfDexItemBasedConstString -> com.android.tools.r8.p.n.m:
+    boolean canThrow() -> e
+    boolean isConstString() -> i
+    1:1:com.android.tools.r8.graph.DexString getString():28:28 -> q
+com.android.tools.r8.cf.code.CfDexItemBasedConstString -> com.android.tools.r8.o.n.m:
     com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo nameComputationInfo -> b
     com.android.tools.r8.graph.DexReference item -> a
     boolean $assertionsDisabled -> c
@@ -2494,11 +2563,11 @@
     9:9:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forDexItemBasedConstString(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexType):80:80 -> a
     9:9:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView):89 -> a
     com.android.tools.r8.cf.code.CfDexItemBasedConstString asDexItemBasedConstString() -> b
-    boolean canThrow() -> g
-    boolean isDexItemBasedConstString() -> l
-    1:1:com.android.tools.r8.graph.DexReference getItem():33:33 -> t
-    1:1:com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo getNameComputationInfo():37:37 -> u
-com.android.tools.r8.cf.code.CfFieldInstruction -> com.android.tools.r8.p.n.n:
+    boolean canThrow() -> e
+    boolean isDexItemBasedConstString() -> j
+    1:1:com.android.tools.r8.graph.DexReference getItem():33:33 -> q
+    1:1:com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo getNameComputationInfo():37:37 -> r
+com.android.tools.r8.cf.code.CfFieldInstruction -> com.android.tools.r8.o.n.n:
     com.android.tools.r8.graph.DexField field -> b
     com.android.tools.r8.graph.DexField declaringField -> c
     boolean $assertionsDisabled -> d
@@ -2522,10 +2591,10 @@
     82:82:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView):135:135 -> a
     83:83:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView):133:133 -> a
     com.android.tools.r8.cf.code.CfFieldInstruction asFieldInstruction() -> c
-    boolean canThrow() -> g
-    1:1:com.android.tools.r8.graph.DexField getField():37:37 -> t
-    1:1:int getOpcode():41:41 -> u
-com.android.tools.r8.cf.code.CfFrame -> com.android.tools.r8.p.n.p:
+    boolean canThrow() -> e
+    1:1:com.android.tools.r8.graph.DexField getField():37:37 -> q
+    1:1:int getOpcode():41:41 -> r
+com.android.tools.r8.cf.code.CfFrame -> com.android.tools.r8.o.n.p:
     java.util.List stack -> b
     boolean $assertionsDisabled -> c
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap locals -> a
@@ -2543,12 +2612,12 @@
     27:27:void print(com.android.tools.r8.cf.CfPrinter):281:281 -> a
     28:28:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):287:287 -> a
     29:29:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView):301:301 -> a
-    boolean emitsIR() -> h
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getLocals():208:208 -> t
+    boolean emitsIR() -> f
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getLocals():208:208 -> q
+    1:1:java.util.List getStack():212:212 -> r
     1:1:java.lang.String toString():276:276 -> toString
-    1:1:java.util.List getStack():212:212 -> u
-com.android.tools.r8.cf.code.CfFrame$1 -> com.android.tools.r8.p.n.o:
-com.android.tools.r8.cf.code.CfFrame$FrameType -> com.android.tools.r8.p.n.p$a:
+com.android.tools.r8.cf.code.CfFrame$1 -> com.android.tools.r8.o.n.o:
+com.android.tools.r8.cf.code.CfFrame$FrameType -> com.android.tools.r8.o.n.p$a:
     1:1:void <init>(com.android.tools.r8.cf.code.CfFrame$1):28:28 -> <init>
     2:2:void <init>():76:76 -> <init>
     com.android.tools.r8.graph.DexType getInitializedType() -> a
@@ -2563,7 +2632,7 @@
     boolean isWide() -> g
     1:1:com.android.tools.r8.cf.code.CfFrame$FrameType top():43:43 -> h
     1:1:com.android.tools.r8.cf.code.CfFrame$FrameType uninitializedThis():39:39 -> i
-com.android.tools.r8.cf.code.CfFrame$InitializedType -> com.android.tools.r8.p.n.q:
+com.android.tools.r8.cf.code.CfFrame$InitializedType -> com.android.tools.r8.o.n.q:
     com.android.tools.r8.graph.DexType type -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():79:79 -> <clinit>
@@ -2576,26 +2645,26 @@
     boolean isInitialized() -> c
     1:1:boolean isWide():116:116 -> g
     1:1:java.lang.String toString():90:90 -> toString
-com.android.tools.r8.cf.code.CfFrame$Top -> com.android.tools.r8.p.n.r:
+com.android.tools.r8.cf.code.CfFrame$Top -> com.android.tools.r8.o.n.r:
     com.android.tools.r8.cf.code.CfFrame$Top SINGLETON -> a
     1:1:void <clinit>():132:132 -> <clinit>
     1:1:void <init>():130:130 -> <init>
     1:1:java.lang.Object getTypeOpcode(com.android.tools.r8.naming.NamingLens):141:141 -> a
     boolean isTop() -> d
     1:1:com.android.tools.r8.cf.code.CfFrame$Top access$300():130:130 -> j
-com.android.tools.r8.cf.code.CfFrame$UninitializedNew -> com.android.tools.r8.p.n.s:
+com.android.tools.r8.cf.code.CfFrame$UninitializedNew -> com.android.tools.r8.o.n.s:
     com.android.tools.r8.cf.code.CfLabel label -> a
     1:1:void <init>(com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.cf.code.CfFrame$1):150:150 -> <init>
     2:3:void <init>(com.android.tools.r8.cf.code.CfLabel):153:154 -> <init>
     1:1:java.lang.Object getTypeOpcode(com.android.tools.r8.naming.NamingLens):164:164 -> a
     1:1:com.android.tools.r8.cf.code.CfLabel getUninitializedLabel():174:174 -> b
     boolean isUninitializedNew() -> e
-com.android.tools.r8.cf.code.CfFrame$UninitializedThis -> com.android.tools.r8.p.n.t:
+com.android.tools.r8.cf.code.CfFrame$UninitializedThis -> com.android.tools.r8.o.n.t:
     1:1:void <init>(com.android.tools.r8.cf.code.CfFrame$1):178:178 -> <init>
     2:2:void <init>():179:179 -> <init>
     1:1:java.lang.Object getTypeOpcode(com.android.tools.r8.naming.NamingLens):183:183 -> a
     boolean isUninitializedThis() -> f
-com.android.tools.r8.cf.code.CfGoto -> com.android.tools.r8.p.n.u:
+com.android.tools.r8.cf.code.CfGoto -> com.android.tools.r8.o.n.u:
     com.android.tools.r8.cf.code.CfLabel target -> a
     1:2:void <init>(com.android.tools.r8.cf.code.CfLabel):23:24 -> <init>
     1:1:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens):49:49 -> a
@@ -2603,9 +2672,9 @@
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):59:59 -> a
     4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forJumpInstruction():203:203 -> a
     4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView):68 -> a
-    1:1:com.android.tools.r8.cf.code.CfLabel getTarget():44:44 -> i
-    boolean isJump() -> n
-com.android.tools.r8.cf.code.CfIf -> com.android.tools.r8.p.n.v:
+    1:1:com.android.tools.r8.cf.code.CfLabel getTarget():44:44 -> g
+    boolean isJump() -> l
+com.android.tools.r8.cf.code.CfIf -> com.android.tools.r8.o.n.v:
     com.android.tools.r8.ir.code.If$Type kind -> a
     com.android.tools.r8.ir.code.ValueType type -> b
     com.android.tools.r8.cf.code.CfLabel target -> c
@@ -2615,15 +2684,15 @@
     3:6:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):89:92 -> a
     7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forJumpInstruction():203:203 -> a
     7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView):101 -> a
-    1:1:com.android.tools.r8.cf.code.CfLabel getTarget():45:45 -> i
-    boolean isConditionalJump() -> j
-    boolean isJump() -> n
-    1:1:com.android.tools.r8.ir.code.If$Type getKind():40:40 -> t
-    1:15:int getOpcode():49:63 -> u
-    16:16:int getOpcode():61:61 -> u
-    17:17:int getOpcode():51:51 -> u
-    1:1:com.android.tools.r8.ir.code.ValueType getType():36:36 -> v
-com.android.tools.r8.cf.code.CfIfCmp -> com.android.tools.r8.p.n.w:
+    1:1:com.android.tools.r8.cf.code.CfLabel getTarget():45:45 -> g
+    boolean isConditionalJump() -> h
+    boolean isJump() -> l
+    1:1:com.android.tools.r8.ir.code.If$Type getKind():40:40 -> q
+    1:15:int getOpcode():49:63 -> r
+    16:16:int getOpcode():61:61 -> r
+    17:17:int getOpcode():51:51 -> r
+    1:1:com.android.tools.r8.ir.code.ValueType getType():36:36 -> s
+com.android.tools.r8.cf.code.CfIfCmp -> com.android.tools.r8.o.n.w:
     com.android.tools.r8.ir.code.If$Type kind -> a
     com.android.tools.r8.ir.code.ValueType type -> b
     com.android.tools.r8.cf.code.CfLabel target -> c
@@ -2643,12 +2712,12 @@
     26:28:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):93 -> a
     29:29:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forJumpInstruction():203:203 -> a
     29:29:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView):102 -> a
-    1:1:com.android.tools.r8.cf.code.CfLabel getTarget():45:45 -> i
-    boolean isConditionalJump() -> j
-    boolean isJump() -> n
-    1:1:com.android.tools.r8.ir.code.If$Type getKind():36:36 -> t
-    1:1:com.android.tools.r8.ir.code.ValueType getType():40:40 -> u
-com.android.tools.r8.cf.code.CfIinc -> com.android.tools.r8.p.n.x:
+    1:1:com.android.tools.r8.cf.code.CfLabel getTarget():45:45 -> g
+    boolean isConditionalJump() -> h
+    boolean isJump() -> l
+    1:1:com.android.tools.r8.ir.code.If$Type getKind():36:36 -> q
+    1:1:com.android.tools.r8.ir.code.ValueType getType():40:40 -> r
+com.android.tools.r8.cf.code.CfIinc -> com.android.tools.r8.o.n.x:
     int increment -> b
     int var -> a
     1:3:void <init>(int,int):24:26 -> <init>
@@ -2656,9 +2725,9 @@
     2:2:void print(com.android.tools.r8.cf.CfPrinter):36:36 -> a
     3:4:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):49:50 -> a
     5:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView):59:59 -> a
-    1:1:int getIncrement():44:44 -> t
-    1:1:int getLocalIndex():40:40 -> u
-com.android.tools.r8.cf.code.CfInstanceOf -> com.android.tools.r8.p.n.y:
+    1:1:int getIncrement():44:44 -> q
+    1:1:int getLocalIndex():40:40 -> r
+com.android.tools.r8.cf.code.CfInstanceOf -> com.android.tools.r8.o.n.y:
     com.android.tools.r8.graph.DexType type -> a
     1:2:void <init>(com.android.tools.r8.graph.DexType):24:25 -> <init>
     1:1:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens):34:34 -> a
@@ -2667,9 +2736,9 @@
     4:6:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):54:56 -> a
     7:7:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):55:55 -> a
     8:8:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView):65:65 -> a
-    boolean canThrow() -> g
-    1:1:com.android.tools.r8.graph.DexType getType():29:29 -> t
-com.android.tools.r8.cf.code.CfInstruction -> com.android.tools.r8.p.n.z:
+    boolean canThrow() -> e
+    1:1:com.android.tools.r8.graph.DexType getType():29:29 -> q
+com.android.tools.r8.cf.code.CfInstruction -> com.android.tools.r8.o.n.z:
     1:1:void <init>():19:19 -> <init>
     com.android.tools.r8.cf.code.CfConstString asConstString() -> a
     void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode) -> a
@@ -2680,23 +2749,20 @@
     com.android.tools.r8.cf.code.CfDexItemBasedConstString asDexItemBasedConstString() -> b
     com.android.tools.r8.cf.code.CfFieldInstruction asFieldInstruction() -> c
     com.android.tools.r8.cf.code.CfInvoke asInvoke() -> d
-    com.android.tools.r8.cf.code.CfLabel asLabel() -> e
-    com.android.tools.r8.cf.code.CfPosition asPosition() -> f
-    boolean canThrow() -> g
-    boolean emitsIR() -> h
-    com.android.tools.r8.cf.code.CfLabel getTarget() -> i
-    boolean isConditionalJump() -> j
-    boolean isConstString() -> k
-    boolean isDexItemBasedConstString() -> l
-    boolean isInvoke() -> m
-    boolean isJump() -> n
-    boolean isLabel() -> o
-    boolean isLoad() -> p
-    boolean isPosition() -> q
-    boolean isReturn() -> r
-    boolean isStore() -> s
+    boolean canThrow() -> e
+    boolean emitsIR() -> f
+    com.android.tools.r8.cf.code.CfLabel getTarget() -> g
+    boolean isConditionalJump() -> h
+    boolean isConstString() -> i
+    boolean isDexItemBasedConstString() -> j
+    boolean isInvoke() -> k
+    boolean isJump() -> l
+    boolean isLabel() -> m
+    boolean isLoad() -> n
+    boolean isReturn() -> o
+    boolean isStore() -> p
     1:3:java.lang.String toString():27:29 -> toString
-com.android.tools.r8.cf.code.CfInvoke -> com.android.tools.r8.p.n.A:
+com.android.tools.r8.cf.code.CfInvoke -> com.android.tools.r8.o.n.A:
     int opcode -> b
     com.android.tools.r8.graph.DexMethod method -> a
     boolean itf -> c
@@ -2731,12 +2797,12 @@
     236:239:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):189:192 -> a
     240:240:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView):202:202 -> a
     com.android.tools.r8.cf.code.CfInvoke asInvoke() -> d
-    boolean canThrow() -> g
-    boolean isInvoke() -> m
-    1:1:com.android.tools.r8.graph.DexMethod getMethod():50:50 -> t
-    1:1:int getOpcode():54:54 -> u
-    1:1:boolean isInterface():58:58 -> v
-com.android.tools.r8.cf.code.CfInvokeDynamic -> com.android.tools.r8.p.n.B:
+    boolean canThrow() -> e
+    boolean isInvoke() -> k
+    1:1:com.android.tools.r8.graph.DexMethod getMethod():50:50 -> q
+    1:1:int getOpcode():54:54 -> r
+    1:1:boolean isInterface():58:58 -> s
+com.android.tools.r8.cf.code.CfInvokeDynamic -> com.android.tools.r8.o.n.B:
     com.android.tools.r8.graph.DexCallSite callSite -> a
     1:2:void <init>(com.android.tools.r8.graph.DexCallSite):41:42 -> <init>
     1:5:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens):47:51 -> a
@@ -2757,20 +2823,19 @@
     48:48:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):105 -> a
     49:49:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forInvokeCustom():154:154 -> a
     49:49:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView):124 -> a
-    boolean canThrow() -> g
-    1:1:com.android.tools.r8.graph.DexCallSite getCallSite():88:88 -> t
-com.android.tools.r8.cf.code.CfLabel -> com.android.tools.r8.p.n.C:
+    boolean canThrow() -> e
+    1:1:com.android.tools.r8.graph.DexCallSite getCallSite():88:88 -> q
+com.android.tools.r8.cf.code.CfLabel -> com.android.tools.r8.o.n.C:
     com.android.tools.r8.org.objectweb.asm.Label label -> a
     1:3:void <init>():19:21 -> <init>
     void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode) -> a
     1:1:void print(com.android.tools.r8.cf.CfPrinter):42:42 -> a
     2:2:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens):47:47 -> a
     3:3:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView):66:66 -> a
-    com.android.tools.r8.cf.code.CfLabel asLabel() -> e
-    boolean emitsIR() -> h
-    boolean isLabel() -> o
-    1:4:com.android.tools.r8.org.objectweb.asm.Label getLabel():24:27 -> t
-com.android.tools.r8.cf.code.CfLoad -> com.android.tools.r8.p.n.D:
+    boolean emitsIR() -> f
+    boolean isLabel() -> m
+    1:4:com.android.tools.r8.org.objectweb.asm.Label getLabel():24:27 -> q
+com.android.tools.r8.cf.code.CfLoad -> com.android.tools.r8.o.n.D:
     com.android.tools.r8.ir.code.ValueType type -> b
     int var -> a
     1:3:void <init>(com.android.tools.r8.ir.code.ValueType,int):27:29 -> <init>
@@ -2783,11 +2848,11 @@
     19:19:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):81 -> a
     20:20:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forLoad():207:207 -> a
     20:20:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView):95 -> a
-    boolean emitsIR() -> h
-    boolean isLoad() -> p
-    1:1:int getLocalIndex():74:74 -> t
-    1:1:com.android.tools.r8.ir.code.ValueType getType():70:70 -> u
-com.android.tools.r8.cf.code.CfLogicalBinop -> com.android.tools.r8.p.n.E:
+    boolean emitsIR() -> f
+    boolean isLoad() -> n
+    1:1:int getLocalIndex():74:74 -> q
+    1:1:com.android.tools.r8.ir.code.ValueType getType():70:70 -> r
+com.android.tools.r8.cf.code.CfLogicalBinop -> com.android.tools.r8.o.n.E:
     com.android.tools.r8.cf.code.CfLogicalBinop$Opcode opcode -> a
     com.android.tools.r8.ir.code.NumericType type -> b
     boolean $assertionsDisabled -> c
@@ -2817,16 +2882,16 @@
     44:44:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):125:125 -> a
     45:45:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):122:122 -> a
     46:46:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):119:119 -> a
-    1:15:int getAsmOpcode():84:98 -> t
-    16:16:int getAsmOpcode():96:96 -> t
-    17:17:int getAsmOpcode():94:94 -> t
-    18:18:int getAsmOpcode():92:92 -> t
-    19:19:int getAsmOpcode():90:90 -> t
-    20:20:int getAsmOpcode():88:88 -> t
-    21:21:int getAsmOpcode():86:86 -> t
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getOpcode():49:49 -> u
-    1:1:com.android.tools.r8.ir.code.NumericType getType():45:45 -> v
-com.android.tools.r8.cf.code.CfLogicalBinop$Opcode -> com.android.tools.r8.p.n.E$a:
+    1:15:int getAsmOpcode():84:98 -> q
+    16:16:int getAsmOpcode():96:96 -> q
+    17:17:int getAsmOpcode():94:94 -> q
+    18:18:int getAsmOpcode():92:92 -> q
+    19:19:int getAsmOpcode():90:90 -> q
+    20:20:int getAsmOpcode():88:88 -> q
+    21:21:int getAsmOpcode():86:86 -> q
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getOpcode():49:49 -> r
+    1:1:com.android.tools.r8.ir.code.NumericType getType():45:45 -> s
+com.android.tools.r8.cf.code.CfLogicalBinop$Opcode -> com.android.tools.r8.o.n.E$a:
     com.android.tools.r8.cf.code.CfLogicalBinop$Opcode Shl -> a
     com.android.tools.r8.cf.code.CfLogicalBinop$Opcode[] $VALUES -> g
     com.android.tools.r8.cf.code.CfLogicalBinop$Opcode And -> d
@@ -2837,7 +2902,7 @@
     1:6:void <clinit>():25:30 -> <clinit>
     7:7:void <clinit>():24:24 -> <clinit>
     1:1:void <init>(java.lang.String,int):24:24 -> <init>
-com.android.tools.r8.cf.code.CfMonitor -> com.android.tools.r8.p.n.F:
+com.android.tools.r8.cf.code.CfMonitor -> com.android.tools.r8.o.n.F:
     com.android.tools.r8.ir.code.Monitor$Type type -> a
     1:2:void <init>(com.android.tools.r8.ir.code.Monitor$Type):25:26 -> <init>
     1:1:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens):35:35 -> a
@@ -2845,9 +2910,9 @@
     3:4:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):50:51 -> a
     5:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMonitor():211:211 -> a
     5:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView):60 -> a
-    boolean canThrow() -> g
-    1:1:com.android.tools.r8.ir.code.Monitor$Type getType():30:30 -> t
-com.android.tools.r8.cf.code.CfMultiANewArray -> com.android.tools.r8.p.n.G:
+    boolean canThrow() -> e
+    1:1:com.android.tools.r8.ir.code.Monitor$Type getType():30:30 -> q
+com.android.tools.r8.cf.code.CfMultiANewArray -> com.android.tools.r8.o.n.G:
     com.android.tools.r8.graph.DexType type -> a
     int dimensions -> b
     boolean $assertionsDisabled -> c
@@ -2863,10 +2928,10 @@
     11:11:int[] com.android.tools.r8.ir.conversion.CfState.popReverse(int):182:182 -> a
     11:11:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):62 -> a
     12:12:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView):72:72 -> a
-    boolean canThrow() -> g
-    1:1:int getDimensions():35:35 -> t
-    1:1:com.android.tools.r8.graph.DexType getType():31:31 -> u
-com.android.tools.r8.cf.code.CfNeg -> com.android.tools.r8.p.n.H:
+    boolean canThrow() -> e
+    1:1:int getDimensions():35:35 -> q
+    1:1:com.android.tools.r8.graph.DexType getType():31:31 -> r
+com.android.tools.r8.cf.code.CfNeg -> com.android.tools.r8.o.n.H:
     com.android.tools.r8.ir.code.NumericType type -> a
     1:2:void <init>(com.android.tools.r8.ir.code.NumericType):26:27 -> <init>
     1:1:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens):36:36 -> a
@@ -2874,9 +2939,9 @@
     3:4:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):79:80 -> a
     5:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forUnop():271:271 -> a
     5:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView):89 -> a
-    1:14:int getAsmOpcode():45:58 -> t
-    1:1:com.android.tools.r8.ir.code.NumericType getType():31:31 -> u
-com.android.tools.r8.cf.code.CfNew -> com.android.tools.r8.p.n.I:
+    1:14:int getAsmOpcode():45:58 -> q
+    1:1:com.android.tools.r8.ir.code.NumericType getType():31:31 -> r
+com.android.tools.r8.cf.code.CfNew -> com.android.tools.r8.o.n.I:
     com.android.tools.r8.graph.DexType type -> a
     1:2:void <init>(com.android.tools.r8.graph.DexType):24:25 -> <init>
     1:1:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens):34:34 -> a
@@ -2884,9 +2949,9 @@
     3:3:void registerUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexType):44:44 -> a
     4:4:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):54:54 -> a
     5:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView):63:63 -> a
-    boolean canThrow() -> g
-    1:1:com.android.tools.r8.graph.DexType getType():29:29 -> t
-com.android.tools.r8.cf.code.CfNewArray -> com.android.tools.r8.p.n.J:
+    boolean canThrow() -> e
+    1:1:com.android.tools.r8.graph.DexType getType():29:29 -> q
+com.android.tools.r8.cf.code.CfNewArray -> com.android.tools.r8.o.n.J:
     com.android.tools.r8.graph.DexType type -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():23:23 -> <clinit>
@@ -2902,16 +2967,16 @@
     29:30:void registerUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexType):83:84 -> a
     31:33:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):95:97 -> a
     34:34:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView):106:106 -> a
-    boolean canThrow() -> g
-    1:1:com.android.tools.r8.graph.DexType getType():33:33 -> t
-com.android.tools.r8.cf.code.CfNop -> com.android.tools.r8.p.n.K:
+    boolean canThrow() -> e
+    1:1:com.android.tools.r8.graph.DexType getType():33:33 -> q
+com.android.tools.r8.cf.code.CfNop -> com.android.tools.r8.o.n.K:
     1:1:void <init>():19:19 -> <init>
     void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode) -> a
     1:1:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens):23:23 -> a
     2:2:void print(com.android.tools.r8.cf.CfPrinter):28:28 -> a
     3:3:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView):47:47 -> a
-    boolean emitsIR() -> h
-com.android.tools.r8.cf.code.CfNumberConversion -> com.android.tools.r8.p.n.L:
+    boolean emitsIR() -> f
+com.android.tools.r8.cf.code.CfNumberConversion -> com.android.tools.r8.o.n.L:
     com.android.tools.r8.ir.code.NumericType to -> b
     com.android.tools.r8.ir.code.NumericType from -> a
     boolean $assertionsDisabled -> c
@@ -2938,13 +3003,13 @@
     19:20:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):150:151 -> a
     21:21:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forUnop():271:271 -> a
     21:21:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView):160 -> a
-    1:53:int getAsmOpcode():55:107 -> t
-    54:101:int getAsmOpcode():57:104 -> t
-    102:110:int getAsmOpcode():85:93 -> t
-    111:119:int getAsmOpcode():74:82 -> t
-    1:1:com.android.tools.r8.ir.code.NumericType getFromType():37:37 -> u
-    1:1:com.android.tools.r8.ir.code.NumericType getToType():41:41 -> v
-com.android.tools.r8.cf.code.CfPosition -> com.android.tools.r8.p.n.M:
+    1:53:int getAsmOpcode():55:107 -> q
+    54:101:int getAsmOpcode():57:104 -> q
+    102:110:int getAsmOpcode():85:93 -> q
+    111:119:int getAsmOpcode():74:82 -> q
+    1:1:com.android.tools.r8.ir.code.NumericType getFromType():37:37 -> r
+    1:1:com.android.tools.r8.ir.code.NumericType getToType():41:41 -> s
+com.android.tools.r8.cf.code.CfPosition -> com.android.tools.r8.o.n.M:
     com.android.tools.r8.cf.code.CfLabel label -> a
     com.android.tools.r8.ir.code.Position position -> b
     1:3:void <init>(com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.ir.code.Position):24:26 -> <init>
@@ -2952,12 +3017,10 @@
     2:2:void print(com.android.tools.r8.cf.CfPrinter):36:36 -> a
     3:5:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):64:66 -> a
     6:6:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView):75:75 -> a
-    com.android.tools.r8.cf.code.CfPosition asPosition() -> f
-    boolean emitsIR() -> h
-    boolean isPosition() -> q
-    1:1:com.android.tools.r8.cf.code.CfLabel getLabel():44:44 -> t
-    1:1:com.android.tools.r8.ir.code.Position getPosition():40:40 -> u
-com.android.tools.r8.cf.code.CfReturn -> com.android.tools.r8.p.n.N:
+    boolean emitsIR() -> f
+    1:1:com.android.tools.r8.cf.code.CfLabel getLabel():44:44 -> q
+    1:1:com.android.tools.r8.ir.code.Position getPosition():40:40 -> r
+com.android.tools.r8.cf.code.CfReturn -> com.android.tools.r8.o.n.N:
     com.android.tools.r8.ir.code.ValueType type -> a
     1:2:void <init>(com.android.tools.r8.ir.code.ValueType):26:27 -> <init>
     1:13:int getOpcode():35:47 -> a
@@ -2967,19 +3030,19 @@
     16:17:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):73:74 -> a
     18:18:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forReturn():243:243 -> a
     18:18:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView):83 -> a
-    boolean isJump() -> n
-    boolean isReturn() -> r
-    1:1:com.android.tools.r8.ir.code.ValueType getType():31:31 -> t
-com.android.tools.r8.cf.code.CfReturnVoid -> com.android.tools.r8.p.n.O:
+    boolean isJump() -> l
+    boolean isReturn() -> o
+    1:1:com.android.tools.r8.ir.code.ValueType getType():31:31 -> q
+com.android.tools.r8.cf.code.CfReturnVoid -> com.android.tools.r8.o.n.O:
     1:1:void <init>():19:19 -> <init>
     1:1:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens):28:28 -> a
     2:2:void print(com.android.tools.r8.cf.CfPrinter):33:33 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):43:43 -> a
     4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forReturn():243:243 -> a
     4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView):52 -> a
-    boolean isJump() -> n
-    boolean isReturn() -> r
-com.android.tools.r8.cf.code.CfStackInstruction -> com.android.tools.r8.p.n.P:
+    boolean isJump() -> l
+    boolean isReturn() -> o
+com.android.tools.r8.cf.code.CfStackInstruction -> com.android.tools.r8.o.n.P:
     com.android.tools.r8.cf.code.CfStackInstruction$Opcode opcode -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():23:23 -> <clinit>
@@ -3105,9 +3168,9 @@
     17:17:void dup2x1(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):277 -> b
     18:18:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1202:1202 -> b
     18:18:void dup2x1(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):269 -> b
-    boolean emitsIR() -> h
-    1:1:com.android.tools.r8.cf.code.CfStackInstruction$Opcode getOpcode():89:89 -> t
-com.android.tools.r8.cf.code.CfStackInstruction$Opcode -> com.android.tools.r8.p.n.P$a:
+    boolean emitsIR() -> f
+    1:1:com.android.tools.r8.cf.code.CfStackInstruction$Opcode getOpcode():89:89 -> q
+com.android.tools.r8.cf.code.CfStackInstruction$Opcode -> com.android.tools.r8.o.n.P$a:
     com.android.tools.r8.cf.code.CfStackInstruction$Opcode Swap -> j
     com.android.tools.r8.cf.code.CfStackInstruction$Opcode[] $VALUES -> k
     com.android.tools.r8.cf.code.CfStackInstruction$Opcode Dup2X2 -> i
@@ -3123,7 +3186,7 @@
     10:10:void <clinit>():25:25 -> <clinit>
     1:2:void <init>(java.lang.String,int,int):38:39 -> <init>
     1:1:int access$000(com.android.tools.r8.cf.code.CfStackInstruction$Opcode):25:25 -> a
-com.android.tools.r8.cf.code.CfStore -> com.android.tools.r8.p.n.Q:
+com.android.tools.r8.cf.code.CfStore -> com.android.tools.r8.o.n.Q:
     com.android.tools.r8.ir.code.ValueType type -> b
     int var -> a
     1:3:void <init>(com.android.tools.r8.ir.code.ValueType,int):27:29 -> <init>
@@ -3136,11 +3199,11 @@
     18:18:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):80 -> a
     19:19:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forStore():259:259 -> a
     19:19:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView):94 -> a
-    boolean emitsIR() -> h
-    boolean isStore() -> s
-    1:1:int getLocalIndex():74:74 -> t
-    1:1:com.android.tools.r8.ir.code.ValueType getType():70:70 -> u
-com.android.tools.r8.cf.code.CfSwitch -> com.android.tools.r8.p.n.S:
+    boolean emitsIR() -> f
+    boolean isStore() -> p
+    1:1:int getLocalIndex():74:74 -> q
+    1:1:com.android.tools.r8.ir.code.ValueType getType():70:70 -> r
+com.android.tools.r8.cf.code.CfSwitch -> com.android.tools.r8.o.n.S:
     com.android.tools.r8.cf.code.CfLabel defaultTarget -> b
     int[] keys -> c
     java.util.List targets -> d
@@ -3154,29 +3217,29 @@
     15:20:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):97:102 -> a
     21:21:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forJumpInstruction():203:203 -> a
     21:21:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView):111 -> a
-    boolean isJump() -> n
-    1:1:com.android.tools.r8.cf.code.CfLabel getDefaultTarget():46:46 -> t
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList getKeys():50:50 -> u
-    2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>(int[]):135:135 -> u
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList getKeys():50 -> u
-    1:1:com.android.tools.r8.cf.code.CfSwitch$Kind getKind():42:42 -> v
-    1:1:java.util.List getSwitchTargets():54:54 -> w
-com.android.tools.r8.cf.code.CfSwitch$Kind -> com.android.tools.r8.p.n.S$a:
+    boolean isJump() -> l
+    1:1:com.android.tools.r8.cf.code.CfLabel getDefaultTarget():46:46 -> q
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList getKeys():50:50 -> r
+    2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>(int[]):135:135 -> r
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList getKeys():50 -> r
+    1:1:com.android.tools.r8.cf.code.CfSwitch$Kind getKind():42:42 -> s
+    1:1:java.util.List getSwitchTargets():54:54 -> t
+com.android.tools.r8.cf.code.CfSwitch$Kind -> com.android.tools.r8.o.n.S$a:
     com.android.tools.r8.cf.code.CfSwitch$Kind[] $VALUES -> c
     com.android.tools.r8.cf.code.CfSwitch$Kind TABLE -> b
     com.android.tools.r8.cf.code.CfSwitch$Kind LOOKUP -> a
     1:1:void <clinit>():25:25 -> <clinit>
     1:1:void <init>(java.lang.String,int):25:25 -> <init>
-com.android.tools.r8.cf.code.CfThrow -> com.android.tools.r8.p.n.T:
+com.android.tools.r8.cf.code.CfThrow -> com.android.tools.r8.o.n.T:
     1:1:void <init>():20:20 -> <init>
     1:1:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens):29:29 -> a
     2:2:void print(com.android.tools.r8.cf.CfPrinter):34:34 -> a
     3:4:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):44:45 -> a
     5:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forJumpInstruction():203:203 -> a
     5:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView):54 -> a
-    boolean canThrow() -> g
-    boolean isJump() -> n
-com.android.tools.r8.cf.code.CfTryCatch -> com.android.tools.r8.p.n.U:
+    boolean canThrow() -> e
+    boolean isJump() -> l
+com.android.tools.r8.cf.code.CfTryCatch -> com.android.tools.r8.o.n.U:
     com.android.tools.r8.cf.code.CfLabel start -> a
     com.android.tools.r8.cf.code.CfLabel end -> b
     java.util.List targets -> d
@@ -3813,18 +3876,18 @@
     3:4:void com.android.tools.r8.code.Format51l.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):34 -> a
     3:4:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):12 -> a
     5:5:long decodedValue():43:43 -> a
-    6:10:boolean com.android.tools.r8.code.Format51l.equals(java.lang.Object):44:48 -> a
-    11:12:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):54:55 -> a
-    13:13:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):54:54 -> a
-    14:14:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):60:60 -> a
+    6:7:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):54:55 -> a
+    8:8:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):54:54 -> a
+    9:9:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):60:60 -> a
     1:2:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):48:49 -> b
     3:3:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):48:48 -> b
-    boolean com.android.tools.r8.code.Format51l.equals(java.lang.Object) -> equals
-    int com.android.tools.r8.code.Format51l.hashCode() -> hashCode
+    1:5:boolean com.android.tools.r8.code.Format51l.equals(java.lang.Object):44:48 -> equals
+    1:5:boolean com.android.tools.r8.code.Format51l.equals(java.lang.Object):0 -> equals
+    1:1:int com.android.tools.r8.code.Format51l.hashCode():39:39 -> hashCode
+    1:1:int com.android.tools.r8.code.Format51l.hashCode():0 -> hashCode
     java.lang.String getName() -> i
     int getOpcode() -> k
     java.lang.String getSmaliName() -> n
-    1:1:int com.android.tools.r8.code.Format51l.hashCode():39:39 -> z
 com.android.tools.r8.code.ConstWide16 -> com.android.tools.r8.code.c0:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):19:19 -> <init>
     2:2:void <init>(int,int):23:23 -> <init>
@@ -4454,19 +4517,19 @@
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
     1:1:void com.android.tools.r8.code.Format10t.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):30:30 -> a
     1:1:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):8 -> a
-    2:5:boolean com.android.tools.r8.code.Format10t.equals(java.lang.Object):40:43 -> a
-    6:6:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):44:44 -> a
-    7:7:java.lang.String com.android.tools.r8.code.Format10t.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):53:53 -> a
-    7:7:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):8 -> a
+    2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):44:44 -> a
+    3:3:java.lang.String com.android.tools.r8.code.Format10t.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):53:53 -> a
+    3:3:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):8 -> a
     1:1:java.lang.String com.android.tools.r8.code.Format10t.toString(com.android.tools.r8.naming.ClassNameMapper):48:48 -> b
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):8 -> b
-    boolean com.android.tools.r8.code.Format10t.equals(java.lang.Object) -> equals
-    int com.android.tools.r8.code.Format10t.hashCode() -> hashCode
+    1:4:boolean com.android.tools.r8.code.Format10t.equals(java.lang.Object):40:43 -> equals
+    1:4:boolean com.android.tools.r8.code.Format10t.equals(java.lang.Object):0 -> equals
+    1:1:int com.android.tools.r8.code.Format10t.hashCode():35:35 -> hashCode
+    1:1:int com.android.tools.r8.code.Format10t.hashCode():0 -> hashCode
     java.lang.String getName() -> i
     int getOpcode() -> k
     java.lang.String getSmaliName() -> n
     1:1:int[] getTargets():39:39 -> o
-    1:1:int com.android.tools.r8.code.Format10t.hashCode():35:35 -> z
 com.android.tools.r8.code.Goto16 -> com.android.tools.r8.code.W0:
     short com.android.tools.r8.code.Format20t.AAAA -> f
     boolean com.android.tools.r8.code.Format20t.$assertionsDisabled -> g
@@ -4481,19 +4544,19 @@
     3:3:void com.android.tools.r8.code.Instruction.write16BitValue(int,java.nio.ShortBuffer):93:93 -> a
     3:3:void com.android.tools.r8.code.Format20t.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):30 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):8 -> a
-    4:7:boolean com.android.tools.r8.code.Format20t.equals(java.lang.Object):40:43 -> a
-    8:8:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):44:44 -> a
-    9:9:java.lang.String com.android.tools.r8.code.Format20t.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):53:53 -> a
-    9:9:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):8 -> a
+    4:4:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):44:44 -> a
+    5:5:java.lang.String com.android.tools.r8.code.Format20t.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):53:53 -> a
+    5:5:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):8 -> a
     1:1:java.lang.String com.android.tools.r8.code.Format20t.toString(com.android.tools.r8.naming.ClassNameMapper):48:48 -> b
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):8 -> b
-    boolean com.android.tools.r8.code.Format20t.equals(java.lang.Object) -> equals
-    int com.android.tools.r8.code.Format20t.hashCode() -> hashCode
+    1:4:boolean com.android.tools.r8.code.Format20t.equals(java.lang.Object):40:43 -> equals
+    1:4:boolean com.android.tools.r8.code.Format20t.equals(java.lang.Object):0 -> equals
+    1:1:int com.android.tools.r8.code.Format20t.hashCode():35:35 -> hashCode
+    1:1:int com.android.tools.r8.code.Format20t.hashCode():0 -> hashCode
     java.lang.String getName() -> i
     int getOpcode() -> k
     java.lang.String getSmaliName() -> n
     1:1:int[] getTargets():39:39 -> o
-    1:1:int com.android.tools.r8.code.Format20t.hashCode():35:35 -> z
 com.android.tools.r8.code.Goto32 -> com.android.tools.r8.code.X0:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int):19:19 -> <init>
@@ -5599,7 +5662,6 @@
     2:12:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):23 -> <init>
     13:27:void com.android.tools.r8.code.Format45cc.<init>(int,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProto,int,int,int,int,int):43:57 -> <init>
     13:27:void <init>(int,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProto,int,int,int,int,int):28 -> <init>
-    1:9:int com.android.tools.r8.code.Format45cc.hashCode():62:70 -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):33:33 -> a
     2:2:com.android.tools.r8.graph.DexMethod com.android.tools.r8.code.Format45cc.getMethod():0:0 -> a
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):34 -> a
@@ -5608,26 +5670,27 @@
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):34 -> a
     4:4:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):34:34 -> a
     5:5:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):33:33 -> a
-    6:17:boolean com.android.tools.r8.code.Format45cc.equals(java.lang.Object):75:86 -> a
-    18:19:void com.android.tools.r8.code.Format45cc.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):92:93 -> a
-    18:19:void com.android.tools.r8.code.Format45cc.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):0 -> a
-    20:22:void com.android.tools.r8.code.Format45cc.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):98:100 -> a
-    20:22:void com.android.tools.r8.code.Format45cc.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):0 -> a
-    23:23:void com.android.tools.r8.code.Instruction.write16BitValue(int,java.nio.ShortBuffer):93:93 -> a
-    23:23:void com.android.tools.r8.code.Format45cc.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):100 -> a
-    23:23:void com.android.tools.r8.code.Format45cc.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):0 -> a
-    24:24:void com.android.tools.r8.code.Format45cc.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):101:101 -> a
-    24:24:void com.android.tools.r8.code.Format45cc.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):0 -> a
-    25:32:java.lang.String com.android.tools.r8.code.Format45cc.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):106:113 -> a
-    25:32:java.lang.String com.android.tools.r8.code.Format45cc.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):0 -> a
-    33:35:java.lang.String com.android.tools.r8.code.Format45cc.itemToString(com.android.tools.r8.graph.IndexedDexItem,com.android.tools.r8.naming.ClassNameMapper):130:132 -> a
-    36:44:void com.android.tools.r8.code.Format45cc.appendRegisterArguments(java.lang.StringBuilder,java.lang.String):138:146 -> a
+    6:7:void com.android.tools.r8.code.Format45cc.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):92:93 -> a
+    6:7:void com.android.tools.r8.code.Format45cc.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):0 -> a
+    8:10:void com.android.tools.r8.code.Format45cc.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):98:100 -> a
+    8:10:void com.android.tools.r8.code.Format45cc.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):0 -> a
+    11:11:void com.android.tools.r8.code.Instruction.write16BitValue(int,java.nio.ShortBuffer):93:93 -> a
+    11:11:void com.android.tools.r8.code.Format45cc.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):100 -> a
+    11:11:void com.android.tools.r8.code.Format45cc.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):0 -> a
+    12:12:void com.android.tools.r8.code.Format45cc.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):101:101 -> a
+    12:12:void com.android.tools.r8.code.Format45cc.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):0 -> a
+    13:20:java.lang.String com.android.tools.r8.code.Format45cc.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):106:113 -> a
+    13:20:java.lang.String com.android.tools.r8.code.Format45cc.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):0 -> a
+    21:23:java.lang.String com.android.tools.r8.code.Format45cc.itemToString(com.android.tools.r8.graph.IndexedDexItem,com.android.tools.r8.naming.ClassNameMapper):130:132 -> a
+    24:32:void com.android.tools.r8.code.Format45cc.appendRegisterArguments(java.lang.StringBuilder,java.lang.String):138:146 -> a
     1:7:java.lang.String com.android.tools.r8.code.Format45cc.toString(com.android.tools.r8.naming.ClassNameMapper):118:124 -> b
     1:7:java.lang.String com.android.tools.r8.code.Format45cc.toString(com.android.tools.r8.naming.ClassNameMapper):0 -> b
-    boolean com.android.tools.r8.code.Format45cc.equals(java.lang.Object) -> equals
+    1:12:boolean com.android.tools.r8.code.Format45cc.equals(java.lang.Object):75:86 -> equals
+    1:12:boolean com.android.tools.r8.code.Format45cc.equals(java.lang.Object):0 -> equals
     boolean canThrow() -> f
     com.android.tools.r8.graph.DexMethod com.android.tools.r8.code.Format45cc.getMethod() -> h
-    int com.android.tools.r8.code.Format45cc.hashCode() -> hashCode
+    1:9:int com.android.tools.r8.code.Format45cc.hashCode():62:70 -> hashCode
+    1:9:int com.android.tools.r8.code.Format45cc.hashCode():0 -> hashCode
     java.lang.String getName() -> i
     int getOpcode() -> k
     java.lang.String getSmaliName() -> n
@@ -5661,22 +5724,22 @@
     10:10:com.android.tools.r8.graph.DexProto com.android.tools.r8.code.Format4rcc.getProto():0 -> a
     10:10:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):56 -> a
     11:11:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):56:56 -> a
-    12:16:boolean com.android.tools.r8.code.Format4rcc.equals(java.lang.Object):58:62 -> a
-    17:24:java.lang.String com.android.tools.r8.code.Format4rcc.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):85:92 -> a
-    17:24:java.lang.String com.android.tools.r8.code.Format4rcc.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):0 -> a
-    25:26:void com.android.tools.r8.code.Format4rcc.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):98:99 -> a
-    25:26:void com.android.tools.r8.code.Format4rcc.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):0 -> a
-    27:33:void com.android.tools.r8.code.Format4rcc.appendRegisterRange(java.lang.StringBuilder):115:121 -> a
+    12:19:java.lang.String com.android.tools.r8.code.Format4rcc.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):85:92 -> a
+    12:19:java.lang.String com.android.tools.r8.code.Format4rcc.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):0 -> a
+    20:21:void com.android.tools.r8.code.Format4rcc.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):98:99 -> a
+    20:21:void com.android.tools.r8.code.Format4rcc.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):0 -> a
+    22:28:void com.android.tools.r8.code.Format4rcc.appendRegisterRange(java.lang.StringBuilder):115:121 -> a
     1:14:java.lang.String com.android.tools.r8.code.Format4rcc.toString(com.android.tools.r8.naming.ClassNameMapper):67:80 -> b
     1:14:java.lang.String com.android.tools.r8.code.Format4rcc.toString(com.android.tools.r8.naming.ClassNameMapper):0 -> b
-    boolean com.android.tools.r8.code.Format4rcc.equals(java.lang.Object) -> equals
+    1:5:boolean com.android.tools.r8.code.Format4rcc.equals(java.lang.Object):58:62 -> equals
+    1:5:boolean com.android.tools.r8.code.Format4rcc.equals(java.lang.Object):0 -> equals
     boolean canThrow() -> f
     1:1:com.android.tools.r8.graph.DexMethod getMethod():46:46 -> h
-    int com.android.tools.r8.code.Format4rcc.hashCode() -> hashCode
+    1:2:int com.android.tools.r8.code.Format4rcc.hashCode():52:53 -> hashCode
+    1:2:int com.android.tools.r8.code.Format4rcc.hashCode():0 -> hashCode
     java.lang.String getName() -> i
     int getOpcode() -> k
     java.lang.String getSmaliName() -> n
-    1:2:int com.android.tools.r8.code.Format4rcc.hashCode():52:53 -> z
 com.android.tools.r8.code.InvokeStatic -> com.android.tools.r8.code.J1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):19:19 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.DexMethod,int,int,int,int,int):23:23 -> <init>
@@ -7155,12 +7218,12 @@
     java.lang.String getName() -> i
     int getOpcode() -> k
     java.lang.String getSmaliName() -> n
-com.android.tools.r8.com.google.common.base.Absent -> com.android.tools.r8.q.a.a.a.a:
+com.android.tools.r8.com.google.common.base.Absent -> com.android.tools.r8.p.a.a.a.a:
     com.android.tools.r8.com.google.common.base.Absent INSTANCE -> a
     1:1:void <clinit>():29:29 -> <clinit>
     1:1:void <init>():36:36 -> <init>
     1:1:java.lang.Object or(java.lang.Object):50:50 -> a
-com.android.tools.r8.com.google.common.base.Ascii -> com.android.tools.r8.q.a.a.a.b:
+com.android.tools.r8.com.google.common.base.Ascii -> com.android.tools.r8.p.a.a.a.b:
     int com.android.tools.r8.com.google.common.primitives.Ints.saturatedCast(long) -> a
     1:19:com.android.tools.r8.com.google.gson.JsonElement com.android.tools.r8.com.google.gson.internal.Streams.parse(com.android.tools.r8.com.google.gson.stream.JsonReader):46:64 -> a
     20:20:com.android.tools.r8.com.google.gson.JsonElement com.android.tools.r8.com.google.gson.internal.Streams.parse(com.android.tools.r8.com.google.gson.stream.JsonReader):62:62 -> a
@@ -7168,7 +7231,7 @@
     22:25:com.android.tools.r8.com.google.gson.JsonElement com.android.tools.r8.com.google.gson.internal.Streams.parse(com.android.tools.r8.com.google.gson.stream.JsonReader):55:58 -> a
     26:26:boolean com.android.tools.r8.com.google.common.base.Objects.equal(java.lang.Object,java.lang.Object):52:52 -> a
     27:37:java.lang.String toLowerCase(java.lang.String):403:413 -> a
-com.android.tools.r8.com.google.common.base.CharMatcher -> com.android.tools.r8.q.a.a.a.o:
+com.android.tools.r8.com.google.common.base.CharMatcher -> com.android.tools.r8.p.a.a.a.o:
     1:1:com.android.tools.r8.com.google.common.base.CharMatcher whitespace():134:134 -> <clinit>
     1:1:void <clinit>():272 -> <clinit>
     2:2:com.android.tools.r8.com.google.common.base.CharMatcher ascii():154:154 -> <clinit>
@@ -7194,7 +7257,7 @@
     1:1:com.android.tools.r8.com.google.common.base.CharMatcher none():117:117 -> b
     1:1:java.util.function.Predicate negate():53:53 -> negate
     2:2:com.android.tools.r8.com.google.common.base.CharMatcher negate():497:497 -> negate
-com.android.tools.r8.com.google.common.base.CharMatcher$Any -> com.android.tools.r8.q.a.a.a.c:
+com.android.tools.r8.com.google.common.base.CharMatcher$Any -> com.android.tools.r8.p.a.a.a.c:
     com.android.tools.r8.com.google.common.base.CharMatcher$Any INSTANCE -> b
     1:1:void <clinit>():1119:1119 -> <clinit>
     1:1:void <init>():1122:1122 -> <init>
@@ -7204,27 +7267,27 @@
     2:2:com.android.tools.r8.com.google.common.base.CharMatcher com.android.tools.r8.com.google.common.base.CharMatcher.none():117:117 -> negate
     2:2:com.android.tools.r8.com.google.common.base.CharMatcher negate():1209 -> negate
     2:2:java.util.function.Predicate negate():1117 -> negate
-com.android.tools.r8.com.google.common.base.CharMatcher$Ascii -> com.android.tools.r8.q.a.a.a.d:
+com.android.tools.r8.com.google.common.base.CharMatcher$Ascii -> com.android.tools.r8.p.a.a.a.d:
     com.android.tools.r8.com.google.common.base.CharMatcher$Ascii INSTANCE -> b
     1:1:void <clinit>():1385:1385 -> <clinit>
     1:1:void <init>():1388:1388 -> <init>
     boolean matches(char) -> a
-com.android.tools.r8.com.google.common.base.CharMatcher$Digit -> com.android.tools.r8.q.a.a.a.e:
+com.android.tools.r8.com.google.common.base.CharMatcher$Digit -> com.android.tools.r8.p.a.a.a.e:
     com.android.tools.r8.com.google.common.base.CharMatcher$Digit INSTANCE -> d
     1:1:void <clinit>():1455:1455 -> <clinit>
     1:1:void <init>():1458:1458 -> <init>
     1:3:char[] nines():1448:1450 -> c
     1:1:char[] zeroes():1444:1444 -> d
-com.android.tools.r8.com.google.common.base.CharMatcher$Invisible -> com.android.tools.r8.q.a.a.a.f:
+com.android.tools.r8.com.google.common.base.CharMatcher$Invisible -> com.android.tools.r8.p.a.a.a.f:
     com.android.tools.r8.com.google.common.base.CharMatcher$Invisible INSTANCE -> d
     1:1:void <clinit>():1567:1567 -> <clinit>
     1:1:void <init>():1570:1570 -> <init>
-com.android.tools.r8.com.google.common.base.CharMatcher$JavaIsoControl -> com.android.tools.r8.q.a.a.a.g:
+com.android.tools.r8.com.google.common.base.CharMatcher$JavaIsoControl -> com.android.tools.r8.p.a.a.a.g:
     com.android.tools.r8.com.google.common.base.CharMatcher$JavaIsoControl INSTANCE -> b
     1:1:void <clinit>():1545:1545 -> <clinit>
     1:1:void <init>():1548:1548 -> <init>
     boolean matches(char) -> a
-com.android.tools.r8.com.google.common.base.CharMatcher$NamedFastMatcher -> com.android.tools.r8.q.a.a.a.h:
+com.android.tools.r8.com.google.common.base.CharMatcher$NamedFastMatcher -> com.android.tools.r8.p.a.a.a.h:
     java.lang.String description -> a
     1:1:void com.android.tools.r8.com.google.common.base.CharMatcher$FastMatcher.<init>():1047:1047 -> <init>
     1:1:void <init>(java.lang.String):1065 -> <init>
@@ -7239,7 +7302,7 @@
     2:2:com.android.tools.r8.com.google.common.base.CharMatcher com.android.tools.r8.com.google.common.base.CharMatcher$FastMatcher.negate():1056:1056 -> negate
     2:2:com.android.tools.r8.com.google.common.base.CharMatcher com.android.tools.r8.com.google.common.base.CharMatcher$FastMatcher.negate():0 -> negate
     1:1:java.lang.String toString():1071:1071 -> toString
-com.android.tools.r8.com.google.common.base.CharMatcher$Negated -> com.android.tools.r8.q.a.a.a.i:
+com.android.tools.r8.com.google.common.base.CharMatcher$Negated -> com.android.tools.r8.p.a.a.a.i:
     com.android.tools.r8.com.google.common.base.CharMatcher original -> a
     1:2:void <init>(com.android.tools.r8.com.google.common.base.CharMatcher):1594:1595 -> <init>
     1:1:boolean matches(char):1600:1600 -> a
@@ -7250,9 +7313,9 @@
     2:2:com.android.tools.r8.com.google.common.base.CharMatcher negate():1629:1629 -> negate
     2:2:java.util.function.Predicate negate():1590 -> negate
     1:1:java.lang.String toString():1634:1634 -> toString
-com.android.tools.r8.com.google.common.base.CharMatcher$NegatedFastMatcher -> com.android.tools.r8.q.a.a.a.j:
+com.android.tools.r8.com.google.common.base.CharMatcher$NegatedFastMatcher -> com.android.tools.r8.p.a.a.a.j:
     1:1:void <init>(com.android.tools.r8.com.google.common.base.CharMatcher):1079:1079 -> <init>
-com.android.tools.r8.com.google.common.base.CharMatcher$None -> com.android.tools.r8.q.a.a.a.k:
+com.android.tools.r8.com.google.common.base.CharMatcher$None -> com.android.tools.r8.p.a.a.a.k:
     com.android.tools.r8.com.google.common.base.CharMatcher$None INSTANCE -> b
     1:1:void <clinit>():1216:1216 -> <clinit>
     1:1:void <init>():1219:1219 -> <init>
@@ -7262,7 +7325,7 @@
     2:2:com.android.tools.r8.com.google.common.base.CharMatcher com.android.tools.r8.com.google.common.base.CharMatcher.any():108:108 -> negate
     2:2:com.android.tools.r8.com.google.common.base.CharMatcher negate():1312 -> negate
     2:2:java.util.function.Predicate negate():1214 -> negate
-com.android.tools.r8.com.google.common.base.CharMatcher$RangesMatcher -> com.android.tools.r8.q.a.a.a.l:
+com.android.tools.r8.com.google.common.base.CharMatcher$RangesMatcher -> com.android.tools.r8.p.a.a.a.l:
     char[] rangeStarts -> b
     char[] rangeEnds -> c
     java.lang.String description -> a
@@ -7274,24 +7337,24 @@
     1:1:com.android.tools.r8.com.google.common.base.CharMatcher com.android.tools.r8.com.google.common.base.CharMatcher.negate():497:497 -> negate
     1:1:java.util.function.Predicate negate():1398 -> negate
     1:1:java.lang.String toString():1430:1430 -> toString
-com.android.tools.r8.com.google.common.base.CharMatcher$SingleWidth -> com.android.tools.r8.q.a.a.a.m:
+com.android.tools.r8.com.google.common.base.CharMatcher$SingleWidth -> com.android.tools.r8.p.a.a.a.m:
     com.android.tools.r8.com.google.common.base.CharMatcher$SingleWidth INSTANCE -> d
     1:1:void <clinit>():1577:1577 -> <clinit>
     1:2:void <init>():1582:1583 -> <init>
     3:3:void <init>():1580:1580 -> <init>
-com.android.tools.r8.com.google.common.base.CharMatcher$Whitespace -> com.android.tools.r8.q.a.a.a.n:
+com.android.tools.r8.com.google.common.base.CharMatcher$Whitespace -> com.android.tools.r8.p.a.a.a.n:
     com.android.tools.r8.com.google.common.base.CharMatcher$Whitespace INSTANCE -> c
     int SHIFT -> b
     1:3:void <clinit>():1326:1328 -> <clinit>
     1:1:void <init>():1331:1331 -> <init>
     1:1:boolean matches(char):1336:1336 -> a
-com.android.tools.r8.com.google.common.base.Charsets -> com.android.tools.r8.q.a.a.a.p:
+com.android.tools.r8.com.google.common.base.Charsets -> com.android.tools.r8.p.a.a.a.p:
     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.q.a.a.a.q:
+com.android.tools.r8.com.google.common.base.CommonPattern -> com.android.tools.r8.p.a.a.a.q:
     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.q.a.a.a.v:
+com.android.tools.r8.com.google.common.base.Equivalence -> com.android.tools.r8.p.a.a.a.v:
     1:1:void <init>():41:41 -> <init>
     1:1:com.android.tools.r8.com.google.common.base.Equivalence equals():323:323 -> a
     1:1:com.android.tools.r8.com.google.common.base.Equivalence identity():336:336 -> b
@@ -7302,14 +7365,14 @@
     1:1:com.android.tools.r8.com.google.common.base.Equivalence pairwise():259:259 -> pairwise
     1:1:boolean test(java.lang.Object,java.lang.Object):78:78 -> test
     1:1:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper wrap(java.lang.Object):162:162 -> wrap
-com.android.tools.r8.com.google.common.base.Equivalence$1 -> com.android.tools.r8.q.a.a.a.r:
-com.android.tools.r8.com.google.common.base.Equivalence$Equals -> com.android.tools.r8.q.a.a.a.s:
+com.android.tools.r8.com.google.common.base.Equivalence$1 -> com.android.tools.r8.p.a.a.a.r:
+com.android.tools.r8.com.google.common.base.Equivalence$Equals -> com.android.tools.r8.p.a.a.a.s:
     com.android.tools.r8.com.google.common.base.Equivalence$Equals INSTANCE -> a
     1:1:void <clinit>():341:341 -> <clinit>
     1:1:void <init>():339:339 -> <init>
     1:1:boolean doEquivalent(java.lang.Object,java.lang.Object):345:345 -> doEquivalent
     1:1:int doHash(java.lang.Object):350:350 -> doHash
-com.android.tools.r8.com.google.common.base.Equivalence$EquivalentToPredicate -> com.android.tools.r8.q.a.a.a.t:
+com.android.tools.r8.com.google.common.base.Equivalence$EquivalentToPredicate -> com.android.tools.r8.p.a.a.a.t:
     com.android.tools.r8.com.google.common.base.Equivalence equivalence -> a
     java.lang.Object target -> b
     1:3:void <init>(com.android.tools.r8.com.google.common.base.Equivalence,java.lang.Object):277:279 -> <init>
@@ -7319,12 +7382,12 @@
     2:2:int com.android.tools.r8.com.google.common.base.Objects.hashCode(java.lang.Object[]):76:76 -> hashCode
     2:2:int hashCode():301 -> hashCode
     1:1:java.lang.String toString():306:306 -> toString
-com.android.tools.r8.com.google.common.base.Equivalence$Identity -> com.android.tools.r8.q.a.a.a.u:
+com.android.tools.r8.com.google.common.base.Equivalence$Identity -> com.android.tools.r8.p.a.a.a.u:
     com.android.tools.r8.com.google.common.base.Equivalence$Identity INSTANCE -> a
     1:1:void <clinit>():362:362 -> <clinit>
     1:1:void <init>():360:360 -> <init>
     1:1:int doHash(java.lang.Object):371:371 -> doHash
-com.android.tools.r8.com.google.common.base.Equivalence$Wrapper -> com.android.tools.r8.q.a.a.a.v$a:
+com.android.tools.r8.com.google.common.base.Equivalence$Wrapper -> com.android.tools.r8.p.a.a.a.v$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>
@@ -7333,8 +7396,8 @@
     1:11:boolean equals(java.lang.Object):208:218 -> equals
     1:1:int hashCode():229:229 -> hashCode
     1:1:java.lang.String toString():238:238 -> toString
-com.android.tools.r8.com.google.common.base.Function -> com.android.tools.r8.q.a.a.a.w:
-com.android.tools.r8.com.google.common.base.FunctionalEquivalence -> com.android.tools.r8.q.a.a.a.x:
+com.android.tools.r8.com.google.common.base.Function -> com.android.tools.r8.p.a.a.a.w:
+com.android.tools.r8.com.google.common.base.FunctionalEquivalence -> com.android.tools.r8.p.a.a.a.x:
     com.android.tools.r8.com.google.common.base.Function function -> a
     com.android.tools.r8.com.google.common.base.Equivalence resultEquivalence -> b
     1:3:void <init>(com.android.tools.r8.com.google.common.base.Function,com.android.tools.r8.com.google.common.base.Equivalence):39:41 -> <init>
@@ -7345,19 +7408,19 @@
     2:2:int com.android.tools.r8.com.google.common.base.Objects.hashCode(java.lang.Object[]):76:76 -> hashCode
     2:2:int hashCode():68 -> hashCode
     1:1:java.lang.String toString():73:73 -> toString
-com.android.tools.r8.com.google.common.base.JdkPattern -> com.android.tools.r8.q.a.a.a.z:
+com.android.tools.r8.com.google.common.base.JdkPattern -> com.android.tools.r8.p.a.a.a.z:
     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.q.a.a.a.y:
+com.android.tools.r8.com.google.common.base.JdkPattern$JdkMatcher -> com.android.tools.r8.p.a.a.a.y:
     java.util.regex.Matcher matcher -> a
     1:1:void com.android.tools.r8.com.google.common.base.CommonMatcher.<init>():25:25 -> <init>
     1:1:void <init>(java.util.regex.Matcher):69 -> <init>
     2:2:void <init>(java.util.regex.Matcher):70:70 -> <init>
-com.android.tools.r8.com.google.common.base.MoreObjects -> com.android.tools.r8.q.a.a.a.D:
+com.android.tools.r8.com.google.common.base.MoreObjects -> com.android.tools.r8.p.a.a.a.D:
     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
@@ -7420,8 +7483,8 @@
     6:6:java.lang.Object firstNonNull(java.lang.Object,java.lang.Object):56 -> b
     7:7:int com.android.tools.r8.com.google.common.base.Preconditions.checkPositionIndex(int,int,java.lang.String):1241:1241 -> b
     7:7:int com.android.tools.r8.com.google.common.base.Preconditions.checkPositionIndex(int,int):1223 -> b
-com.android.tools.r8.com.google.common.base.MoreObjects$1 -> com.android.tools.r8.q.a.a.a.A:
-com.android.tools.r8.com.google.common.base.MoreObjects$ToStringHelper -> com.android.tools.r8.q.a.a.a.C:
+com.android.tools.r8.com.google.common.base.MoreObjects$1 -> com.android.tools.r8.p.a.a.a.A:
+com.android.tools.r8.com.google.common.base.MoreObjects$ToStringHelper -> com.android.tools.r8.p.a.a.a.C:
     com.android.tools.r8.com.google.common.base.MoreObjects$ToStringHelper$ValueHolder holderTail -> c
     com.android.tools.r8.com.google.common.base.MoreObjects$ToStringHelper$ValueHolder holderHead -> b
     java.lang.String className -> a
@@ -7438,18 +7501,18 @@
     5:5:com.android.tools.r8.com.google.common.base.MoreObjects$ToStringHelper addHolder(java.lang.String,java.lang.Object):372 -> b
     1:20:java.lang.String toString():331:350 -> toString
     21:39:java.lang.String toString():336:354 -> toString
-com.android.tools.r8.com.google.common.base.MoreObjects$ToStringHelper$ValueHolder -> com.android.tools.r8.q.a.a.a.B:
+com.android.tools.r8.com.google.common.base.MoreObjects$ToStringHelper$ValueHolder -> com.android.tools.r8.p.a.a.a.B:
     com.android.tools.r8.com.google.common.base.MoreObjects$ToStringHelper$ValueHolder next -> c
     java.lang.Object value -> b
     java.lang.String name -> a
     1:1:void <init>():376:376 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.base.MoreObjects$1):376:376 -> <init>
-com.android.tools.r8.com.google.common.base.Optional -> com.android.tools.r8.q.a.a.a.E:
+com.android.tools.r8.com.google.common.base.Optional -> com.android.tools.r8.p.a.a.a.E:
     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 com.android.tools.r8.com.google.common.base.Absent.withType():33:33 -> a
     1:1:com.android.tools.r8.com.google.common.base.Optional absent():93 -> a
-com.android.tools.r8.com.google.common.base.PairwiseEquivalence -> com.android.tools.r8.q.a.a.a.F:
+com.android.tools.r8.com.google.common.base.PairwiseEquivalence -> com.android.tools.r8.p.a.a.a.F:
     com.android.tools.r8.com.google.common.base.Equivalence elementEquivalence -> a
     1:2:void <init>(com.android.tools.r8.com.google.common.base.Equivalence):27:28 -> <init>
     1:1:boolean doEquivalent(java.lang.Object,java.lang.Object):22:22 -> doEquivalent
@@ -7461,7 +7524,7 @@
     1:3:boolean equals(java.lang.Object):56:58 -> equals
     1:1:int hashCode():66:66 -> hashCode
     1:1:java.lang.String toString():71:71 -> toString
-com.android.tools.r8.com.google.common.base.Platform -> com.android.tools.r8.q.a.a.a.I:
+com.android.tools.r8.com.google.common.base.Platform -> com.android.tools.r8.p.a.a.a.I:
     com.android.tools.r8.com.google.common.base.PatternCompiler patternCompiler -> b
     java.util.logging.Logger logger -> a
     1:1:void <clinit>():35:35 -> <clinit>
@@ -7481,21 +7544,21 @@
     2:2:com.android.tools.r8.com.google.common.base.CommonPattern compilePattern(java.lang.String):66 -> a
     3:3:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
     3:3:com.android.tools.r8.com.google.common.base.CommonPattern compilePattern(java.lang.String):65 -> a
-com.android.tools.r8.com.google.common.base.Platform$1 -> com.android.tools.r8.q.a.a.a.G:
-com.android.tools.r8.com.google.common.base.Platform$JdkPatternCompiler -> com.android.tools.r8.q.a.a.a.H:
+com.android.tools.r8.com.google.common.base.Platform$1 -> com.android.tools.r8.p.a.a.a.G:
+com.android.tools.r8.com.google.common.base.Platform$JdkPatternCompiler -> com.android.tools.r8.p.a.a.a.H:
     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.Predicate -> com.android.tools.r8.q.a.a.a.J:
+com.android.tools.r8.com.google.common.base.Predicate -> com.android.tools.r8.p.a.a.a.J:
     1:1:boolean test(java.lang.Object):80:80 -> test
-com.android.tools.r8.com.google.common.base.Predicates$1 -> com.android.tools.r8.q.a.a.a.K:
-com.android.tools.r8.com.google.common.base.Predicates$NotPredicate -> com.android.tools.r8.q.a.a.a.L:
+com.android.tools.r8.com.google.common.base.Predicates$1 -> com.android.tools.r8.p.a.a.a.K:
+com.android.tools.r8.com.google.common.base.Predicates$NotPredicate -> com.android.tools.r8.p.a.a.a.L:
     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.q.a.a.a.Q:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate -> com.android.tools.r8.p.a.a.a.Q:
     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
@@ -7503,15 +7566,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.q.a.a.a.M:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$1 -> com.android.tools.r8.p.a.a.a.M:
     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.q.a.a.a.N:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$2 -> com.android.tools.r8.p.a.a.a.N:
     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.q.a.a.a.O:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$3 -> com.android.tools.r8.p.a.a.a.O:
     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.q.a.a.a.P:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$4 -> com.android.tools.r8.p.a.a.a.P:
     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.q.a.a.a.S:
+com.android.tools.r8.com.google.common.base.Predicates$OrPredicate -> com.android.tools.r8.p.a.a.a.S:
     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>
@@ -7522,7 +7585,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.q.a.a.a.U:
+com.android.tools.r8.com.google.common.base.Splitter -> com.android.tools.r8.p.a.a.a.U:
     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 on(com.android.tools.r8.com.google.common.base.CommonPattern):214:214 -> a
@@ -7535,24 +7598,24 @@
     10:10:void <init>(com.android.tools.r8.com.google.common.base.Splitter$Strategy):100:100 -> a
     10:10:com.android.tools.r8.com.google.common.base.Splitter on(com.android.tools.r8.com.google.common.base.CommonPattern):218 -> a
     10:10: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.q.a.a.a.T:
+com.android.tools.r8.com.google.common.base.Splitter$3 -> com.android.tools.r8.p.a.a.a.T:
     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.q.a.a.a.V:
-com.android.tools.r8.com.google.common.base.Suppliers$MemoizingSupplier -> com.android.tools.r8.q.a.a.a.W:
+com.android.tools.r8.com.google.common.base.Supplier -> com.android.tools.r8.p.a.a.a.V:
+com.android.tools.r8.com.google.common.base.Suppliers$MemoizingSupplier -> com.android.tools.r8.p.a.a.a.W:
     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.q.a.a.a.X:
+com.android.tools.r8.com.google.common.base.Suppliers$NonSerializableMemoizingSupplier -> com.android.tools.r8.p.a.a.a.X:
     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.q.a.a.a.Y:
+com.android.tools.r8.com.google.common.base.Throwables -> com.android.tools.r8.p.a.a.a.Y:
     java.lang.Object jla -> a
     1:3:java.lang.Object getJLA():482:484 -> <clinit>
     1:3:void <clinit>():452 -> <clinit>
@@ -7582,7 +7645,7 @@
     8:8:void throwIfUnchecked(java.lang.Throwable):130:130 -> a
     8:8:void propagateIfPossible(java.lang.Throwable):159 -> a
     8:8:void propagateIfPossible(java.lang.Throwable,java.lang.Class):185 -> a
-com.android.tools.r8.com.google.common.collect.AbstractIndexedListIterator -> com.android.tools.r8.q.a.a.b.a:
+com.android.tools.r8.com.google.common.collect.AbstractIndexedListIterator -> com.android.tools.r8.p.a.a.b.a:
     int position -> b
     int size -> a
     1:1:void <init>(int):52:52 -> <init>
@@ -7596,7 +7659,7 @@
     1:4:java.lang.Object previous():97:100 -> previous
     5:5:java.lang.Object previous():98:98 -> previous
     1:1:int previousIndex():105:105 -> previousIndex
-com.android.tools.r8.com.google.common.collect.AbstractIterator -> com.android.tools.r8.q.a.a.b.c:
+com.android.tools.r8.com.google.common.collect.AbstractIterator -> com.android.tools.r8.p.a.a.b.c:
     java.lang.Object next -> b
     com.android.tools.r8.com.google.common.collect.AbstractIterator$State state -> a
     1:1:void <init>():68:68 -> <init>
@@ -7608,7 +7671,7 @@
     3:6:boolean hasNext():140 -> hasNext
     1:6:java.lang.Object next():156:161 -> next
     7:7:java.lang.Object next():157:157 -> next
-com.android.tools.r8.com.google.common.collect.AbstractIterator$State -> com.android.tools.r8.q.a.a.b.b:
+com.android.tools.r8.com.google.common.collect.AbstractIterator$State -> com.android.tools.r8.p.a.a.b.b:
     com.android.tools.r8.com.google.common.collect.AbstractIterator$State[] $VALUES -> e
     com.android.tools.r8.com.google.common.collect.AbstractIterator$State DONE -> c
     com.android.tools.r8.com.google.common.collect.AbstractIterator$State NOT_READY -> b
@@ -7617,14 +7680,14 @@
     1:10:void <clinit>():72:81 -> <clinit>
     11:11:void <clinit>():70:70 -> <clinit>
     1:1:void <init>(java.lang.String,int):70:70 -> <init>
-com.android.tools.r8.com.google.common.collect.AbstractListMultimap -> com.android.tools.r8.q.a.a.b.d:
+com.android.tools.r8.com.google.common.collect.AbstractListMultimap -> com.android.tools.r8.p.a.a.b.d:
     1:1:void <init>(java.util.Map):45:45 -> <init>
     1:1:java.util.Map asMap():117:117 -> b
     1:1:boolean equals(java.lang.Object):129:129 -> equals
     1:1:java.util.Collection get(java.lang.Object):35:35 -> get
     2:2:java.util.List get(java.lang.Object):67:67 -> get
     1:1:boolean put(java.lang.Object,java.lang.Object):106:106 -> put
-com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap -> com.android.tools.r8.q.a.a.b.f:
+com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap -> com.android.tools.r8.p.a.a.b.f:
     int totalSize -> f
     java.util.Map map -> e
     1:3:void <init>(java.util.Map):122:124 -> <init>
@@ -7672,9 +7735,9 @@
     2:2:boolean put(java.lang.Object,java.lang.Object):194 -> put
     3:11:boolean put(java.lang.Object,java.lang.Object):195:203 -> put
     1:1:int size():180:180 -> size
-com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$2 -> com.android.tools.r8.q.a.a.b.e:
+com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$2 -> com.android.tools.r8.p.a.a.b.e:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap):1253:1253 -> <init>
-com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$AsMap -> com.android.tools.r8.q.a.a.b.f$a:
+com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$AsMap -> com.android.tools.r8.p.a.a.b.f$a:
     java.util.Map submap -> c
     com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap this$0 -> d
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap,java.util.Map):1301:1302 -> <init>
@@ -7702,7 +7765,7 @@
     1:9:java.lang.Object remove(java.lang.Object):1293 -> remove
     1:1:int size():1335:1335 -> size
     1:1:java.lang.String toString():1364:1364 -> toString
-com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$AsMap$AsMapEntries -> com.android.tools.r8.q.a.a.b.f$a$a:
+com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$AsMap$AsMapEntries -> com.android.tools.r8.p.a.a.b.f$a$a:
     com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$AsMap this$1 -> a
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$AsMap):1382:1382 -> <init>
     1:1:java.util.Map map():1385:1385 -> a
@@ -7715,7 +7778,7 @@
     1:1:java.util.Iterator iterator():1390:1390 -> iterator
     1:5:boolean remove(java.lang.Object):1407:1411 -> remove
     1:1:java.util.Spliterator spliterator():1395:1395 -> spliterator
-com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$AsMap$AsMapIterator -> com.android.tools.r8.q.a.a.b.f$a$b:
+com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$AsMap$AsMapIterator -> com.android.tools.r8.p.a.a.b.f$a$b:
     com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$AsMap this$1 -> c
     java.util.Collection collection -> b
     java.util.Iterator delegateIterator -> a
@@ -7724,7 +7787,7 @@
     1:3:java.util.Map$Entry next():1428:1430 -> next
     1:3:java.lang.Object next():1417 -> next
     1:3:void remove():1435:1437 -> remove
-com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$Itr -> com.android.tools.r8.q.a.a.b.f$b:
+com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$Itr -> com.android.tools.r8.p.a.a.b.f$b:
     java.util.Iterator valueIterator -> d
     java.util.Collection collection -> c
     com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap this$0 -> e
@@ -7738,7 +7801,7 @@
     8:8:java.lang.Object com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$2.output(java.lang.Object,java.lang.Object):1253 -> next
     8:8:java.lang.Object next():1182 -> next
     1:5:void remove():1187:1191 -> remove
-com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$KeySet -> com.android.tools.r8.q.a.a.b.f$c:
+com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$KeySet -> com.android.tools.r8.p.a.a.b.f$c:
     com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap this$0 -> b
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap,java.util.Map):943:944 -> <init>
     1:1:void clear():996:996 -> clear
@@ -7767,7 +7830,7 @@
     1:1:java.util.Map com.android.tools.r8.com.google.common.collect.Maps$KeySet.map():3844:3844 -> spliterator
     1:1:java.util.Spliterator spliterator():979 -> spliterator
     2:2:java.util.Spliterator spliterator():979:979 -> spliterator
-com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$KeySet$1 -> com.android.tools.r8.q.a.a.b.g:
+com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$KeySet$1 -> com.android.tools.r8.p.a.a.b.g:
     java.util.Map$Entry entry -> a
     java.util.Iterator val$entryIterator -> b
     com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$KeySet this$1 -> c
@@ -7775,7 +7838,7 @@
     1:1:boolean hasNext():955:955 -> hasNext
     1:2:java.lang.Object next():960:961 -> next
     1:5:void remove():966:970 -> remove
-com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$NavigableAsMap -> com.android.tools.r8.q.a.a.b.f$d:
+com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$NavigableAsMap -> com.android.tools.r8.p.a.a.b.f$d:
     com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap this$0 -> g
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap,java.util.NavigableMap):1500:1501 -> <init>
     1:8:java.util.Map$Entry pollAsMapEntry(java.util.Iterator):1576:1583 -> a
@@ -7821,7 +7884,7 @@
     2:2:java.util.NavigableMap tailMap(java.lang.Object,boolean):1639:1639 -> tailMap
     2:2:java.util.NavigableMap tailMap(java.lang.Object):1634 -> tailMap
     2:2:java.util.SortedMap tailMap(java.lang.Object):1498 -> tailMap
-com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$NavigableKeySet -> com.android.tools.r8.q.a.a.b.f$e:
+com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$NavigableKeySet -> com.android.tools.r8.p.a.a.b.f$e:
     com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap this$0 -> d
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap,java.util.NavigableMap):1059:1060 -> <init>
     1:1:java.util.SortedMap sortedMap():1057:1057 -> a
@@ -7853,9 +7916,9 @@
     2:2:java.util.NavigableSet tailSet(java.lang.Object,boolean):1137:1137 -> tailSet
     2:2:java.util.NavigableSet tailSet(java.lang.Object):1132 -> tailSet
     2:2:java.util.SortedSet tailSet(java.lang.Object):1057 -> tailSet
-com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$RandomAccessWrappedList -> com.android.tools.r8.q.a.a.b.f$f:
+com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$RandomAccessWrappedList -> com.android.tools.r8.p.a.a.b.f$f:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap,java.lang.Object,java.util.List,com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedCollection):926:926 -> <init>
-com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$SortedAsMap -> com.android.tools.r8.q.a.a.b.f$g:
+com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$SortedAsMap -> com.android.tools.r8.p.a.a.b.f$g:
     java.util.SortedSet sortedKeySet -> e
     com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap this$0 -> f
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap,java.util.SortedMap):1444:1445 -> <init>
@@ -7869,7 +7932,7 @@
     1:1:java.lang.Object lastKey():1464:1464 -> lastKey
     1:1:java.util.SortedMap subMap(java.lang.Object,java.lang.Object):1474:1474 -> subMap
     1:1:java.util.SortedMap tailMap(java.lang.Object):1479:1479 -> tailMap
-com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$SortedKeySet -> com.android.tools.r8.q.a.a.b.f$h:
+com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$SortedKeySet -> com.android.tools.r8.p.a.a.b.f$h:
     com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap this$0 -> c
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap,java.util.SortedMap):1018:1019 -> <init>
     1:1:java.util.Map com.android.tools.r8.com.google.common.collect.Maps$KeySet.map():3844:3844 -> a
@@ -7881,7 +7944,7 @@
     1:1:java.lang.Object last():1043:1043 -> last
     1:1:java.util.SortedSet subSet(java.lang.Object,java.lang.Object):1048:1048 -> subSet
     1:1:java.util.SortedSet tailSet(java.lang.Object):1053:1053 -> tailSet
-com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedCollection -> com.android.tools.r8.q.a.a.b.f$i:
+com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedCollection -> com.android.tools.r8.p.a.a.b.f$i:
     com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedCollection ancestor -> c
     java.util.Collection ancestorDelegate -> d
     java.util.Collection delegate -> b
@@ -7911,7 +7974,7 @@
     1:2:int size():422:423 -> size
     1:2:java.util.Spliterator spliterator():459:460 -> spliterator
     1:2:java.lang.String toString():443:444 -> toString
-com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedCollection$WrappedIterator -> com.android.tools.r8.q.a.a.b.f$i$a:
+com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedCollection$WrappedIterator -> com.android.tools.r8.p.a.a.b.f$i$a:
     com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedCollection this$1 -> c
     java.util.Collection originalDelegate -> b
     java.util.Iterator delegateIterator -> a
@@ -7923,7 +7986,7 @@
     1:2:boolean hasNext():489:490 -> hasNext
     1:2:java.lang.Object next():495:496 -> next
     1:3:void remove():501:503 -> remove
-com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedList -> com.android.tools.r8.q.a.a.b.f$j:
+com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedList -> com.android.tools.r8.p.a.a.b.f$j:
     com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap this$0 -> f
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap,java.lang.Object,java.util.List,com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedCollection):780:781 -> <init>
     1:1:void add(int,java.lang.Object):819:819 -> add
@@ -8000,7 +8063,7 @@
     8:8:java.util.List com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.wrapList(java.lang.Object,java.util.List,com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedCollection):331:331 -> subList
     8:8:java.util.List com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap.access$300(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap,java.lang.Object,java.util.List,com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedCollection):91 -> subList
     8:8:java.util.List subList(int,int):864 -> subList
-com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedList$WrappedListIterator -> com.android.tools.r8.q.a.a.b.f$j$a:
+com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedList$WrappedListIterator -> com.android.tools.r8.p.a.a.b.f$j$a:
     com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedList this$1 -> d
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedList):872:872 -> <init>
     2:3:void <init>(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedList,int):874:875 -> <init>
@@ -8013,7 +8076,7 @@
     1:1:java.lang.Object previous():889:889 -> previous
     1:1:int previousIndex():899:899 -> previousIndex
     1:1:void set(java.lang.Object):904:904 -> set
-com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedNavigableSet -> com.android.tools.r8.q.a.a.b.f$k:
+com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedNavigableSet -> com.android.tools.r8.p.a.a.b.f$k:
     com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap this$0 -> g
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap,java.lang.Object,java.util.NavigableSet,com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedCollection):706:707 -> <init>
     1:1:java.util.NavigableSet wrap(java.util.NavigableSet):746:746 -> a
@@ -8043,11 +8106,11 @@
     1:1:java.util.NavigableSet subSet(java.lang.Object,boolean,java.lang.Object,boolean):763:763 -> subSet
     2:2:java.util.NavigableSet subSet(java.lang.Object,boolean,java.lang.Object,boolean):762:762 -> subSet
     1:1:java.util.NavigableSet tailSet(java.lang.Object,boolean):773:773 -> tailSet
-com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedSet -> com.android.tools.r8.q.a.a.b.f$l:
+com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedSet -> com.android.tools.r8.p.a.a.b.f$l:
     com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap this$0 -> f
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap,java.lang.Object,java.util.Set):621:622 -> <init>
     1:13:boolean removeAll(java.util.Collection):627:639 -> removeAll
-com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedSortedSet -> com.android.tools.r8.q.a.a.b.f$m:
+com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedSortedSet -> com.android.tools.r8.p.a.a.b.f$m:
     com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap this$0 -> f
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap,java.lang.Object,java.util.SortedSet,com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedCollection):650:651 -> <init>
     1:1:java.util.Comparator comparator():660:660 -> comparator
@@ -8077,7 +8140,7 @@
     5:5:com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedCollection com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedCollection.getAncestor():527:527 -> tailSet
     5:5:java.util.SortedSet tailSet(java.lang.Object):699 -> tailSet
     6:6:java.util.SortedSet tailSet(java.lang.Object):699:699 -> tailSet
-com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset -> com.android.tools.r8.q.a.a.b.j:
+com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset -> com.android.tools.r8.p.a.a.b.j:
     java.util.Map backingMap -> c
     long size -> d
     1:3:void <init>(java.util.Map):60:62 -> <init>
@@ -8100,7 +8163,7 @@
     1:2:java.util.Iterator entryIterator():86:87 -> d
     1:1:java.util.Set entrySet():81:81 -> entrySet
     1:1:int size():152:152 -> size
-com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset$1 -> com.android.tools.r8.q.a.a.b.i:
+com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset$1 -> com.android.tools.r8.p.a.a.b.i:
     java.util.Map$Entry toRemove -> a
     java.util.Iterator val$backingEntries -> b
     com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset this$0 -> c
@@ -8109,7 +8172,7 @@
     1:3:com.android.tools.r8.com.google.common.collect.Multiset$Entry next():97:99 -> next
     1:3:java.lang.Object next():87 -> next
     1:4:void remove():121:124 -> remove
-com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset$1$1 -> com.android.tools.r8.q.a.a.b.h:
+com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset$1$1 -> com.android.tools.r8.p.a.a.b.h:
     java.util.Map$Entry val$mapEntry -> a
     com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset$1 this$1 -> b
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset$1,java.util.Map$Entry):99:99 -> <init>
@@ -8118,7 +8181,7 @@
     4:4:int getCount():109 -> a
     5:10:int getCount():109:114 -> a
     1:1:java.lang.Object getElement():102:102 -> b
-com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset$MapBasedMultisetIterator -> com.android.tools.r8.q.a.a.b.j$a:
+com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset$MapBasedMultisetIterator -> com.android.tools.r8.p.a.a.b.j$a:
     java.util.Map$Entry currentEntry -> b
     java.util.Iterator entryIterator -> a
     com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset this$0 -> e
@@ -8129,13 +8192,13 @@
     1:7:java.lang.Object next():182:188 -> next
     1:10:void remove():193:202 -> remove
     11:11:void remove():196:196 -> remove
-com.android.tools.r8.com.google.common.collect.AbstractMapEntry -> com.android.tools.r8.q.a.a.b.k:
+com.android.tools.r8.com.google.common.collect.AbstractMapEntry -> com.android.tools.r8.p.a.a.b.k:
     1:1:void <init>():31:31 -> <init>
     1:4:boolean equals(java.lang.Object):46:49 -> equals
     1:3:int hashCode():56:58 -> hashCode
     1:1:java.lang.Object setValue(java.lang.Object):41:41 -> setValue
     1:1:java.lang.String toString():66:66 -> toString
-com.android.tools.r8.com.google.common.collect.AbstractMultimap -> com.android.tools.r8.q.a.a.b.m:
+com.android.tools.r8.com.google.common.collect.AbstractMultimap -> com.android.tools.r8.p.a.a.b.m:
     java.util.Map asMap -> d
     java.util.Collection entries -> a
     java.util.Set keySet -> b
@@ -8158,14 +8221,14 @@
     1:2:java.util.Set keySet():168:169 -> keySet
     1:2:boolean remove(java.lang.Object,java.lang.Object):66:67 -> remove
     1:1:java.lang.String toString():274:274 -> toString
-com.android.tools.r8.com.google.common.collect.AbstractMultimap$1 -> com.android.tools.r8.q.a.a.b.l:
-com.android.tools.r8.com.google.common.collect.AbstractMultimap$Entries -> com.android.tools.r8.q.a.a.b.m$a:
+com.android.tools.r8.com.google.common.collect.AbstractMultimap$1 -> com.android.tools.r8.p.a.a.b.l:
+com.android.tools.r8.com.google.common.collect.AbstractMultimap$Entries -> com.android.tools.r8.p.a.a.b.m$a:
     com.android.tools.r8.com.google.common.collect.AbstractMultimap this$0 -> a
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.AbstractMultimap):127:127 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.collect.AbstractMultimap,com.android.tools.r8.com.google.common.collect.AbstractMultimap$1):127:127 -> <init>
     1:1:java.util.Iterator iterator():135:135 -> iterator
     1:1:java.util.Spliterator spliterator():140:140 -> spliterator
-com.android.tools.r8.com.google.common.collect.AbstractMultiset -> com.android.tools.r8.q.a.a.b.n:
+com.android.tools.r8.com.google.common.collect.AbstractMultiset -> com.android.tools.r8.p.a.a.b.n:
     java.util.Set elementSet -> a
     java.util.Set entrySet -> b
     1:1:void <init>():47:47 -> <init>
@@ -8206,16 +8269,16 @@
     1:4:int com.android.tools.r8.com.google.common.collect.Multisets.sizeImpl(com.android.tools.r8.com.google.common.collect.Multiset):1138:1141 -> size
     1:4:int size():52 -> size
     1:1:java.lang.String toString():248:248 -> toString
-com.android.tools.r8.com.google.common.collect.AbstractMultiset$ElementSet -> com.android.tools.r8.q.a.a.b.n$a:
+com.android.tools.r8.com.google.common.collect.AbstractMultiset$ElementSet -> com.android.tools.r8.p.a.a.b.n$a:
     com.android.tools.r8.com.google.common.collect.AbstractMultiset this$0 -> a
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.AbstractMultiset):171:171 -> <init>
-com.android.tools.r8.com.google.common.collect.AbstractMultiset$EntrySet -> com.android.tools.r8.q.a.a.b.n$b:
+com.android.tools.r8.com.google.common.collect.AbstractMultiset$EntrySet -> com.android.tools.r8.p.a.a.b.n$b:
     com.android.tools.r8.com.google.common.collect.AbstractMultiset this$0 -> a
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.AbstractMultiset):194:194 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.Multiset multiset():197:197 -> a
     1:1:java.util.Iterator iterator():202:202 -> iterator
     1:1:int size():207:207 -> size
-com.android.tools.r8.com.google.common.collect.ArrayListMultimap -> com.android.tools.r8.q.a.a.b.o:
+com.android.tools.r8.com.google.common.collect.ArrayListMultimap -> com.android.tools.r8.p.a.a.b.o:
     int expectedValuesPerKey -> g
     1:1:void <init>():112:112 -> <init>
     2:2:void com.android.tools.r8.com.google.common.collect.ArrayListMultimapGwtSerializationDependencies.<init>(java.util.Map):36:36 -> <init>
@@ -8242,10 +8305,10 @@
     1:1:int size():65:65 -> 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():65 -> toString
-com.android.tools.r8.com.google.common.collect.BiMap -> com.android.tools.r8.q.a.a.b.p:
+com.android.tools.r8.com.google.common.collect.BiMap -> com.android.tools.r8.p.a.a.b.p:
     java.lang.Object forcePut(java.lang.Object,java.lang.Object) -> a
     com.android.tools.r8.com.google.common.collect.BiMap inverse() -> f
-com.android.tools.r8.com.google.common.collect.CollectCollectors -> com.android.tools.r8.q.a.a.b.q:
+com.android.tools.r8.com.google.common.collect.CollectCollectors -> com.android.tools.r8.p.a.a.b.q:
     java.util.stream.Collector TO_IMMUTABLE_SET -> a
     1:25:void <clinit>():44:68 -> <clinit>
     1:1:java.util.stream.Collector toImmutableMap(java.util.function.Function,java.util.function.Function):60:60 -> a
@@ -8255,7 +8318,7 @@
     3:3:java.util.stream.Collector toImmutableMap(java.util.function.Function,java.util.function.Function):58 -> a
     4:4: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
     5:5:java.util.stream.Collector toImmutableSet():75:75 -> a
-com.android.tools.r8.com.google.common.collect.CollectSpliterators$1 -> com.android.tools.r8.q.a.a.b.r:
+com.android.tools.r8.com.google.common.collect.CollectSpliterators$1 -> com.android.tools.r8.p.a.a.b.r:
     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>
@@ -8266,7 +8329,7 @@
     1:1:void forEachRemaining(java.util.function.Consumer):115:115 -> forEachRemaining
     1:1:boolean tryAdvance(java.util.function.Consumer):109:109 -> tryAdvance
     1:2:java.util.Spliterator trySplit():120:121 -> trySplit
-com.android.tools.r8.com.google.common.collect.CollectSpliterators$1FlatMapSpliterator -> com.android.tools.r8.q.a.a.b.s:
+com.android.tools.r8.com.google.common.collect.CollectSpliterators$1FlatMapSpliterator -> com.android.tools.r8.p.a.a.b.s:
     long estimatedSize -> d
     java.util.function.Function val$function -> e
     java.util.Spliterator from -> b
@@ -8280,7 +8343,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.q.a.a.b.t:
+com.android.tools.r8.com.google.common.collect.CollectSpliterators$1Splitr -> com.android.tools.r8.p.a.a.b.t:
     java.util.function.Predicate val$predicate -> c
     java.lang.Object holder -> a
     java.util.Spliterator val$fromSpliterator -> b
@@ -8296,7 +8359,7 @@
     4:4:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> trySplit
     4:4:java.util.Spliterator com.android.tools.r8.com.google.common.collect.CollectSpliterators.filter(java.util.Spliterator,java.util.function.Predicate):140 -> trySplit
     4:4:java.util.Spliterator trySplit():167 -> trySplit
-com.android.tools.r8.com.google.common.collect.CollectSpliterators$1WithCharacteristics -> com.android.tools.r8.q.a.a.b.u:
+com.android.tools.r8.com.google.common.collect.CollectSpliterators$1WithCharacteristics -> com.android.tools.r8.p.a.a.b.u:
     java.util.Comparator val$comparator -> c
     java.util.Spliterator delegate -> a
     int val$extraCharacteristics -> b
@@ -8307,7 +8370,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.q.a.a.b.v:
+com.android.tools.r8.com.google.common.collect.Collections2 -> com.android.tools.r8.p.a.a.b.v:
     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
@@ -8410,84 +8473,23 @@
     334:334:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator com.android.tools.r8.com.google.common.collect.Iterators.singletonIterator(java.lang.Object):1104:1104 -> a
     335:335:java.util.Spliterator com.android.tools.r8.com.google.common.collect.Multisets.lambda$spliteratorImpl$2(com.android.tools.r8.com.google.common.collect.Multiset$Entry):1126:1126 -> a
     336:338:com.android.tools.r8.com.google.common.collect.ImmutableMultiset com.android.tools.r8.com.google.common.collect.Multisets.copyHighestCountFirst(com.android.tools.r8.com.google.common.collect.Multiset):1159:1161 -> a
-    339:339:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap com.android.tools.r8.com.google.common.collect.Multimaps.index(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Function):1590:1590 -> a
-    340:340:void com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Builder.<init>():156:156 -> a
-    340:340:void com.android.tools.r8.com.google.common.collect.ImmutableListMultimap$Builder.<init>():237 -> a
-    340:340:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap$Builder com.android.tools.r8.com.google.common.collect.ImmutableListMultimap.builder():211 -> a
-    340:340:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap com.android.tools.r8.com.google.common.collect.Multimaps.index(java.util.Iterator,com.android.tools.r8.com.google.common.base.Function):1633 -> a
-    340:340:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap com.android.tools.r8.com.google.common.collect.Multimaps.index(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Function):1590 -> a
-    341:344:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap com.android.tools.r8.com.google.common.collect.Multimaps.index(java.util.Iterator,com.android.tools.r8.com.google.common.base.Function):1634:1637 -> a
-    341:344:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap com.android.tools.r8.com.google.common.collect.Multimaps.index(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Function):1590 -> a
-    345:346: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
-    345:346:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap$Builder com.android.tools.r8.com.google.common.collect.ImmutableListMultimap$Builder.put(java.lang.Object,java.lang.Object):242 -> a
-    345:346:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap com.android.tools.r8.com.google.common.collect.Multimaps.index(java.util.Iterator,com.android.tools.r8.com.google.common.base.Function):1637 -> a
-    345:346:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap com.android.tools.r8.com.google.common.collect.Multimaps.index(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Function):1590 -> a
-    347:349:com.android.tools.r8.com.google.common.collect.ImmutableMultimap com.android.tools.r8.com.google.common.collect.ImmutableMultimap.copyOf(com.android.tools.r8.com.google.common.collect.Multimap):313:315 -> a
-    347:349:com.android.tools.r8.com.google.common.collect.ImmutableMultimap com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Builder.build():296 -> a
-    347:349:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap com.android.tools.r8.com.google.common.collect.ImmutableListMultimap$Builder.build():328 -> a
-    347:349:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap com.android.tools.r8.com.google.common.collect.Multimaps.index(java.util.Iterator,com.android.tools.r8.com.google.common.base.Function):1639 -> a
-    347:349:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap com.android.tools.r8.com.google.common.collect.Multimaps.index(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Function):1590 -> a
-    350:350:boolean com.android.tools.r8.com.google.common.collect.ImmutableMultimap.isPartialView():476:476 -> a
-    350:350:com.android.tools.r8.com.google.common.collect.ImmutableMultimap com.android.tools.r8.com.google.common.collect.ImmutableMultimap.copyOf(com.android.tools.r8.com.google.common.collect.Multimap):316 -> a
-    350:350:com.android.tools.r8.com.google.common.collect.ImmutableMultimap com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Builder.build():296 -> a
-    350:350:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap com.android.tools.r8.com.google.common.collect.ImmutableListMultimap$Builder.build():328 -> a
-    350:350:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap com.android.tools.r8.com.google.common.collect.Multimaps.index(java.util.Iterator,com.android.tools.r8.com.google.common.base.Function):1639 -> a
-    350:350:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap com.android.tools.r8.com.google.common.collect.Multimaps.index(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Function):1590 -> a
-    351:351:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap com.android.tools.r8.com.google.common.collect.ImmutableListMultimap.copyOf(com.android.tools.r8.com.google.common.collect.Multimap):346:346 -> a
-    351:351:com.android.tools.r8.com.google.common.collect.ImmutableMultimap com.android.tools.r8.com.google.common.collect.ImmutableMultimap.copyOf(com.android.tools.r8.com.google.common.collect.Multimap):320 -> a
-    351:351:com.android.tools.r8.com.google.common.collect.ImmutableMultimap com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Builder.build():296 -> a
-    351:351:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap com.android.tools.r8.com.google.common.collect.ImmutableListMultimap$Builder.build():328 -> a
-    351:351:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap com.android.tools.r8.com.google.common.collect.Multimaps.index(java.util.Iterator,com.android.tools.r8.com.google.common.base.Function):1639 -> a
-    351:351:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap com.android.tools.r8.com.google.common.collect.Multimaps.index(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Function):1590 -> a
-    352:352:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap com.android.tools.r8.com.google.common.collect.ImmutableListMultimap.of():144:144 -> a
-    352:352:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap com.android.tools.r8.com.google.common.collect.ImmutableListMultimap.copyOf(com.android.tools.r8.com.google.common.collect.Multimap):347 -> a
-    352:352:com.android.tools.r8.com.google.common.collect.ImmutableMultimap com.android.tools.r8.com.google.common.collect.ImmutableMultimap.copyOf(com.android.tools.r8.com.google.common.collect.Multimap):320 -> a
-    352:352:com.android.tools.r8.com.google.common.collect.ImmutableMultimap com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Builder.build():296 -> a
-    352:352:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap com.android.tools.r8.com.google.common.collect.ImmutableListMultimap$Builder.build():328 -> a
-    352:352:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap com.android.tools.r8.com.google.common.collect.Multimaps.index(java.util.Iterator,com.android.tools.r8.com.google.common.base.Function):1639 -> a
-    352:352:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap com.android.tools.r8.com.google.common.collect.Multimaps.index(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Function):1590 -> a
-    353:355:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap com.android.tools.r8.com.google.common.collect.ImmutableListMultimap.copyOf(com.android.tools.r8.com.google.common.collect.Multimap):351:353 -> a
-    353:355:com.android.tools.r8.com.google.common.collect.ImmutableMultimap com.android.tools.r8.com.google.common.collect.ImmutableMultimap.copyOf(com.android.tools.r8.com.google.common.collect.Multimap):320 -> a
-    353:355:com.android.tools.r8.com.google.common.collect.ImmutableMultimap com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Builder.build():296 -> a
-    353:355:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap com.android.tools.r8.com.google.common.collect.ImmutableListMultimap$Builder.build():328 -> a
-    353:355:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap com.android.tools.r8.com.google.common.collect.Multimaps.index(java.util.Iterator,com.android.tools.r8.com.google.common.base.Function):1639 -> a
-    353:355:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap com.android.tools.r8.com.google.common.collect.Multimaps.index(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Function):1590 -> a
-    356:356:boolean com.android.tools.r8.com.google.common.collect.ImmutableMultimap.isPartialView():476:476 -> a
-    356:356:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap com.android.tools.r8.com.google.common.collect.ImmutableListMultimap.copyOf(com.android.tools.r8.com.google.common.collect.Multimap):354 -> a
-    356:356:com.android.tools.r8.com.google.common.collect.ImmutableMultimap com.android.tools.r8.com.google.common.collect.ImmutableMultimap.copyOf(com.android.tools.r8.com.google.common.collect.Multimap):320 -> a
-    356:356:com.android.tools.r8.com.google.common.collect.ImmutableMultimap com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Builder.build():296 -> a
-    356:356:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap com.android.tools.r8.com.google.common.collect.ImmutableListMultimap$Builder.build():328 -> a
-    356:356:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap com.android.tools.r8.com.google.common.collect.Multimaps.index(java.util.Iterator,com.android.tools.r8.com.google.common.base.Function):1639 -> a
-    356:356:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap com.android.tools.r8.com.google.common.collect.Multimaps.index(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Function):1590 -> a
-    357:370:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap com.android.tools.r8.com.google.common.collect.ImmutableListMultimap.copyOf(com.android.tools.r8.com.google.common.collect.Multimap):359:372 -> a
-    357:370:com.android.tools.r8.com.google.common.collect.ImmutableMultimap com.android.tools.r8.com.google.common.collect.ImmutableMultimap.copyOf(com.android.tools.r8.com.google.common.collect.Multimap):320 -> a
-    357:370:com.android.tools.r8.com.google.common.collect.ImmutableMultimap com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Builder.build():296 -> a
-    357:370:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap com.android.tools.r8.com.google.common.collect.ImmutableListMultimap$Builder.build():328 -> a
-    357:370:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap com.android.tools.r8.com.google.common.collect.Multimaps.index(java.util.Iterator,com.android.tools.r8.com.google.common.base.Function):1639 -> a
-    357:370:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap com.android.tools.r8.com.google.common.collect.Multimaps.index(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Function):1590 -> a
-    371:371:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap com.android.tools.r8.com.google.common.collect.ImmutableListMultimap$Builder.build():328:328 -> a
-    371:371:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap com.android.tools.r8.com.google.common.collect.Multimaps.index(java.util.Iterator,com.android.tools.r8.com.google.common.base.Function):1639 -> a
-    371:371:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap com.android.tools.r8.com.google.common.collect.Multimaps.index(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Function):1590 -> a
-    372:372:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
-    372:372:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap com.android.tools.r8.com.google.common.collect.Multimaps.index(java.util.Iterator,com.android.tools.r8.com.google.common.base.Function):1632 -> a
-    372:372:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap com.android.tools.r8.com.google.common.collect.Multimaps.index(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Function):1590 -> a
-    373:374:int com.android.tools.r8.com.google.common.collect.Sets.hashCodeImpl(java.util.Set):1770:1771 -> a
-    375:379:boolean com.android.tools.r8.com.google.common.collect.Sets.equalsImpl(java.util.Set,java.lang.Object):1786:1790 -> a
-    380:383:java.util.NavigableSet com.android.tools.r8.com.google.common.collect.Sets.unmodifiableNavigableSet(java.util.NavigableSet):1817:1820 -> a
-    384:385:boolean com.android.tools.r8.com.google.common.collect.Sets.removeAllImpl(java.util.Set,java.util.Iterator):1980:1981 -> a
-    386:399:boolean com.android.tools.r8.com.google.common.collect.Sets.removeAllImpl(java.util.Set,java.util.Collection):1988:2001 -> a
-    400:400:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
-    400:400:boolean com.android.tools.r8.com.google.common.collect.Sets.removeAllImpl(java.util.Set,java.util.Collection):1987 -> a
-    401:401:java.lang.Object com.android.tools.r8.com.google.common.collect.Maps.safeGet(java.util.Map,java.lang.Object):3706:3706 -> a
-    402:402:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
-    402:402:java.lang.Object com.android.tools.r8.com.google.common.collect.Maps.safeGet(java.util.Map,java.lang.Object):3704 -> a
-    403:403:java.lang.Object com.android.tools.r8.com.google.common.collect.Maps.keyOrNull(java.util.Map$Entry):3891:3891 -> a
-    404:409:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.com.google.common.collect.Maps.indexMap(java.util.Collection):4375:4380 -> a
-    404:409:java.util.Set com.android.tools.r8.com.google.common.collect.Sets.combinations(java.util.Set,int):1668 -> a
-    410:413:java.util.Set com.android.tools.r8.com.google.common.collect.Sets.combinations(java.util.Set,int):1669:1672 -> a
-    414:414:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableSet.of(java.lang.Object):83:83 -> a
-    414:414:java.util.Set com.android.tools.r8.com.google.common.collect.Sets.combinations(java.util.Set,int):1672 -> a
-    415:418:java.util.Set com.android.tools.r8.com.google.common.collect.Sets.combinations(java.util.Set,int):1673:1676 -> a
+    339:340:int com.android.tools.r8.com.google.common.collect.Sets.hashCodeImpl(java.util.Set):1770:1771 -> a
+    341:345:boolean com.android.tools.r8.com.google.common.collect.Sets.equalsImpl(java.util.Set,java.lang.Object):1786:1790 -> a
+    346:349:java.util.NavigableSet com.android.tools.r8.com.google.common.collect.Sets.unmodifiableNavigableSet(java.util.NavigableSet):1817:1820 -> a
+    350:351:boolean com.android.tools.r8.com.google.common.collect.Sets.removeAllImpl(java.util.Set,java.util.Iterator):1980:1981 -> a
+    352:365:boolean com.android.tools.r8.com.google.common.collect.Sets.removeAllImpl(java.util.Set,java.util.Collection):1988:2001 -> a
+    366:366:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
+    366:366:boolean com.android.tools.r8.com.google.common.collect.Sets.removeAllImpl(java.util.Set,java.util.Collection):1987 -> a
+    367:367:java.lang.Object com.android.tools.r8.com.google.common.collect.Maps.safeGet(java.util.Map,java.lang.Object):3706:3706 -> a
+    368:368:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
+    368:368:java.lang.Object com.android.tools.r8.com.google.common.collect.Maps.safeGet(java.util.Map,java.lang.Object):3704 -> a
+    369:369:java.lang.Object com.android.tools.r8.com.google.common.collect.Maps.keyOrNull(java.util.Map$Entry):3891:3891 -> a
+    370:375:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.com.google.common.collect.Maps.indexMap(java.util.Collection):4375:4380 -> a
+    370:375:java.util.Set com.android.tools.r8.com.google.common.collect.Sets.combinations(java.util.Set,int):1668 -> a
+    376:379:java.util.Set com.android.tools.r8.com.google.common.collect.Sets.combinations(java.util.Set,int):1669:1672 -> a
+    380:380:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableSet.of(java.lang.Object):83:83 -> a
+    380:380:java.util.Set com.android.tools.r8.com.google.common.collect.Sets.combinations(java.util.Set,int):1672 -> a
+    381:384:java.util.Set com.android.tools.r8.com.google.common.collect.Sets.combinations(java.util.Set,int):1673:1676 -> a
     1:1:int com.android.tools.r8.com.google.common.collect.Hashing.smearedHash(java.lang.Object):54:54 -> b
     2:2:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterables.getOnlyElement(java.lang.Iterable):266:266 -> b
     3:17:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterators.getOnlyElement(java.util.Iterator):314:328 -> b
@@ -8546,14 +8548,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.q.a.a.b.w:
+com.android.tools.r8.com.google.common.collect.ComparatorOrdering -> com.android.tools.r8.p.a.a.b.w:
     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.q.a.a.b.x:
+com.android.tools.r8.com.google.common.collect.Count -> com.android.tools.r8.p.a.a.b.x:
     int value -> a
     1:2:void <init>(int):30:31 -> <init>
     1:1:int get():35:35 -> a
@@ -8564,11 +8566,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.q.a.a.b.y:
+com.android.tools.r8.com.google.common.collect.EmptyImmutableListMultimap -> com.android.tools.r8.p.a.a.b.y:
     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.q.a.a.b.B:
+com.android.tools.r8.com.google.common.collect.FluentIterable -> com.android.tools.r8.p.a.a.b.B:
     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
@@ -8583,18 +8585,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.q.a.a.b.A:
+com.android.tools.r8.com.google.common.collect.FluentIterable$2 -> com.android.tools.r8.p.a.a.b.A:
     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.q.a.a.b.z:
+com.android.tools.r8.com.google.common.collect.FluentIterable$2$1 -> com.android.tools.r8.p.a.a.b.z:
     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 get(int):269:269 -> a
     1:1:java.lang.Object get(int):266 -> a
-com.android.tools.r8.com.google.common.collect.ForwardingCollection -> com.android.tools.r8.q.a.a.b.C:
+com.android.tools.r8.com.google.common.collect.ForwardingCollection -> com.android.tools.r8.p.a.a.b.C:
     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
@@ -8614,7 +8616,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.q.a.a.b.D:
+com.android.tools.r8.com.google.common.collect.ForwardingSortedSet -> com.android.tools.r8.p.a.a.b.D:
     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() -> a
@@ -8629,7 +8631,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.q.a.a.b.I:
+com.android.tools.r8.com.google.common.collect.HashBiMap -> com.android.tools.r8.p.a.a.b.I:
     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
@@ -8708,19 +8710,19 @@
     1:1:java.util.Set values():469:469 -> values
     1:1:java.util.Collection values():57 -> values
     2:2:java.util.Set values():469:469 -> values
-com.android.tools.r8.com.google.common.collect.HashBiMap$1 -> com.android.tools.r8.q.a.a.b.E:
+com.android.tools.r8.com.google.common.collect.HashBiMap$1 -> com.android.tools.r8.p.a.a.b.E:
     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 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.q.a.a.b.E$a:
+com.android.tools.r8.com.google.common.collect.HashBiMap$1$MapEntry -> com.android.tools.r8.p.a.a.b.E$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.q.a.a.b.F:
+com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry -> com.android.tools.r8.p.a.a.b.F:
     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
@@ -8728,7 +8730,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.q.a.a.b.I$a:
+com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse -> com.android.tools.r8.p.a.a.b.I$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>
@@ -8769,27 +8771,27 @@
     3:3:com.android.tools.r8.com.google.common.collect.BiMap forward():553:553 -> values
     3:3:java.util.Set values():640 -> values
     4:4:java.util.Set values():640:640 -> values
-com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$1 -> com.android.tools.r8.q.a.a.b.G:
+com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$1 -> com.android.tools.r8.p.a.a.b.G:
     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 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.q.a.a.b.G$a:
+com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$1$InverseEntry -> com.android.tools.r8.p.a.a.b.G$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.q.a.a.b.I$a$a:
+com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$InverseKeySet -> com.android.tools.r8.p.a.a.b.I$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.q.a.a.b.H:
+com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$InverseKeySet$1 -> com.android.tools.r8.p.a.a.b.H:
     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.q.a.a.b.I$b:
+com.android.tools.r8.com.google.common.collect.HashBiMap$Itr -> com.android.tools.r8.p.a.a.b.I$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
@@ -8802,15 +8804,15 @@
     9:9:java.lang.Object next():409:409 -> next
     1:7:void remove():420:426 -> remove
     8:8:void remove():421:421 -> remove
-com.android.tools.r8.com.google.common.collect.HashBiMap$KeySet -> com.android.tools.r8.q.a.a.b.I$c:
+com.android.tools.r8.com.google.common.collect.HashBiMap$KeySet -> com.android.tools.r8.p.a.a.b.I$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.q.a.a.b.J:
+com.android.tools.r8.com.google.common.collect.HashBiMap$KeySet$1 -> com.android.tools.r8.p.a.a.b.J:
     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.q.a.a.b.K:
+com.android.tools.r8.com.google.common.collect.HashMultiset -> com.android.tools.r8.p.a.a.b.K:
     1:1:void <init>():70:70 -> <init>
     1:1:int remove(java.lang.Object,int):33:33 -> a
     2:2:boolean setCount(java.lang.Object,int,int):33:33 -> a
@@ -8841,14 +8843,14 @@
     1:1:int size():33:33 -> size
     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.q.a.a.b.L:
+com.android.tools.r8.com.google.common.collect.ImmutableAsList -> com.android.tools.r8.p.a.a.b.L:
     1:1:void <init>():34:34 -> <init>
     1:1:boolean isPartialView():56:56 -> b
     1:1:boolean contains(java.lang.Object):41:41 -> contains
     com.android.tools.r8.com.google.common.collect.ImmutableCollection delegateCollection() -> g
     1:1:boolean isEmpty():51:51 -> isEmpty
     1:1:int size():46:46 -> size
-com.android.tools.r8.com.google.common.collect.ImmutableBiMap -> com.android.tools.r8.q.a.a.b.M:
+com.android.tools.r8.com.google.common.collect.ImmutableBiMap -> com.android.tools.r8.p.a.a.b.M:
     1:1:void <init>():341:341 -> <init>
     1:1:java.lang.Object forcePut(java.lang.Object,java.lang.Object):376:376 -> a
     com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse() -> f
@@ -8861,7 +8863,7 @@
     2:2:java.util.Collection values():36 -> values
     3:3:com.android.tools.r8.com.google.common.collect.ImmutableSet values():358:358 -> values
     3:3:java.util.Set values():36 -> values
-com.android.tools.r8.com.google.common.collect.ImmutableBiMap$Builder -> com.android.tools.r8.q.a.a.b.M$a:
+com.android.tools.r8.com.google.common.collect.ImmutableBiMap$Builder -> com.android.tools.r8.p.a.a.b.M$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 put(java.lang.Object,java.lang.Object):172:172 -> a
@@ -8875,9 +8877,9 @@
     31:31:com.android.tools.r8.com.google.common.collect.ImmutableBiMap build():257 -> a
     32:32:com.android.tools.r8.com.google.common.collect.ImmutableBiMap com.android.tools.r8.com.google.common.collect.ImmutableBiMap.of():66:66 -> a
     32:32:com.android.tools.r8.com.google.common.collect.ImmutableBiMap build():255 -> a
-com.android.tools.r8.com.google.common.collect.ImmutableBiMapFauxverideShim -> com.android.tools.r8.q.a.a.b.N:
+com.android.tools.r8.com.google.common.collect.ImmutableBiMapFauxverideShim -> com.android.tools.r8.p.a.a.b.N:
     1:1:void <init>():32:32 -> <init>
-com.android.tools.r8.com.google.common.collect.ImmutableCollection -> com.android.tools.r8.q.a.a.b.Q:
+com.android.tools.r8.com.google.common.collect.ImmutableCollection -> com.android.tools.r8.p.a.a.b.Q:
     java.lang.Object[] EMPTY_ARRAY -> a
     1:1:void <clinit>():181:181 -> <clinit>
     1:1:void <init>():168:168 -> <init>
@@ -8904,7 +8906,7 @@
     15:18:java.lang.Object[] toArray(java.lang.Object[]):201:204 -> toArray
     19:19:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> toArray
     19:19:java.lang.Object[] toArray(java.lang.Object[]):197 -> toArray
-com.android.tools.r8.com.google.common.collect.ImmutableCollection$ArrayBasedBuilder -> com.android.tools.r8.q.a.a.b.O:
+com.android.tools.r8.com.google.common.collect.ImmutableCollection$ArrayBasedBuilder -> com.android.tools.r8.p.a.a.b.O:
     java.lang.Object[] contents -> a
     int size -> b
     1:4:void <init>(int):459:462 -> <init>
@@ -8920,19 +8922,19 @@
     18:20:com.android.tools.r8.com.google.common.collect.ImmutableCollection$ArrayBasedBuilder combine(com.android.tools.r8.com.google.common.collect.ImmutableCollection$ArrayBasedBuilder):510:512 -> a
     21:21:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
     21:21:com.android.tools.r8.com.google.common.collect.ImmutableCollection$ArrayBasedBuilder combine(com.android.tools.r8.com.google.common.collect.ImmutableCollection$ArrayBasedBuilder):509 -> a
-com.android.tools.r8.com.google.common.collect.ImmutableCollection$Builder -> com.android.tools.r8.q.a.a.b.P:
+com.android.tools.r8.com.google.common.collect.ImmutableCollection$Builder -> com.android.tools.r8.p.a.a.b.P:
     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.q.a.a.b.S:
+com.android.tools.r8.com.google.common.collect.ImmutableEntry -> com.android.tools.r8.p.a.a.b.S:
     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.q.a.a.b.T:
+com.android.tools.r8.com.google.common.collect.ImmutableEnumMap -> com.android.tools.r8.p.a.a.b.T:
     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>
@@ -8967,7 +8969,7 @@
     1:1:int size():68:68 -> size
     1:1:java.util.Collection com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap.values():445:445 -> values
     1:1:java.util.Collection com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap.values():0 -> values
-com.android.tools.r8.com.google.common.collect.ImmutableEnumSet -> com.android.tools.r8.q.a.a.b.U:
+com.android.tools.r8.com.google.common.collect.ImmutableEnumSet -> com.android.tools.r8.p.a.a.b.U:
     java.util.EnumSet delegate -> c
     int hashCode -> d
     1:2:void <init>(java.util.EnumSet):58:59 -> <init>
@@ -8990,7 +8992,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.q.a.a.b.W:
+com.android.tools.r8.com.google.common.collect.ImmutableList -> com.android.tools.r8.p.a.a.b.W:
     1:1:void <init>():377:377 -> <init>
     com.android.tools.r8.com.google.common.collect.ImmutableList asList() -> a
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList of(java.lang.Object):93:93 -> a
@@ -9062,11 +9064,11 @@
     7:7:com.android.tools.r8.com.google.common.collect.ImmutableList of(java.lang.Object):93:93 -> subList
     7:7:com.android.tools.r8.com.google.common.collect.ImmutableList subList(int,int):442 -> subList
     8:8:com.android.tools.r8.com.google.common.collect.ImmutableList subList(int,int):444:444 -> subList
-com.android.tools.r8.com.google.common.collect.ImmutableList$1 -> com.android.tools.r8.q.a.a.b.V:
+com.android.tools.r8.com.google.common.collect.ImmutableList$1 -> com.android.tools.r8.p.a.a.b.V:
     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.q.a.a.b.W$a:
+com.android.tools.r8.com.google.common.collect.ImmutableList$Builder -> com.android.tools.r8.p.a.a.b.W$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 add(java.lang.Object):757:757 -> a
@@ -9076,7 +9078,7 @@
     4:4:com.android.tools.r8.com.google.common.collect.ImmutableList$Builder add(java.lang.Object[]):787:787 -> a
     5:5:com.android.tools.r8.com.google.common.collect.ImmutableList$Builder combine(com.android.tools.r8.com.google.common.collect.ImmutableCollection$ArrayBasedBuilder):809:809 -> a
     6:6:com.android.tools.r8.com.google.common.collect.ImmutableList build():819:819 -> a
-com.android.tools.r8.com.google.common.collect.ImmutableList$ReverseImmutableList -> com.android.tools.r8.q.a.a.b.X:
+com.android.tools.r8.com.google.common.collect.ImmutableList$ReverseImmutableList -> com.android.tools.r8.p.a.a.b.X:
     com.android.tools.r8.com.google.common.collect.ImmutableList forwardList -> b
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableList):604:605 -> <init>
     1:1:boolean isPartialView():657:657 -> b
@@ -9109,7 +9111,7 @@
     5:5:int reversePosition(int):613 -> subList
     5:5:com.android.tools.r8.com.google.common.collect.ImmutableList subList(int,int):641 -> subList
     6:6:com.android.tools.r8.com.google.common.collect.ImmutableList subList(int,int):641:641 -> subList
-com.android.tools.r8.com.google.common.collect.ImmutableList$SubList -> com.android.tools.r8.q.a.a.b.W$b:
+com.android.tools.r8.com.google.common.collect.ImmutableList$SubList -> com.android.tools.r8.p.a.a.b.W$b:
     int offset -> b
     int length -> c
     com.android.tools.r8.com.google.common.collect.ImmutableList this$0 -> d
@@ -9126,12 +9128,11 @@
     1:1:int size():468:468 -> size
     1:1:java.util.List subList(int,int):457:457 -> subList
     2:3:com.android.tools.r8.com.google.common.collect.ImmutableList subList(int,int):479:480 -> subList
-com.android.tools.r8.com.google.common.collect.ImmutableListMultimap -> com.android.tools.r8.q.a.a.b.Z:
+com.android.tools.r8.com.google.common.collect.ImmutableListMultimap -> com.android.tools.r8.p.a.a.b.Z:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap,int):391:391 -> <init>
     1:2:com.android.tools.r8.com.google.common.collect.ImmutableList get(java.lang.Object):405:406 -> get
-    3:4:com.android.tools.r8.com.google.common.collect.ImmutableList get(java.lang.Object):405:406 -> get
-    3:4:java.util.Collection get(java.lang.Object):52 -> get
-com.android.tools.r8.com.google.common.collect.ImmutableListMultimap$Builder -> com.android.tools.r8.q.a.a.b.Y:
+    1:2:java.util.Collection get(java.lang.Object):52 -> get
+com.android.tools.r8.com.google.common.collect.ImmutableListMultimap$Builder -> com.android.tools.r8.p.a.a.b.Y:
     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
@@ -9167,7 +9168,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.q.a.a.b.b0:
+com.android.tools.r8.com.google.common.collect.ImmutableMap -> com.android.tools.r8.p.a.a.b.b0:
     com.android.tools.r8.com.google.common.collect.ImmutableCollection values -> c
     java.util.Map$Entry[] EMPTY_ENTRY_ARRAY -> d
     com.android.tools.r8.com.google.common.collect.ImmutableSet keySet -> b
@@ -9248,12 +9249,12 @@
     4:13:java.lang.String toString():851 -> toString
     1:1:java.util.Collection values():60:60 -> values
     2:3:com.android.tools.r8.com.google.common.collect.ImmutableCollection values():733:734 -> values
-com.android.tools.r8.com.google.common.collect.ImmutableMap$1 -> com.android.tools.r8.q.a.a.b.a0:
+com.android.tools.r8.com.google.common.collect.ImmutableMap$1 -> com.android.tools.r8.p.a.a.b.a0:
     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.q.a.a.b.b0$a:
+com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder -> com.android.tools.r8.p.a.a.b.b0$a:
     java.util.Map$Entry[] entries -> a
     int size -> b
     boolean entriesUsed -> c
@@ -9272,28 +9273,28 @@
     25:25:com.android.tools.r8.com.google.common.collect.ImmutableMap build():371 -> a
     26:26:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.com.google.common.collect.ImmutableMap.of():113:113 -> a
     26:26:com.android.tools.r8.com.google.common.collect.ImmutableMap build():369 -> a
-com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap$1EntrySetImpl -> com.android.tools.r8.q.a.a.b.c0:
+com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap$1EntrySetImpl -> com.android.tools.r8.p.a.a.b.c0:
     com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap this$0 -> c
     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 -> iterator
     2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():471:471 -> iterator
     2:2:java.util.Iterator iterator():462 -> iterator
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap map():466:466 -> j
-com.android.tools.r8.com.google.common.collect.ImmutableMapEntry -> com.android.tools.r8.q.a.a.b.f0:
+com.android.tools.r8.com.google.common.collect.ImmutableMapEntry -> com.android.tools.r8.p.a.a.b.f0:
     1:2:void <init>(java.lang.Object,java.lang.Object):48:49 -> <init>
     com.android.tools.r8.com.google.common.collect.ImmutableMapEntry getNextInKeyBucket() -> d
     com.android.tools.r8.com.google.common.collect.ImmutableMapEntry getNextInValueBucket() -> e
     boolean isReusable() -> f
-com.android.tools.r8.com.google.common.collect.ImmutableMapEntry$NonTerminalImmutableBiMapEntry -> com.android.tools.r8.q.a.a.b.d0:
+com.android.tools.r8.com.google.common.collect.ImmutableMapEntry$NonTerminalImmutableBiMapEntry -> com.android.tools.r8.p.a.a.b.d0:
     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 -> e
-com.android.tools.r8.com.google.common.collect.ImmutableMapEntry$NonTerminalImmutableMapEntry -> com.android.tools.r8.q.a.a.b.e0:
+com.android.tools.r8.com.google.common.collect.ImmutableMapEntry$NonTerminalImmutableMapEntry -> com.android.tools.r8.p.a.a.b.e0:
     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 -> d
     boolean isReusable() -> f
-com.android.tools.r8.com.google.common.collect.ImmutableMapEntrySet -> com.android.tools.r8.q.a.a.b.h0:
+com.android.tools.r8.com.google.common.collect.ImmutableMapEntrySet -> com.android.tools.r8.p.a.a.b.h0:
     1:1:void <init>():77:77 -> <init>
     1:1:boolean isPartialView():98:98 -> b
     1:4:boolean contains(java.lang.Object):88:91 -> contains
@@ -9301,7 +9302,7 @@
     1:1:int hashCode():109:109 -> hashCode
     com.android.tools.r8.com.google.common.collect.ImmutableMap map() -> j
     1:1:int size():83:83 -> size
-com.android.tools.r8.com.google.common.collect.ImmutableMapEntrySet$RegularEntrySet -> com.android.tools.r8.q.a.a.b.g0:
+com.android.tools.r8.com.google.common.collect.ImmutableMapEntrySet$RegularEntrySet -> com.android.tools.r8.p.a.a.b.g0:
     com.android.tools.r8.com.google.common.collect.ImmutableMap map -> c
     java.util.Map$Entry[] entries -> d
     1:3:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap,java.util.Map$Entry[]):43:45 -> <init>
@@ -9316,7 +9317,7 @@
     2:2:java.util.Iterator iterator():39 -> iterator
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap map():50:50 -> j
     1:1:java.util.Spliterator spliterator():60:60 -> spliterator
-com.android.tools.r8.com.google.common.collect.ImmutableMapKeySet -> com.android.tools.r8.q.a.a.b.i0:
+com.android.tools.r8.com.google.common.collect.ImmutableMapKeySet -> com.android.tools.r8.p.a.a.b.i0:
     com.android.tools.r8.com.google.common.collect.ImmutableMap map -> c
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap):39:40 -> <init>
     1:1:void lambda$forEach$0(java.util.function.Consumer,java.lang.Object,java.lang.Object):71:71 -> a
@@ -9331,7 +9332,7 @@
     2:2: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.q.a.a.b.l0:
+com.android.tools.r8.com.google.common.collect.ImmutableMapValues -> com.android.tools.r8.p.a.a.b.l0:
     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
@@ -9357,19 +9358,19 @@
     2:2: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.q.a.a.b.j0:
+com.android.tools.r8.com.google.common.collect.ImmutableMapValues$1 -> com.android.tools.r8.p.a.a.b.j0:
     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.q.a.a.b.k0:
+com.android.tools.r8.com.google.common.collect.ImmutableMapValues$2 -> com.android.tools.r8.p.a.a.b.k0:
     com.android.tools.r8.com.google.common.collect.ImmutableMapValues this$0 -> c
     com.android.tools.r8.com.google.common.collect.ImmutableList val$entryList -> b
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMapValues,com.android.tools.r8.com.google.common.collect.ImmutableList):83:83 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection delegateCollection():91:91 -> g
     1:1:java.lang.Object get(int):86:86 -> get
-com.android.tools.r8.com.google.common.collect.ImmutableMultimap -> com.android.tools.r8.q.a.a.b.p0:
+com.android.tools.r8.com.google.common.collect.ImmutableMultimap -> com.android.tools.r8.p.a.a.b.p0:
     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>
@@ -9411,13 +9412,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.q.a.a.b.m0:
+com.android.tools.r8.com.google.common.collect.ImmutableMultimap$1 -> com.android.tools.r8.p.a.a.b.m0:
     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.q.a.a.b.n0:
+com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Builder -> com.android.tools.r8.p.a.a.b.n0:
     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.q.a.a.b.o0:
+com.android.tools.r8.com.google.common.collect.ImmutableMultimap$EntryCollection -> com.android.tools.r8.p.a.a.b.o0:
     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
@@ -9431,7 +9432,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.q.a.a.b.p0$a:
+com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Itr -> com.android.tools.r8.p.a.a.b.p0$a:
     java.util.Iterator valueIterator -> c
     java.util.Iterator mapIterator -> a
     java.lang.Object key -> b
@@ -9444,7 +9445,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.q.a.a.b.p0$b:
+com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Keys -> com.android.tools.r8.p.a.a.b.p0$b:
     com.android.tools.r8.com.google.common.collect.ImmutableMultimap this$0 -> d
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMultimap):642:642 -> <init>
     boolean isPartialView() -> b
@@ -9466,7 +9467,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.q.a.a.b.r0:
+com.android.tools.r8.com.google.common.collect.ImmutableMultiset -> com.android.tools.r8.p.a.a.b.r0:
     com.android.tools.r8.com.google.common.collect.ImmutableList asList -> b
     com.android.tools.r8.com.google.common.collect.ImmutableSet entrySet -> c
     1:1:void <init>():235:235 -> <init>
@@ -9493,14 +9494,14 @@
     1:1:java.util.Iterator iterator():53:53 -> iterator
     2:3:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():239:240 -> iterator
     1:1:java.lang.String toString():350:350 -> toString
-com.android.tools.r8.com.google.common.collect.ImmutableMultiset$1 -> com.android.tools.r8.q.a.a.b.q0:
+com.android.tools.r8.com.google.common.collect.ImmutableMultiset$1 -> com.android.tools.r8.p.a.a.b.q0:
     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.q.a.a.b.r0$a:
+com.android.tools.r8.com.google.common.collect.ImmutableMultiset$EntrySet -> com.android.tools.r8.p.a.a.b.r0$a:
     com.android.tools.r8.com.google.common.collect.ImmutableMultiset this$0 -> c
     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>
@@ -9510,9 +9511,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.q.a.a.b.s0:
+com.android.tools.r8.com.google.common.collect.ImmutableMultisetGwtSerializationDependencies -> com.android.tools.r8.p.a.a.b.s0:
     1:1:void <init>():40:40 -> <init>
-com.android.tools.r8.com.google.common.collect.ImmutableSet -> com.android.tools.r8.q.a.a.b.t0:
+com.android.tools.r8.com.google.common.collect.ImmutableSet -> com.android.tools.r8.p.a.a.b.t0:
     com.android.tools.r8.com.google.common.collect.ImmutableList asList -> b
     1:1:void <init>():332:332 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet access$000(int,java.lang.Object[]):51:51 -> a
@@ -9545,7 +9546,7 @@
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet of():74:74 -> g
     1:1:int hashCode():354:354 -> hashCode
     1:1:java.util.stream.Collector toImmutableSet():65:65 -> i
-com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder -> com.android.tools.r8.q.a.a.b.t0$a:
+com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder -> com.android.tools.r8.p.a.a.b.t0$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
@@ -9554,7 +9555,7 @@
     4:4:com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder addAll(java.lang.Iterable):522:522 -> a
     5:5:com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder combine(com.android.tools.r8.com.google.common.collect.ImmutableCollection$ArrayBasedBuilder):545:545 -> a
     6:9:com.android.tools.r8.com.google.common.collect.ImmutableSet build():555:558 -> a
-com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed -> com.android.tools.r8.q.a.a.b.v0:
+com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed -> com.android.tools.r8.p.a.a.b.v0:
     1:1:void <init>():376:376 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList createAsList():400:400 -> d
     1:3:void forEach(java.util.function.Consumer):392:394 -> forEach
@@ -9565,13 +9566,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.q.a.a.b.u0:
+com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed$1 -> com.android.tools.r8.p.a.a.b.u0:
     com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed this$0 -> b
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed):400:400 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed delegateCollection():408:408 -> g
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection delegateCollection():400 -> g
     1:1:java.lang.Object get(int):403:403 -> get
-com.android.tools.r8.com.google.common.collect.ImmutableSortedAsList -> com.android.tools.r8.q.a.a.b.w0:
+com.android.tools.r8.com.google.common.collect.ImmutableSortedAsList -> com.android.tools.r8.p.a.a.b.w0:
     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.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.subListUnchecked(int,int):454:454 -> b
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList subListUnchecked(int,int):83 -> b
@@ -9591,7 +9592,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.ImmutableSortedMap -> com.android.tools.r8.q.a.a.b.A0:
+com.android.tools.r8.com.google.common.collect.ImmutableSortedMap -> com.android.tools.r8.p.a.a.b.A0:
     com.android.tools.r8.com.google.common.collect.ImmutableList valueList -> f
     com.android.tools.r8.com.google.common.collect.ImmutableSortedMap descendingMap -> g
     com.android.tools.r8.com.google.common.collect.ImmutableSortedMap NATURAL_EMPTY_MAP -> h
@@ -9779,13 +9780,13 @@
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection values():694:694 -> values
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableCollection values():694:694 -> values
     2:2:java.util.Collection values():62 -> values
-com.android.tools.r8.com.google.common.collect.ImmutableSortedMap$1 -> com.android.tools.r8.q.a.a.b.x0:
+com.android.tools.r8.com.google.common.collect.ImmutableSortedMap$1 -> com.android.tools.r8.p.a.a.b.x0:
     java.util.Comparator val$comparator -> a
     1:1:void <init>(java.util.Comparator):392:392 -> <init>
     1:1:int compare(java.lang.Object,java.lang.Object):392:392 -> compare
     2:2:int compare(java.util.Map$Entry,java.util.Map$Entry):395:395 -> compare
     2:2:int compare(java.lang.Object,java.lang.Object):392 -> compare
-com.android.tools.r8.com.google.common.collect.ImmutableSortedMap$1EntrySet -> com.android.tools.r8.q.a.a.b.z0:
+com.android.tools.r8.com.google.common.collect.ImmutableSortedMap$1EntrySet -> com.android.tools.r8.p.a.a.b.z0:
     com.android.tools.r8.com.google.common.collect.ImmutableSortedMap this$0 -> c
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableSortedMap):629:629 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList createAsList():647:647 -> d
@@ -9795,7 +9796,7 @@
     2:2:java.util.Iterator iterator():628 -> iterator
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap map():669:669 -> j
     1:1:java.util.Spliterator spliterator():637:637 -> spliterator
-com.android.tools.r8.com.google.common.collect.ImmutableSortedMap$1EntrySet$1 -> com.android.tools.r8.q.a.a.b.y0:
+com.android.tools.r8.com.google.common.collect.ImmutableSortedMap$1EntrySet$1 -> com.android.tools.r8.p.a.a.b.y0:
     com.android.tools.r8.com.google.common.collect.ImmutableSortedMap$1EntrySet this$1 -> b
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableSortedMap$1EntrySet):647:647 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection delegateCollection():662:662 -> g
@@ -9807,7 +9808,7 @@
     2:2:java.util.Spliterator spliterator():657:657 -> spliterator
     3:3:java.util.Spliterator com.android.tools.r8.com.google.common.collect.CollectSpliterators.indexed(int,int,java.util.function.IntFunction):40:40 -> spliterator
     3:3:java.util.Spliterator spliterator():656 -> spliterator
-com.android.tools.r8.com.google.common.collect.ImmutableSortedMap$Builder -> com.android.tools.r8.q.a.a.b.A0$a:
+com.android.tools.r8.com.google.common.collect.ImmutableSortedMap$Builder -> com.android.tools.r8.p.a.a.b.A0$a:
     java.util.Comparator comparator -> d
     1:2:void <init>(java.util.Comparator):475:476 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap build():467:467 -> a
@@ -9819,9 +9820,9 @@
     5:11:com.android.tools.r8.com.google.common.collect.ImmutableSortedMap build():564:570 -> a
     12:12:com.android.tools.r8.com.google.common.collect.ImmutableSortedMap build():568:568 -> a
     13:13:com.android.tools.r8.com.google.common.collect.ImmutableSortedMap build():566:566 -> a
-com.android.tools.r8.com.google.common.collect.ImmutableSortedMapFauxverideShim -> com.android.tools.r8.q.a.a.b.B0:
+com.android.tools.r8.com.google.common.collect.ImmutableSortedMapFauxverideShim -> com.android.tools.r8.p.a.a.b.B0:
     1:1:void <init>():32:32 -> <init>
-com.android.tools.r8.com.google.common.collect.ImmutableSortedSet -> com.android.tools.r8.q.a.a.b.C0:
+com.android.tools.r8.com.google.common.collect.ImmutableSortedSet -> com.android.tools.r8.p.a.a.b.C0:
     com.android.tools.r8.com.google.common.collect.ImmutableSortedSet descendingSet -> d
     java.util.Comparator comparator -> c
     1:2:void <init>(java.util.Comparator):564:565 -> <init>
@@ -9900,7 +9901,7 @@
     4:4:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet tailSet(java.lang.Object,boolean):661 -> tailSet
     4:4: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.q.a.a.b.C0$a:
+com.android.tools.r8.com.google.common.collect.ImmutableSortedSet$Builder -> com.android.tools.r8.p.a.a.b.C0$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
@@ -9917,9 +9918,9 @@
     8:8:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet$Builder combine(com.android.tools.r8.com.google.common.collect.ImmutableCollection$ArrayBasedBuilder):531:531 -> a
     8:8:com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder combine(com.android.tools.r8.com.google.common.collect.ImmutableCollection$ArrayBasedBuilder):455 -> a
     9:11:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet build():542:544 -> a
-com.android.tools.r8.com.google.common.collect.ImmutableSortedSetFauxverideShim -> com.android.tools.r8.q.a.a.b.D0:
+com.android.tools.r8.com.google.common.collect.ImmutableSortedSetFauxverideShim -> com.android.tools.r8.p.a.a.b.D0:
     1:1:void <init>():39:39 -> <init>
-com.android.tools.r8.com.google.common.collect.Iterables$4 -> com.android.tools.r8.q.a.a.b.E0:
+com.android.tools.r8.com.google.common.collect.Iterables$4 -> com.android.tools.r8.p.a.a.b.E0:
     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>
@@ -9945,35 +9946,35 @@
     4:4:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> spliterator
     4:4:java.util.Spliterator com.android.tools.r8.com.google.common.collect.CollectSpliterators.filter(java.util.Spliterator,java.util.function.Predicate):139 -> spliterator
     4:4:java.util.Spliterator spliterator():594 -> spliterator
-com.android.tools.r8.com.google.common.collect.Iterators$1 -> com.android.tools.r8.q.a.a.b.F0:
+com.android.tools.r8.com.google.common.collect.Iterators$1 -> com.android.tools.r8.p.a.a.b.F0:
     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.q.a.a.b.G0:
+com.android.tools.r8.com.google.common.collect.Iterators$2 -> com.android.tools.r8.p.a.a.b.G0:
     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.q.a.a.b.H0:
+com.android.tools.r8.com.google.common.collect.Iterators$3 -> com.android.tools.r8.p.a.a.b.H0:
     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.q.a.a.b.I0:
+com.android.tools.r8.com.google.common.collect.Iterators$5 -> com.android.tools.r8.p.a.a.b.I0:
     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 -> c
-com.android.tools.r8.com.google.common.collect.Iterators$6 -> com.android.tools.r8.q.a.a.b.J0:
+com.android.tools.r8.com.google.common.collect.Iterators$6 -> com.android.tools.r8.p.a.a.b.J0:
     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.q.a.a.b.K0:
+com.android.tools.r8.com.google.common.collect.Iterators$7 -> com.android.tools.r8.p.a.a.b.K0:
     java.util.Iterator val$iterator -> c
     int val$limitSize -> b
     int count -> a
@@ -9982,21 +9983,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.q.a.a.b.L0:
+com.android.tools.r8.com.google.common.collect.Iterators$9 -> com.android.tools.r8.p.a.a.b.L0:
     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.q.a.a.b.M0:
+com.android.tools.r8.com.google.common.collect.Iterators$ArrayItr -> com.android.tools.r8.p.a.a.b.M0:
     com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator EMPTY -> e
     java.lang.Object[] array -> c
     int offset -> d
     1:1:void <clinit>():1058:1058 -> <clinit>
     1:3:void <init>(java.lang.Object[],int,int,int):1065:1067 -> <init>
     1:1:java.lang.Object get(int):1072:1072 -> a
-com.android.tools.r8.com.google.common.collect.Iterators$ConcatenatedIterator -> com.android.tools.r8.q.a.a.b.N0:
+com.android.tools.r8.com.google.common.collect.Iterators$ConcatenatedIterator -> com.android.tools.r8.p.a.a.b.N0:
     java.util.Deque metaIterators -> d
     java.util.Iterator topMetaIterator -> c
     java.util.Iterator iterator -> b
@@ -10010,16 +10011,16 @@
     12:38:boolean hasNext():1389:1415 -> hasNext
     1:5:java.lang.Object next():1423:1427 -> next
     1:3:void remove():1433:1435 -> remove
-com.android.tools.r8.com.google.common.collect.Iterators$EmptyModifiableIterator -> com.android.tools.r8.q.a.a.b.O0:
+com.android.tools.r8.com.google.common.collect.Iterators$EmptyModifiableIterator -> com.android.tools.r8.p.a.a.b.O0:
     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 remove():112:112 -> remove
-com.android.tools.r8.com.google.common.collect.ListMultimap -> com.android.tools.r8.q.a.a.b.P0:
-com.android.tools.r8.com.google.common.collect.Lists$RandomAccessReverseList -> com.android.tools.r8.q.a.a.b.Q0:
+com.android.tools.r8.com.google.common.collect.ListMultimap -> com.android.tools.r8.p.a.a.b.P0:
+com.android.tools.r8.com.google.common.collect.Lists$RandomAccessReverseList -> com.android.tools.r8.p.a.a.b.Q0:
     1:1:void <init>(java.util.List):991:991 -> <init>
-com.android.tools.r8.com.google.common.collect.Lists$ReverseList -> com.android.tools.r8.q.a.a.b.S0:
+com.android.tools.r8.com.google.common.collect.Lists$ReverseList -> com.android.tools.r8.p.a.a.b.S0:
     java.util.List forwardList -> a
     1:2:void <init>(java.util.List):854:855 -> <init>
     1:1:java.util.List getForwardList():859:859 -> a
@@ -10080,7 +10081,7 @@
     7:7:int 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.q.a.a.b.R0:
+com.android.tools.r8.com.google.common.collect.Lists$ReverseList$1 -> com.android.tools.r8.p.a.a.b.R0:
     com.android.tools.r8.com.google.common.collect.Lists$ReverseList this$0 -> c
     java.util.ListIterator val$forwardIterator -> b
     boolean canRemoveOrSet -> a
@@ -10100,7 +10101,7 @@
     1:1:int previousIndex():970:970 -> previousIndex
     1:3:void remove():975:977 -> remove
     1:2:void set(java.lang.Object):982:983 -> set
-com.android.tools.r8.com.google.common.collect.MapMaker -> com.android.tools.r8.q.a.a.b.T0:
+com.android.tools.r8.com.google.common.collect.MapMaker -> com.android.tools.r8.p.a.a.b.T0:
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Strength valueStrength -> d
     boolean useCustomMap -> a
     int initialCapacity -> b
@@ -10122,7 +10123,7 @@
     2:6:com.android.tools.r8.com.google.common.collect.MapMaker setValueStrength(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Strength):253:257 -> g
     2:6:com.android.tools.r8.com.google.common.collect.MapMaker weakValues():239 -> g
     1:17:java.lang.String toString():290:306 -> toString
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap -> com.android.tools.r8.q.a.a.b.Y0:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap -> com.android.tools.r8.p.a.a.b.Y0:
     java.util.Set keySet -> g
     java.util.Set entrySet -> i
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntryHelper entryHelper -> f
@@ -10244,11 +10245,11 @@
     127:127:java.lang.Object replace(java.lang.Object,java.lang.Object):2497 -> replace
     1:6:int size():2361:2366 -> size
     1:2:java.util.Collection values():2522:2523 -> values
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$1 -> com.android.tools.r8.q.a.a.b.U0:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$1 -> com.android.tools.r8.p.a.a.b.U0:
     1:1:void <init>():1024:1024 -> <init>
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry getEntry() -> a
     1:1:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakValueReference copyFor(java.lang.ref.ReferenceQueue,com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry):1024:1024 -> a
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$AbstractStrongKeyEntry -> com.android.tools.r8.q.a.a.b.V0:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$AbstractStrongKeyEntry -> com.android.tools.r8.p.a.a.b.V0:
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry next -> c
     java.lang.Object key -> a
     int hash -> b
@@ -10256,19 +10257,19 @@
     1:1:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry getNext():378:378 -> b
     1:1:int getHash():373:373 -> c
     1:1:java.lang.Object getKey():368:368 -> getKey
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$AbstractWeakKeyEntry -> com.android.tools.r8.q.a.a.b.W0:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$AbstractWeakKeyEntry -> com.android.tools.r8.p.a.a.b.W0:
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry next -> b
     int hash -> a
     1:3:void <init>(java.lang.ref.ReferenceQueue,java.lang.Object,int,com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry):671:673 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry getNext():688:688 -> b
     1:1:int getHash():683:683 -> c
     1:1:java.lang.Object getKey():678:678 -> getKey
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$DummyInternalEntry -> com.android.tools.r8.q.a.a.b.X0:
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$EntryIterator -> com.android.tools.r8.q.a.a.b.Y0$a:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$DummyInternalEntry -> com.android.tools.r8.p.a.a.b.X0:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$EntryIterator -> com.android.tools.r8.p.a.a.b.Y0$a:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap):2711:2711 -> <init>
     1:1:java.util.Map$Entry next():2715:2715 -> next
     1:1:java.lang.Object next():2711 -> next
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$EntrySet -> com.android.tools.r8.q.a.a.b.Y0$b:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$EntrySet -> com.android.tools.r8.p.a.a.b.Y0$b:
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap):2796:2796 -> <init>
     1:1:void clear():2840:2840 -> clear
@@ -10277,7 +10278,7 @@
     1:1:java.util.Iterator iterator():2800:2800 -> iterator
     1:6:boolean remove(java.lang.Object):2820:2825 -> remove
     1:1:int size():2830:2830 -> size
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$HashIterator -> com.android.tools.r8.q.a.a.b.Y0$c:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$HashIterator -> com.android.tools.r8.p.a.a.b.Y0$c:
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry nextEntry -> e
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Segment currentSegment -> c
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap this$0 -> h
@@ -10305,21 +10306,21 @@
     3:3:java.lang.Object com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WriteThroughEntry.getKey():2679:2679 -> remove
     3:3:void remove():2643 -> remove
     4:5:void remove():2643:2644 -> remove
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry -> com.android.tools.r8.q.a.a.b.Z0:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry -> com.android.tools.r8.p.a.a.b.Z0:
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry getNext() -> b
     int getHash() -> c
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntryHelper -> com.android.tools.r8.q.a.a.b.a1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntryHelper -> com.android.tools.r8.p.a.a.b.a1:
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry copy(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Segment,com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry,com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry) -> a
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry newEntry(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Segment,java.lang.Object,int,com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry) -> a
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Segment newSegment(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap,int,int) -> a
     void setValue(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Segment,com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry,java.lang.Object) -> a
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Strength valueStrength() -> a
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$KeyIterator -> com.android.tools.r8.q.a.a.b.Y0$d:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$KeyIterator -> com.android.tools.r8.p.a.a.b.Y0$d:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap):2648:2648 -> <init>
     1:1:java.lang.Object next():2652:2652 -> next
     2:2:java.lang.Object com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WriteThroughEntry.getKey():2679:2679 -> next
     2:2:java.lang.Object next():2652 -> next
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$KeySet -> com.android.tools.r8.q.a.a.b.Y0$e:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$KeySet -> com.android.tools.r8.p.a.a.b.Y0$e:
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap):2720:2720 -> <init>
     1:1:void clear():2749:2749 -> clear
@@ -10328,12 +10329,12 @@
     1:1:java.util.Iterator iterator():2724:2724 -> iterator
     1:1:boolean remove(java.lang.Object):2744:2744 -> remove
     1:1:int size():2729:2729 -> size
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$SafeToArraySet -> com.android.tools.r8.q.a.a.b.b1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$SafeToArraySet -> com.android.tools.r8.p.a.a.b.b1:
     1:1:void <init>():2844:2844 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$1):2844:2844 -> <init>
     1:1:java.lang.Object[] toArray():2850:2850 -> toArray
     2:2:java.lang.Object[] toArray(java.lang.Object[]):2855:2855 -> toArray
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Segment -> com.android.tools.r8.q.a.a.b.c1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Segment -> com.android.tools.r8.p.a.a.b.c1:
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap map -> a
     java.util.concurrent.atomic.AtomicInteger readCount -> g
     int maxSegmentSize -> f
@@ -10420,27 +10421,27 @@
     1:6:void runLockedCleanup():2015:2020 -> e
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Segment self() -> f
     1:5:void tryDrainReferenceQueues():1367:1371 -> g
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Strength -> com.android.tools.r8.q.a.a.b.f1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Strength -> com.android.tools.r8.p.a.a.b.f1:
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Strength STRONG -> a
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Strength WEAK -> b
     1:8:void <clinit>():257:264 -> <clinit>
     1:1:void <init>(java.lang.String,int):256:256 -> <init>
     2:2:void <init>(java.lang.String,int,com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$1):256:256 -> <init>
     com.android.tools.r8.com.google.common.base.Equivalence defaultEquivalence() -> a
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Strength$1 -> com.android.tools.r8.q.a.a.b.d1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Strength$1 -> com.android.tools.r8.p.a.a.b.d1:
     1:1:void <init>(java.lang.String,int):257:257 -> <init>
     1:1:com.android.tools.r8.com.google.common.base.Equivalence defaultEquivalence():260:260 -> a
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Strength$2 -> com.android.tools.r8.q.a.a.b.e1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Strength$2 -> com.android.tools.r8.p.a.a.b.e1:
     1:1:void <init>(java.lang.String,int):264:264 -> <init>
     1:1:com.android.tools.r8.com.google.common.base.Equivalence defaultEquivalence():267:267 -> a
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyStrongValueEntry -> com.android.tools.r8.q.a.a.b.h1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyStrongValueEntry -> com.android.tools.r8.p.a.a.b.h1:
     java.lang.Object value -> d
     1:1:void <init>(java.lang.Object,int,com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyStrongValueEntry):411:411 -> <init>
     2:2:void <init>(java.lang.Object,int,com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyStrongValueEntry):408:408 -> <init>
     1:1:void setValue(java.lang.Object):421:421 -> a
     2:4:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyStrongValueEntry copy(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyStrongValueEntry):425:427 -> a
     1:1:java.lang.Object getValue():417:417 -> getValue
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyStrongValueEntry$Helper -> com.android.tools.r8.q.a.a.b.g1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyStrongValueEntry$Helper -> com.android.tools.r8.p.a.a.b.g1:
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyStrongValueEntry$Helper INSTANCE -> a
     1:1:void <clinit>():435:435 -> <clinit>
     1:1:void <init>():432:432 -> <init>
@@ -10457,10 +10458,10 @@
     8:8:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyStrongValueSegment newSegment(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap,int,int):459:459 -> a
     8:8:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Segment newSegment(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap,int,int):432 -> a
     1:1:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyStrongValueEntry$Helper instance():439:439 -> b
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyStrongValueSegment -> com.android.tools.r8.q.a.a.b.i1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyStrongValueSegment -> com.android.tools.r8.p.a.a.b.i1:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap,int,int):2035:2035 -> <init>
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Segment self() -> f
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyWeakValueEntry -> com.android.tools.r8.q.a.a.b.k1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyWeakValueEntry -> com.android.tools.r8.p.a.a.b.k1:
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakValueReference valueReference -> d
     1:1:void <init>(java.lang.Object,int,com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyWeakValueEntry):497:497 -> <init>
     2:2:void <init>(java.lang.Object,int,com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyWeakValueEntry):494:494 -> <init>
@@ -10468,7 +10469,7 @@
     6:8:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyWeakValueEntry copy(java.lang.ref.ReferenceQueue,com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyWeakValueEntry):520:522 -> a
     9:9:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakValueReference getValueReference():528:528 -> a
     1:1:java.lang.Object getValue():502:502 -> getValue
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyWeakValueEntry$Helper -> com.android.tools.r8.q.a.a.b.j1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyWeakValueEntry$Helper -> com.android.tools.r8.p.a.a.b.j1:
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyWeakValueEntry$Helper INSTANCE -> a
     1:1:void <clinit>():535:535 -> <clinit>
     1:1:void <init>():532:532 -> <init>
@@ -10485,7 +10486,7 @@
     11:11:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyWeakValueSegment newSegment(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap,int,int):558:558 -> a
     11:11:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Segment newSegment(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap,int,int):532 -> a
     1:1:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyWeakValueEntry$Helper instance():539:539 -> b
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyWeakValueSegment -> com.android.tools.r8.q.a.a.b.l1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyWeakValueSegment -> com.android.tools.r8.p.a.a.b.l1:
     java.lang.ref.ReferenceQueue queueForValues -> h
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap,int,int):2060:2060 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap,int,int):2053:2053 -> <init>
@@ -10493,12 +10494,12 @@
     1:1:void maybeClearReferenceQueues():2112:2112 -> b
     1:1:void maybeDrainReferenceQueues():2107:2107 -> c
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Segment self() -> f
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$ValueIterator -> com.android.tools.r8.q.a.a.b.Y0$f:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$ValueIterator -> com.android.tools.r8.p.a.a.b.Y0$f:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap):2656:2656 -> <init>
     1:1:java.lang.Object next():2660:2660 -> next
     2:2:java.lang.Object com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WriteThroughEntry.getValue():2684:2684 -> next
     2:2:java.lang.Object next():2660 -> next
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Values -> com.android.tools.r8.q.a.a.b.Y0$g:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Values -> com.android.tools.r8.p.a.a.b.Y0$g:
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap):2754:2754 -> <init>
     1:1:void clear():2778:2778 -> clear
@@ -10508,7 +10509,7 @@
     1:1:int size():2763:2763 -> size
     1:1:java.lang.Object[] toArray():2786:2786 -> toArray
     2:2:java.lang.Object[] toArray(java.lang.Object[]):2791:2791 -> toArray
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyStrongValueEntry -> com.android.tools.r8.q.a.a.b.n1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyStrongValueEntry -> com.android.tools.r8.p.a.a.b.n1:
     java.lang.Object value -> c
     1:1:void <init>(java.lang.ref.ReferenceQueue,java.lang.Object,int,com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyStrongValueEntry):780:780 -> <init>
     2:2:void <init>(java.lang.ref.ReferenceQueue,java.lang.Object,int,com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyStrongValueEntry):776:776 -> <init>
@@ -10520,7 +10521,7 @@
     6:6:void setValue(java.lang.Object):790:790 -> a
     6:6:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyStrongValueEntry copy(java.lang.ref.ReferenceQueue,com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyStrongValueEntry):797 -> a
     1:1:java.lang.Object getValue():786:786 -> getValue
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyStrongValueEntry$Helper -> com.android.tools.r8.q.a.a.b.m1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyStrongValueEntry$Helper -> com.android.tools.r8.p.a.a.b.m1:
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyStrongValueEntry$Helper INSTANCE -> a
     1:1:void <clinit>():805:805 -> <clinit>
     1:1:void <init>():802:802 -> <init>
@@ -10540,7 +10541,7 @@
     9:9:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyStrongValueSegment newSegment(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap,int,int):828:828 -> a
     9:9:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Segment newSegment(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap,int,int):802 -> a
     1:1:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyStrongValueEntry$Helper instance():809:809 -> b
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyStrongValueSegment -> com.android.tools.r8.q.a.a.b.o1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyStrongValueSegment -> com.android.tools.r8.p.a.a.b.o1:
     java.lang.ref.ReferenceQueue queueForKeys -> h
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap,int,int):2149:2149 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap,int,int):2142:2142 -> <init>
@@ -10548,7 +10549,7 @@
     1:1:void maybeClearReferenceQueues():2175:2175 -> b
     1:1:void maybeDrainReferenceQueues():2170:2170 -> c
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Segment self() -> f
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyWeakValueEntry -> com.android.tools.r8.q.a.a.b.q1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyWeakValueEntry -> com.android.tools.r8.p.a.a.b.q1:
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakValueReference valueReference -> c
     1:1:void <init>(java.lang.ref.ReferenceQueue,java.lang.Object,int,com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyWeakValueEntry):869:869 -> <init>
     2:2:void <init>(java.lang.ref.ReferenceQueue,java.lang.Object,int,com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyWeakValueEntry):865:865 -> <init>
@@ -10559,7 +10560,7 @@
     5:9:void setValue(java.lang.Object,java.lang.ref.ReferenceQueue):893:897 -> a
     10:10:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakValueReference getValueReference():902:902 -> a
     1:1:java.lang.Object getValue():874:874 -> getValue
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyWeakValueEntry$Helper -> com.android.tools.r8.q.a.a.b.p1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyWeakValueEntry$Helper -> com.android.tools.r8.p.a.a.b.p1:
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyWeakValueEntry$Helper INSTANCE -> a
     1:1:void <clinit>():909:909 -> <clinit>
     1:1:void <init>():906:906 -> <init>
@@ -10579,7 +10580,7 @@
     12:12:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyWeakValueSegment newSegment(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap,int,int):931:931 -> a
     12:12:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Segment newSegment(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap,int,int):906 -> a
     1:1:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyWeakValueEntry$Helper instance():913:913 -> b
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyWeakValueSegment -> com.android.tools.r8.q.a.a.b.r1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyWeakValueSegment -> com.android.tools.r8.p.a.a.b.r1:
     java.lang.ref.ReferenceQueue queueForKeys -> h
     java.lang.ref.ReferenceQueue queueForValues -> i
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap,int,int):2189:2189 -> <init>
@@ -10589,17 +10590,17 @@
     2:2:void maybeClearReferenceQueues():2247:2247 -> b
     1:2:void maybeDrainReferenceQueues():2241:2242 -> c
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Segment self() -> f
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakValueEntry -> com.android.tools.r8.q.a.a.b.s1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakValueEntry -> com.android.tools.r8.p.a.a.b.s1:
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakValueReference getValueReference() -> a
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakValueReference -> com.android.tools.r8.q.a.a.b.t1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakValueReference -> com.android.tools.r8.p.a.a.b.t1:
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakValueReference copyFor(java.lang.ref.ReferenceQueue,com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry) -> a
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry getEntry() -> a
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakValueReferenceImpl -> com.android.tools.r8.q.a.a.b.u1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakValueReferenceImpl -> com.android.tools.r8.p.a.a.b.u1:
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry entry -> a
     1:2:void <init>(java.lang.ref.ReferenceQueue,java.lang.Object,com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry):1051:1052 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry getEntry():1057:1057 -> a
     2:2:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakValueReference copyFor(java.lang.ref.ReferenceQueue,com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry):1062:1062 -> a
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WriteThroughEntry -> com.android.tools.r8.q.a.a.b.Y0$h:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WriteThroughEntry -> com.android.tools.r8.p.a.a.b.Y0$h:
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap this$0 -> c
     java.lang.Object value -> b
     java.lang.Object key -> a
@@ -10609,13 +10610,13 @@
     1:1:java.lang.Object getValue():2684:2684 -> getValue
     1:1:int hashCode():2700:2700 -> hashCode
     1:2:java.lang.Object setValue(java.lang.Object):2705:2706 -> setValue
-com.android.tools.r8.com.google.common.collect.Maps$1 -> com.android.tools.r8.q.a.a.b.v1:
-com.android.tools.r8.com.google.common.collect.Maps$5 -> com.android.tools.r8.q.a.a.b.w1:
+com.android.tools.r8.com.google.common.collect.Maps$1 -> com.android.tools.r8.p.a.a.b.v1:
+com.android.tools.r8.com.google.common.collect.Maps$5 -> com.android.tools.r8.p.a.a.b.w1:
     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.q.a.a.b.x1:
+com.android.tools.r8.com.google.common.collect.Maps$6 -> com.android.tools.r8.p.a.a.b.x1:
     java.util.Iterator val$entryIterator -> a
     1:1:void <init>(java.util.Iterator):1462:1462 -> <init>
     1:1:boolean hasNext():1465:1465 -> hasNext
@@ -10628,23 +10629,23 @@
     3:3:java.util.Map$Entry com.android.tools.r8.com.google.common.collect.Maps.unmodifiableEntry(java.util.Map$Entry):1446 -> next
     3:3:java.util.Map$Entry 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.q.a.a.b.A1:
+com.android.tools.r8.com.google.common.collect.Maps$EntryFunction -> com.android.tools.r8.p.a.a.b.A1:
     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.q.a.a.b.y1:
+com.android.tools.r8.com.google.common.collect.Maps$EntryFunction$1 -> com.android.tools.r8.p.a.a.b.y1:
     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 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.q.a.a.b.z1:
+com.android.tools.r8.com.google.common.collect.Maps$EntryFunction$2 -> com.android.tools.r8.p.a.a.b.z1:
     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 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.q.a.a.b.B1:
+com.android.tools.r8.com.google.common.collect.Maps$EntrySet -> com.android.tools.r8.p.a.a.b.B1:
     1:1:void <init>():4112:4112 -> <init>
     java.util.Map map() -> a
     1:1:void clear():4122:4122 -> clear
@@ -10664,11 +10665,11 @@
     4:4:boolean retainAll(java.util.Collection):4166 -> retainAll
     5:11: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.q.a.a.b.D1:
+com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap -> com.android.tools.r8.p.a.a.b.D1:
     1:1:void <init>():3653:3653 -> <init>
     java.util.Iterator entryIterator() -> c
     1:1:java.util.Set entrySet():3666:3666 -> entrySet
-com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap$1 -> com.android.tools.r8.q.a.a.b.C1:
+com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap$1 -> com.android.tools.r8.p.a.a.b.C1:
     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
@@ -10681,7 +10682,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.q.a.a.b.E1:
+com.android.tools.r8.com.google.common.collect.Maps$KeySet -> com.android.tools.r8.p.a.a.b.E1:
     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
@@ -10717,7 +10718,7 @@
     1:1:java.util.Map 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.q.a.a.b.F1:
+com.android.tools.r8.com.google.common.collect.Maps$Values -> com.android.tools.r8.p.a.a.b.F1:
     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
@@ -10774,7 +10775,7 @@
     1:1:java.util.Map 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.q.a.a.b.G1:
+com.android.tools.r8.com.google.common.collect.Maps$ViewCachingAbstractMap -> com.android.tools.r8.p.a.a.b.G1:
     java.util.Collection values -> b
     java.util.Set entrySet -> a
     1:1:void <init>():3612:3612 -> <init>
@@ -10786,31 +10787,31 @@
     2:2:java.util.Collection 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.q.a.a.b.H1:
+com.android.tools.r8.com.google.common.collect.Multimap -> com.android.tools.r8.p.a.a.b.H1:
     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.q.a.a.b.I1:
+com.android.tools.r8.com.google.common.collect.MultimapBuilder$2 -> com.android.tools.r8.p.a.a.b.I1:
     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.q.a.a.b.J1:
+com.android.tools.r8.com.google.common.collect.MultimapBuilder$ArrayListSupplier -> com.android.tools.r8.p.a.a.b.J1:
     int expectedValuesPerKey -> a
     1:2:void <init>(int):193:194 -> <init>
     1:1:java.util.List 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.q.a.a.b.K1:
+com.android.tools.r8.com.google.common.collect.MultimapBuilder$ListMultimapBuilder -> com.android.tools.r8.p.a.a.b.K1:
     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.q.a.a.b.M1:
+com.android.tools.r8.com.google.common.collect.MultimapBuilder$MultimapBuilderWithKeys -> com.android.tools.r8.p.a.a.b.M1:
     1:1:void <init>():282:282 -> <init>
     1:2:com.android.tools.r8.com.google.common.collect.MultimapBuilder$ListMultimapBuilder 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.q.a.a.b.L1:
+com.android.tools.r8.com.google.common.collect.MultimapBuilder$MultimapBuilderWithKeys$1 -> com.android.tools.r8.p.a.a.b.L1:
     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>
@@ -10823,12 +10824,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.q.a.a.b.N1:
+com.android.tools.r8.com.google.common.collect.Multimaps$CustomListMultimap -> com.android.tools.r8.p.a.a.b.N1:
     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 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.q.a.a.b.O1:
+com.android.tools.r8.com.google.common.collect.Multimaps$Entries -> com.android.tools.r8.p.a.a.b.O1:
     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
@@ -10846,7 +10847,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.q.a.a.b.R1:
+com.android.tools.r8.com.google.common.collect.Multimaps$Keys -> com.android.tools.r8.p.a.a.b.R1:
     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
@@ -10869,17 +10870,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.q.a.a.b.Q1:
+com.android.tools.r8.com.google.common.collect.Multimaps$Keys$1 -> com.android.tools.r8.p.a.a.b.Q1:
     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 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.q.a.a.b.P1:
+com.android.tools.r8.com.google.common.collect.Multimaps$Keys$1$1 -> com.android.tools.r8.p.a.a.b.P1:
     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.q.a.a.b.R1$a:
+com.android.tools.r8.com.google.common.collect.Multimaps$Keys$KeysEntrySet -> com.android.tools.r8.p.a.a.b.R1$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
@@ -10892,7 +10893,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.q.a.a.b.S1:
+com.android.tools.r8.com.google.common.collect.Multiset -> com.android.tools.r8.p.a.a.b.S1:
     int remove(java.lang.Object,int) -> a
     boolean setCount(java.lang.Object,int,int) -> a
     1:4:void lambda$forEach$1(java.util.function.Consumer,com.android.tools.r8.com.google.common.collect.Multiset$Entry):494:497 -> a
@@ -10904,22 +10905,22 @@
     3:3:void forEach(java.util.function.Consumer):490 -> forEach
     java.util.Set elementSet() -> h
     1:1:java.util.Spliterator spliterator():504:504 -> spliterator
-com.android.tools.r8.com.google.common.collect.Multiset$Entry -> com.android.tools.r8.q.a.a.b.S1$a:
+com.android.tools.r8.com.google.common.collect.Multiset$Entry -> com.android.tools.r8.p.a.a.b.S1$a:
     int getCount() -> a
     java.lang.Object getElement() -> b
-com.android.tools.r8.com.google.common.collect.Multisets$AbstractEntry -> com.android.tools.r8.q.a.a.b.T1:
+com.android.tools.r8.com.google.common.collect.Multisets$AbstractEntry -> com.android.tools.r8.p.a.a.b.T1:
     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.q.a.a.b.U1:
+com.android.tools.r8.com.google.common.collect.Multisets$DecreasingCount -> com.android.tools.r8.p.a.a.b.U1:
     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 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.q.a.a.b.W1:
+com.android.tools.r8.com.google.common.collect.Multisets$ElementSet -> com.android.tools.r8.p.a.a.b.W1:
     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
@@ -10949,25 +10950,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.q.a.a.b.V1:
+com.android.tools.r8.com.google.common.collect.Multisets$ElementSet$1 -> com.android.tools.r8.p.a.a.b.V1:
     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 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.q.a.a.b.X1:
+com.android.tools.r8.com.google.common.collect.Multisets$EntrySet -> com.android.tools.r8.p.a.a.b.X1:
     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.q.a.a.b.Y1:
+com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry -> com.android.tools.r8.p.a.a.b.Y1:
     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.q.a.a.b.Z1:
+com.android.tools.r8.com.google.common.collect.NaturalOrdering -> com.android.tools.r8.p.a.a.b.Z1:
     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>
@@ -10981,11 +10982,11 @@
     4:4:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> compare
     4:4:int compare(java.lang.Comparable,java.lang.Comparable):35 -> 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.q.a.a.b.a2:
+com.android.tools.r8.com.google.common.collect.Ordering -> com.android.tools.r8.p.a.a.b.a2:
     1:1:void <init>():390:390 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.Ordering from(java.util.Comparator):181:181 -> a
     2:2:com.android.tools.r8.com.google.common.collect.Ordering reverse():404:404 -> a
-com.android.tools.r8.com.google.common.collect.RegularImmutableAsList -> com.android.tools.r8.q.a.a.b.b2:
+com.android.tools.r8.com.google.common.collect.RegularImmutableAsList -> com.android.tools.r8.p.a.a.b.b2:
     com.android.tools.r8.com.google.common.collect.ImmutableCollection delegate -> b
     com.android.tools.r8.com.google.common.collect.ImmutableList delegateList -> c
     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>
@@ -10997,7 +10998,7 @@
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator listIterator(int):56:56 -> listIterator
     2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator listIterator(int):56:56 -> listIterator
     2:2:java.util.ListIterator listIterator(int):29 -> listIterator
-com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap -> com.android.tools.r8.q.a.a.b.e2:
+com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap -> com.android.tools.r8.p.a.a.b.e2:
     com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse -> j
     com.android.tools.r8.com.google.common.collect.ImmutableMapEntry[] keyTable -> e
     com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap EMPTY -> k
@@ -11043,8 +11044,8 @@
     boolean isHashCodeFast() -> k
     boolean isPartialView() -> l
     1:1:int size():179:179 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$1 -> com.android.tools.r8.q.a.a.b.c2:
-com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse -> com.android.tools.r8.q.a.a.b.e2$a:
+com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$1 -> com.android.tools.r8.p.a.a.b.c2:
+com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse -> com.android.tools.r8.p.a.a.b.e2$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>
@@ -11068,7 +11069,7 @@
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse():204:204 -> size
     1:1:int size():199 -> size
     2:2:int size():199:199 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet -> com.android.tools.r8.q.a.a.b.e2$a$a:
+com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet -> com.android.tools.r8.p.a.a.b.e2$a$a:
     com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse this$1 -> c
     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.ImmutableList createAsList():268:268 -> d
@@ -11079,7 +11080,7 @@
     2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():258:258 -> iterator
     2:2:java.util.Iterator iterator():239 -> iterator
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap map():243:243 -> j
-com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet$1 -> com.android.tools.r8.q.a.a.b.d2:
+com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet$1 -> com.android.tools.r8.p.a.a.b.d2:
     com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet this$2 -> b
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet):268:268 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection delegateCollection():277:277 -> g
@@ -11088,7 +11089,7 @@
     3:3:java.util.Map$Entry com.android.tools.r8.com.google.common.collect.Maps.immutableEntry(java.lang.Object,java.lang.Object):1421:1421 -> get
     3:3:java.util.Map$Entry get(int):272 -> get
     3:3:java.lang.Object get(int):268 -> get
-com.android.tools.r8.com.google.common.collect.RegularImmutableList -> com.android.tools.r8.q.a.a.b.f2:
+com.android.tools.r8.com.google.common.collect.RegularImmutableList -> com.android.tools.r8.p.a.a.b.f2:
     java.lang.Object[] array -> b
     com.android.tools.r8.com.google.common.collect.ImmutableList EMPTY -> c
     1:1:void <clinit>():31:31 -> <clinit>
@@ -11101,7 +11102,7 @@
     2:2: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.q.a.a.b.i2:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMap -> com.android.tools.r8.p.a.a.b.i2:
     com.android.tools.r8.com.google.common.collect.ImmutableMap EMPTY -> h
     com.android.tools.r8.com.google.common.collect.ImmutableMapEntry[] table -> f
     java.util.Map$Entry[] entries -> e
@@ -11145,7 +11146,7 @@
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection createValues():229:229 -> j
     boolean isPartialView() -> l
     1:1:int size():159:159 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableMap$KeySet -> com.android.tools.r8.q.a.a.b.g2:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMap$KeySet -> com.android.tools.r8.p.a.a.b.g2:
     com.android.tools.r8.com.google.common.collect.RegularImmutableMap map -> c
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableMap):181:182 -> <init>
     boolean isPartialView() -> b
@@ -11154,13 +11155,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.q.a.a.b.h2:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMap$Values -> com.android.tools.r8.p.a.a.b.h2:
     com.android.tools.r8.com.google.common.collect.RegularImmutableMap map -> b
     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.q.a.a.b.k2:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset -> com.android.tools.r8.p.a.a.b.k2:
     com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset EMPTY -> i
     com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry[] hashTable -> e
     int size -> f
@@ -11179,8 +11180,8 @@
     3:4:java.util.Set elementSet():34 -> h
     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.q.a.a.b.j2:
-com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$ElementSet -> com.android.tools.r8.q.a.a.b.k2$a:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$1 -> com.android.tools.r8.p.a.a.b.j2:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$ElementSet -> com.android.tools.r8.p.a.a.b.k2$a:
     com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset this$0 -> c
     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>
@@ -11190,11 +11191,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.q.a.a.b.l2:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$NonTerminalEntry -> com.android.tools.r8.p.a.a.b.l2:
     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.q.a.a.b.m2:
+com.android.tools.r8.com.google.common.collect.RegularImmutableSet -> com.android.tools.r8.p.a.a.b.m2:
     java.lang.Object[] table -> d
     com.android.tools.r8.com.google.common.collect.RegularImmutableSet EMPTY -> g
     java.lang.Object[] elements -> c
@@ -11215,7 +11216,7 @@
     2:2: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.q.a.a.b.n2:
+com.android.tools.r8.com.google.common.collect.RegularImmutableSortedSet -> com.android.tools.r8.p.a.a.b.n2:
     com.android.tools.r8.com.google.common.collect.RegularImmutableSortedSet NATURAL_EMPTY_SET -> f
     com.android.tools.r8.com.google.common.collect.ImmutableList elements -> e
     1:2:void <clinit>():44:45 -> <clinit>
@@ -11320,7 +11321,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.ReverseNaturalOrdering -> com.android.tools.r8.q.a.a.b.o2:
+com.android.tools.r8.com.google.common.collect.ReverseNaturalOrdering -> com.android.tools.r8.p.a.a.b.o2:
     com.android.tools.r8.com.google.common.collect.ReverseNaturalOrdering INSTANCE -> a
     1:1:void <clinit>():29:29 -> <clinit>
     1:1:void <init>():98:98 -> <init>
@@ -11332,7 +11333,7 @@
     3:3:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> compare
     3:3:int compare(java.lang.Comparable,java.lang.Comparable):33 -> compare
     3:3:int compare(java.lang.Object,java.lang.Object):26 -> compare
-com.android.tools.r8.com.google.common.collect.ReverseOrdering -> com.android.tools.r8.q.a.a.b.p2:
+com.android.tools.r8.com.google.common.collect.ReverseOrdering -> com.android.tools.r8.p.a.a.b.p2:
     com.android.tools.r8.com.google.common.collect.Ordering forwardOrder -> a
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.Ordering):31:32 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.Ordering reverse():43:43 -> a
@@ -11340,7 +11341,7 @@
     1:3:boolean equals(java.lang.Object):98:100 -> equals
     1:1:int hashCode():90:90 -> hashCode
     1:1:java.lang.String toString():107:107 -> toString
-com.android.tools.r8.com.google.common.collect.Sets$1 -> com.android.tools.r8.q.a.a.b.r2:
+com.android.tools.r8.com.google.common.collect.Sets$1 -> com.android.tools.r8.p.a.a.b.r2:
     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>
@@ -11352,13 +11353,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.q.a.a.b.q2:
+com.android.tools.r8.com.google.common.collect.Sets$1$1 -> com.android.tools.r8.p.a.a.b.q2:
     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 -> c
-com.android.tools.r8.com.google.common.collect.Sets$2 -> com.android.tools.r8.q.a.a.b.t2:
+com.android.tools.r8.com.google.common.collect.Sets$2 -> com.android.tools.r8.p.a.a.b.t2:
     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>
@@ -11370,12 +11371,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.q.a.a.b.s2:
+com.android.tools.r8.com.google.common.collect.Sets$2$1 -> com.android.tools.r8.p.a.a.b.s2:
     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 -> c
-com.android.tools.r8.com.google.common.collect.Sets$3 -> com.android.tools.r8.q.a.a.b.v2:
+com.android.tools.r8.com.google.common.collect.Sets$3 -> com.android.tools.r8.p.a.a.b.v2:
     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>
@@ -11388,12 +11389,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.q.a.a.b.u2:
+com.android.tools.r8.com.google.common.collect.Sets$3$1 -> com.android.tools.r8.p.a.a.b.u2:
     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 -> c
-com.android.tools.r8.com.google.common.collect.Sets$5 -> com.android.tools.r8.q.a.a.b.z2:
+com.android.tools.r8.com.google.common.collect.Sets$5 -> com.android.tools.r8.p.a.a.b.z2:
     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>
@@ -11401,31 +11402,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.q.a.a.b.y2:
+com.android.tools.r8.com.google.common.collect.Sets$5$1 -> com.android.tools.r8.p.a.a.b.y2:
     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 computeNext():1693:1721 -> c
     1:29:java.lang.Object computeNext():1688 -> c
-com.android.tools.r8.com.google.common.collect.Sets$5$1$1 -> com.android.tools.r8.q.a.a.b.x2:
+com.android.tools.r8.com.google.common.collect.Sets$5$1$1 -> com.android.tools.r8.p.a.a.b.x2:
     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.q.a.a.b.w2:
+com.android.tools.r8.com.google.common.collect.Sets$5$1$1$1 -> com.android.tools.r8.p.a.a.b.w2:
     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 -> c
-com.android.tools.r8.com.google.common.collect.Sets$ImprovedAbstractSet -> com.android.tools.r8.q.a.a.b.A2:
+com.android.tools.r8.com.google.common.collect.Sets$ImprovedAbstractSet -> com.android.tools.r8.p.a.a.b.A2:
     1:1:void <init>():77:77 -> <init>
     1:1:boolean removeAll(java.util.Collection):80:80 -> removeAll
     1:1:boolean retainAll(java.util.Collection):85:85 -> retainAll
     2:2:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> retainAll
     2:2:boolean retainAll(java.util.Collection):85 -> retainAll
-com.android.tools.r8.com.google.common.collect.Sets$SetView -> com.android.tools.r8.q.a.a.b.B2:
+com.android.tools.r8.com.google.common.collect.Sets$SetView -> com.android.tools.r8.p.a.a.b.B2:
     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
@@ -11435,7 +11436,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.q.a.a.b.C2:
+com.android.tools.r8.com.google.common.collect.Sets$UnmodifiableNavigableSet -> com.android.tools.r8.p.a.a.b.C2:
     java.util.SortedSet unmodifiableDelegate -> b
     java.util.NavigableSet delegate -> a
     com.android.tools.r8.com.google.common.collect.Sets$UnmodifiableNavigableSet descendingSet -> c
@@ -11463,7 +11464,7 @@
     1:2:java.util.NavigableSet subSet(java.lang.Object,boolean,java.lang.Object,boolean):1910:1911 -> subSet
     3: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.q.a.a.b.D2:
+com.android.tools.r8.com.google.common.collect.SingletonImmutableBiMap -> com.android.tools.r8.p.a.a.b.D2:
     java.lang.Object singleValue -> f
     com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse -> g
     java.lang.Object singleKey -> e
@@ -11484,7 +11485,7 @@
     1:1:java.lang.Object get(java.lang.Object):55:55 -> get
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createKeySet():90:90 -> h
     boolean isPartialView() -> l
-com.android.tools.r8.com.google.common.collect.SingletonImmutableList -> com.android.tools.r8.q.a.a.b.E2:
+com.android.tools.r8.com.google.common.collect.SingletonImmutableList -> com.android.tools.r8.p.a.a.b.E2:
     java.lang.Object element -> b
     1:2:void <init>(java.lang.Object):37:38 -> <init>
     boolean isPartialView() -> b
@@ -11499,7 +11500,7 @@
     3:3:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of():81:81 -> subList
     3:3:com.android.tools.r8.com.google.common.collect.ImmutableList subList(int,int):65 -> subList
     1:1:java.lang.String toString():70:70 -> toString
-com.android.tools.r8.com.google.common.collect.SingletonImmutableSet -> com.android.tools.r8.q.a.a.b.F2:
+com.android.tools.r8.com.google.common.collect.SingletonImmutableSet -> com.android.tools.r8.p.a.a.b.F2:
     java.lang.Object element -> c
     int cachedHashCode -> d
     1:2:void <init>(java.lang.Object):44:45 -> <init>
@@ -11515,22 +11516,22 @@
     3:3:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator com.android.tools.r8.com.google.common.collect.Iterators.singletonIterator(java.lang.Object):1104:1104 -> iterator
     3:3:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():66 -> iterator
     1:1:java.lang.String toString():102:102 -> toString
-com.android.tools.r8.com.google.common.collect.SortedIterable -> com.android.tools.r8.q.a.a.b.G2:
-com.android.tools.r8.com.google.common.collect.Streams$1Splitr -> com.android.tools.r8.q.a.a.b.H2:
+com.android.tools.r8.com.google.common.collect.SortedIterable -> com.android.tools.r8.p.a.a.b.G2:
+com.android.tools.r8.com.google.common.collect.Streams$1Splitr -> com.android.tools.r8.p.a.a.b.H2:
     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.q.a.a.b.I2:
+com.android.tools.r8.com.google.common.collect.Streams$2 -> com.android.tools.r8.p.a.a.b.I2:
     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.q.a.a.b.J2:
+com.android.tools.r8.com.google.common.collect.Streams$FunctionWithIndex -> com.android.tools.r8.p.a.a.b.J2:
     java.lang.Object apply(java.lang.Object,long) -> a
-com.android.tools.r8.com.google.common.collect.Streams$MapWithIndexSpliterator -> com.android.tools.r8.q.a.a.b.K2:
+com.android.tools.r8.com.google.common.collect.Streams$MapWithIndexSpliterator -> com.android.tools.r8.p.a.a.b.K2:
     long index -> b
     java.util.Spliterator fromSpliterator -> a
     1:3:void <init>(java.util.Spliterator,long):419:421 -> <init>
@@ -11544,33 +11545,33 @@
     6:6:java.util.Spliterator trySplit():413 -> trySplit
     7:7: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.q.a.a.b.L2:
+com.android.tools.r8.com.google.common.collect.TransformedIterator -> com.android.tools.r8.p.a.a.b.L2:
     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.q.a.a.b.M2:
+com.android.tools.r8.com.google.common.collect.UnmodifiableIterator -> com.android.tools.r8.p.a.a.b.M2:
     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.q.a.a.b.N2:
+com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator -> com.android.tools.r8.p.a.a.b.N2:
     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
-com.android.tools.r8.com.google.common.hash.AbstractHashFunction -> com.android.tools.r8.q.a.a.c.a:
+com.android.tools.r8.com.google.common.hash.AbstractHashFunction -> com.android.tools.r8.p.a.a.c.a:
     1:1:void <init>():28:28 -> <init>
     1:1:com.android.tools.r8.com.google.common.hash.HashCode hashString(java.lang.CharSequence,java.nio.charset.Charset):42:42 -> a
     2:2:com.android.tools.r8.com.google.common.hash.HashCode hashBytes(byte[],int,int):62:62 -> a
     3:5:com.android.tools.r8.com.google.common.hash.Hasher newHasher(int):73:75 -> a
     3:5:com.android.tools.r8.com.google.common.hash.HashCode hashBytes(byte[],int,int):63 -> a
     6:6:com.android.tools.r8.com.google.common.hash.HashCode hashBytes(byte[],int,int):63:63 -> a
-com.android.tools.r8.com.google.common.hash.AbstractHasher -> com.android.tools.r8.q.a.a.c.b:
+com.android.tools.r8.com.google.common.hash.AbstractHasher -> com.android.tools.r8.p.a.a.c.b:
     1:1:void <init>():29:29 -> <init>
     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.q.a.a.c.e:
+com.android.tools.r8.com.google.common.hash.HashCode -> com.android.tools.r8.p.a.a.c.e:
     char[] hexDigits -> a
     1:1:void <clinit>():429:429 -> <clinit>
     1:1:void <init>():38:38 -> <init>
@@ -11584,7 +11585,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.q.a.a.c.c:
+com.android.tools.r8.com.google.common.hash.HashCode$BytesHashCode -> com.android.tools.r8.p.a.a.c.c:
     byte[] bytes -> b
     1:2:void <init>(byte[]):262:263 -> <init>
     1:1:byte[] asBytes():273:273 -> a
@@ -11592,30 +11593,30 @@
     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.q.a.a.c.d:
+com.android.tools.r8.com.google.common.hash.HashCode$IntHashCode -> com.android.tools.r8.p.a.a.c.d:
     int hash -> b
     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.q.a.a.c.f:
+com.android.tools.r8.com.google.common.hash.HashFunction -> com.android.tools.r8.p.a.a.c.f:
     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.q.a.a.c.g:
+com.android.tools.r8.com.google.common.hash.Hasher -> com.android.tools.r8.p.a.a.c.g:
     com.android.tools.r8.com.google.common.hash.HashCode hash() -> a
     com.android.tools.r8.com.google.common.hash.Hasher putBytes(byte[],int,int) -> 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.q.a.a.c.i:
+com.android.tools.r8.com.google.common.hash.Hashing -> com.android.tools.r8.p.a.a.c.i:
     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.q.a.a.c.h:
+com.android.tools.r8.com.google.common.hash.Hashing$Sha256Holder -> com.android.tools.r8.p.a.a.c.h:
     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.q.a.a.c.l:
+com.android.tools.r8.com.google.common.hash.MessageDigestHashFunction -> com.android.tools.r8.p.a.a.c.l:
     java.security.MessageDigest prototype -> a
     int bytes -> b
     boolean supportsClone -> c
@@ -11630,8 +11631,8 @@
     15:15:java.security.MessageDigest 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.q.a.a.c.j:
-com.android.tools.r8.com.google.common.hash.MessageDigestHashFunction$MessageDigestHasher -> com.android.tools.r8.q.a.a.c.k:
+com.android.tools.r8.com.google.common.hash.MessageDigestHashFunction$1 -> com.android.tools.r8.p.a.a.c.j:
+com.android.tools.r8.com.google.common.hash.MessageDigestHashFunction$MessageDigestHasher -> com.android.tools.r8.p.a.a.c.k:
     java.security.MessageDigest digest -> b
     java.nio.ByteBuffer com.android.tools.r8.com.google.common.hash.AbstractByteHasher.scratch -> a
     int bytes -> c
@@ -11664,7 +11665,7 @@
     6:6:void com.android.tools.r8.com.google.common.base.Preconditions.checkState(boolean,java.lang.Object):459:459 -> b
     6:6:void checkNotDone():149 -> b
     6:6:void update(byte[],int,int):138 -> b
-com.android.tools.r8.com.google.common.hash.Murmur3_32HashFunction -> com.android.tools.r8.q.a.a.c.n:
+com.android.tools.r8.com.google.common.hash.Murmur3_32HashFunction -> com.android.tools.r8.p.a.a.c.n:
     com.android.tools.r8.com.google.common.hash.HashFunction MURMUR3_32 -> b
     int seed -> a
     1:3:void <clinit>():53:55 -> <clinit>
@@ -11695,7 +11696,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.q.a.a.c.m:
+com.android.tools.r8.com.google.common.hash.Murmur3_32HashFunction$Murmur3_32Hasher -> com.android.tools.r8.p.a.a.c.m:
     long buffer -> b
     boolean isDone -> e
     int length -> d
@@ -11715,7 +11716,7 @@
     52:52:com.android.tools.r8.com.google.common.hash.Hasher com.android.tools.r8.com.google.common.hash.AbstractHasher.putString(java.lang.CharSequence,java.nio.charset.Charset):55:55 -> a
     52:52:com.android.tools.r8.com.google.common.hash.Hasher putString(java.lang.CharSequence,java.nio.charset.Charset):378 -> a
     53:56:com.android.tools.r8.com.google.common.hash.HashCode hash():384:387 -> a
-com.android.tools.r8.com.google.common.io.BaseEncoding -> com.android.tools.r8.q.a.a.d.e:
+com.android.tools.r8.com.google.common.io.BaseEncoding -> com.android.tools.r8.p.a.a.d.e:
     com.android.tools.r8.com.google.common.io.BaseEncoding BASE64_URL -> a
     1:45:void <clinit>():315:359 -> <clinit>
     46:46:void com.android.tools.r8.com.google.common.io.BaseEncoding$StandardBaseEncoding.<init>(java.lang.String,java.lang.String,java.lang.Character):563:563 -> <clinit>
@@ -11738,7 +11739,7 @@
     12:12:java.lang.String encode(byte[],int,int):157:157 -> a
     12:12:java.lang.String encode(byte[]):144 -> a
     1:1:com.android.tools.r8.com.google.common.io.BaseEncoding base64Url():355:355 -> b
-com.android.tools.r8.com.google.common.io.BaseEncoding$Alphabet -> com.android.tools.r8.q.a.a.d.a:
+com.android.tools.r8.com.google.common.io.BaseEncoding$Alphabet -> com.android.tools.r8.p.a.a.d.a:
     char[] chars -> b
     int bytesPerChunk -> f
     byte[] decodabet -> g
@@ -11755,19 +11756,19 @@
     1:3:boolean equals(java.lang.Object):543:545 -> equals
     1:1:int hashCode():552:552 -> hashCode
     1:1:java.lang.String toString():538:538 -> toString
-com.android.tools.r8.com.google.common.io.BaseEncoding$Base16Encoding -> com.android.tools.r8.q.a.a.d.b:
+com.android.tools.r8.com.google.common.io.BaseEncoding$Base16Encoding -> com.android.tools.r8.p.a.a.d.b:
     char[] encoding -> d
     1:1:void <init>(java.lang.String,java.lang.String):847:847 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.io.BaseEncoding$Alphabet):851:851 -> <init>
     3:14:void <init>(com.android.tools.r8.com.google.common.io.BaseEncoding$Alphabet):844:855 -> <init>
     1:5:void encodeTo(java.lang.Appendable,byte[],int,int):862:866 -> a
     6:6:com.android.tools.r8.com.google.common.io.BaseEncoding newInstance(com.android.tools.r8.com.google.common.io.BaseEncoding$Alphabet,java.lang.Character):886:886 -> a
-com.android.tools.r8.com.google.common.io.BaseEncoding$Base64Encoding -> com.android.tools.r8.q.a.a.d.c:
+com.android.tools.r8.com.google.common.io.BaseEncoding$Base64Encoding -> com.android.tools.r8.p.a.a.d.c:
     1:1:void <init>(java.lang.String,java.lang.String,java.lang.Character):892:892 -> <init>
     2:3:void <init>(com.android.tools.r8.com.google.common.io.BaseEncoding$Alphabet,java.lang.Character):896:897 -> <init>
     1:11:void encodeTo(java.lang.Appendable,byte[],int,int):903:913 -> a
     12:12:com.android.tools.r8.com.google.common.io.BaseEncoding newInstance(com.android.tools.r8.com.google.common.io.BaseEncoding$Alphabet,java.lang.Character):943:943 -> a
-com.android.tools.r8.com.google.common.io.BaseEncoding$StandardBaseEncoding -> com.android.tools.r8.q.a.a.d.d:
+com.android.tools.r8.com.google.common.io.BaseEncoding$StandardBaseEncoding -> com.android.tools.r8.p.a.a.d.d:
     java.lang.Character paddingChar -> c
     com.android.tools.r8.com.google.common.io.BaseEncoding$Alphabet alphabet -> b
     1:4:void <init>(com.android.tools.r8.com.google.common.io.BaseEncoding$Alphabet,java.lang.Character):566:569 -> <init>
@@ -11782,7 +11783,7 @@
     2:2:int com.android.tools.r8.com.google.common.base.Objects.hashCode(java.lang.Object[]):76:76 -> hashCode
     2:2:int hashCode():839 -> hashCode
     1:10:java.lang.String toString():815:824 -> toString
-com.android.tools.r8.com.google.common.io.ByteStreams -> com.android.tools.r8.q.a.a.d.g:
+com.android.tools.r8.com.google.common.io.ByteStreams -> com.android.tools.r8.p.a.a.d.g:
     java.io.OutputStream NULL_OUTPUT_STREAM -> a
     1:1:void <clinit>():594:594 -> <clinit>
     1:1:byte[] createBuffer():56:56 -> a
@@ -11792,13 +11793,13 @@
     7:7:long copy(java.io.InputStream,java.io.OutputStream):101 -> a
     8:10:byte[] toByteArray(java.io.InputStream):165:167 -> a
     11:11:java.io.OutputStream nullOutputStream():624:624 -> a
-com.android.tools.r8.com.google.common.io.ByteStreams$1 -> com.android.tools.r8.q.a.a.d.f:
+com.android.tools.r8.com.google.common.io.ByteStreams$1 -> com.android.tools.r8.p.a.a.d.f:
     1:1:void <init>():595:595 -> <init>
     1:1:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> write
     1:1:void write(byte[]):603 -> write
     2:2:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> write
     2:2:void write(byte[],int,int):609 -> write
-com.android.tools.r8.com.google.common.io.CharSequenceReader -> com.android.tools.r8.q.a.a.d.h:
+com.android.tools.r8.com.google.common.io.CharSequenceReader -> com.android.tools.r8.p.a.a.d.h:
     java.lang.CharSequence seq -> a
     int pos -> b
     int mark -> c
@@ -11816,11 +11817,11 @@
     1:1:boolean ready():106:106 -> ready
     1:2:void reset():124:125 -> reset
     1:4:long skip(long):97:100 -> skip
-com.android.tools.r8.com.google.common.io.CharSource -> com.android.tools.r8.q.a.a.d.k:
+com.android.tools.r8.com.google.common.io.CharSource -> com.android.tools.r8.p.a.a.d.k:
     1:1:void <init>():76:76 -> <init>
     java.io.Reader openStream() -> a
     1:1:com.android.tools.r8.com.google.common.io.CharSource wrap(java.lang.CharSequence):479:479 -> a
-com.android.tools.r8.com.google.common.io.CharSource$CharSequenceCharSource -> com.android.tools.r8.q.a.a.d.i:
+com.android.tools.r8.com.google.common.io.CharSource$CharSequenceCharSource -> com.android.tools.r8.p.a.a.d.i:
     java.lang.CharSequence seq -> a
     1:1:void <clinit>():525:525 -> <clinit>
     1:2:void <init>(java.lang.CharSequence):529:530 -> <init>
@@ -11832,13 +11833,13 @@
     22:22:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> toString
     22:22:java.lang.String com.android.tools.r8.com.google.common.base.Ascii.truncate(java.lang.CharSequence,int,java.lang.String):546 -> toString
     22:22:java.lang.String toString():609 -> toString
-com.android.tools.r8.com.google.common.io.CharSource$StringCharSource -> com.android.tools.r8.q.a.a.d.j:
+com.android.tools.r8.com.google.common.io.CharSource$StringCharSource -> com.android.tools.r8.p.a.a.d.j:
     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.q.a.a.d.l:
+com.android.tools.r8.com.google.common.io.Closeables -> com.android.tools.r8.p.a.a.d.l:
     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.q.a.a.d.p:
+com.android.tools.r8.com.google.common.io.Closer -> com.android.tools.r8.p.a.a.d.p:
     com.android.tools.r8.com.google.common.io.Closer$Suppressor suppressor -> a
     java.util.Deque stack -> b
     com.android.tools.r8.com.google.common.io.Closer$Suppressor SUPPRESSOR -> c
@@ -11850,12 +11851,12 @@
     1:1:com.android.tools.r8.com.google.common.io.Closer create():104:104 -> a
     2:2:java.io.Closeable register(java.io.Closeable):128:128 -> a
     1:16:void close():213:228 -> close
-com.android.tools.r8.com.google.common.io.Closer$LoggingSuppressor -> com.android.tools.r8.q.a.a.d.m:
+com.android.tools.r8.com.google.common.io.Closer$LoggingSuppressor -> com.android.tools.r8.p.a.a.d.m:
     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.q.a.a.d.n:
+com.android.tools.r8.com.google.common.io.Closer$SuppressingSuppressor -> com.android.tools.r8.p.a.a.d.n:
     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>
@@ -11866,9 +11867,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.q.a.a.d.o:
+com.android.tools.r8.com.google.common.io.Closer$Suppressor -> com.android.tools.r8.p.a.a.d.o:
     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.q.a.a.e.b:
+com.android.tools.r8.com.google.common.math.IntMath -> com.android.tools.r8.p.a.a.e.b:
     int[] biggestBinomials -> a
     1:1:void <clinit>():675:675 -> <clinit>
     boolean isPowerOfTwo(int) -> a
@@ -11888,12 +11889,12 @@
     89:89:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
     89:89:int divide(int,int,java.math.RoundingMode):318 -> a
     90:108:int binomial(int,int):649:667 -> a
-com.android.tools.r8.com.google.common.math.IntMath$1 -> com.android.tools.r8.q.a.a.e.a:
+com.android.tools.r8.com.google.common.math.IntMath$1 -> com.android.tools.r8.p.a.a.e.a:
     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.q.a.a.e.c:
+com.android.tools.r8.com.google.common.math.MathPreconditions -> com.android.tools.r8.p.a.a.e.c:
     1:1:int checkNonNegative(java.lang.String,int):53:53 -> a
-com.android.tools.r8.com.google.gson.JsonArray -> com.android.tools.r8.q.a.b.a:
+com.android.tools.r8.com.google.gson.JsonArray -> com.android.tools.r8.p.a.b.a:
     java.util.List elements -> a
     1:2:void <init>():39:40 -> <init>
     1:3:void add(com.android.tools.r8.com.google.gson.JsonElement):95:97 -> a
@@ -11905,7 +11906,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.q.a.b.b:
+com.android.tools.r8.com.google.gson.JsonElement -> com.android.tools.r8.p.a.b.b:
     1:1:void <init>():33:33 -> <init>
     1:1:boolean getAsBoolean():152:152 -> a
     1:1:int getAsInt():243:243 -> b
@@ -11921,15 +11922,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.q.a.b.c:
+com.android.tools.r8.com.google.gson.JsonIOException -> com.android.tools.r8.p.a.b.c:
     1:1:void <init>(java.lang.Throwable):43:43 -> <init>
-com.android.tools.r8.com.google.gson.JsonNull -> com.android.tools.r8.q.a.b.d:
+com.android.tools.r8.com.google.gson.JsonNull -> com.android.tools.r8.p.a.b.d:
     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.q.a.b.e:
+com.android.tools.r8.com.google.gson.JsonObject -> com.android.tools.r8.p.a.b.e:
     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
@@ -11949,11 +11950,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.q.a.b.f:
+com.android.tools.r8.com.google.gson.JsonParseException -> com.android.tools.r8.p.a.b.f:
     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.q.a.b.g:
+com.android.tools.r8.com.google.gson.JsonParser -> com.android.tools.r8.p.a.b.g:
     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 parse(java.io.Reader):58:59 -> a
@@ -11975,7 +11976,7 @@
     11:20:com.android.tools.r8.com.google.gson.JsonElement parse(com.android.tools.r8.com.google.gson.stream.JsonReader):81:90 -> a
     21:21:com.android.tools.r8.com.google.gson.JsonElement parse(com.android.tools.r8.com.google.gson.stream.JsonReader):88:88 -> a
     22:26: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.q.a.b.h:
+com.android.tools.r8.com.google.gson.JsonPrimitive -> com.android.tools.r8.p.a.b.h:
     java.lang.Class[] PRIMITIVE_TYPES -> b
     java.lang.Object value -> a
     1:1:void <clinit>():35:35 -> <clinit>
@@ -12014,20 +12015,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.q.a.b.i:
+com.android.tools.r8.com.google.gson.JsonSyntaxException -> com.android.tools.r8.p.a.b.i:
     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.q.a.b.k:
+com.android.tools.r8.com.google.gson.TypeAdapter -> com.android.tools.r8.p.a.b.k:
     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.q.a.b.j:
+com.android.tools.r8.com.google.gson.TypeAdapter$1 -> com.android.tools.r8.p.a.b.j:
     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.q.a.b.l.a:
+com.android.tools.r8.com.google.gson.internal.LazilyParsedNumber -> com.android.tools.r8.p.a.b.l.a:
     java.lang.String value -> a
     1:2:void <init>(java.lang.String):30:31 -> <init>
     1:1:double doubleValue():63:63 -> doubleValue
@@ -12037,7 +12038,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.q.a.b.l.d:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap -> com.android.tools.r8.p.a.b.l.d:
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node header -> e
     java.util.Comparator NATURAL_ORDER -> h
     boolean $assertionsDisabled -> i
@@ -12080,12 +12081,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.q.a.b.l.b:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$1 -> com.android.tools.r8.p.a.b.l.b:
     1:1:void <init>():40:40 -> <init>
     1:1:int compare(java.lang.Object,java.lang.Object):40:40 -> compare
     2:2:int 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.q.a.b.l.d$a:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$EntrySet -> com.android.tools.r8.p.a.b.l.d$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
@@ -12093,11 +12094,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.q.a.b.l.c:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$EntrySet$1 -> com.android.tools.r8.p.a.b.l.c:
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$EntrySet):566:566 -> <init>
     1:1:java.util.Map$Entry 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.q.a.b.l.d$b:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$KeySet -> com.android.tools.r8.p.a.b.l.d$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
@@ -12109,10 +12110,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.q.a.b.l.e:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$KeySet$1 -> com.android.tools.r8.p.a.b.l.e:
     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.q.a.b.l.d$c:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$LinkedTreeMapIterator -> com.android.tools.r8.p.a.b.l.d$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
@@ -12125,7 +12126,7 @@
     1:1:boolean hasNext():535:535 -> hasNext
     1:6:void remove():551:556 -> remove
     7:7:void remove():552:552 -> remove
-com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node -> com.android.tools.r8.q.a.b.l.f:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node -> com.android.tools.r8.p.a.b.l.f:
     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
@@ -12142,7 +12143,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.q.a.b.l.g.w:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters -> com.android.tools.r8.p.a.b.l.g.w:
     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
@@ -12166,21 +12167,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.q.a.b.l.g.f:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$1 -> com.android.tools.r8.p.a.b.l.g.f:
     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 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 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.q.a.b.l.g.a:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$10 -> com.android.tools.r8.p.a.b.l.g.a:
     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 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 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.q.a.b.l.g.b:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$14 -> com.android.tools.r8.p.a.b.l.g.b:
     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 write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Number):378:378 -> a
@@ -12189,7 +12190,7 @@
     3:11:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):362 -> a
     12:12:java.lang.Number 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.q.a.b.l.g.c:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$15 -> com.android.tools.r8.p.a.b.l.g.c:
     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 write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Character):399:399 -> a
@@ -12198,21 +12199,21 @@
     3:11:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):384 -> a
     12:12:java.lang.Character 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.q.a.b.l.g.d:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$16 -> com.android.tools.r8.p.a.b.l.g.d:
     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 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 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.q.a.b.l.g.e:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$19 -> com.android.tools.r8.p.a.b.l.g.e:
     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 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 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.q.a.b.l.g.p:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$2 -> com.android.tools.r8.p.a.b.l.g.p:
     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 write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.util.BitSet):136:145 -> a
@@ -12225,63 +12226,63 @@
     42:63:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):92 -> a
     64:77:java.util.BitSet 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.q.a.b.l.g.g:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$20 -> com.android.tools.r8.p.a.b.l.g.g:
     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 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 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.q.a.b.l.g.h:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$21 -> com.android.tools.r8.p.a.b.l.g.h:
     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 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 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.q.a.b.l.g.i:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$22 -> com.android.tools.r8.p.a.b.l.g.i:
     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 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 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.q.a.b.l.g.j:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$23 -> com.android.tools.r8.p.a.b.l.g.j:
     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 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 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.q.a.b.l.g.k:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$24 -> com.android.tools.r8.p.a.b.l.g.k:
     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 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 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.q.a.b.l.g.l:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$25 -> com.android.tools.r8.p.a.b.l.g.l:
     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 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 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.q.a.b.l.g.m:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$27 -> com.android.tools.r8.p.a.b.l.g.m:
     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 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 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.q.a.b.l.g.n:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$28 -> com.android.tools.r8.p.a.b.l.g.n:
     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 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 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.q.a.b.l.g.o:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$29 -> com.android.tools.r8.p.a.b.l.g.o:
     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
@@ -12307,49 +12308,49 @@
     66:67:com.android.tools.r8.com.google.gson.JsonElement read(com.android.tools.r8.com.google.gson.stream.JsonReader):720:721 -> a
     68:91:com.android.tools.r8.com.google.gson.JsonElement read(com.android.tools.r8.com.google.gson.stream.JsonReader):718:741 -> a
     92:97:com.android.tools.r8.com.google.gson.JsonElement read(com.android.tools.r8.com.google.gson.stream.JsonReader):728:733 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$3 -> com.android.tools.r8.q.a.b.l.g.q:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$3 -> com.android.tools.r8.p.a.b.l.g.q:
     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 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 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.q.a.b.l.g.r:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$5 -> com.android.tools.r8.p.a.b.l.g.r:
     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 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 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.q.a.b.l.g.s:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$6 -> com.android.tools.r8.p.a.b.l.g.s:
     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 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 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.q.a.b.l.g.t:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$7 -> com.android.tools.r8.p.a.b.l.g.t:
     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 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 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.q.a.b.l.g.u:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$8 -> com.android.tools.r8.p.a.b.l.g.u:
     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 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 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.q.a.b.l.g.v:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$9 -> com.android.tools.r8.p.a.b.l.g.v:
     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 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 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.q.a.b.m.a:
+com.android.tools.r8.com.google.gson.stream.JsonReader -> com.android.tools.r8.p.a.b.m.a:
     long peekedLong -> i
     char[] buffer -> c
     int stackSize -> m
@@ -12451,7 +12452,7 @@
     1:52:java.lang.String nextUnquotedValue():1032:1083 -> 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.q.a.b.m.b:
+com.android.tools.r8.com.google.gson.stream.JsonToken -> com.android.tools.r8.p.a.b.m.b:
     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
@@ -12466,7 +12467,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.q.a.b.m.c:
+com.android.tools.r8.com.google.gson.stream.JsonWriter -> com.android.tools.r8.p.a.b.m.c:
     java.lang.String deferredName -> f
     java.lang.String[] HTML_SAFE_REPLACEMENT_CHARS -> i
     int[] stack -> b
@@ -12519,7 +12520,7 @@
     10:11:void writeDeferredName():402:403 -> h
     12:12:void beforeName():616:616 -> h
     12:12:void writeDeferredName():401 -> h
-com.android.tools.r8.com.google.gson.stream.MalformedJsonException -> com.android.tools.r8.q.a.b.m.d:
+com.android.tools.r8.com.google.gson.stream.MalformedJsonException -> com.android.tools.r8.p.a.b.m.d:
     1:1:void <init>(java.lang.String):29:29 -> <init>
 com.android.tools.r8.compatdexbuilder.CompatDexBuilder -> com.android.tools.r8.compatdexbuilder.CompatDexBuilder:
     java.lang.String input -> a
@@ -12833,122 +12834,126 @@
 com.android.tools.r8.dex.ApplicationWriter -> com.android.tools.r8.dex.b:
     com.android.tools.r8.graph.DexApplication application -> a
     com.android.tools.r8.graph.AppView appView -> b
-    java.util.List markers -> f
-    com.android.tools.r8.DexIndexedConsumer programConsumer -> h
-    boolean $assertionsDisabled -> j
+    com.android.tools.r8.DexIndexedConsumer programConsumer -> i
+    boolean $assertionsDisabled -> k
     com.android.tools.r8.graph.GraphLense graphLense -> c
+    com.android.tools.r8.dex.CodeToKeep desugaredLibraryCodeToKeep -> f
     com.android.tools.r8.utils.InternalOptions options -> e
     com.android.tools.r8.naming.NamingLens namingLens -> d
-    java.util.List markerStrings -> g
-    com.android.tools.r8.naming.ProguardMapSupplier proguardMapSupplier -> i
+    java.util.List markerStrings -> h
+    java.util.List markers -> g
+    com.android.tools.r8.naming.ProguardMapSupplier proguardMapSupplier -> j
     1:1:void <clinit>():67:67 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,java.util.List,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.naming.ProguardMapSupplier):145:145 -> <init>
-    2:12:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,java.util.List,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.naming.ProguardMapSupplier,com.android.tools.r8.DexIndexedConsumer):164:174 -> <init>
-    1:2:void encodeChecksums(java.lang.Iterable):204:205 -> a
+    1:1:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,java.util.List,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.naming.ProguardMapSupplier):146:146 -> <init>
+    2:13:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,java.util.List,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.naming.ProguardMapSupplier,com.android.tools.r8.DexIndexedConsumer):165:176 -> <init>
+    1:2:void encodeChecksums(java.lang.Iterable):206:207 -> a
     3:3:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap.<init>(int):110:110 -> a
-    3:3:void encodeChecksums(java.lang.Iterable):205 -> a
-    4:4:void encodeChecksums(java.lang.Iterable):206:206 -> a
-    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():720:720 -> a
-    5:5:void encodeChecksums(java.lang.Iterable):207 -> a
-    6:13:void encodeChecksums(java.lang.Iterable):207:214 -> a
-    14:44:void write(java.util.concurrent.ExecutorService):219:249 -> a
-    45:57:void write(java.util.concurrent.ExecutorService):247:259 -> a
-    58:122:void write(java.util.concurrent.ExecutorService):258:322 -> a
-    123:131:void write(java.util.concurrent.ExecutorService):316:324 -> a
-    132:132:void lambda$write$0(com.android.tools.r8.dex.ApplicationWriter$SortAnnotations,com.android.tools.r8.graph.DexProgramClass):252:252 -> a
-    133:137:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):263:267 -> a
-    138:138:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():353:353 -> a
-    138:138:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):267 -> a
-    139:146:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):270:277 -> a
-    147:147:com.android.tools.r8.DexIndexedConsumer com.android.tools.r8.utils.InternalOptions.getDexIndexedConsumer():349:349 -> a
-    147:147:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):277 -> a
-    148:151:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):281:284 -> a
-    152:152:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):283:283 -> a
-    153:158:com.android.tools.r8.dex.FileWriter$ByteBufferResult writeDexFile(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.dex.MethodToCodeObjectMapping,com.android.tools.r8.ByteBufferProvider):578:583 -> a
-    153:158:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):286 -> a
-    159:167:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):287:295 -> a
-    168:178:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):292:302 -> a
-    179:188:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):299:308 -> a
-    189:192:void supplyAdditionalConsumers(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,java.lang.String):335:338 -> a
-    193:199:void supplyAdditionalConsumers(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,java.lang.String):336:342 -> a
-    200:202:boolean validateProguardMapParses(java.lang.String):445:447 -> a
-    200:202:void supplyAdditionalConsumers(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,java.lang.String):342 -> a
-    203:210:void supplyAdditionalConsumers(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,java.lang.String):342:349 -> a
-    211:258:void supplyAdditionalConsumers(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,java.lang.String):348:395 -> a
-    259:259:void supplyAdditionalConsumers(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,java.lang.String):394:394 -> a
-    260:260:void lambda$supplyAdditionalConsumers$2(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):371:371 -> a
-    261:270:void lambda$supplyAdditionalConsumers$2(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):370:379 -> a
-    271:279:void lambda$supplyAdditionalConsumers$2(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):374:382 -> a
-    280:280:void lambda$supplyAdditionalConsumers$2(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):373:373 -> a
-    281:281:void lambda$supplyAdditionalConsumers$2(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):372:372 -> a
-    282:315:void adaptAndPassDataResources(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.DataResourceConsumer,java.util.Collection,com.android.tools.r8.dex.ResourceAdapter):405:438 -> a
-    316:329:void insertAttributeAnnotations():455:468 -> a
-    330:330:void insertAttributeAnnotations():467:467 -> a
-    331:339:void insertAttributeAnnotations():466:474 -> a
-    340:340:void insertAttributeAnnotations():473:473 -> a
-    341:357:void insertAttributeAnnotations():472:488 -> a
-    358:364:void insertAttributeAnnotations():487:493 -> a
-    365:374:com.android.tools.r8.graph.DexAnnotation com.android.tools.r8.graph.DexAnnotation.createInnerClassAnnotation(com.android.tools.r8.graph.DexString,int,com.android.tools.r8.graph.DexItemFactory):142:151 -> a
-    365:374:void insertAttributeAnnotations():491 -> a
-    375:383:void insertAttributeAnnotations():490:498 -> a
-    384:384:void insertAttributeAnnotations():497:497 -> a
-    385:396:void insertAttributeAnnotations():496:507 -> a
-    397:407:void insertAttributeAnnotations():506:516 -> a
-    408:408:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.concat(java.lang.Object[],java.lang.Object[],java.lang.Class):72:72 -> a
-    408:408:void insertAttributeAnnotations():514 -> a
-    409:409:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.newArray(java.lang.Class,int):49:49 -> a
-    409:409:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.concat(java.lang.Object[],java.lang.Object[],java.lang.Class):72 -> a
-    409:409:void insertAttributeAnnotations():514 -> a
-    410:411:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.concat(java.lang.Object[],java.lang.Object[],java.lang.Class):73:74 -> a
-    410:411:void insertAttributeAnnotations():514 -> a
-    412:421:void insertAttributeAnnotations():514:523 -> a
-    422:424:com.android.tools.r8.dex.MethodToCodeObjectMapping rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,java.util.Collection,com.android.tools.r8.graph.DexApplication):539:541 -> a
-    425:425:com.android.tools.r8.dex.MethodToCodeObjectMapping com.android.tools.r8.dex.MethodToCodeObjectMapping.fromMethodBacking():21:21 -> a
-    425:425:com.android.tools.r8.dex.MethodToCodeObjectMapping rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,java.util.Collection,com.android.tools.r8.graph.DexApplication):542 -> a
-    426:427:com.android.tools.r8.dex.MethodToCodeObjectMapping rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,java.util.Collection,com.android.tools.r8.graph.DexApplication):545:546 -> a
-    428:428:com.android.tools.r8.dex.MethodToCodeObjectMapping com.android.tools.r8.dex.MethodToCodeObjectMapping.fromMethodBacking():21:21 -> a
-    428:428:com.android.tools.r8.dex.MethodToCodeObjectMapping rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,java.util.Collection,com.android.tools.r8.graph.DexApplication):547 -> a
-    429:432:com.android.tools.r8.dex.MethodToCodeObjectMapping rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,java.util.Collection,com.android.tools.r8.graph.DexApplication):552:555 -> a
-    433:433:com.android.tools.r8.dex.MethodToCodeObjectMapping com.android.tools.r8.dex.MethodToCodeObjectMapping.fromMapBacking(java.util.Map):25:25 -> a
-    433:433:com.android.tools.r8.dex.MethodToCodeObjectMapping rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,java.util.Collection,com.android.tools.r8.graph.DexApplication):571 -> a
-    434:444:void lambda$rewriteCodeWithJumboStrings$3(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexApplication,java.util.Map,boolean,com.android.tools.r8.graph.DexEncodedMethod):557:567 -> a
-    445:446:java.lang.String mapMainDexListName(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.NamingLens):587:588 -> a
-    445:446:void lambda$writeMainDexList$4(java.lang.StringBuilder,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexType):596 -> a
-    447:447:void lambda$writeMainDexList$4(java.lang.StringBuilder,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexType):596:596 -> a
-    448:453:java.lang.String writeMainDexList(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.naming.NamingLens):592:597 -> a
-    1:1:java.lang.Iterable distribute(java.util.concurrent.ExecutorService):181:181 -> b
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():341:341 -> b
-    2:2:java.lang.Iterable distribute(java.util.concurrent.ExecutorService):181 -> b
-    3:3:java.lang.Iterable distribute(java.util.concurrent.ExecutorService):182:182 -> b
-    4:4:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():353:353 -> b
-    4:4:java.lang.Iterable distribute(java.util.concurrent.ExecutorService):183 -> b
-    5:15:java.lang.Iterable distribute(java.util.concurrent.ExecutorService):183:193 -> b
+    3:3:void encodeChecksums(java.lang.Iterable):207 -> a
+    4:4:void encodeChecksums(java.lang.Iterable):208:208 -> a
+    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():770:770 -> a
+    5:5:void encodeChecksums(java.lang.Iterable):209 -> a
+    6:13:void encodeChecksums(java.lang.Iterable):209:216 -> a
+    14:44:void write(java.util.concurrent.ExecutorService):221:251 -> a
+    45:57:void write(java.util.concurrent.ExecutorService):249:261 -> a
+    58:115:void write(java.util.concurrent.ExecutorService):260:317 -> a
+    116:116:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():316:316 -> a
+    116:116:void write(java.util.concurrent.ExecutorService):317 -> a
+    117:129:void write(java.util.concurrent.ExecutorService):317:329 -> a
+    130:138:void write(java.util.concurrent.ExecutorService):323:331 -> a
+    139:139:void lambda$write$0(com.android.tools.r8.dex.ApplicationWriter$SortAnnotations,com.android.tools.r8.graph.DexProgramClass):254:254 -> a
+    140:144:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):265:269 -> a
+    145:145:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():345:345 -> a
+    145:145:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):269 -> a
+    146:153:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):272:279 -> a
+    154:154:com.android.tools.r8.DexIndexedConsumer com.android.tools.r8.utils.InternalOptions.getDexIndexedConsumer():341:341 -> a
+    154:154:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):279 -> a
+    155:158:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):283:286 -> a
+    159:159:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):285:285 -> a
+    160:172:com.android.tools.r8.dex.FileWriter$ByteBufferResult writeDexFile(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.dex.MethodToCodeObjectMapping,com.android.tools.r8.ByteBufferProvider):585:597 -> a
+    160:172:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):288 -> a
+    173:181:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):289:297 -> a
+    182:192:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):294:304 -> a
+    193:202:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):301:310 -> a
+    203:206:void supplyAdditionalConsumers(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,java.lang.String):342:345 -> a
+    207:213:void supplyAdditionalConsumers(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,java.lang.String):343:349 -> a
+    214:216:boolean validateProguardMapParses(java.lang.String):452:454 -> a
+    214:216:void supplyAdditionalConsumers(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,java.lang.String):349 -> a
+    217:224:void supplyAdditionalConsumers(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,java.lang.String):349:356 -> a
+    225:272:void supplyAdditionalConsumers(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,java.lang.String):355:402 -> a
+    273:273:void supplyAdditionalConsumers(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,java.lang.String):401:401 -> a
+    274:274:void lambda$supplyAdditionalConsumers$2(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):378:378 -> a
+    275:284:void lambda$supplyAdditionalConsumers$2(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):377:386 -> a
+    285:293:void lambda$supplyAdditionalConsumers$2(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):381:389 -> a
+    294:294:void lambda$supplyAdditionalConsumers$2(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):380:380 -> a
+    295:295:void lambda$supplyAdditionalConsumers$2(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):379:379 -> a
+    296:329:void adaptAndPassDataResources(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.DataResourceConsumer,java.util.Collection,com.android.tools.r8.dex.ResourceAdapter):412:445 -> a
+    330:343:void insertAttributeAnnotations():462:475 -> a
+    344:344:void insertAttributeAnnotations():474:474 -> a
+    345:353:void insertAttributeAnnotations():473:481 -> a
+    354:354:void insertAttributeAnnotations():480:480 -> a
+    355:371:void insertAttributeAnnotations():479:495 -> a
+    372:378:void insertAttributeAnnotations():494:500 -> a
+    379:388:com.android.tools.r8.graph.DexAnnotation com.android.tools.r8.graph.DexAnnotation.createInnerClassAnnotation(com.android.tools.r8.graph.DexString,int,com.android.tools.r8.graph.DexItemFactory):142:151 -> a
+    379:388:void insertAttributeAnnotations():498 -> a
+    389:397:void insertAttributeAnnotations():497:505 -> a
+    398:398:void insertAttributeAnnotations():504:504 -> a
+    399:410:void insertAttributeAnnotations():503:514 -> a
+    411:421:void insertAttributeAnnotations():513:523 -> a
+    422:422:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.concat(java.lang.Object[],java.lang.Object[],java.lang.Class):72:72 -> a
+    422:422:void insertAttributeAnnotations():521 -> a
+    423:423:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.newArray(java.lang.Class,int):49:49 -> a
+    423:423:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.concat(java.lang.Object[],java.lang.Object[],java.lang.Class):72 -> a
+    423:423:void insertAttributeAnnotations():521 -> a
+    424:425:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.concat(java.lang.Object[],java.lang.Object[],java.lang.Class):73:74 -> a
+    424:425:void insertAttributeAnnotations():521 -> a
+    426:435:void insertAttributeAnnotations():521:530 -> a
+    436:438:com.android.tools.r8.dex.MethodToCodeObjectMapping rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,java.util.Collection,com.android.tools.r8.graph.DexApplication):546:548 -> a
+    439:439:com.android.tools.r8.dex.MethodToCodeObjectMapping com.android.tools.r8.dex.MethodToCodeObjectMapping.fromMethodBacking():21:21 -> a
+    439:439:com.android.tools.r8.dex.MethodToCodeObjectMapping rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,java.util.Collection,com.android.tools.r8.graph.DexApplication):549 -> a
+    440:441:com.android.tools.r8.dex.MethodToCodeObjectMapping rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,java.util.Collection,com.android.tools.r8.graph.DexApplication):552:553 -> a
+    442:442:com.android.tools.r8.dex.MethodToCodeObjectMapping com.android.tools.r8.dex.MethodToCodeObjectMapping.fromMethodBacking():21:21 -> a
+    442:442:com.android.tools.r8.dex.MethodToCodeObjectMapping rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,java.util.Collection,com.android.tools.r8.graph.DexApplication):554 -> a
+    443:446:com.android.tools.r8.dex.MethodToCodeObjectMapping rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,java.util.Collection,com.android.tools.r8.graph.DexApplication):559:562 -> a
+    447:447:com.android.tools.r8.dex.MethodToCodeObjectMapping com.android.tools.r8.dex.MethodToCodeObjectMapping.fromMapBacking(java.util.Map):25:25 -> a
+    447:447:com.android.tools.r8.dex.MethodToCodeObjectMapping rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,java.util.Collection,com.android.tools.r8.graph.DexApplication):578 -> a
+    448:458:void lambda$rewriteCodeWithJumboStrings$3(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexApplication,java.util.Map,boolean,com.android.tools.r8.graph.DexEncodedMethod):564:574 -> a
+    459:460:java.lang.String mapMainDexListName(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.NamingLens):601:602 -> a
+    459:460:void lambda$writeMainDexList$4(java.lang.StringBuilder,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexType):610 -> a
+    461:461:void lambda$writeMainDexList$4(java.lang.StringBuilder,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexType):610:610 -> a
+    462:467:java.lang.String writeMainDexList(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.naming.NamingLens):606:611 -> a
+    1:1:java.lang.Iterable distribute(java.util.concurrent.ExecutorService):183:183 -> b
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():333:333 -> b
+    2:2:java.lang.Iterable distribute(java.util.concurrent.ExecutorService):183 -> b
+    3:3:java.lang.Iterable distribute(java.util.concurrent.ExecutorService):184:184 -> b
+    4:4:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():345:345 -> b
+    4:4:java.lang.Iterable distribute(java.util.concurrent.ExecutorService):185 -> b
+    5:15:java.lang.Iterable distribute(java.util.concurrent.ExecutorService):185:195 -> b
 com.android.tools.r8.dex.ApplicationWriter$1 -> com.android.tools.r8.dex.b$a:
     com.android.tools.r8.dex.ResourceAdapter val$resourceAdapter -> a
     com.android.tools.r8.DataResourceConsumer val$dataResourceConsumer -> b
     java.util.Set val$generatedResourceNames -> d
     com.android.tools.r8.utils.InternalOptions val$options -> c
-    1:1:void <init>(com.android.tools.r8.dex.ResourceAdapter,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,java.util.Set):410:410 -> <init>
-    1:4:void visit(com.android.tools.r8.DataDirectoryResource):413:416 -> visit
-    5:5:void visit(com.android.tools.r8.DataEntryResource):422:422 -> visit
+    1:1:void <init>(com.android.tools.r8.dex.ResourceAdapter,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,java.util.Set):417:417 -> <init>
+    1:4:void visit(com.android.tools.r8.DataDirectoryResource):420:423 -> visit
+    5:5:void visit(com.android.tools.r8.DataEntryResource):429:429 -> visit
     6:6:boolean com.android.tools.r8.dex.ResourceAdapter.isService(com.android.tools.r8.DataEntryResource):97:97 -> visit
-    6:6:void visit(com.android.tools.r8.DataEntryResource):422 -> visit
-    7:12:void visit(com.android.tools.r8.DataEntryResource):427:432 -> visit
-    13:16:void visit(com.android.tools.r8.DataEntryResource):431:434 -> visit
+    6:6:void visit(com.android.tools.r8.DataEntryResource):429 -> visit
+    7:12:void visit(com.android.tools.r8.DataEntryResource):434:439 -> visit
+    13:16:void visit(com.android.tools.r8.DataEntryResource):438:441 -> visit
     17:17:boolean com.android.tools.r8.dex.ResourceAdapter.isService(com.android.tools.r8.DataEntryResource):97:97 -> visit
-    17:17:void visit(com.android.tools.r8.DataEntryResource):422 -> visit
+    17:17:void visit(com.android.tools.r8.DataEntryResource):429 -> visit
 com.android.tools.r8.dex.ApplicationWriter$SortAnnotations -> com.android.tools.r8.dex.b$b:
-    1:1:void <init>():80:80 -> <init>
-    2:2:void <init>(com.android.tools.r8.dex.ApplicationWriter$1):80:80 -> <init>
+    1:1:void <init>():81:81 -> <init>
+    2:2:void <init>(com.android.tools.r8.dex.ApplicationWriter$1):81:81 -> <init>
     boolean add(com.android.tools.r8.graph.DexCode) -> a
     boolean add(com.android.tools.r8.graph.DexDebugInfo) -> a
     boolean add(com.android.tools.r8.graph.DexProgramClass) -> a
     boolean add(com.android.tools.r8.graph.DexTypeList) -> a
     boolean add(com.android.tools.r8.graph.ParameterAnnotationsList) -> a
     boolean setAnnotationsDirectoryForClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotationDirectory) -> a
-    1:1:boolean add(com.android.tools.r8.graph.DexAnnotationSet):85:85 -> a
-    2:2:boolean add(com.android.tools.r8.graph.DexAnnotation):92:92 -> a
-    3:4:boolean add(com.android.tools.r8.graph.DexEncodedArray):99:100 -> a
+    1:1:boolean add(com.android.tools.r8.graph.DexAnnotationSet):86:86 -> a
+    2:2:boolean add(com.android.tools.r8.graph.DexAnnotation):93:93 -> a
+    3:4:boolean add(com.android.tools.r8.graph.DexEncodedArray):100:101 -> a
 com.android.tools.r8.dex.BinaryReader -> com.android.tools.r8.dex.c:
     com.android.tools.r8.origin.Origin origin -> a
     com.android.tools.r8.dex.CompatByteBuffer buffer -> b
@@ -12990,7 +12995,7 @@
     void recordField(com.android.tools.r8.graph.DexField) -> a
     void recordMethod(com.android.tools.r8.graph.DexMethod) -> a
     1:2:com.android.tools.r8.dex.CodeToKeep createCodeToKeep(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.NamingLens):23:24 -> a
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():324:324 -> a
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():316:316 -> a
     3:3:com.android.tools.r8.dex.CodeToKeep createCodeToKeep(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.NamingLens):25 -> a
     4:6:com.android.tools.r8.dex.CodeToKeep createCodeToKeep(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.NamingLens):26:28 -> a
     void recordClassAllAccesses(com.android.tools.r8.graph.DexType) -> b
@@ -13011,9 +13016,9 @@
     1:3:void recordClassAllAccesses(com.android.tools.r8.graph.DexType):103:105 -> b
     1:3:java.lang.String convertType(com.android.tools.r8.graph.DexType):120:122 -> c
     1:1:void keepClass(com.android.tools.r8.graph.DexType):110:110 -> d
-    2:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexType.lookupBaseType(com.android.tools.r8.graph.DexItemFactory):321:328 -> d
+    2:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexType.lookupBaseType(com.android.tools.r8.graph.DexItemFactory):337:344 -> d
     2:9:void keepClass(com.android.tools.r8.graph.DexType):110 -> d
-    10:14:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexType.lookupBaseType(com.android.tools.r8.graph.DexItemFactory):326:330 -> d
+    10:14:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexType.lookupBaseType(com.android.tools.r8.graph.DexItemFactory):342:346 -> d
     10:14:void keepClass(com.android.tools.r8.graph.DexType):110 -> d
     15:15:void keepClass(com.android.tools.r8.graph.DexType):111:111 -> d
     1:1:boolean shouldKeep(com.android.tools.r8.graph.DexType):64:64 -> e
@@ -13320,7 +13325,7 @@
     150:150:void ensureCodesInited(int):161 -> a
     150:150:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean,boolean):642 -> a
     151:165:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean,boolean):643:657 -> a
-    166:166:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():345:345 -> a
+    166:166:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():337:337 -> a
     166:166:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean,boolean):657 -> a
     167:170:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean,boolean):658:661 -> a
     171:171:int com.android.tools.r8.dex.BinaryReader.getUleb128():44:44 -> a
@@ -13744,278 +13749,275 @@
     com.android.tools.r8.dex.FileWriter$MixedSectionOffsets mixedSectionOffsets -> g
     com.android.tools.r8.graph.DexApplication application -> c
     1:1:void <clinit>():74:74 -> <clinit>
-    1:9:void <init>(com.android.tools.r8.ByteBufferProvider,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.dex.MethodToCodeObjectMapping,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.NamingLens):104:112 -> <init>
+    1:9:void <init>(com.android.tools.r8.ByteBufferProvider,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.dex.MethodToCodeObjectMapping,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.dex.CodeToKeep):105:113 -> <init>
     1:1:com.android.tools.r8.dex.FileWriter$MixedSectionOffsets access$300(com.android.tools.r8.dex.FileWriter):74:74 -> a
-    2:3:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):117:118 -> a
+    2:3:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):118:119 -> a
     4:4:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    4:4:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):118 -> a
-    5:5:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):120:120 -> a
+    4:4:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):119 -> a
+    5:5:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):121:121 -> a
     6:6:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    6:6:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):120 -> a
-    7:7:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):121:121 -> a
+    6:6:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):121 -> a
+    7:7:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):122:122 -> a
     8:8:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    8:8:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):121 -> a
-    9:9:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):122:122 -> a
+    8:8:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):122 -> a
+    9:9:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):123:123 -> a
     10:10:boolean com.android.tools.r8.graph.PresortedComparable.isSorted(java.lang.Object[],java.util.function.Function):19:19 -> a
-    10:10:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):122 -> a
-    11:13:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):122:124 -> a
+    10:10:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):123 -> a
+    11:13:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):123:125 -> a
     14:14:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    14:14:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):124 -> a
-    15:15:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):125:125 -> a
+    14:14:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):125 -> a
+    15:15:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):126:126 -> a
     16:16:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    16:16:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):120 -> a
-    17:17:com.android.tools.r8.graph.DexString lambda$writeEncodedAnnotation$0(com.android.tools.r8.graph.DexAnnotationElement):122:122 -> a
-    18:38:com.android.tools.r8.dex.FileWriter collect():131:151 -> a
-    39:76:void checkInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):256:293 -> a
+    16:16:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):121 -> a
+    17:17:com.android.tools.r8.graph.DexString lambda$writeEncodedAnnotation$0(com.android.tools.r8.graph.DexAnnotationElement):123:123 -> a
+    18:38:com.android.tools.r8.dex.FileWriter collect():132:152 -> a
+    39:76:void checkInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):251:288 -> a
     77:77:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    77:77:void checkInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):293 -> a
-    78:78:void checkInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):293:293 -> a
-    79:80:void checkInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):269:270 -> a
+    77:77:void checkInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):288 -> a
+    78:78:void checkInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):288:288 -> a
+    79:80:void checkInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):264:265 -> a
     81:81:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    81:81:void checkInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):270 -> a
-    82:82:void checkInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):270:270 -> a
-    83:88:void lambda$sortDexCodesByClassName$1(java.util.List,java.util.Map,com.android.tools.r8.graph.DexEncodedMethod):324:329 -> a
-    89:95:void addSignaturesFromMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexCode,java.util.Map,com.android.tools.r8.naming.ClassNameMapper):345:351 -> a
-    89:95:void lambda$sortDexCodesByClassName$1(java.util.List,java.util.Map,com.android.tools.r8.graph.DexEncodedMethod):328 -> a
-    96:98:void writeFixedSectionItems(java.util.Collection,int,java.util.function.Consumer):356:358 -> a
-    99:103:void writeItems(java.util.Collection,java.util.function.Consumer,java.util.function.Consumer,int):377:381 -> a
-    104:105:void writeTypeItem(com.android.tools.r8.graph.DexType):430:431 -> a
-    106:108:void writeProtoItem(com.android.tools.r8.graph.DexProto):435:437 -> a
-    109:116:void writeFieldItem(com.android.tools.r8.graph.DexField):441:448 -> a
-    117:124:void writeMethodItem(com.android.tools.r8.graph.DexMethod):452:459 -> a
-    125:126:void writeDebugItem(com.android.tools.r8.graph.DexDebugInfo):477:478 -> a
-    127:141:void writeCodeItem(com.android.tools.r8.graph.DexCode):482:496 -> a
+    81:81:void checkInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):265 -> a
+    82:82:void checkInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):265:265 -> a
+    83:88:void lambda$sortDexCodesByClassName$1(java.util.List,java.util.Map,com.android.tools.r8.graph.DexEncodedMethod):319:324 -> a
+    89:95:void addSignaturesFromMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexCode,java.util.Map,com.android.tools.r8.naming.ClassNameMapper):340:346 -> a
+    89:95:void lambda$sortDexCodesByClassName$1(java.util.List,java.util.Map,com.android.tools.r8.graph.DexEncodedMethod):323 -> a
+    96:98:void writeFixedSectionItems(java.util.Collection,int,java.util.function.Consumer):351:353 -> a
+    99:103:void writeItems(java.util.Collection,java.util.function.Consumer,java.util.function.Consumer,int):372:376 -> a
+    104:105:void writeTypeItem(com.android.tools.r8.graph.DexType):425:426 -> a
+    106:108:void writeProtoItem(com.android.tools.r8.graph.DexProto):430:432 -> a
+    109:116:void writeFieldItem(com.android.tools.r8.graph.DexField):436:443 -> a
+    117:124:void writeMethodItem(com.android.tools.r8.graph.DexMethod):447:454 -> a
+    125:126:void writeDebugItem(com.android.tools.r8.graph.DexDebugInfo):472:473 -> a
+    127:141:void writeCodeItem(com.android.tools.r8.graph.DexCode):477:491 -> a
     142:142:void com.android.tools.r8.dex.DexOutputBuffer.rewind(int):166:166 -> a
-    142:142:void writeCodeItem(com.android.tools.r8.graph.DexCode):496 -> a
-    143:151:void writeCodeItem(com.android.tools.r8.graph.DexCode):497:505 -> a
+    142:142:void writeCodeItem(com.android.tools.r8.graph.DexCode):491 -> a
+    143:151:void writeCodeItem(com.android.tools.r8.graph.DexCode):492:500 -> a
     152:152:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    152:152:void writeCodeItem(com.android.tools.r8.graph.DexCode):505 -> a
-    153:158:void writeCodeItem(com.android.tools.r8.graph.DexCode):506:511 -> a
+    152:152:void writeCodeItem(com.android.tools.r8.graph.DexCode):500 -> a
+    153:158:void writeCodeItem(com.android.tools.r8.graph.DexCode):501:506 -> a
     159:159:void com.android.tools.r8.dex.DexOutputBuffer.putSleb128(int):84:84 -> a
-    159:159:void writeCodeItem(com.android.tools.r8.graph.DexCode):511 -> a
-    160:161:void writeCodeItem(com.android.tools.r8.graph.DexCode):512:513 -> a
+    159:159:void writeCodeItem(com.android.tools.r8.graph.DexCode):506 -> a
+    160:161:void writeCodeItem(com.android.tools.r8.graph.DexCode):507:508 -> a
     162:162:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    162:162:void writeCodeItem(com.android.tools.r8.graph.DexCode):513 -> a
-    163:163:void writeCodeItem(com.android.tools.r8.graph.DexCode):514:514 -> a
+    162:162:void writeCodeItem(com.android.tools.r8.graph.DexCode):508 -> a
+    163:163:void writeCodeItem(com.android.tools.r8.graph.DexCode):509:509 -> a
     164:164:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    164:164:void writeCodeItem(com.android.tools.r8.graph.DexCode):514 -> a
+    164:164:void writeCodeItem(com.android.tools.r8.graph.DexCode):509 -> a
     165:165:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    165:165:void writeCodeItem(com.android.tools.r8.graph.DexCode):513 -> a
-    166:166:void writeCodeItem(com.android.tools.r8.graph.DexCode):517:517 -> a
+    165:165:void writeCodeItem(com.android.tools.r8.graph.DexCode):508 -> a
+    166:166:void writeCodeItem(com.android.tools.r8.graph.DexCode):512:512 -> a
     167:167:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    167:167:void writeCodeItem(com.android.tools.r8.graph.DexCode):517 -> a
+    167:167:void writeCodeItem(com.android.tools.r8.graph.DexCode):512 -> a
     168:168:void com.android.tools.r8.dex.DexOutputBuffer.putSleb128(int):84:84 -> a
-    168:168:void writeCodeItem(com.android.tools.r8.graph.DexCode):511 -> a
-    169:178:void writeCodeItem(com.android.tools.r8.graph.DexCode):520:529 -> a
+    168:168:void writeCodeItem(com.android.tools.r8.graph.DexCode):506 -> a
+    169:178:void writeCodeItem(com.android.tools.r8.graph.DexCode):515:524 -> a
     179:179:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    179:179:void writeCodeItem(com.android.tools.r8.graph.DexCode):505 -> a
-    180:185:void writeTypeList(com.android.tools.r8.graph.DexTypeList):534:539 -> a
-    186:187:void writeStringData(com.android.tools.r8.graph.DexString):544:545 -> a
+    179:179:void writeCodeItem(com.android.tools.r8.graph.DexCode):500 -> a
+    180:185:void writeTypeList(com.android.tools.r8.graph.DexTypeList):529:534 -> a
+    186:187:void writeStringData(com.android.tools.r8.graph.DexString):539:540 -> a
     188:188:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    188:188:void writeStringData(com.android.tools.r8.graph.DexString):545 -> a
-    189:189:void writeStringData(com.android.tools.r8.graph.DexString):546:546 -> a
+    188:188:void writeStringData(com.android.tools.r8.graph.DexString):540 -> a
+    189:189:void writeStringData(com.android.tools.r8.graph.DexString):541:541 -> a
     190:190:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    190:190:void writeStringData(com.android.tools.r8.graph.DexString):545 -> a
-    191:191:com.android.tools.r8.graph.DexType lambda$writeAnnotationSet$2(com.android.tools.r8.graph.DexAnnotation):559:559 -> a
-    192:192:void writeAnnotationSet(com.android.tools.r8.graph.DexAnnotationSet):559:559 -> a
+    190:190:void writeStringData(com.android.tools.r8.graph.DexString):540 -> a
+    191:191:com.android.tools.r8.graph.DexType lambda$writeAnnotationSet$2(com.android.tools.r8.graph.DexAnnotation):554:554 -> a
+    192:192:void writeAnnotationSet(com.android.tools.r8.graph.DexAnnotationSet):554:554 -> a
     193:193:boolean com.android.tools.r8.graph.PresortedComparable.isSorted(java.lang.Object[],java.util.function.Function):19:19 -> a
-    193:193:void writeAnnotationSet(com.android.tools.r8.graph.DexAnnotationSet):559 -> a
-    194:198:void writeAnnotationSet(com.android.tools.r8.graph.DexAnnotationSet):559:563 -> a
+    193:193:void writeAnnotationSet(com.android.tools.r8.graph.DexAnnotationSet):554 -> a
+    194:198:void writeAnnotationSet(com.android.tools.r8.graph.DexAnnotationSet):554:558 -> a
     199:199:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    199:199:void writeAnnotationSet(com.android.tools.r8.graph.DexAnnotationSet):563 -> a
-    200:202:void writeAnnotationSet(com.android.tools.r8.graph.DexAnnotationSet):565:567 -> a
-    203:212:void writeAnnotationSetRefList(com.android.tools.r8.graph.ParameterAnnotationsList):572:581 -> a
-    213:215:void writeMemberAnnotations(java.util.List,java.util.function.ToIntFunction):587:589 -> a
-    216:228:void writeAnnotationDirectory(com.android.tools.r8.graph.DexAnnotationDirectory):594:606 -> a
-    229:229:int lambda$writeAnnotationDirectory$3(com.android.tools.r8.graph.DexEncodedField):603:603 -> a
-    230:235:void writeEncodedFields(java.util.List):611:616 -> a
+    199:199:void writeAnnotationSet(com.android.tools.r8.graph.DexAnnotationSet):558 -> a
+    200:202:void writeAnnotationSet(com.android.tools.r8.graph.DexAnnotationSet):560:562 -> a
+    203:212:void writeAnnotationSetRefList(com.android.tools.r8.graph.ParameterAnnotationsList):567:576 -> a
+    213:215:void writeMemberAnnotations(java.util.List,java.util.function.ToIntFunction):582:584 -> a
+    216:228:void writeAnnotationDirectory(com.android.tools.r8.graph.DexAnnotationDirectory):589:601 -> a
+    229:229:int lambda$writeAnnotationDirectory$3(com.android.tools.r8.graph.DexEncodedField):598:598 -> a
+    230:235:void writeEncodedFields(java.util.List):606:611 -> a
     236:236:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    236:236:void writeEncodedFields(java.util.List):616 -> a
-    237:237:void writeEncodedFields(java.util.List):618:618 -> a
+    236:236:void writeEncodedFields(java.util.List):611 -> a
+    237:237:void writeEncodedFields(java.util.List):613:613 -> a
     238:238:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    238:238:void writeEncodedFields(java.util.List):618 -> a
-    239:239:void writeEncodedFields(java.util.List):619:619 -> a
+    238:238:void writeEncodedFields(java.util.List):613 -> a
+    239:239:void writeEncodedFields(java.util.List):614:614 -> a
     240:240:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    240:240:void writeEncodedFields(java.util.List):618 -> a
+    240:240:void writeEncodedFields(java.util.List):613 -> a
     241:241:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    241:241:void writeEncodedFields(java.util.List):616 -> a
-    242:247:void writeEncodedMethods(java.util.List,boolean):624:629 -> a
+    241:241:void writeEncodedFields(java.util.List):611 -> a
+    242:247:void writeEncodedMethods(java.util.List,boolean):619:624 -> a
     248:248:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    248:248:void writeEncodedMethods(java.util.List,boolean):629 -> a
-    249:249:void writeEncodedMethods(java.util.List,boolean):631:631 -> a
+    248:248:void writeEncodedMethods(java.util.List,boolean):624 -> a
+    249:249:void writeEncodedMethods(java.util.List,boolean):626:626 -> a
     250:250:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    250:250:void writeEncodedMethods(java.util.List,boolean):631 -> a
-    251:255:void writeEncodedMethods(java.util.List,boolean):632:636 -> a
+    250:250:void writeEncodedMethods(java.util.List,boolean):626 -> a
+    251:255:void writeEncodedMethods(java.util.List,boolean):627:631 -> a
     256:256:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    256:256:void writeEncodedMethods(java.util.List,boolean):636 -> a
-    257:257:void writeEncodedMethods(java.util.List,boolean):638:638 -> a
+    256:256:void writeEncodedMethods(java.util.List,boolean):631 -> a
+    257:257:void writeEncodedMethods(java.util.List,boolean):633:633 -> a
     258:258:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    258:258:void writeEncodedMethods(java.util.List,boolean):638 -> a
-    259:259:void writeEncodedMethods(java.util.List,boolean):641:641 -> a
+    258:258:void writeEncodedMethods(java.util.List,boolean):633 -> a
+    259:259:void writeEncodedMethods(java.util.List,boolean):636:636 -> a
     260:260:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    260:260:void writeEncodedMethods(java.util.List,boolean):638 -> a
+    260:260:void writeEncodedMethods(java.util.List,boolean):633 -> a
     261:261:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    261:261:void writeEncodedMethods(java.util.List,boolean):631 -> a
+    261:261:void writeEncodedMethods(java.util.List,boolean):626 -> a
     262:262:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    262:262:void writeEncodedMethods(java.util.List,boolean):629 -> a
-    263:269:void addStaticFieldValues(com.android.tools.r8.graph.DexProgramClass):665:671 -> a
-    270:272:void writeEncodedArray(com.android.tools.r8.graph.DexEncodedArray):708:710 -> a
+    262:262:void writeEncodedMethods(java.util.List,boolean):624 -> a
+    263:269:void addStaticFieldValues(com.android.tools.r8.graph.DexProgramClass):660:666 -> a
+    270:272:void writeEncodedArray(com.android.tools.r8.graph.DexEncodedArray):703:705 -> a
     273:273:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    273:273:void writeEncodedArray(com.android.tools.r8.graph.DexEncodedArray):710 -> a
-    274:274:void writeEncodedArray(com.android.tools.r8.graph.DexEncodedArray):712:712 -> a
+    273:273:void writeEncodedArray(com.android.tools.r8.graph.DexEncodedArray):705 -> a
+    274:274:void writeEncodedArray(com.android.tools.r8.graph.DexEncodedArray):707:707 -> a
     275:275:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    275:275:void writeEncodedArray(com.android.tools.r8.graph.DexEncodedArray):712 -> a
-    276:277:void writeEncodedArray(com.android.tools.r8.graph.DexEncodedArray):713:714 -> a
+    275:275:void writeEncodedArray(com.android.tools.r8.graph.DexEncodedArray):707 -> a
+    276:277:void writeEncodedArray(com.android.tools.r8.graph.DexEncodedArray):708:709 -> a
     278:278:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    278:278:void writeEncodedArray(com.android.tools.r8.graph.DexEncodedArray):712 -> a
-    279:285:int writeMapItem(int,int,int):722:728 -> a
-    286:286:void checkThatInvokeCustomIsAllowed():1370:1370 -> a
-    286:286:void writeCallSite(com.android.tools.r8.graph.DexCallSite):702 -> a
-    287:288:void writeCallSite(com.android.tools.r8.graph.DexCallSite):703:704 -> a
-    289:289:void checkThatInvokeCustomIsAllowed():1371:1371 -> a
-    289:289:void writeCallSite(com.android.tools.r8.graph.DexCallSite):702 -> a
-    290:290:void checkThatInvokeCustomIsAllowed():1370:1370 -> a
-    290:290:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):676 -> a
-    291:296:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):678:683 -> a
-    297:305:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):680:688 -> a
+    278:278:void writeEncodedArray(com.android.tools.r8.graph.DexEncodedArray):707 -> a
+    279:285:int writeMapItem(int,int,int):717:723 -> a
+    286:286:void checkThatInvokeCustomIsAllowed():1365:1365 -> a
+    286:286:void writeCallSite(com.android.tools.r8.graph.DexCallSite):697 -> a
+    287:288:void writeCallSite(com.android.tools.r8.graph.DexCallSite):698:699 -> a
+    289:289:void checkThatInvokeCustomIsAllowed():1366:1366 -> a
+    289:289:void writeCallSite(com.android.tools.r8.graph.DexCallSite):697 -> a
+    290:290:void checkThatInvokeCustomIsAllowed():1365:1365 -> a
+    290:290:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):671 -> a
+    291:296:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):673:678 -> a
+    297:305:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):675:683 -> a
     306:306:boolean com.android.tools.r8.graph.DexMethodHandle.isMethodHandle():297:297 -> a
-    306:306:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):690 -> a
-    307:309:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):691:693 -> a
+    306:306:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):685 -> a
+    307:309:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):686:688 -> a
     310:310:boolean com.android.tools.r8.graph.DexMethodHandle.isFieldHandle():293:293 -> a
-    310:310:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):693 -> a
-    311:316:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):693:698 -> a
-    317:317:void checkThatInvokeCustomIsAllowed():1371:1371 -> a
-    317:317:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):676 -> a
-    1:7:void checkInterfaceMethods():237:243 -> b
-    1:7:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():158 -> b
-    8:8:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():161:161 -> b
-    9:22:boolean verifyNames():298:311 -> b
-    9:22:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():161 -> b
-    23:33:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():163:173 -> b
-    34:34:int sizeOfCodeItems(java.lang.Iterable):387:387 -> b
-    34:34:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():173 -> b
-    35:57:int sizeOfCodeItem(com.android.tools.r8.graph.DexCode):397:419 -> b
-    35:57:int sizeOfCodeItems(java.lang.Iterable):389 -> b
-    35:57:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():173 -> b
+    310:310:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):688 -> a
+    311:316:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):688:693 -> a
+    317:317:void checkThatInvokeCustomIsAllowed():1366:1366 -> a
+    317:317:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):671 -> a
+    1:7:void checkInterfaceMethods():232:238 -> b
+    1:7:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():159 -> b
+    8:8:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():162:162 -> b
+    9:22:boolean verifyNames():293:306 -> b
+    9:22:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():162 -> b
+    23:33:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():164:174 -> b
+    34:34:int sizeOfCodeItems(java.lang.Iterable):382:382 -> b
+    34:34:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():174 -> b
+    35:57:int sizeOfCodeItem(com.android.tools.r8.graph.DexCode):392:414 -> b
+    35:57:int sizeOfCodeItems(java.lang.Iterable):384 -> b
+    35:57:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():174 -> b
     58:58:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> b
-    58:58:int sizeOfCodeItem(com.android.tools.r8.graph.DexCode):420 -> b
-    58:58:int sizeOfCodeItems(java.lang.Iterable):389 -> b
-    58:58:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():173 -> b
-    59:60:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():173:174 -> b
-    61:61:void writeItems(java.util.Collection,java.util.function.Consumer,java.util.function.Consumer):372:372 -> b
-    61:61:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():174 -> b
-    62:72:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():178:188 -> b
-    73:73:void writeItems(java.util.Collection,java.util.function.Consumer,java.util.function.Consumer):372:372 -> b
-    73:73:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():188 -> b
-    74:74:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():189:189 -> b
-    75:75:void writeItems(java.util.Collection,java.util.function.Consumer,java.util.function.Consumer):372:372 -> b
-    75:75:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():189 -> b
-    76:76:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():191:191 -> b
-    77:77:void writeItems(java.util.Collection,java.util.function.Consumer,java.util.function.Consumer):372:372 -> b
-    77:77:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():191 -> b
-    78:78:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():193:193 -> b
-    79:79:void writeItems(java.util.Collection,java.util.function.Consumer,java.util.function.Consumer):372:372 -> b
-    79:79:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():193 -> b
-    80:80:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():195:195 -> b
-    81:81:void writeItems(java.util.Collection,java.util.function.Consumer,java.util.function.Consumer):372:372 -> b
-    81:81:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():195 -> b
-    82:90:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():197:205 -> b
-    91:96:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):733:738 -> b
-    91:96:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():206 -> b
-    97:100:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):737:740 -> b
-    97:100:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():206 -> b
-    101:104:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):739:742 -> b
-    101:104:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():206 -> b
-    105:108:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):741:744 -> b
-    105:108:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():206 -> b
-    109:112:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):743:746 -> b
-    109:112:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():206 -> b
-    113:116:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):745:748 -> b
-    113:116:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():206 -> b
-    117:120:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):747:750 -> b
-    117:120:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():206 -> b
-    121:124:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):749:752 -> b
-    121:124:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():206 -> b
-    125:128:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):751:754 -> b
-    125:128:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():206 -> b
-    129:132:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):753:756 -> b
-    129:132:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():206 -> b
-    133:136:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):755:758 -> b
-    133:136:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():206 -> b
-    137:140:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):757:760 -> b
-    137:140:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():206 -> b
-    141:144:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):759:762 -> b
-    141:144:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():206 -> b
-    145:148:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):761:764 -> b
-    145:148:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():206 -> b
-    149:152:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):763:766 -> b
-    149:152:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():206 -> b
-    153:156:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):765:768 -> b
-    153:156:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():206 -> b
-    157:161:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):767:771 -> b
-    157:161:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():206 -> b
-    162:167:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):769:774 -> b
-    162:167:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():206 -> b
-    168:174:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):772:778 -> b
-    168:174:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():206 -> b
-    175:184:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():207:216 -> b
-    185:187:void writeFixedSectionItems(com.android.tools.r8.graph.DexProgramClass[],int,java.util.function.Consumer):364:366 -> b
-    185:187:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():216 -> b
-    188:190:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():217:219 -> b
-    191:191:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():218:218 -> b
-    192:198:void writeHeader(com.android.tools.r8.dex.FileWriter$Layout):782:788 -> b
-    192:198:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():222 -> b
-    199:200:void writeHeader(com.android.tools.r8.dex.FileWriter$Layout):787:788 -> b
-    199:200:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():222 -> b
-    201:235:void writeHeader(com.android.tools.r8.dex.FileWriter$Layout):784:818 -> b
-    201:235:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():222 -> b
-    236:238:void writeSignature(com.android.tools.r8.dex.FileWriter$Layout):823:825 -> b
-    236:238:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():223 -> b
-    239:241:void writeSignature(com.android.tools.r8.dex.FileWriter$Layout):824:826 -> b
-    239:241:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():223 -> b
-    242:244:void writeChecksum(com.android.tools.r8.dex.FileWriter$Layout):833:835 -> b
-    242:244:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():224 -> b
-    245:248:void writeChecksum(com.android.tools.r8.dex.FileWriter$Layout):834:837 -> b
-    245:248:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():224 -> b
-    249:250:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():227:228 -> b
-    251:251:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():324:324 -> b
-    251:251:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():228 -> b
-    252:257:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():228:233 -> b
-    258:258:void writeSignature(com.android.tools.r8.dex.FileWriter$Layout):828:828 -> b
-    258:258:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():223 -> b
-    259:259:void writeStringItem(com.android.tools.r8.graph.DexString):426:426 -> b
-    260:262:void writeAnnotation(com.android.tools.r8.graph.DexAnnotation):550:552 -> b
-    263:263:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> b
-    263:263:void writeAnnotation(com.android.tools.r8.graph.DexAnnotation):552 -> b
-    264:265:void writeAnnotation(com.android.tools.r8.graph.DexAnnotation):554:555 -> b
-    266:266:int lambda$writeAnnotationDirectory$4(com.android.tools.r8.graph.DexEncodedMethod):605:605 -> b
-    267:273:void writeClassData(com.android.tools.r8.graph.DexProgramClass):647:653 -> b
-    274:274:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> b
-    274:274:void writeClassData(com.android.tools.r8.graph.DexProgramClass):653 -> b
-    275:275:void writeClassData(com.android.tools.r8.graph.DexProgramClass):654:654 -> b
-    276:276:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> b
-    276:276:void writeClassData(com.android.tools.r8.graph.DexProgramClass):654 -> b
-    277:277:void writeClassData(com.android.tools.r8.graph.DexProgramClass):655:655 -> b
+    58:58:int sizeOfCodeItem(com.android.tools.r8.graph.DexCode):415 -> b
+    58:58:int sizeOfCodeItems(java.lang.Iterable):384 -> b
+    58:58:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():174 -> b
+    59:60:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():174:175 -> b
+    61:61:void writeItems(java.util.Collection,java.util.function.Consumer,java.util.function.Consumer):367:367 -> b
+    61:61:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():175 -> b
+    62:72:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():179:189 -> b
+    73:73:void writeItems(java.util.Collection,java.util.function.Consumer,java.util.function.Consumer):367:367 -> b
+    73:73:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():189 -> b
+    74:74:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():190:190 -> b
+    75:75:void writeItems(java.util.Collection,java.util.function.Consumer,java.util.function.Consumer):367:367 -> b
+    75:75:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():190 -> b
+    76:76:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():192:192 -> b
+    77:77:void writeItems(java.util.Collection,java.util.function.Consumer,java.util.function.Consumer):367:367 -> b
+    77:77:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():192 -> b
+    78:78:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():194:194 -> b
+    79:79:void writeItems(java.util.Collection,java.util.function.Consumer,java.util.function.Consumer):367:367 -> b
+    79:79:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():194 -> b
+    80:80:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():196:196 -> b
+    81:81:void writeItems(java.util.Collection,java.util.function.Consumer,java.util.function.Consumer):367:367 -> b
+    81:81:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():196 -> b
+    82:90:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():198:206 -> b
+    91:96:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):728:733 -> b
+    91:96:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():207 -> b
+    97:100:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):732:735 -> b
+    97:100:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():207 -> b
+    101:104:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):734:737 -> b
+    101:104:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():207 -> b
+    105:108:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):736:739 -> b
+    105:108:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():207 -> b
+    109:112:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):738:741 -> b
+    109:112:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():207 -> b
+    113:116:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):740:743 -> b
+    113:116:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():207 -> b
+    117:120:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):742:745 -> b
+    117:120:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():207 -> b
+    121:124:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):744:747 -> b
+    121:124:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():207 -> b
+    125:128:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):746:749 -> b
+    125:128:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():207 -> b
+    129:132:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):748:751 -> b
+    129:132:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():207 -> b
+    133:136:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):750:753 -> b
+    133:136:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():207 -> b
+    137:140:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):752:755 -> b
+    137:140:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():207 -> b
+    141:144:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):754:757 -> b
+    141:144:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():207 -> b
+    145:148:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):756:759 -> b
+    145:148:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():207 -> b
+    149:152:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):758:761 -> b
+    149:152:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():207 -> b
+    153:156:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):760:763 -> b
+    153:156:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():207 -> b
+    157:161:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):762:766 -> b
+    157:161:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():207 -> b
+    162:167:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):764:769 -> b
+    162:167:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():207 -> b
+    168:174:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):767:773 -> b
+    168:174:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():207 -> b
+    175:184:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():208:217 -> b
+    185:187:void writeFixedSectionItems(com.android.tools.r8.graph.DexProgramClass[],int,java.util.function.Consumer):359:361 -> b
+    185:187:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():217 -> b
+    188:190:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():218:220 -> b
+    191:191:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():219:219 -> b
+    192:198:void writeHeader(com.android.tools.r8.dex.FileWriter$Layout):777:783 -> b
+    192:198:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():223 -> b
+    199:200:void writeHeader(com.android.tools.r8.dex.FileWriter$Layout):782:783 -> b
+    199:200:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():223 -> b
+    201:235:void writeHeader(com.android.tools.r8.dex.FileWriter$Layout):779:813 -> b
+    201:235:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():223 -> b
+    236:238:void writeSignature(com.android.tools.r8.dex.FileWriter$Layout):818:820 -> b
+    236:238:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():224 -> b
+    239:241:void writeSignature(com.android.tools.r8.dex.FileWriter$Layout):819:821 -> b
+    239:241:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():224 -> b
+    242:244:void writeChecksum(com.android.tools.r8.dex.FileWriter$Layout):828:830 -> b
+    242:244:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():225 -> b
+    245:248:void writeChecksum(com.android.tools.r8.dex.FileWriter$Layout):829:832 -> b
+    245:248:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():225 -> b
+    249:249:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():228:228 -> b
+    250:250:void writeSignature(com.android.tools.r8.dex.FileWriter$Layout):823:823 -> b
+    250:250:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():224 -> b
+    251:251:void writeStringItem(com.android.tools.r8.graph.DexString):421:421 -> b
+    252:254:void writeAnnotation(com.android.tools.r8.graph.DexAnnotation):545:547 -> b
+    255:255:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> b
+    255:255:void writeAnnotation(com.android.tools.r8.graph.DexAnnotation):547 -> b
+    256:257:void writeAnnotation(com.android.tools.r8.graph.DexAnnotation):549:550 -> b
+    258:258:int lambda$writeAnnotationDirectory$4(com.android.tools.r8.graph.DexEncodedMethod):600:600 -> b
+    259:265:void writeClassData(com.android.tools.r8.graph.DexProgramClass):642:648 -> b
+    266:266:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> b
+    266:266:void writeClassData(com.android.tools.r8.graph.DexProgramClass):648 -> b
+    267:267:void writeClassData(com.android.tools.r8.graph.DexProgramClass):649:649 -> b
+    268:268:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> b
+    268:268:void writeClassData(com.android.tools.r8.graph.DexProgramClass):649 -> b
+    269:269:void writeClassData(com.android.tools.r8.graph.DexProgramClass):650:650 -> b
+    270:270:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> b
+    270:270:void writeClassData(com.android.tools.r8.graph.DexProgramClass):650 -> b
+    271:271:void writeClassData(com.android.tools.r8.graph.DexProgramClass):651:651 -> b
+    272:272:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> b
+    272:272:void writeClassData(com.android.tools.r8.graph.DexProgramClass):651 -> b
+    273:277:void writeClassData(com.android.tools.r8.graph.DexProgramClass):652:656 -> b
     278:278:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> b
-    278:278:void writeClassData(com.android.tools.r8.graph.DexProgramClass):655 -> b
-    279:279:void writeClassData(com.android.tools.r8.graph.DexProgramClass):656:656 -> b
+    278:278:void writeClassData(com.android.tools.r8.graph.DexProgramClass):651 -> b
+    279:279:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> b
+    279:279:void writeClassData(com.android.tools.r8.graph.DexProgramClass):650 -> b
     280:280:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> b
-    280:280:void writeClassData(com.android.tools.r8.graph.DexProgramClass):656 -> b
-    281:285:void writeClassData(com.android.tools.r8.graph.DexProgramClass):657:661 -> b
-    286:286:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> b
-    286:286:void writeClassData(com.android.tools.r8.graph.DexProgramClass):656 -> b
-    287:287:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> b
-    287:287:void writeClassData(com.android.tools.r8.graph.DexProgramClass):655 -> b
-    288:288:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> b
-    288:288:void writeClassData(com.android.tools.r8.graph.DexProgramClass):654 -> b
-    289:289:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> b
-    289:289:void writeClassData(com.android.tools.r8.graph.DexProgramClass):653 -> b
-    1:15:java.util.List sortDexCodesByClassName():319:333 -> c
-    16:19:void writeClassDefItem(com.android.tools.r8.graph.DexProgramClass):463:466 -> c
-    20:24:void writeClassDefItem(com.android.tools.r8.graph.DexProgramClass):465:469 -> c
-    25:29:void writeClassDefItem(com.android.tools.r8.graph.DexProgramClass):468:472 -> c
-    30:32:void writeClassDefItem(com.android.tools.r8.graph.DexProgramClass):471:473 -> c
-    33:33:int lambda$writeAnnotationDirectory$5(com.android.tools.r8.graph.DexEncodedMethod):607:607 -> c
+    280:280:void writeClassData(com.android.tools.r8.graph.DexProgramClass):649 -> b
+    281:281:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> b
+    281:281:void writeClassData(com.android.tools.r8.graph.DexProgramClass):648 -> b
+    1:15:java.util.List sortDexCodesByClassName():314:328 -> c
+    16:19:void writeClassDefItem(com.android.tools.r8.graph.DexProgramClass):458:461 -> c
+    20:24:void writeClassDefItem(com.android.tools.r8.graph.DexProgramClass):460:464 -> c
+    25:29:void writeClassDefItem(com.android.tools.r8.graph.DexProgramClass):463:467 -> c
+    30:32:void writeClassDefItem(com.android.tools.r8.graph.DexProgramClass):466:468 -> c
+    33:33:int lambda$writeAnnotationDirectory$5(com.android.tools.r8.graph.DexEncodedMethod):602:602 -> c
 com.android.tools.r8.dex.FileWriter$1 -> com.android.tools.r8.dex.q:
 com.android.tools.r8.dex.FileWriter$ByteBufferResult -> com.android.tools.r8.dex.r$a:
     com.android.tools.r8.dex.CompatByteBuffer buffer -> a
@@ -14045,39 +14047,39 @@
     int encodedArrarysOffset -> s
     int annotationSetRefListsOffset -> p
     int annotationDirectoriesOffset -> q
-    1:1:void <clinit>():845:845 -> <clinit>
-    1:1:void <init>(int,int,int,int,int,int,int,int,int):877:877 -> <init>
-    2:35:void <init>(int,int,int,int,int,int,int,int,int):861:894 -> <init>
+    1:1:void <clinit>():840:840 -> <clinit>
+    1:1:void <init>(int,int,int,int,int,int,int,int,int):872:872 -> <init>
+    2:35:void <init>(int,int,int,int,int,int,int,int,int):856:889 -> <init>
     void alreadySetOffset(int) -> a
-    1:10:com.android.tools.r8.dex.FileWriter$Layout from(com.android.tools.r8.graph.ObjectToOffsetMapping):899:908 -> a
-    11:11:boolean isValidOffset(int,boolean):918:918 -> a
-    12:13:int getAnnotationDirectoriesOffset():996:997 -> a
-    1:2:int getAnnotationSetRefListsOffset():986:987 -> b
-    3:4:void setAnnotationDirectoriesOffset(int):1001:1002 -> b
-    1:2:int getAnnotationSetsOffset():972:973 -> c
-    3:4:void setAnnotationSetRefListsOffset(int):991:992 -> c
-    1:2:int getAnnotationsOffset():962:963 -> d
-    3:4:void setAnnotationSetsOffset(int):981:982 -> d
-    1:2:void setAnnotationsOffset(int):967:968 -> e
-    3:4:int getClassDataOffset():1006:1007 -> e
-    1:2:int getCodesOffset():922:923 -> f
-    3:4:void setClassDataOffset(int):1011:1012 -> f
-    1:2:void setCodesOffset(int):927:928 -> g
-    3:3:int getEndOfFile():1034:1034 -> g
-    3:3:int getDataSectionSize():912 -> g
-    4:5:int getDataSectionSize():912:913 -> g
-    1:2:int getDebugInfosOffset():932:933 -> h
-    3:4:void setDebugInfosOffset(int):937:938 -> h
-    1:2:int getEncodedArrarysOffset():1016:1017 -> i
-    3:4:void setEncodedArrarysOffset(int):1021:1022 -> i
-    1:1:int getEndOfFile():1034:1034 -> j
-    2:2:void setEndOfFile(int):1038:1038 -> j
-    1:1:int getMapOffset():1026:1026 -> k
-    2:2:void setMapOffset(int):1030:1030 -> k
-    1:2:int getStringDataOffsets():952:953 -> l
-    3:4:void setStringDataOffsets(int):957:958 -> l
-    1:2:int getTypeListsOffset():942:943 -> m
-    3:4:void setTypeListsOffset(int):947:948 -> m
+    1:10:com.android.tools.r8.dex.FileWriter$Layout from(com.android.tools.r8.graph.ObjectToOffsetMapping):894:903 -> a
+    11:11:boolean isValidOffset(int,boolean):913:913 -> a
+    12:13:int getAnnotationDirectoriesOffset():991:992 -> a
+    1:2:int getAnnotationSetRefListsOffset():981:982 -> b
+    3:4:void setAnnotationDirectoriesOffset(int):996:997 -> b
+    1:2:int getAnnotationSetsOffset():967:968 -> c
+    3:4:void setAnnotationSetRefListsOffset(int):986:987 -> c
+    1:2:int getAnnotationsOffset():957:958 -> d
+    3:4:void setAnnotationSetsOffset(int):976:977 -> d
+    1:2:void setAnnotationsOffset(int):962:963 -> e
+    3:4:int getClassDataOffset():1001:1002 -> e
+    1:2:int getCodesOffset():917:918 -> f
+    3:4:void setClassDataOffset(int):1006:1007 -> f
+    1:2:void setCodesOffset(int):922:923 -> g
+    3:3:int getEndOfFile():1029:1029 -> g
+    3:3:int getDataSectionSize():907 -> g
+    4:5:int getDataSectionSize():907:908 -> g
+    1:2:int getDebugInfosOffset():927:928 -> h
+    3:4:void setDebugInfosOffset(int):932:933 -> h
+    1:2:int getEncodedArrarysOffset():1011:1012 -> i
+    3:4:void setEncodedArrarysOffset(int):1016:1017 -> i
+    1:1:int getEndOfFile():1029:1029 -> j
+    2:2:void setEndOfFile(int):1033:1033 -> j
+    1:1:int getMapOffset():1021:1021 -> k
+    2:2:void setMapOffset(int):1025:1025 -> k
+    1:2:int getStringDataOffsets():947:948 -> l
+    3:4:void setStringDataOffsets(int):952:953 -> l
+    1:2:int getTypeListsOffset():937:938 -> m
+    3:4:void setTypeListsOffset(int):942:943 -> m
 com.android.tools.r8.dex.FileWriter$MixedSectionOffsets -> com.android.tools.r8.dex.t:
     boolean $assertionsDisabled -> n
     int minApiLevel -> m
@@ -14093,76 +14095,76 @@
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap classesWithData -> j
     java.util.Map clazzToAnnotationDirectory -> l
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap encodedArrays -> k
-    1:1:void <clinit>():1049:1049 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.dex.MethodToCodeObjectMapping,com.android.tools.r8.dex.FileWriter$1):1049:1049 -> <init>
-    2:2:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.dex.MethodToCodeObjectMapping):1085:1085 -> <init>
-    3:34:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.dex.MethodToCodeObjectMapping):1056:1087 -> <init>
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap access$100(com.android.tools.r8.dex.FileWriter$MixedSectionOffsets):1049:1049 -> a
-    2:3:boolean add(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,java.lang.Object):1091:1092 -> a
-    4:4:boolean add(com.android.tools.r8.graph.DexProgramClass):1108:1108 -> a
-    5:5:boolean add(com.android.tools.r8.graph.DexEncodedArray):1113:1113 -> a
-    6:9:boolean add(com.android.tools.r8.graph.DexAnnotationSet):1120:1123 -> a
-    10:10:void visit(com.android.tools.r8.graph.DexEncodedMethod):1128:1128 -> a
-    11:11:boolean add(com.android.tools.r8.graph.DexCode):1133:1133 -> a
-    12:13:boolean add(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,java.lang.Object):1099:1100 -> a
-    12:13:boolean add(com.android.tools.r8.graph.DexCode):1133 -> a
-    14:14:boolean add(com.android.tools.r8.graph.DexDebugInfo):1138:1138 -> a
-    15:18:boolean add(com.android.tools.r8.graph.DexTypeList):1143:1146 -> a
-    19:22:boolean add(com.android.tools.r8.graph.ParameterAnnotationsList):1151:1154 -> a
-    23:23:boolean add(com.android.tools.r8.graph.DexAnnotation):1159:1159 -> a
-    24:26:boolean setAnnotationsDirectoryForClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotationDirectory):1165:1167 -> a
-    27:27:boolean add(com.android.tools.r8.graph.DexString):1171:1171 -> a
-    28:29:boolean add(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,java.lang.Object):1099:1100 -> a
-    28:29:boolean add(com.android.tools.r8.graph.DexString):1171 -> a
-    30:30:java.util.Collection getAnnotationDirectories():1207:1207 -> a
-    31:32:int lookup(java.lang.Object,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap):1218:1219 -> a
-    33:34:int lookup(java.lang.Object,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1227:1228 -> a
-    35:36:void setOffsetFor(java.lang.Object,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap):1290:1291 -> a
-    37:37:void setOffsetFor(com.android.tools.r8.graph.DexDebugInfo,int):1300:1300 -> a
-    38:38:void setOffsetFor(com.android.tools.r8.graph.DexCode,int):1304:1304 -> a
-    39:40:void setOffsetFor(java.lang.Object,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1295:1296 -> a
-    39:40:void setOffsetFor(com.android.tools.r8.graph.DexCode,int):1304 -> a
-    41:42:void setOffsetFor(com.android.tools.r8.graph.DexTypeList,int):1308:1309 -> a
-    43:43:void setOffsetFor(com.android.tools.r8.graph.DexString,int):1313:1313 -> a
-    44:45:void setOffsetFor(java.lang.Object,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1295:1296 -> a
-    44:45:void setOffsetFor(com.android.tools.r8.graph.DexString,int):1313 -> a
-    46:46:void setOffsetFor(com.android.tools.r8.graph.DexAnnotation,int):1317:1317 -> a
-    47:48:void setOffsetFor(com.android.tools.r8.graph.DexAnnotationSet,int):1323:1324 -> a
-    49:49:void setOffsetForAnnotationsDirectory(com.android.tools.r8.graph.DexAnnotationDirectory,int):1328:1328 -> a
-    50:50:void setOffsetFor(com.android.tools.r8.graph.DexProgramClass,int):1332:1332 -> a
-    51:51:void setOffsetFor(com.android.tools.r8.graph.DexEncodedArray,int):1336:1336 -> a
-    52:53:void setOffsetFor(com.android.tools.r8.graph.ParameterAnnotationsList,int):1340:1341 -> a
-    1:1:java.util.Collection getAnnotationSetRefLists():1199:1199 -> b
-    2:2:int getOffsetFor(com.android.tools.r8.graph.DexString):1233:1233 -> b
-    3:6:int getOffsetFor(com.android.tools.r8.graph.DexTypeList):1237:1240 -> b
-    7:7:int getOffsetFor(com.android.tools.r8.graph.DexProgramClass):1244:1244 -> b
-    8:8:int getOffsetFor(com.android.tools.r8.graph.DexEncodedArray):1248:1248 -> b
-    9:9:int getOffsetFor(com.android.tools.r8.graph.DexDebugInfo):1252:1252 -> b
-    10:10:int getOffsetFor(com.android.tools.r8.graph.DexAnnotation):1266:1266 -> b
-    11:14:int getOffsetFor(com.android.tools.r8.graph.DexAnnotationSet):1272:1275 -> b
-    15:18:int getOffsetFor(com.android.tools.r8.graph.ParameterAnnotationsList):1279:1282 -> b
-    19:19:int getOffsetFor(com.android.tools.r8.graph.DexCode):1286:1286 -> b
-    1:1:java.util.Collection getAnnotationSets():1195:1195 -> c
-    2:6:int getOffsetForAnnotationsDirectory(com.android.tools.r8.graph.DexProgramClass):1257:1261 -> c
-    1:1:java.util.Collection getAnnotations():1191:1191 -> d
-    1:1:java.util.Collection getClassesWithData():1203:1203 -> e
-    1:1:java.util.Collection getCodes():1175:1175 -> f
-    1:1:java.util.Collection getDebugInfos():1179:1179 -> g
-    1:1:java.util.Collection getEncodedArrays():1211:1211 -> h
-    1:1:java.util.Collection getStringData():1187:1187 -> i
-    1:1:java.util.Collection getTypeLists():1183:1183 -> j
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap createObject2IntMap():1074:1075 -> k
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap createReference2IntMap():1080:1080 -> l
+    1:1:void <clinit>():1044:1044 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.dex.MethodToCodeObjectMapping,com.android.tools.r8.dex.FileWriter$1):1044:1044 -> <init>
+    2:2:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.dex.MethodToCodeObjectMapping):1080:1080 -> <init>
+    3:34:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.dex.MethodToCodeObjectMapping):1051:1082 -> <init>
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap access$100(com.android.tools.r8.dex.FileWriter$MixedSectionOffsets):1044:1044 -> a
+    2:3:boolean add(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,java.lang.Object):1086:1087 -> a
+    4:4:boolean add(com.android.tools.r8.graph.DexProgramClass):1103:1103 -> a
+    5:5:boolean add(com.android.tools.r8.graph.DexEncodedArray):1108:1108 -> a
+    6:9:boolean add(com.android.tools.r8.graph.DexAnnotationSet):1115:1118 -> a
+    10:10:void visit(com.android.tools.r8.graph.DexEncodedMethod):1123:1123 -> a
+    11:11:boolean add(com.android.tools.r8.graph.DexCode):1128:1128 -> a
+    12:13:boolean add(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,java.lang.Object):1094:1095 -> a
+    12:13:boolean add(com.android.tools.r8.graph.DexCode):1128 -> a
+    14:14:boolean add(com.android.tools.r8.graph.DexDebugInfo):1133:1133 -> a
+    15:18:boolean add(com.android.tools.r8.graph.DexTypeList):1138:1141 -> a
+    19:22:boolean add(com.android.tools.r8.graph.ParameterAnnotationsList):1146:1149 -> a
+    23:23:boolean add(com.android.tools.r8.graph.DexAnnotation):1154:1154 -> a
+    24:26:boolean setAnnotationsDirectoryForClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotationDirectory):1160:1162 -> a
+    27:27:boolean add(com.android.tools.r8.graph.DexString):1166:1166 -> a
+    28:29:boolean add(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,java.lang.Object):1094:1095 -> a
+    28:29:boolean add(com.android.tools.r8.graph.DexString):1166 -> a
+    30:30:java.util.Collection getAnnotationDirectories():1202:1202 -> a
+    31:32:int lookup(java.lang.Object,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap):1213:1214 -> a
+    33:34:int lookup(java.lang.Object,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1222:1223 -> a
+    35:36:void setOffsetFor(java.lang.Object,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap):1285:1286 -> a
+    37:37:void setOffsetFor(com.android.tools.r8.graph.DexDebugInfo,int):1295:1295 -> a
+    38:38:void setOffsetFor(com.android.tools.r8.graph.DexCode,int):1299:1299 -> a
+    39:40:void setOffsetFor(java.lang.Object,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1290:1291 -> a
+    39:40:void setOffsetFor(com.android.tools.r8.graph.DexCode,int):1299 -> a
+    41:42:void setOffsetFor(com.android.tools.r8.graph.DexTypeList,int):1303:1304 -> a
+    43:43:void setOffsetFor(com.android.tools.r8.graph.DexString,int):1308:1308 -> a
+    44:45:void setOffsetFor(java.lang.Object,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1290:1291 -> a
+    44:45:void setOffsetFor(com.android.tools.r8.graph.DexString,int):1308 -> a
+    46:46:void setOffsetFor(com.android.tools.r8.graph.DexAnnotation,int):1312:1312 -> a
+    47:48:void setOffsetFor(com.android.tools.r8.graph.DexAnnotationSet,int):1318:1319 -> a
+    49:49:void setOffsetForAnnotationsDirectory(com.android.tools.r8.graph.DexAnnotationDirectory,int):1323:1323 -> a
+    50:50:void setOffsetFor(com.android.tools.r8.graph.DexProgramClass,int):1327:1327 -> a
+    51:51:void setOffsetFor(com.android.tools.r8.graph.DexEncodedArray,int):1331:1331 -> a
+    52:53:void setOffsetFor(com.android.tools.r8.graph.ParameterAnnotationsList,int):1335:1336 -> a
+    1:1:java.util.Collection getAnnotationSetRefLists():1194:1194 -> b
+    2:2:int getOffsetFor(com.android.tools.r8.graph.DexString):1228:1228 -> b
+    3:6:int getOffsetFor(com.android.tools.r8.graph.DexTypeList):1232:1235 -> b
+    7:7:int getOffsetFor(com.android.tools.r8.graph.DexProgramClass):1239:1239 -> b
+    8:8:int getOffsetFor(com.android.tools.r8.graph.DexEncodedArray):1243:1243 -> b
+    9:9:int getOffsetFor(com.android.tools.r8.graph.DexDebugInfo):1247:1247 -> b
+    10:10:int getOffsetFor(com.android.tools.r8.graph.DexAnnotation):1261:1261 -> b
+    11:14:int getOffsetFor(com.android.tools.r8.graph.DexAnnotationSet):1267:1270 -> b
+    15:18:int getOffsetFor(com.android.tools.r8.graph.ParameterAnnotationsList):1274:1277 -> b
+    19:19:int getOffsetFor(com.android.tools.r8.graph.DexCode):1281:1281 -> b
+    1:1:java.util.Collection getAnnotationSets():1190:1190 -> c
+    2:6:int getOffsetForAnnotationsDirectory(com.android.tools.r8.graph.DexProgramClass):1252:1256 -> c
+    1:1:java.util.Collection getAnnotations():1186:1186 -> d
+    1:1:java.util.Collection getClassesWithData():1198:1198 -> e
+    1:1:java.util.Collection getCodes():1170:1170 -> f
+    1:1:java.util.Collection getDebugInfos():1174:1174 -> g
+    1:1:java.util.Collection getEncodedArrays():1206:1206 -> h
+    1:1:java.util.Collection getStringData():1182:1182 -> i
+    1:1:java.util.Collection getTypeLists():1178:1178 -> j
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap createObject2IntMap():1069:1070 -> k
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap createReference2IntMap():1075:1075 -> l
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap.<init>():176:176 -> l
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap createReference2IntMap():1080 -> l
-    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap createReference2IntMap():1081:1081 -> l
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap createReference2IntMap():1075 -> l
+    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap createReference2IntMap():1076:1076 -> l
 com.android.tools.r8.dex.FileWriter$ProgramClassDependencyCollector -> com.android.tools.r8.dex.u:
     java.util.Set includedClasses -> c
     com.android.tools.r8.dex.FileWriter this$0 -> d
-    1:2:void <init>(com.android.tools.r8.dex.FileWriter,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexProgramClass[]):1349:1350 -> <init>
-    3:7:void <init>(com.android.tools.r8.dex.FileWriter,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexProgramClass[]):1347:1351 -> <init>
+    1:2:void <init>(com.android.tools.r8.dex.FileWriter,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexProgramClass[]):1344:1345 -> <init>
+    3:7:void <init>(com.android.tools.r8.dex.FileWriter,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexProgramClass[]):1342:1346 -> <init>
     void visit(com.android.tools.r8.graph.DexType) -> a
-    1:4:void visit(com.android.tools.r8.graph.DexClass):1362:1365 -> a
+    1:4:void visit(com.android.tools.r8.graph.DexClass):1357:1360 -> a
 com.android.tools.r8.dex.IndexedItemCollection -> com.android.tools.r8.dex.v:
 com.android.tools.r8.dex.InheritanceClassInDexDistributor -> com.android.tools.r8.dex.z:
     com.android.tools.r8.dex.VirtualFile mainDex -> b
@@ -14208,7 +14210,7 @@
     99:99:java.util.Collection assignClassesWithLinkingError(java.util.Set,java.util.Collection):447 -> a
     100:103:java.util.Collection assignClassesWithLinkingError(java.util.Set,java.util.Collection):450:453 -> a
     104:104:java.util.Collection assignClassesWithLinkingError(java.util.Set,java.util.Collection):442:442 -> a
-    105:105:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():716:716 -> a
+    105:105:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():766:766 -> a
     105:105:java.util.Collection assignClassesWithLinkingError(java.util.Set,java.util.Collection):443 -> a
     106:106:java.util.Collection assignClassesWithLinkingError(java.util.Set,java.util.Collection):443:443 -> a
     107:107:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
@@ -14255,7 +14257,7 @@
     49:49:void markDexFull(com.android.tools.r8.dex.VirtualFile):716:716 -> b
     49:49:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):643 -> b
     50:50:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):637:637 -> b
-    51:51:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():716:716 -> b
+    51:51:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():766:766 -> b
     51:51:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):638 -> b
     52:52:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):638:638 -> b
     53:53:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> b
@@ -15245,7 +15247,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.FeatureSplitConfiguration -> com.android.tools.r8.r.a:
+com.android.tools.r8.features.FeatureSplitConfiguration -> com.android.tools.r8.q.a:
     java.util.List featureSplits -> a
     java.util.Map javaTypeToFeatureSplitMapping -> b
     boolean $assertionsDisabled -> c
@@ -15266,7 +15268,7 @@
     41:41:boolean inSameFeatureOrBase(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):127:127 -> a
     41:41:boolean inSameFeatureOrBase(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):116 -> a
     1:1:java.util.List getFeatureSplits():132:132 -> b
-com.android.tools.r8.features.FeatureSplitConfiguration$DataResourceProvidersAndConsumer -> com.android.tools.r8.r.a$a:
+com.android.tools.r8.features.FeatureSplitConfiguration$DataResourceProvidersAndConsumer -> com.android.tools.r8.q.a$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):72:74 -> <init>
@@ -15275,7 +15277,7 @@
 com.android.tools.r8.graph.AccessControl -> com.android.tools.r8.graph.a:
     1:1:boolean isClassAccessible(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass):15:15 -> a
     1:1:boolean isMemberAccessible(com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithSubtyping):42 -> a
-    2:2:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():720:720 -> a
+    2:2:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():770:770 -> a
     2:2:boolean isClassAccessible(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass):18 -> a
     2:2:boolean isMemberAccessible(com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithSubtyping):42 -> a
     3:3:boolean isClassAccessible(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass):18:18 -> a
@@ -15283,161 +15285,165 @@
     4:7:boolean isMemberAccessible(com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithSubtyping):45:48 -> a
     8:11:boolean isNestMate(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass):64:67 -> a
     8:11:boolean isMemberAccessible(com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithSubtyping):49 -> a
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():720:720 -> a
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():770:770 -> a
     12:12:boolean isMemberAccessible(com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithSubtyping):51 -> a
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():720:720 -> a
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():770:770 -> a
     13:13:boolean isMemberAccessible(com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithSubtyping):51 -> a
     14:17:boolean isMemberAccessible(com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithSubtyping):51:54 -> a
-    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():720:720 -> a
+    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():770:770 -> a
     18:18:boolean isMemberAccessible(com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithSubtyping):57 -> a
-    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():720:720 -> a
+    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():770:770 -> a
     19:19:boolean isMemberAccessible(com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithSubtyping):57 -> a
     20:20:boolean isMemberAccessible(com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithSubtyping):57:57 -> a
     21:21:boolean isMethodAccessible(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithSubtyping):26:26 -> a
     22:22:boolean isFieldAccessible(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithSubtyping):34:34 -> a
 com.android.tools.r8.graph.AccessFlags -> com.android.tools.r8.graph.b:
-    java.util.List NAMES -> c
-    int modifiedFlags -> b
-    boolean $assertionsDisabled -> d
-    int originalFlags -> a
-    1:12:void <clinit>():12:23 -> <clinit>
-    1:3:void <init>(int,int):51:53 -> <init>
-    1:7:int visibilityOrdinal():110:116 -> A
-    1:5:boolean isMoreVisibleThan(com.android.tools.r8.graph.AccessFlags,java.lang.String,java.lang.String):88:92 -> a
-    6:6:boolean isVisibilityDependingOnPackage():124:124 -> a
-    6:6:boolean isMoreVisibleThan(com.android.tools.r8.graph.AccessFlags,java.lang.String,java.lang.String):93 -> a
-    7:7:boolean isMoreVisibleThan(com.android.tools.r8.graph.AccessFlags,java.lang.String,java.lang.String):94:94 -> a
-    8:8:boolean isAtLeastAsVisibleAs(com.android.tools.r8.graph.AccessFlags):101:101 -> a
-    9:9:boolean isSet(int):224:224 -> a
-    10:10:void demote(int):246:246 -> a
-    10:10:void demoteFromFinal():203 -> a
-    11:24:java.lang.String toStringInternal(boolean):259:272 -> a
-    1:1:java.util.List getNames():45:45 -> b
-    2:2:boolean isSameVisibility(com.android.tools.r8.graph.AccessFlags):105:105 -> b
-    3:3:void promote(int):242:242 -> b
-    1:1:int getOriginalAccessFlags():69:69 -> c
-    2:3:void set(int):228:229 -> c
-    1:1:java.util.List getPredicates():34:34 -> d
-    2:3:void unset(int):233:234 -> d
-    1:1:boolean isFinal():175:175 -> e
-    1:3:boolean equals(java.lang.Object):74:76 -> equals
-    1:1:boolean isPrivate():141:141 -> f
-    1:1:boolean wasSet(int):220:220 -> g
-    1:1:boolean isPromoted(int):238 -> g
-    1:1:boolean isPromotedToPublic():207 -> g
-    2:2:boolean isSet(int):224:224 -> g
-    2:2:boolean isPromoted(int):238 -> g
-    2:2:boolean isPromotedToPublic():207 -> g
-    1:1:boolean isProtected():154:154 -> h
-    1:1:int hashCode():83:83 -> hashCode
-    1:1:boolean isPublic():128:128 -> i
-    1:1:boolean isStatic():167:167 -> j
-    1:1:boolean isSynthetic():187:187 -> k
-    1:1:int materialize():61:61 -> l
-    1:1:void promoteToFinal():199:199 -> m
-    1:1:void demote(int):246:246 -> n
-    1:1:void promoteToPublic():211 -> n
-    2:2:void promoteToPublic():212:212 -> n
-    1:1:void promoteToStatic():216:216 -> o
-    1:1:void setFinal():179:179 -> p
-    1:2:void setPrivate():145:146 -> q
-    1:2:void setProtected():158:159 -> r
-    1:2:void setPublic():132:133 -> s
-    1:1:void setStatic():171:171 -> t
-    1:1:java.lang.String toString():255:255 -> toString
-    1:1:void setSynthetic():191:191 -> u
-    1:1:java.lang.String toSmaliString():250:250 -> v
-    1:1:void unsetPrivate():150:150 -> w
-    1:1:void unsetProtected():163:163 -> x
-    1:1:void unsetPublic():137:137 -> y
-    1:1:void unsetSynthetic():195:195 -> z
+    com.android.tools.r8.jetbrains.kotlinx.metadata.Flag[] EMPTY_FLAG -> a
+    java.util.List NAMES -> d
+    boolean $assertionsDisabled -> e
+    int originalFlags -> b
+    int modifiedFlags -> c
+    1:14:void <clinit>():16:29 -> <clinit>
+    1:1:void <init>(int,int):57:57 -> <init>
+    2:43:void <init>(int,int):18:59 -> <init>
+    1:7:int visibilityOrdinal():136:142 -> A
+    1:5:boolean isMoreVisibleThan(com.android.tools.r8.graph.AccessFlags,java.lang.String,java.lang.String):114:118 -> a
+    6:6:boolean isVisibilityDependingOnPackage():150:150 -> a
+    6:6:boolean isMoreVisibleThan(com.android.tools.r8.graph.AccessFlags,java.lang.String,java.lang.String):119 -> a
+    7:7:boolean isMoreVisibleThan(com.android.tools.r8.graph.AccessFlags,java.lang.String,java.lang.String):120:120 -> a
+    8:8:boolean isAtLeastAsVisibleAs(com.android.tools.r8.graph.AccessFlags):127:127 -> a
+    9:9:boolean isSet(int):254:254 -> a
+    10:10:void demote(int):276:276 -> a
+    10:10:void demoteFromFinal():233 -> a
+    11:24:java.lang.String toStringInternal(boolean):289:302 -> a
+    1:1:java.util.List getNames():51:51 -> b
+    2:2:boolean isSameVisibility(com.android.tools.r8.graph.AccessFlags):131:131 -> b
+    3:3:void promote(int):272:272 -> b
+    1:1:int getOriginalAccessFlags():95:95 -> c
+    2:3:void set(int):258:259 -> c
+    1:1:java.util.List getPredicates():40:40 -> d
+    2:3:void unset(int):263:264 -> d
+    1:1:boolean isFinal():205:205 -> e
+    1:3:boolean equals(java.lang.Object):100:102 -> equals
+    1:1:boolean isPrivate():167:167 -> f
+    1:1:boolean wasSet(int):250:250 -> g
+    1:1:boolean isPromoted(int):268 -> g
+    1:1:boolean isPromotedToPublic():237 -> g
+    2:2:boolean isSet(int):254:254 -> g
+    2:2:boolean isPromoted(int):268 -> g
+    2:2:boolean isPromotedToPublic():237 -> g
+    1:1:boolean isProtected():180:180 -> h
+    1:1:int hashCode():109:109 -> hashCode
+    1:1:boolean isPublic():154:154 -> i
+    1:1:boolean isStatic():193:193 -> j
+    1:1:boolean isSynthetic():217:217 -> k
+    1:1:int materialize():67:67 -> l
+    1:1:void promoteToFinal():229:229 -> m
+    1:1:void demote(int):276:276 -> n
+    1:1:void promoteToPublic():241 -> n
+    2:2:void promoteToPublic():242:242 -> n
+    1:1:void promoteToStatic():246:246 -> o
+    1:1:void setFinal():209:209 -> p
+    1:2:void setPrivate():171:172 -> q
+    1:2:void setProtected():184:185 -> r
+    1:2:void setPublic():158:159 -> s
+    1:1:void setStatic():197:197 -> t
+    1:1:java.lang.String toString():285:285 -> toString
+    1:1:void setSynthetic():221:221 -> u
+    1:1:java.lang.String toSmaliString():280:280 -> v
+    1:1:void unsetPrivate():176:176 -> w
+    1:1:void unsetProtected():189:189 -> x
+    1:1:void unsetPublic():163:163 -> y
+    1:1:void unsetSynthetic():225:225 -> z
 com.android.tools.r8.graph.AppInfo -> com.android.tools.r8.graph.c:
-    1:1:void <clinit>():26:26 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexApplication):40:40 -> <init>
-    2:14:void <init>(com.android.tools.r8.graph.DexApplication):30:42 -> <init>
-    15:15:void <init>(com.android.tools.r8.graph.AppInfo):45:45 -> <init>
-    16:36:void <init>(com.android.tools.r8.graph.AppInfo):30:50 -> <init>
-    1:1:com.android.tools.r8.graph.DexItemFactory access$000(com.android.tools.r8.graph.AppInfo):26:26 -> a
+    1:1:void <clinit>():28:28 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexApplication):42:42 -> <init>
+    2:14:void <init>(com.android.tools.r8.graph.DexApplication):32:44 -> <init>
+    15:15:void <init>(com.android.tools.r8.graph.AppInfo):47:47 -> <init>
+    16:36:void <init>(com.android.tools.r8.graph.AppInfo):32:52 -> <init>
+    1:1:com.android.tools.r8.graph.DexItemFactory access$000(com.android.tools.r8.graph.AppInfo):28:28 -> a
     2:2:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getKey():100:100 -> a
-    2:2:void lambda$computeDefinitions$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexEncodedField):107 -> a
-    3:3:void lambda$computeDefinitions$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexEncodedField):107:107 -> a
-    4:10:java.util.Map computeDefinitions(com.android.tools.r8.graph.DexType):103:109 -> a
-    11:16:com.android.tools.r8.graph.ResolutionResult resolveMethodOnArray(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):311:316 -> a
-    17:17:com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):369:369 -> a
-    18:24: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):586:592 -> a
-    18:24:com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):369 -> a
-    25:27:boolean com.android.tools.r8.graph.DexClass.isSignaturePolymorphicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexItemFactory):608:610 -> a
-    25:27: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):599 -> a
-    25:27:com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):369 -> a
-    28:28:boolean com.android.tools.r8.graph.MethodAccessFlags.isVarargs():134:134 -> a
-    28:28:boolean com.android.tools.r8.graph.DexClass.isSignaturePolymorphicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexItemFactory):610 -> a
-    28:28: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):599 -> a
-    28:28:com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):369 -> a
-    29:31:boolean com.android.tools.r8.graph.DexClass.isSignaturePolymorphicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexItemFactory):610:612 -> a
-    29:31: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):599 -> a
-    29:31:com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):369 -> a
-    32:43:com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):371:382 -> a
-    44:46:com.android.tools.r8.graph.ResolutionResult resolveMethodStep3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):411:413 -> a
-    47:54:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppInfo$MaximallySpecificMethodsBuilder):419:426 -> a
-    55:55:boolean isMaximallySpecificCandidate(com.android.tools.r8.graph.DexEncodedMethod):450:450 -> a
-    55:55:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppInfo$MaximallySpecificMethodsBuilder):427 -> a
-    56:66:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppInfo$MaximallySpecificMethodsBuilder):429:439 -> a
-    67:67:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getKey():1086:1086 -> a
-    67:67:void lambda$computeDefinitions$0(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexEncodedMethod):106 -> a
-    68:68:void lambda$computeDefinitions$0(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexEncodedMethod):106:106 -> a
-    1:5:void addSynthesizedClass(com.android.tools.r8.graph.DexProgramClass):90:94 -> addSynthesizedClass
-    1:2:com.android.tools.r8.graph.DexApplication app():79:80 -> app
-    1:7:java.util.Map getDefinitions(com.android.tools.r8.graph.DexType):176:182 -> b
-    1:1:boolean checkIfObsolete():74:74 -> checkIfObsolete
-    1:2:java.lang.Iterable classes():113:114 -> classes
-    1:2:java.lang.Iterable classesWithDeterministicOrder():118:119 -> classesWithDeterministicOrder
-    1:1:void copyMetadataFromPrevious(com.android.tools.r8.graph.AppInfo):58:58 -> copyMetadataFromPrevious
-    1:9:com.android.tools.r8.graph.DexDefinition definitionFor(com.android.tools.r8.graph.DexReference):124:132 -> definitionFor
-    10:16:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):137:143 -> definitionFor
-    17:22:com.android.tools.r8.graph.DexEncodedMethod definitionFor(com.android.tools.r8.graph.DexMethod):159:164 -> definitionFor
-    23:24:com.android.tools.r8.graph.DexEncodedField definitionFor(com.android.tools.r8.graph.DexField):171:172 -> definitionFor
-    1:1:com.android.tools.r8.graph.DexProgramClass definitionForProgramType(com.android.tools.r8.graph.DexType):148:148 -> definitionForProgramType
-    1:2:com.android.tools.r8.graph.DexItemFactory dexItemFactory():85:86 -> dexItemFactory
-    1:2:java.util.Collection getSynthesizedClassesForSanityCheck():98:99 -> getSynthesizedClassesForSanityCheck
-    1:1:boolean hasLiveness():587:587 -> hasLiveness
-    1:1:boolean hasSubtyping():577:577 -> hasSubtyping
-    1:1:void invalidateTypeCacheFor(com.android.tools.r8.graph.DexType):187:187 -> invalidateTypeCacheFor
-    1:2:boolean isInMainDexList(com.android.tools.r8.graph.DexType):597:598 -> isInMainDexList
-    1:1:boolean isObsolete():62:62 -> isObsolete
-    1:4:com.android.tools.r8.graph.DexEncodedMethod lookupDirectTarget(com.android.tools.r8.graph.DexMethod):237:240 -> lookupDirectTarget
-    1:4:com.android.tools.r8.graph.DexEncodedField lookupInstanceTarget(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):511:514 -> lookupInstanceTarget
-    1:4:com.android.tools.r8.graph.DexEncodedMethod lookupStaticTarget(com.android.tools.r8.graph.DexMethod):200:203 -> lookupStaticTarget
-    5:8:com.android.tools.r8.graph.DexEncodedField lookupStaticTarget(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):524:527 -> lookupStaticTarget
-    1:4:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):217:220 -> lookupSuperTarget
-    5:6:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):224:225 -> lookupSuperTarget
-    1:5:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualTarget(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):250:254 -> lookupVirtualTarget
-    1:1:void markObsolete():66:66 -> markObsolete
-    1:1:com.android.tools.r8.utils.InternalOptions options():54:54 -> options
-    1:3:com.android.tools.r8.origin.Origin originFor(com.android.tools.r8.graph.DexType):152:154 -> originFor
-    1:2:com.android.tools.r8.graph.DexEncodedField resolveField(com.android.tools.r8.graph.DexField):535:536 -> resolveField
-    1:3:com.android.tools.r8.graph.DexEncodedField resolveFieldOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):546:548 -> resolveFieldOn
-    4:20:com.android.tools.r8.graph.DexEncodedField resolveFieldOn(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexField):552:568 -> resolveFieldOn
-    1:9:com.android.tools.r8.graph.ResolutionResult resolveMaximallySpecificMethods(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):393:401 -> resolveMaximallySpecificMethods
-    1:9:com.android.tools.r8.graph.ResolutionResult resolveMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):268:276 -> resolveMethod
-    10:12:com.android.tools.r8.graph.ResolutionResult resolveMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):280:282 -> resolveMethod
-    13:16:com.android.tools.r8.graph.ResolutionResult resolveMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,boolean):297:300 -> resolveMethod
-    1:13:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):332:344 -> resolveMethodOnClass
-    14:22:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):348:356 -> resolveMethodOnClass
-    1:15:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):465:479 -> resolveMethodOnInterface
-    16:34:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):483:501 -> resolveMethodOnInterface
-    1:1:void unsetObsolete():70:70 -> unsetObsolete
-    1:1:com.android.tools.r8.shaking.AppInfoWithLiveness withLiveness():592:592 -> withLiveness
-    1:1:com.android.tools.r8.graph.AppInfoWithSubtyping withSubtyping():582:582 -> withSubtyping
+    2:2:void lambda$computeDefinitions$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexEncodedField):109 -> a
+    3:3:void lambda$computeDefinitions$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexEncodedField):109:109 -> a
+    4:10:java.util.Map computeDefinitions(com.android.tools.r8.graph.DexType):105:111 -> a
+    11:16:com.android.tools.r8.graph.ResolutionResult resolveMethodOnArray(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):325:330 -> a
+    17:17: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):383:383 -> a
+    18:24: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):636:642 -> a
+    18:24: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):383 -> a
+    25:27:boolean com.android.tools.r8.graph.DexClass.isSignaturePolymorphicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexItemFactory):658:660 -> a
+    25:27: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):649 -> a
+    25:27: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):383 -> a
+    28:28:boolean com.android.tools.r8.graph.MethodAccessFlags.isVarargs():148:148 -> a
+    28:28:boolean com.android.tools.r8.graph.DexClass.isSignaturePolymorphicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexItemFactory):660 -> a
+    28:28: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):649 -> a
+    28:28: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):383 -> a
+    29:31:boolean com.android.tools.r8.graph.DexClass.isSignaturePolymorphicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexItemFactory):660:662 -> a
+    29:31: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):649 -> a
+    29:31: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):383 -> a
+    32:51: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):385:404 -> a
+    52:54:com.android.tools.r8.graph.ResolutionResult resolveMethodStep3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):433:435 -> a
+    55:62:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppInfo$MaximallySpecificMethodsBuilder):441:448 -> a
+    63:63:boolean isMaximallySpecificCandidate(com.android.tools.r8.graph.DexEncodedMethod):472:472 -> a
+    63:63:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppInfo$MaximallySpecificMethodsBuilder):449 -> a
+    64:74:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppInfo$MaximallySpecificMethodsBuilder):451:461 -> a
+    75:75:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getKey():1163:1163 -> a
+    75:75:void lambda$computeDefinitions$0(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexEncodedMethod):108 -> a
+    76:76:void lambda$computeDefinitions$0(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexEncodedMethod):108:108 -> a
+    1:5:void addSynthesizedClass(com.android.tools.r8.graph.DexProgramClass):92:96 -> addSynthesizedClass
+    1:2:com.android.tools.r8.graph.DexApplication app():81:82 -> app
+    1:7:java.util.Map getDefinitions(com.android.tools.r8.graph.DexType):190:196 -> b
+    1:1:boolean checkIfObsolete():76:76 -> checkIfObsolete
+    1:2:java.lang.Iterable classes():115:116 -> classes
+    1:2:java.lang.Iterable classesWithDeterministicOrder():120:121 -> classesWithDeterministicOrder
+    1:1:void copyMetadataFromPrevious(com.android.tools.r8.graph.AppInfo):60:60 -> copyMetadataFromPrevious
+    1:9:com.android.tools.r8.graph.DexDefinition definitionFor(com.android.tools.r8.graph.DexReference):126:134 -> definitionFor
+    10:16:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):139:145 -> definitionFor
+    17:22:com.android.tools.r8.graph.DexEncodedMethod definitionFor(com.android.tools.r8.graph.DexMethod):173:178 -> definitionFor
+    23:24:com.android.tools.r8.graph.DexEncodedField definitionFor(com.android.tools.r8.graph.DexField):185:186 -> definitionFor
+    1:7:com.android.tools.r8.graph.DexClass definitionForDesugarDependency(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):149:155 -> definitionForDesugarDependency
+    8:8:com.android.tools.r8.graph.DexClass definitionForDesugarDependency(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):154:154 -> definitionForDesugarDependency
+    1:1:com.android.tools.r8.graph.DexProgramClass definitionForProgramType(com.android.tools.r8.graph.DexType):162:162 -> definitionForProgramType
+    1:2:com.android.tools.r8.graph.DexItemFactory dexItemFactory():87:88 -> dexItemFactory
+    1:2:java.util.Collection getSynthesizedClassesForSanityCheck():100:101 -> getSynthesizedClassesForSanityCheck
+    1:1:boolean hasLiveness():609:609 -> hasLiveness
+    1:1:boolean hasSubtyping():599:599 -> hasSubtyping
+    1:1:void invalidateTypeCacheFor(com.android.tools.r8.graph.DexType):201:201 -> invalidateTypeCacheFor
+    1:2:boolean isInMainDexList(com.android.tools.r8.graph.DexType):619:620 -> isInMainDexList
+    1:1:boolean isObsolete():64:64 -> isObsolete
+    1:4:com.android.tools.r8.graph.DexEncodedMethod lookupDirectTarget(com.android.tools.r8.graph.DexMethod):251:254 -> lookupDirectTarget
+    1:4:com.android.tools.r8.graph.DexEncodedField lookupInstanceTarget(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):533:536 -> lookupInstanceTarget
+    1:4:com.android.tools.r8.graph.DexEncodedMethod lookupStaticTarget(com.android.tools.r8.graph.DexMethod):214:217 -> lookupStaticTarget
+    5:8:com.android.tools.r8.graph.DexEncodedField lookupStaticTarget(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):546:549 -> lookupStaticTarget
+    1:4:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):231:234 -> lookupSuperTarget
+    5:6:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):238:239 -> lookupSuperTarget
+    1:5:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualTarget(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):264:268 -> lookupVirtualTarget
+    1:1:void markObsolete():68:68 -> markObsolete
+    1:1:com.android.tools.r8.utils.InternalOptions options():56:56 -> options
+    1:3:com.android.tools.r8.origin.Origin originFor(com.android.tools.r8.graph.DexType):166:168 -> originFor
+    1:2:com.android.tools.r8.graph.DexEncodedField resolveField(com.android.tools.r8.graph.DexField):557:558 -> resolveField
+    1:3:com.android.tools.r8.graph.DexEncodedField resolveFieldOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):568:570 -> resolveFieldOn
+    4:20:com.android.tools.r8.graph.DexEncodedField resolveFieldOn(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexField):574:590 -> resolveFieldOn
+    1:9:com.android.tools.r8.graph.ResolutionResult resolveMaximallySpecificMethods(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):415:423 -> resolveMaximallySpecificMethods
+    1:9:com.android.tools.r8.graph.ResolutionResult resolveMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):282:290 -> resolveMethod
+    10:12:com.android.tools.r8.graph.ResolutionResult resolveMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):294:296 -> resolveMethod
+    13:16:com.android.tools.r8.graph.ResolutionResult resolveMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,boolean):311:314 -> resolveMethod
+    1:13:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):346:358 -> resolveMethodOnClass
+    14:22:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):362:370 -> resolveMethodOnClass
+    1:15:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):487:501 -> resolveMethodOnInterface
+    16:34:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):505:523 -> resolveMethodOnInterface
+    1:1:void unsetObsolete():72:72 -> unsetObsolete
+    1:1:com.android.tools.r8.shaking.AppInfoWithLiveness withLiveness():614:614 -> withLiveness
+    1:1:com.android.tools.r8.graph.AppInfoWithSubtyping withSubtyping():604:604 -> withSubtyping
 com.android.tools.r8.graph.AppInfo$MaximallySpecificMethodsBuilder -> com.android.tools.r8.graph.c$a:
     com.android.tools.r8.graph.DexClass initialResolutionHolder -> a
     java.util.LinkedHashMap maximallySpecificMethods -> b
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():601:601 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexClass):613:613 -> <init>
-    2:5:void <init>(com.android.tools.r8.graph.DexClass):611:614 -> <init>
-    1:9:void addCandidate(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppInfo):619:627 -> a
-    10:24:void markShadowed(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppInfo):635:649 -> a
-    25:65:com.android.tools.r8.graph.ResolutionResult resolve():654:694 -> a
+    1:1:void <clinit>():623:623 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexClass):635:635 -> <init>
+    2:5:void <init>(com.android.tools.r8.graph.DexClass):633:636 -> <init>
+    1:9:void addCandidate(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppInfo):641:649 -> a
+    10:24:void markShadowed(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppInfo):657:671 -> a
+    25:65:com.android.tools.r8.graph.ResolutionResult resolve():676:716 -> a
 com.android.tools.r8.graph.AppInfoWithSubtyping -> com.android.tools.r8.graph.d:
     1:8:void <clinit>():29:36 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexApplication):135:135 -> <init>
@@ -15488,7 +15494,7 @@
     1:1:boolean isExternalizable(com.android.tools.r8.graph.DexType):604:604 -> isExternalizable
     1:1:boolean isMarkedAsInterface(com.android.tools.r8.graph.DexType):463:463 -> isMarkedAsInterface
     1:1:boolean isMissingOrHasMissingSuperType(com.android.tools.r8.graph.DexType):599:599 -> isMissingOrHasMissingSuperType
-    2:6:boolean com.android.tools.r8.graph.DexClass.hasMissingSuperType(com.android.tools.r8.graph.AppInfoWithSubtyping):746:750 -> isMissingOrHasMissingSuperType
+    2:6:boolean com.android.tools.r8.graph.DexClass.hasMissingSuperType(com.android.tools.r8.graph.AppInfoWithSubtyping):796:800 -> isMissingOrHasMissingSuperType
     2:6:boolean isMissingOrHasMissingSuperType(com.android.tools.r8.graph.DexType):600 -> isMissingOrHasMissingSuperType
     1:3:boolean isRelatedBySubtyping(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):472:474 -> isRelatedBySubtyping
     1:1:boolean isSerializable(com.android.tools.r8.graph.DexType):608:608 -> isSerializable
@@ -15582,12 +15588,13 @@
     13:18:void visit(com.android.tools.r8.DataEntryResource):167:172 -> visit
 com.android.tools.r8.graph.AppView -> com.android.tools.r8.graph.f:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
+    java.util.Map sourceDebugExtensions -> r
     com.android.tools.r8.ir.analysis.proto.ProtoShrinker protoShrinker -> k
     com.android.tools.r8.graph.AppView$WholeProgramOptimizations wholeProgramOptimizations -> d
     boolean allCodeProcessed -> l
     com.android.tools.r8.utils.InternalOptions options -> f
-    boolean $assertionsDisabled -> r
     com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator callSiteOptimizationInfoPropagator -> j
+    boolean $assertionsDisabled -> s
     com.android.tools.r8.shaking.RootSetBuilder$RootSet rootSet -> g
     com.android.tools.r8.ir.desugar.PrefixRewritingMapper rewritePrefix -> i
     com.android.tools.r8.graph.classmerging.VerticallyMergedClasses verticallyMergedClasses -> q
@@ -15599,77 +15606,79 @@
     com.android.tools.r8.graph.AppInfo appInfo -> a
     com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$InitializedClassesInInstanceMethods initializedClassesInInstanceMethods -> n
     com.android.tools.r8.ir.analysis.value.AbstractValueFactory abstractValueFactory -> h
-    1:1:void <clinit>():30:30 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):79:79 -> <init>
-    2:55:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):44:97 -> <init>
-    1:1:com.android.tools.r8.graph.AppView createForD8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions):102:102 -> a
+    1:1:void <clinit>():32:32 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):81:81 -> <init>
+    2:55:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):46:99 -> <init>
+    1:1:com.android.tools.r8.graph.AppView createForD8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions):104:104 -> a
     2:2:com.android.tools.r8.ir.desugar.PrefixRewritingMapper com.android.tools.r8.ir.desugar.PrefixRewritingMapper.empty():22:22 -> a
-    2:2:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.utils.InternalOptions):70 -> a
-    2:2:com.android.tools.r8.graph.AppView createForD8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions):102 -> a
-    3:3:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.utils.InternalOptions):71:71 -> a
-    3:3:com.android.tools.r8.graph.AppView createForD8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions):102 -> a
-    4:4:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.utils.InternalOptions):65:65 -> a
-    4:4:com.android.tools.r8.graph.AppView createForD8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions):102 -> a
-    5:5:com.android.tools.r8.graph.AppView createForD8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):107:107 -> a
-    6:6:com.android.tools.r8.ir.analysis.value.AbstractValueFactory abstractValueFactory():120:120 -> a
-    7:11:com.android.tools.r8.graph.AppView setAppInfo(com.android.tools.r8.graph.AppInfo):128:132 -> a
-    12:12:void setAppServices(com.android.tools.r8.graph.AppServices):160:160 -> a
-    13:13:void setClassesEscapingIntoLibrary(java.util.function.Predicate):169:169 -> a
-    14:14:com.android.tools.r8.graph.DexProgramClass definitionForProgramType(com.android.tools.r8.graph.DexType):194:194 -> a
-    15:16:void withGeneratedExtensionRegistryShrinker(java.util.function.Consumer):231:232 -> a
-    17:18:java.lang.Object withGeneratedExtensionRegistryShrinker(java.util.function.Function,java.lang.Object):238:239 -> a
-    19:20:boolean setGraphLense(com.android.tools.r8.graph.GraphLense):279:280 -> a
-    21:21:void setInitializedClassesInInstanceMethods(com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$InitializedClassesInInstanceMethods):288:288 -> a
-    22:23:void setRootSet(com.android.tools.r8.shaking.RootSetBuilder$RootSet):308:309 -> a
-    24:24:void setUnneededVisibilityBridgeMethods(java.util.Set):317:317 -> a
-    25:25:void setHorizontallyMergedLambdaClasses(com.android.tools.r8.graph.classmerging.HorizontallyMergedLambdaClasses):339:339 -> a
-    26:26:void setVerticallyMergedClasses(com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):349:349 -> a
-    27:28:com.android.tools.r8.utils.OptionalBool isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):366:367 -> a
-    29:29:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.utils.OptionalBool.unknown():58:58 -> a
-    29:29:com.android.tools.r8.utils.OptionalBool isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):368 -> a
-    1:1:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions):111:111 -> b
+    2:2:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.utils.InternalOptions):72 -> a
+    2:2:com.android.tools.r8.graph.AppView createForD8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions):104 -> a
+    3:3:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.utils.InternalOptions):73:73 -> a
+    3:3:com.android.tools.r8.graph.AppView createForD8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions):104 -> a
+    4:4:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.utils.InternalOptions):67:67 -> a
+    4:4:com.android.tools.r8.graph.AppView createForD8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions):104 -> a
+    5:5:com.android.tools.r8.graph.AppView createForD8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):109:109 -> a
+    6:6:com.android.tools.r8.ir.analysis.value.AbstractValueFactory abstractValueFactory():122:122 -> a
+    7:11:com.android.tools.r8.graph.AppView setAppInfo(com.android.tools.r8.graph.AppInfo):130:134 -> a
+    12:12:void setAppServices(com.android.tools.r8.graph.AppServices):154:154 -> a
+    13:13:void setClassesEscapingIntoLibrary(java.util.function.Predicate):163:163 -> a
+    14:14:void setSourceDebugExtensionForType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexValue$DexValueString):167:167 -> a
+    15:15:com.android.tools.r8.graph.DexValue$DexValueString getSourceDebugExtensionForType(com.android.tools.r8.graph.DexClass):171:171 -> a
+    16:16:com.android.tools.r8.graph.DexProgramClass definitionForProgramType(com.android.tools.r8.graph.DexType):196:196 -> a
+    17:18:void withGeneratedExtensionRegistryShrinker(java.util.function.Consumer):233:234 -> a
+    19:20:java.lang.Object withGeneratedExtensionRegistryShrinker(java.util.function.Function,java.lang.Object):240:241 -> a
+    21:22:boolean setGraphLense(com.android.tools.r8.graph.GraphLense):281:282 -> a
+    23:23:void setInitializedClassesInInstanceMethods(com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$InitializedClassesInInstanceMethods):290:290 -> a
+    24:25:void setRootSet(com.android.tools.r8.shaking.RootSetBuilder$RootSet):310:311 -> a
+    26:26:void setUnneededVisibilityBridgeMethods(java.util.Set):319:319 -> a
+    27:27:void setHorizontallyMergedLambdaClasses(com.android.tools.r8.graph.classmerging.HorizontallyMergedLambdaClasses):341:341 -> a
+    28:28:void setVerticallyMergedClasses(com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):351:351 -> a
+    29:30:com.android.tools.r8.utils.OptionalBool isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):368:369 -> a
+    31:31:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.utils.OptionalBool.unknown():58:58 -> a
+    31:31:com.android.tools.r8.utils.OptionalBool isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):370 -> a
+    1:1:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions):113:113 -> b
     2:2:com.android.tools.r8.ir.desugar.PrefixRewritingMapper com.android.tools.r8.ir.desugar.PrefixRewritingMapper.empty():22:22 -> b
-    2:2:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.utils.InternalOptions):70 -> b
-    2:2:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions):111 -> b
-    3:3:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.utils.InternalOptions):71:71 -> b
-    3:3:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions):111 -> b
-    4:4:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.utils.InternalOptions):65:65 -> b
-    4:4:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions):111 -> b
-    5:5:com.android.tools.r8.graph.AppView createForL8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):116:116 -> b
-    6:7:boolean isClassEscapingIntoLibrary(com.android.tools.r8.graph.DexType):164:165 -> b
-    8:9:void withGeneratedMessageLiteBuilderShrinker(java.util.function.Consumer):252:253 -> b
-    10:11:java.lang.Object withGeneratedMessageLiteBuilderShrinker(java.util.function.Function,java.lang.Object):267:268 -> b
-    12:17:com.android.tools.r8.graph.classmerging.MergedClassesCollection allMergedClasses():321:326 -> b
-    1:1:com.android.tools.r8.graph.AppInfo appInfo():124:124 -> c
-    2:6:com.android.tools.r8.utils.OptionalBool isInterface(com.android.tools.r8.graph.DexType):200:204 -> c
+    2:2:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.utils.InternalOptions):72 -> b
+    2:2:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions):113 -> b
+    3:3:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.utils.InternalOptions):73:73 -> b
+    3:3:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions):113 -> b
+    4:4:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.utils.InternalOptions):67:67 -> b
+    4:4:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions):113 -> b
+    5:5:com.android.tools.r8.graph.AppView createForL8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):118:118 -> b
+    6:7:boolean isClassEscapingIntoLibrary(com.android.tools.r8.graph.DexType):158:159 -> b
+    8:9:void withGeneratedMessageLiteBuilderShrinker(java.util.function.Consumer):254:255 -> b
+    10:11:java.lang.Object withGeneratedMessageLiteBuilderShrinker(java.util.function.Function,java.lang.Object):269:270 -> b
+    12:17:com.android.tools.r8.graph.classmerging.MergedClassesCollection allMergedClasses():323:328 -> b
+    1:1:com.android.tools.r8.graph.AppInfo appInfo():126:126 -> c
+    2:6:com.android.tools.r8.utils.OptionalBool isInterface(com.android.tools.r8.graph.DexType):202:206 -> c
     7:7:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.utils.OptionalBool.unknown():58:58 -> c
-    7:7:com.android.tools.r8.utils.OptionalBool isInterface(com.android.tools.r8.graph.DexType):205 -> c
-    8:8:com.android.tools.r8.utils.OptionalBool isInterface(com.android.tools.r8.graph.DexType):206:206 -> c
+    7:7:com.android.tools.r8.utils.OptionalBool isInterface(com.android.tools.r8.graph.DexType):207 -> c
+    8:8:com.android.tools.r8.utils.OptionalBool isInterface(com.android.tools.r8.graph.DexType):208:208 -> c
     9:9:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.utils.OptionalBool.unknown():58:58 -> c
-    9:9:com.android.tools.r8.utils.OptionalBool isInterface(com.android.tools.r8.graph.DexType):209 -> c
-    10:11:void withGeneratedMessageLiteShrinker(java.util.function.Consumer):245:246 -> c
-    12:13:java.lang.Object withGeneratedMessageLiteShrinker(java.util.function.Function,java.lang.Object):259:260 -> c
-    1:1:com.android.tools.r8.graph.AppServices appServices():156:156 -> d
-    2:3:java.lang.Object withInitializedClassesInInstanceMethods(java.util.function.Function,java.lang.Object):293:294 -> d
-    1:1:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):189:189 -> definitionFor
-    1:1:com.android.tools.r8.graph.DexItemFactory dexItemFactory():214:214 -> dexItemFactory
-    1:1:com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator callSiteOptimizationInfoPropagator():222:222 -> e
-    1:1:boolean enableWholeProgramOptimizations():218:218 -> f
-    1:1:com.android.tools.r8.graph.GraphLense graphLense():274:274 -> g
-    1:1:boolean isAllCodeProcessed():140:140 -> h
-    1:1:com.android.tools.r8.utils.InternalOptions options():300:300 -> i
-    1:1:com.android.tools.r8.ir.analysis.proto.ProtoShrinker protoShrinker():226:226 -> j
-    1:1:com.android.tools.r8.shaking.RootSetBuilder$RootSet rootSet():304:304 -> k
-    1:1:void setAllCodeProcessed():144:144 -> l
-    1:1:java.util.Set unneededVisibilityBridgeMethods():313:313 -> m
-    1:1:com.android.tools.r8.graph.classmerging.VerticallyMergedClasses verticallyMergedClasses():345:345 -> n
+    9:9:com.android.tools.r8.utils.OptionalBool isInterface(com.android.tools.r8.graph.DexType):211 -> c
+    10:11:void withGeneratedMessageLiteShrinker(java.util.function.Consumer):247:248 -> c
+    12:13:java.lang.Object withGeneratedMessageLiteShrinker(java.util.function.Function,java.lang.Object):261:262 -> c
+    1:1:com.android.tools.r8.graph.AppServices appServices():150:150 -> d
+    2:3:java.lang.Object withInitializedClassesInInstanceMethods(java.util.function.Function,java.lang.Object):295:296 -> d
+    1:1:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):191:191 -> definitionFor
+    1:1:com.android.tools.r8.graph.DexItemFactory dexItemFactory():216:216 -> dexItemFactory
+    1:1:com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator callSiteOptimizationInfoPropagator():224:224 -> e
+    1:1:boolean enableWholeProgramOptimizations():220:220 -> f
+    1:1:com.android.tools.r8.graph.GraphLense graphLense():276:276 -> g
+    1:1:boolean isAllCodeProcessed():142:142 -> h
+    1:1:com.android.tools.r8.utils.InternalOptions options():302:302 -> i
+    1:1:com.android.tools.r8.ir.analysis.proto.ProtoShrinker protoShrinker():228:228 -> j
+    1:1:com.android.tools.r8.shaking.RootSetBuilder$RootSet rootSet():306:306 -> k
+    1:1:void setAllCodeProcessed():146:146 -> l
+    1:1:java.util.Set unneededVisibilityBridgeMethods():315:315 -> m
+    1:1:com.android.tools.r8.graph.classmerging.VerticallyMergedClasses verticallyMergedClasses():347:347 -> n
     com.android.tools.r8.graph.AppView withLiveness() -> o
-    1:1:com.android.tools.r8.graph.AppView withSubtyping():354:354 -> p
+    1:1:com.android.tools.r8.graph.AppView withSubtyping():356:356 -> p
 com.android.tools.r8.graph.AppView$WholeProgramOptimizations -> com.android.tools.r8.graph.f$a:
     com.android.tools.r8.graph.AppView$WholeProgramOptimizations ON -> a
     com.android.tools.r8.graph.AppView$WholeProgramOptimizations OFF -> b
-    1:2:void <clinit>():33:34 -> <clinit>
-    1:1:void <init>(java.lang.String,int):32:32 -> <init>
+    1:2:void <clinit>():35:36 -> <clinit>
+    1:1:void <init>(java.lang.String,int):34:34 -> <init>
 com.android.tools.r8.graph.AppliedGraphLens -> com.android.tools.r8.graph.g:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.com.google.common.collect.BiMap originalTypeNames -> b
@@ -15706,7 +15715,7 @@
     9:21:void writeMethod(com.android.tools.r8.graph.DexEncodedMethod,java.io.PrintStream):103:115 -> a
     22:23:void writeIR(com.android.tools.r8.graph.DexEncodedMethod,java.io.PrintStream):124:125 -> a
     22:23:void writeMethod(com.android.tools.r8.graph.DexEncodedMethod,java.io.PrintStream):116 -> a
-    24:24:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):370:370 -> a
+    24:24:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):371:371 -> a
     24:24:void writeIR(com.android.tools.r8.graph.DexEncodedMethod,java.io.PrintStream):125 -> a
     24:24:void writeMethod(com.android.tools.r8.graph.DexEncodedMethod,java.io.PrintStream):116 -> a
     25:26:void writeIR(com.android.tools.r8.graph.DexEncodedMethod,java.io.PrintStream):128:129 -> a
@@ -15724,7 +15733,7 @@
     1:1:void visit(java.lang.Iterable,java.util.function.Consumer):7:7 -> a
     2:2:com.android.tools.r8.graph.BottomUpClassHierarchyTraversal forAllClasses(com.android.tools.r8.graph.AppView):21:21 -> a
     3:15:void addDependentsToWorklist(com.android.tools.r8.graph.DexClass):43:55 -> a
-    16:16:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    16:16:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     16:16:void addDependentsToWorklist(com.android.tools.r8.graph.DexClass):55 -> a
     17:18:void addDependentsToWorklist(com.android.tools.r8.graph.DexClass):57:58 -> a
     1:1:com.android.tools.r8.graph.BottomUpClassHierarchyTraversal forProgramClasses(com.android.tools.r8.graph.AppView):30:30 -> b
@@ -15742,124 +15751,128 @@
     com.android.tools.r8.graph.DexType originalHolder -> a
     int maxStack -> b
     int maxLocals -> c
-    1:1:void <clinit>():39:39 -> <clinit>
-    1:7:void <init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):105:111 -> <init>
-    1:1:java.util.List getInstructions():131:131 -> a
-    2:2:void write(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.AppView,int):196:196 -> a
-    3:12:boolean shouldAddParameterNames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):175:184 -> a
-    3:12:void write(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.AppView,int):198 -> a
-    13:13:void write(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.AppView,int):199:199 -> a
+    1:1:void <clinit>():43:43 -> <clinit>
+    1:7:void <init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):109:115 -> <init>
+    1:1:java.util.List getInstructions():135:135 -> a
+    2:2:void write(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.AppView,int):200:200 -> a
+    3:12:boolean shouldAddParameterNames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):179:188 -> a
+    3:12:void write(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.AppView,int):202 -> a
+    13:13:void write(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.AppView,int):203:203 -> a
     14:14:void com.android.tools.r8.cf.code.CfLabel.write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens):47:47 -> a
-    14:14:void write(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.AppView,int):200 -> a
-    15:16:void write(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.AppView,int):202:203 -> a
-    17:17:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():324:324 -> a
-    17:17:boolean com.android.tools.r8.utils.InternalOptions.shouldKeepStackMapTable():328 -> a
-    17:17:void write(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.AppView,int):205 -> a
-    18:18:boolean com.android.tools.r8.utils.InternalOptions.shouldKeepStackMapTable():329:329 -> a
-    18:18:void write(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.AppView,int):205 -> a
-    19:35:void write(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.AppView,int):208:224 -> a
-    36:49:void write(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.AppView,int):218:231 -> a
-    50:56:void write(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.AppView,int):230:236 -> a
-    57:57:void write(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.AppView,int):235:235 -> a
-    58:63: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):248:253 -> a
-    64:64: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):248:248 -> a
-    65:67:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):307:309 -> a
-    68:68:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):308:308 -> a
-    69:70:com.android.tools.r8.ir.code.IRCode internalBuildWithLocals(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):331:332 -> a
-    69:70:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):317 -> a
-    71:82:com.android.tools.r8.ir.code.IRCode internalBuildWithLocals(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):331:342 -> a
-    71:82:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):317 -> a
-    83:83:com.android.tools.r8.ir.code.IRCode internalBuildWithLocals(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):341:341 -> a
-    83:83:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):317 -> a
-    84:93:com.android.tools.r8.ir.code.IRCode internalBuild(java.util.List,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):361:370 -> a
-    94:105:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexType):486:497 -> a
-    106:106:boolean com.android.tools.r8.graph.MethodAccessFlags.isSynchronized():110:110 -> a
-    106:106:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexType):497 -> a
+    14:14:void write(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.AppView,int):204 -> a
+    15:16:void write(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.AppView,int):206:207 -> a
+    17:17:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():316:316 -> a
+    17:17:boolean com.android.tools.r8.utils.InternalOptions.shouldKeepStackMapTable():320 -> a
+    17:17:void write(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.AppView,int):209 -> a
+    18:18:boolean com.android.tools.r8.utils.InternalOptions.shouldKeepStackMapTable():321:321 -> a
+    18:18:void write(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.AppView,int):209 -> a
+    19:35:void write(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.AppView,int):212:228 -> a
+    36:49:void write(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.AppView,int):222:235 -> a
+    50:56:void write(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.AppView,int):234:240 -> a
+    57:57:void write(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.AppView,int):239:239 -> a
+    58:63: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):252:257 -> a
+    64:64: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):252:252 -> a
+    65:67:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):311:313 -> a
+    68:68:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):312:312 -> a
+    69:70:com.android.tools.r8.ir.code.IRCode internalBuildWithLocals(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):335:336 -> a
+    69:70:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):321 -> a
+    71:82:com.android.tools.r8.ir.code.IRCode internalBuildWithLocals(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):335:346 -> a
+    71:82:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):321 -> a
+    83:83:com.android.tools.r8.ir.code.IRCode internalBuildWithLocals(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):345:345 -> a
+    83:83:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):321 -> a
+    84:93:com.android.tools.r8.ir.code.IRCode internalBuild(java.util.List,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):365:374 -> a
+    94:105:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexType):490:501 -> a
+    106:106:boolean com.android.tools.r8.graph.MethodAccessFlags.isSynchronized():124:124 -> a
+    106:106:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexType):501 -> a
     107:107:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMonitor():211:211 -> a
-    107:107:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexType):498 -> a
-    108:117:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexType):499:508 -> a
-    118:126:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexType):506:514 -> a
+    107:107:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexType):502 -> a
+    108:117:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexType):503:512 -> a
+    118:126:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexType):510:518 -> a
     127:127:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMoveException():219:219 -> a
-    127:127:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexType):517 -> a
-    128:128:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexType):517:517 -> a
-    1:1:java.util.List getLocalVariables():135:135 -> b
-    2:3:int countNonStackOperations(int):150:151 -> b
-    1:1:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):281:281 -> buildIR
-    1:3:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):293:295 -> buildInliningIR
-    1:1:int getMaxLocals():123:123 -> c
-    1:41:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap collectParameterInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):389:429 -> collectParameterInfo
-    42:42:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap collectParameterInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):428:428 -> collectParameterInfo
-    43:43:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap collectParameterInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):400:400 -> collectParameterInfo
-    1:1:boolean computeEquals(java.lang.Object):264:264 -> computeEquals
-    1:1:int computeHashCode():259:259 -> computeHashCode
-    1:1:int getMaxStack():119:119 -> d
-    1:1:com.android.tools.r8.graph.DexType getOriginalHolder():115:115 -> e
-    1:1:int estimatedSizeForInlining():140:140 -> estimatedSizeForInlining
-    1:1:boolean estimatedSizeForInliningAtMost(int):145:145 -> estimatedSizeForInliningAtMost
-    1:1:java.util.List getTryCatchRanges():127:127 -> f
-    1:2:boolean isEmptyVoidMethod():269:270 -> isEmptyVoidMethod
-    1:29:void registerArgumentReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.ArgumentUse):437:465 -> registerArgumentReferences
-    1:6:void registerCodeReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry):375:380 -> registerCodeReferences
-    1:1:java.lang.String toString():472:472 -> toString
+    127:127:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexType):521 -> a
+    128:128:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexType):521:521 -> a
+    129:153:void addFakeThisParameter(com.android.tools.r8.graph.DexItemFactory):527:551 -> a
+    154:155: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):59:60 -> a
+    154:155:void addFakeThisParameter(com.android.tools.r8.graph.DexItemFactory):551 -> a
+    156:156:void addFakeThisParameter(com.android.tools.r8.graph.DexItemFactory):548:548 -> a
+    1:1:java.util.List getLocalVariables():139:139 -> b
+    2:3:int countNonStackOperations(int):154:155 -> b
+    1:1:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):285:285 -> buildIR
+    1:3:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):297:299 -> buildInliningIR
+    1:1:int getMaxLocals():127:127 -> c
+    1:41:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap collectParameterInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):393:433 -> collectParameterInfo
+    42:42:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap collectParameterInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):432:432 -> collectParameterInfo
+    43:43:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap collectParameterInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):404:404 -> collectParameterInfo
+    1:1:boolean computeEquals(java.lang.Object):268:268 -> computeEquals
+    1:1:int computeHashCode():263:263 -> computeHashCode
+    1:1:int getMaxStack():123:123 -> d
+    1:1:com.android.tools.r8.graph.DexType getOriginalHolder():119:119 -> e
+    1:1:int estimatedSizeForInlining():144:144 -> estimatedSizeForInlining
+    1:1:boolean estimatedSizeForInliningAtMost(int):149:149 -> estimatedSizeForInliningAtMost
+    1:1:java.util.List getTryCatchRanges():131:131 -> f
+    1:2:boolean isEmptyVoidMethod():273:274 -> isEmptyVoidMethod
+    1:29:void registerArgumentReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.ArgumentUse):441:469 -> registerArgumentReferences
+    1:6:void registerCodeReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry):379:384 -> registerCodeReferences
+    1:1:java.lang.String toString():476:476 -> toString
     2:2:void com.android.tools.r8.cf.CfPrinter.<init>(com.android.tools.r8.graph.CfCode):120:120 -> toString
-    2:2:java.lang.String toString():472 -> toString
-    3:3:java.lang.String toString():472:472 -> toString
-    4:4:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.ClassNameMapper):477:477 -> toString
+    2:2:java.lang.String toString():476 -> toString
+    3:3:java.lang.String toString():476:476 -> toString
+    4:4:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.ClassNameMapper):481:481 -> toString
 com.android.tools.r8.graph.CfCode$LocalVariableInfo -> com.android.tools.r8.graph.l$a:
     com.android.tools.r8.graph.DebugLocalInfo local -> b
     boolean $assertionsDisabled -> e
     com.android.tools.r8.cf.code.CfLabel start -> c
     com.android.tools.r8.cf.code.CfLabel end -> d
     int index -> a
-    1:1:void <clinit>():41:41 -> <clinit>
-    1:4:void <init>(int,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.cf.code.CfLabel):48:51 -> <init>
-    1:1:com.android.tools.r8.graph.DebugLocalInfo access$000(com.android.tools.r8.graph.CfCode$LocalVariableInfo):41:41 -> a
-    2:4:void setEnd(com.android.tools.r8.cf.code.CfLabel):60:62 -> a
-    5:5:com.android.tools.r8.cf.code.CfLabel getEnd():78:78 -> a
-    1:1:com.android.tools.r8.cf.code.CfLabel access$100(com.android.tools.r8.graph.CfCode$LocalVariableInfo):41:41 -> b
-    2:2:int getIndex():66:66 -> b
-    1:1:com.android.tools.r8.cf.code.CfLabel access$200(com.android.tools.r8.graph.CfCode$LocalVariableInfo):41:41 -> c
-    2:2:com.android.tools.r8.graph.DebugLocalInfo getLocal():70:70 -> c
-    1:1:int access$300(com.android.tools.r8.graph.CfCode$LocalVariableInfo):41:41 -> d
-    2:2:com.android.tools.r8.cf.code.CfLabel getStart():74:74 -> d
-    1:1:java.lang.String toString():83:83 -> toString
+    1:1:void <clinit>():45:45 -> <clinit>
+    1:4:void <init>(int,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.cf.code.CfLabel):52:55 -> <init>
+    1:1:com.android.tools.r8.graph.DebugLocalInfo access$000(com.android.tools.r8.graph.CfCode$LocalVariableInfo):45:45 -> a
+    2:4:void setEnd(com.android.tools.r8.cf.code.CfLabel):64:66 -> a
+    5:5:com.android.tools.r8.cf.code.CfLabel getEnd():82:82 -> a
+    1:1:com.android.tools.r8.cf.code.CfLabel access$100(com.android.tools.r8.graph.CfCode$LocalVariableInfo):45:45 -> b
+    2:2:int getIndex():70:70 -> b
+    1:1:com.android.tools.r8.cf.code.CfLabel access$200(com.android.tools.r8.graph.CfCode$LocalVariableInfo):45:45 -> c
+    2:2:com.android.tools.r8.graph.DebugLocalInfo getLocal():74:74 -> c
+    1:1:int access$300(com.android.tools.r8.graph.CfCode$LocalVariableInfo):45:45 -> d
+    2:2:com.android.tools.r8.cf.code.CfLabel getStart():78:78 -> d
+    1:1:java.lang.String toString():87:87 -> toString
 com.android.tools.r8.graph.ClassAccessFlags -> com.android.tools.r8.graph.m:
-    boolean $assertionsDisabled -> e
-    1:1:void <clinit>():11:11 -> <clinit>
-    1:1:void <init>(int,int):57:57 -> <init>
-    1:1:com.android.tools.r8.graph.ClassAccessFlags copy():77:77 -> A
-    1:1:int com.android.tools.r8.graph.AccessFlags.materialize():61:61 -> B
-    1:1:int getAsCfAccessFlags():98 -> B
-    1:1:int com.android.tools.r8.graph.AccessFlags.materialize():61:61 -> C
-    1:1:int getAsDexAccessFlags():89 -> C
-    2:2:boolean isInterface():125:125 -> C
-    2:2:int getAsDexAccessFlags():90 -> C
-    1:1:boolean isAbstract():137:137 -> D
-    1:1:boolean isAnnotation():149:149 -> E
-    1:1:boolean isEnum():161:161 -> F
-    1:1:boolean isInterface():125:125 -> G
-    1:1:boolean isSuper():169:169 -> H
-    1:1:void setAbstract():141:141 -> I
-    1:1:void unsetAbstract():145:145 -> J
-    1:1:void unsetAnnotation():157:157 -> K
-    1:1:void unsetInterface():133:133 -> L
-    1:1:boolean isInterface():125:125 -> a
-    1:1:boolean areValid(int,boolean):106 -> a
-    2:2:boolean isSuper():169:169 -> a
-    2:2:boolean areValid(int,boolean):108 -> a
-    3:7:boolean areValid(int,boolean):114:118 -> a
-    8:8:boolean isEnum():161:161 -> a
-    8:8:boolean areValid(int,boolean):118 -> a
-    9:9:boolean areValid(int,boolean):120:120 -> a
-    1:8:java.util.List getNames():30:37 -> b
-    1:8:java.util.List getPredicates():42:49 -> d
-    1:1:com.android.tools.r8.graph.ClassAccessFlags fromCfAccessFlags(int):72:72 -> e
-    2:2:void <init>(int):53:53 -> e
-    2:2:com.android.tools.r8.graph.ClassAccessFlags fromCfAccessFlags(int):72 -> e
-    1:1:com.android.tools.r8.graph.ClassAccessFlags fromDexAccessFlags(int):68:68 -> f
-    2:2:void <init>(int):53:53 -> f
-    2:2:com.android.tools.r8.graph.ClassAccessFlags fromDexAccessFlags(int):68 -> f
-    1:3:com.android.tools.r8.graph.ClassAccessFlags fromSharedAccessFlags(int):61:63 -> g
+    boolean $assertionsDisabled -> f
+    1:1:void <clinit>():15:15 -> <clinit>
+    1:1:void <init>(int,int):61:61 -> <init>
+    1:1:com.android.tools.r8.graph.ClassAccessFlags copy():81:81 -> A
+    1:1:int com.android.tools.r8.graph.AccessFlags.materialize():67:67 -> B
+    1:1:int getAsCfAccessFlags():91 -> B
+    1:1:int com.android.tools.r8.graph.AccessFlags.materialize():67:67 -> C
+    1:1:int getAsDexAccessFlags():98 -> C
+    2:2:boolean isInterface():155:155 -> C
+    2:2:int getAsDexAccessFlags():99 -> C
+    1:1:boolean isAbstract():167:167 -> D
+    1:1:boolean isAnnotation():179:179 -> E
+    1:1:boolean isEnum():191:191 -> F
+    1:1:boolean isInterface():155:155 -> G
+    1:1:boolean isSuper():199:199 -> H
+    1:1:void setAbstract():171:171 -> I
+    1:1:void unsetAbstract():175:175 -> J
+    1:1:void unsetAnnotation():187:187 -> K
+    1:1:void unsetInterface():163:163 -> L
+    1:1:boolean isInterface():155:155 -> a
+    1:1:boolean areValid(int,boolean):132 -> a
+    2:2:boolean isSuper():199:199 -> a
+    2:2:boolean areValid(int,boolean):134 -> a
+    3:7:boolean areValid(int,boolean):140:144 -> a
+    8:8:boolean isEnum():191:191 -> a
+    8:8:boolean areValid(int,boolean):144 -> a
+    9:9:boolean areValid(int,boolean):146:146 -> a
+    1:8:java.util.List getNames():34:41 -> b
+    1:8:java.util.List getPredicates():46:53 -> d
+    1:1:com.android.tools.r8.graph.ClassAccessFlags fromCfAccessFlags(int):76:76 -> e
+    2:2:void <init>(int):57:57 -> e
+    2:2:com.android.tools.r8.graph.ClassAccessFlags fromCfAccessFlags(int):76 -> e
+    1:1:com.android.tools.r8.graph.ClassAccessFlags fromDexAccessFlags(int):72:72 -> f
+    2:2:void <init>(int):57:57 -> f
+    2:2:com.android.tools.r8.graph.ClassAccessFlags fromDexAccessFlags(int):72 -> f
+    1:3:com.android.tools.r8.graph.ClassAccessFlags fromSharedAccessFlags(int):65:67 -> g
 com.android.tools.r8.graph.ClassHierarchyTraversal -> com.android.tools.r8.graph.o:
     java.util.Deque worklist -> d
     com.android.tools.r8.graph.AppView appView -> a
@@ -16059,7 +16072,7 @@
     1:1:com.android.tools.r8.graph.DexType findDuplicateEntryType(com.android.tools.r8.graph.DexAnnotation[]):32:32 -> a
     2:2:boolean isEmpty():80:80 -> a
     3:3:int lambda$sort$0(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation):88:88 -> a
-    4:4:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):160:160 -> a
+    4:4:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):166:166 -> a
     4:4:int lambda$sort$0(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation):88 -> a
     5:6:com.android.tools.r8.graph.DexAnnotation getFirstMatching(com.android.tools.r8.graph.DexType):96:97 -> a
     7:7:com.android.tools.r8.graph.DexAnnotationSet keepIf(java.util.function.Predicate):146:146 -> a
@@ -16269,158 +16282,167 @@
     com.android.tools.r8.graph.ClassAccessFlags accessFlags -> d
     com.android.tools.r8.graph.DexType superType -> e
     com.android.tools.r8.graph.DexEncodedMethod[] virtualMethods -> l
-    1:1:void <clinit>():30:30 -> <clinit>
-    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.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):90:90 -> <init>
-    2:81: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.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):40:119 -> <init>
-    82:82: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.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):109:109 -> <init>
-    1:1:java.util.List getNestMembersClassAttributes():961:961 -> A
-    1:1:com.android.tools.r8.graph.DexType getType():720:720 -> B
-    1:1:boolean hasClassInitializer():724:724 -> C
-    1:1:com.android.tools.r8.graph.DexEncodedMethod getDefaultInitializer():742:742 -> D
-    1:1:boolean hasDefaultInitializer():728 -> D
-    1:1:boolean hasKotlinInfo():968:968 -> E
-    1:2:boolean hasStaticSynchronizedMethods():997:998 -> F
-    3:3:boolean com.android.tools.r8.graph.MethodAccessFlags.isSynchronized():110:110 -> F
-    3:3:boolean hasStaticSynchronizedMethods():998 -> F
-    1:5:java.util.List instanceFields():454:458 -> G
-    1:4:boolean isAnonymousClass():919:922 -> H
+    1:1:void <clinit>():36:36 -> <clinit>
+    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.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):96:96 -> <init>
+    2:81: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.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):46:125 -> <init>
+    82:82: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.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):115:115 -> <init>
+    1:1:java.util.List getNestMembersClassAttributes():1011:1011 -> A
+    1:1:com.android.tools.r8.graph.DexType getType():770:770 -> B
+    1:1:boolean hasClassInitializer():774:774 -> C
+    1:1:com.android.tools.r8.graph.DexEncodedMethod getDefaultInitializer():792:792 -> D
+    1:1:boolean hasDefaultInitializer():778 -> D
+    1:1:boolean hasKotlinInfo():1018:1018 -> E
+    1:2:boolean hasStaticSynchronizedMethods():1047:1048 -> F
+    3:3:boolean com.android.tools.r8.graph.MethodAccessFlags.isSynchronized():124:124 -> F
+    3:3:boolean hasStaticSynchronizedMethods():1048 -> F
+    1:5:java.util.List instanceFields():504:508 -> G
+    1:4:boolean isAnonymousClass():969:972 -> H
     boolean isClasspathClass() -> I
-    1:1:boolean isEnum():646:646 -> J
-    2:2:boolean com.android.tools.r8.graph.ClassAccessFlags.isEnum():161:161 -> J
-    2:2:boolean isEnum():646 -> J
-    1:1:boolean isInANest():926:926 -> K
-    1:1:boolean isInterface():642:642 -> L
-    2:2:boolean com.android.tools.r8.graph.ClassAccessFlags.isInterface():125:125 -> L
-    2:2:boolean isInterface():642 -> L
+    1:1:boolean isEnum():696:696 -> J
+    2:2:boolean com.android.tools.r8.graph.ClassAccessFlags.isEnum():191:191 -> J
+    2:2:boolean isEnum():696 -> J
+    1:1:boolean isInANest():976:976 -> K
+    1:1:boolean isInterface():692:692 -> L
+    2:2:boolean com.android.tools.r8.graph.ClassAccessFlags.isInterface():155:155 -> L
+    2:2:boolean isInterface():692 -> L
     boolean isLibraryClass() -> M
-    1:3:boolean isLocalClass():906:908 -> N
-    1:3:boolean isMemberClass():912:914 -> O
-    1:1:boolean isNestHost():939:939 -> P
-    1:1:boolean isNestMember():943:943 -> Q
+    1:3:boolean isLocalClass():956:958 -> N
+    1:3:boolean isMemberClass():962:964 -> O
+    1:1:boolean isNestHost():989:989 -> P
+    1:1:boolean isNestMember():993:993 -> Q
     boolean isNotProgramClass() -> R
     boolean isProgramClass() -> S
-    1:1:java.lang.Iterable methods():135:135 -> T
-    1:5:java.util.List staticFields():396:400 -> U
-    1:5:java.util.List virtualMethods():204:208 -> V
-    1:3:com.android.tools.r8.graph.DexEncodedMethod[] virtualMethodsSorted():321:323 -> W
-    1:4:boolean verifyNoDuplicateFields():521:524 -> X
-    1:4:boolean verifyNoDuplicateMethods():284:287 -> Y
+    1:1:java.lang.Iterable methods():141:141 -> T
+    1:5:java.util.List staticFields():446:450 -> U
+    1:5:java.util.List virtualMethods():210:214 -> V
+    1:3:com.android.tools.r8.graph.DexEncodedMethod[] virtualMethodsSorted():371:373 -> W
+    1:4:boolean verifyNoDuplicateFields():571:574 -> X
+    1:4:boolean verifyNoDuplicateMethods():334:337 -> Y
     void addDependencies(com.android.tools.r8.dex.MixedSectionCollection) -> a
     com.android.tools.r8.graph.DexClass asDexClass() -> a
     java.util.Iterator lambda$allImmediateSupertypes$3(java.util.Iterator) -> a
-    1:3:java.lang.Iterable fields(java.util.function.Predicate):129:131 -> a
+    1:3:java.lang.Iterable fields(java.util.function.Predicate):135:137 -> a
     4:4:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
-    4:4:java.lang.Iterable fields(java.util.function.Predicate):129 -> a
-    5:11:void appendDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):158:164 -> a
-    12:22:void appendDirectMethods(java.util.Collection):168:178 -> a
-    23:26:void setDirectMethod(int,com.android.tools.r8.graph.DexEncodedMethod):190:193 -> a
-    27:30:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):197:200 -> a
-    31:31:int lambda$allMethodsSorted$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):308:308 -> a
-    32:54:void virtualizeMethods(java.util.Set):329:351 -> a
-    55:59:void forEachField(java.util.function.Consumer):387:391 -> a
-    60:62:void setInstanceField(int,com.android.tools.r8.graph.DexEncodedField):492:494 -> a
-    63:65:void setInstanceFields(com.android.tools.r8.graph.DexEncodedField[]):498:500 -> a
-    66:67:boolean verifyCorrectnessOfFieldHolders(java.lang.Iterable):514:515 -> a
-    68:68:com.android.tools.r8.graph.DexEncodedField lookupInstanceField(com.android.tools.r8.graph.DexField):536:536 -> a
-    68:68:com.android.tools.r8.graph.DexEncodedField lookupField(com.android.tools.r8.graph.DexField):554 -> a
-    69:69:com.android.tools.r8.graph.DexEncodedField lookupStaticField(com.android.tools.r8.graph.DexField):531:531 -> a
-    69:69:com.android.tools.r8.graph.DexEncodedField lookupField(com.android.tools.r8.graph.DexField):555 -> a
-    70:70:com.android.tools.r8.graph.DexEncodedMethod lookupDirectMethod(com.android.tools.r8.graph.DexMethod):560:560 -> a
-    71:72:com.android.tools.r8.graph.DexItem lookupTarget(com.android.tools.r8.graph.DexItem[],com.android.tools.r8.graph.Descriptor):617:618 -> a
-    73:75:com.android.tools.r8.graph.DexEncodedMethod getInitializer(com.android.tools.r8.graph.DexType[]):732:734 -> a
-    76:83:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):791:798 -> a
-    84:92:boolean hasClassInitializerThatCannotBePostponed():812:820 -> a
-    84:92:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):802 -> a
-    93:96:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):805:808 -> a
-    97:97:boolean lambda$defaultValuesForStaticFieldsMayTriggerAllocation$4(com.android.tools.r8.graph.DexEncodedField):855:855 -> a
-    98:106:void replaceInnerClassAttributeForThisClass(com.android.tools.r8.graph.InnerClassAttribute):894:902 -> a
-    107:108:void setNestHost(com.android.tools.r8.graph.DexType):934:935 -> a
-    109:109:boolean hasInstanceFieldsDirectlyOrIndirectly(com.android.tools.r8.graph.AppView):976:976 -> a
-    110:110:boolean hasInstanceFields():972:972 -> a
-    110:110:boolean hasInstanceFieldsDirectlyOrIndirectly(com.android.tools.r8.graph.AppView):979 -> a
-    111:111:boolean hasInstanceFieldsDirectlyOrIndirectly(com.android.tools.r8.graph.AppView):982:982 -> a
-    112:112:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
-    112:112:boolean hasInstanceFieldsDirectlyOrIndirectly(com.android.tools.r8.graph.AppView):982 -> a
-    113:113:boolean hasInstanceFieldsDirectlyOrIndirectly(com.android.tools.r8.graph.AppView):983:983 -> a
-    114:114:boolean isValid(com.android.tools.r8.utils.InternalOptions):987:987 -> a
-    115:115:boolean verifyNoAbstractMethodsOnNonAbstractClasses(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):272:272 -> a
-    115:115:boolean isValid(com.android.tools.r8.utils.InternalOptions):987 -> a
-    116:116:boolean isAbstract():626:626 -> a
-    116:116:boolean verifyNoAbstractMethodsOnNonAbstractClasses(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):273 -> a
-    116:116:boolean isValid(com.android.tools.r8.utils.InternalOptions):987 -> a
-    117:118:boolean verifyNoAbstractMethodsOnNonAbstractClasses(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):274:275 -> a
-    117:118:boolean isValid(com.android.tools.r8.utils.InternalOptions):987 -> a
-    119:119:boolean com.android.tools.r8.graph.DexEncodedMethod.isAbstract():253:253 -> a
-    119:119:boolean verifyNoAbstractMethodsOnNonAbstractClasses(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):275 -> a
-    119:119:boolean isValid(com.android.tools.r8.utils.InternalOptions):987 -> a
-    120:121:boolean verifyNoAbstractMethodsOnNonAbstractClasses(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):275:276 -> a
-    120:121:boolean isValid(com.android.tools.r8.utils.InternalOptions):987 -> a
-    122:126:boolean isValid(com.android.tools.r8.utils.InternalOptions):988:992 -> a
-    1:5:void removeDirectMethod(int):182:186 -> b
-    6:11:void appendVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):212:217 -> b
-    12:21:void appendVirtualMethods(java.util.Collection):221:230 -> b
-    22:24:void setVirtualMethod(int,com.android.tools.r8.graph.DexEncodedMethod):242:244 -> b
-    25:27:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):248:250 -> b
-    28:29:boolean verifyCorrectnessOfMethodHolders(java.lang.Iterable):264:265 -> b
-    30:34:void forEachMethod(java.util.function.Consumer):293:297 -> b
-    35:35:int lambda$directMethodsSorted$1(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):316:316 -> b
-    36:38:void setStaticField(int,com.android.tools.r8.graph.DexEncodedField):433:435 -> b
-    39:41:void setStaticFields(com.android.tools.r8.graph.DexEncodedField[]):439:441 -> b
-    42:46:boolean verifyCorrectnessOfFieldHolder(com.android.tools.r8.graph.DexEncodedField):504:508 -> b
-    47:47:com.android.tools.r8.graph.DexEncodedField lookupInstanceField(com.android.tools.r8.graph.DexField):536:536 -> b
-    48:48:com.android.tools.r8.graph.DexEncodedMethod lookupDirectMethod(com.android.tools.r8.graph.DexMethod):560:560 -> b
-    48:48:com.android.tools.r8.graph.DexEncodedMethod lookupMethod(com.android.tools.r8.graph.DexMethod):580 -> b
-    49:49:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualMethod(com.android.tools.r8.graph.DexMethod):570:570 -> b
-    49:49:com.android.tools.r8.graph.DexEncodedMethod lookupMethod(com.android.tools.r8.graph.DexMethod):581 -> b
-    50:50:com.android.tools.r8.graph.DexEncodedMethod lookupDirectMethod(java.util.function.Predicate):565:565 -> b
-    51:51:boolean isFinal():634:634 -> b
-    51:51:boolean isEffectivelyFinal(com.android.tools.r8.graph.AppView):638 -> b
-    52:57:boolean initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):838:843 -> b
-    1:5:boolean verifyCorrectnessOfMethodHolder(com.android.tools.r8.graph.DexEncodedMethod):254:258 -> c
-    6:6:int lambda$virtualMethodsSorted$2(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):324:324 -> c
-    7:7:com.android.tools.r8.graph.DexEncodedField lookupStaticField(com.android.tools.r8.graph.DexField):531:531 -> c
-    8:8:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualMethod(com.android.tools.r8.graph.DexMethod):570:570 -> c
-    9:9:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualMethod(java.util.function.Predicate):575:575 -> c
-    10:16:boolean isResolvable(com.android.tools.r8.graph.AppView):758:764 -> c
-    17:17:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> c
-    17:17:boolean com.android.tools.r8.graph.DexType.isResolvable(com.android.tools.r8.graph.AppView):276 -> c
-    17:17:boolean isResolvable(com.android.tools.r8.graph.AppView):765 -> c
-    18:18:boolean com.android.tools.r8.graph.DexType.isResolvable(com.android.tools.r8.graph.AppView):277:277 -> c
-    18:18:boolean isResolvable(com.android.tools.r8.graph.AppView):765 -> c
-    19:19:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> c
-    19:19:boolean com.android.tools.r8.graph.DexType.isResolvable(com.android.tools.r8.graph.AppView):276 -> c
-    19:19:boolean isResolvable(com.android.tools.r8.graph.AppView):765 -> c
-    20:23:boolean isResolvable(com.android.tools.r8.graph.AppView):771:774 -> c
-    1:1:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):146:146 -> collectMixedSectionItems
+    4:4:java.lang.Iterable fields(java.util.function.Predicate):135 -> a
+    5:11:void appendDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):164:170 -> a
+    12:22:void appendDirectMethods(java.util.Collection):174:184 -> a
+    23:26:void setDirectMethod(int,com.android.tools.r8.graph.DexEncodedMethod):196:199 -> a
+    27:30:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):203:206 -> a
+    31:33:java.util.Map kotlinConstructors(java.util.List,com.android.tools.r8.graph.AppView):219:221 -> a
+    34:38:com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor com.android.tools.r8.graph.DexEncodedMethod.findCompatibleKotlinConstructor(java.util.List,com.android.tools.r8.graph.AppView):358:362 -> a
+    34:38:java.util.Map kotlinConstructors(java.util.List,com.android.tools.r8.graph.AppView):222 -> a
+    39:43:java.util.Map kotlinConstructors(java.util.List,com.android.tools.r8.graph.AppView):225:229 -> a
+    44:49:java.util.List kotlinFunctions(java.util.List,java.util.List,com.android.tools.r8.graph.AppView):247:252 -> a
+    50:70:boolean com.android.tools.r8.graph.DexEncodedMethod.isKotlinProperty(java.util.List):398:418 -> a
+    50:70:java.util.List kotlinFunctions(java.util.List,java.util.List,com.android.tools.r8.graph.AppView):253 -> a
+    71:74:java.util.List kotlinFunctions(java.util.List,java.util.List,com.android.tools.r8.graph.AppView):255:258 -> a
+    75:75:int lambda$allMethodsSorted$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):358:358 -> a
+    76:98:void virtualizeMethods(java.util.Set):379:401 -> a
+    99:103:void forEachField(java.util.function.Consumer):437:441 -> a
+    104:106:void setInstanceField(int,com.android.tools.r8.graph.DexEncodedField):542:544 -> a
+    107:109:void setInstanceFields(com.android.tools.r8.graph.DexEncodedField[]):548:550 -> a
+    110:111:boolean verifyCorrectnessOfFieldHolders(java.lang.Iterable):564:565 -> a
+    112:112:com.android.tools.r8.graph.DexEncodedField lookupInstanceField(com.android.tools.r8.graph.DexField):586:586 -> a
+    112:112:com.android.tools.r8.graph.DexEncodedField lookupField(com.android.tools.r8.graph.DexField):604 -> a
+    113:113:com.android.tools.r8.graph.DexEncodedField lookupStaticField(com.android.tools.r8.graph.DexField):581:581 -> a
+    113:113:com.android.tools.r8.graph.DexEncodedField lookupField(com.android.tools.r8.graph.DexField):605 -> a
+    114:114:com.android.tools.r8.graph.DexEncodedMethod lookupDirectMethod(com.android.tools.r8.graph.DexMethod):610:610 -> a
+    115:116:com.android.tools.r8.graph.DexItem lookupTarget(com.android.tools.r8.graph.DexItem[],com.android.tools.r8.graph.Descriptor):667:668 -> a
+    117:119:com.android.tools.r8.graph.DexEncodedMethod getInitializer(com.android.tools.r8.graph.DexType[]):782:784 -> a
+    120:127:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):841:848 -> a
+    128:136:boolean hasClassInitializerThatCannotBePostponed():862:870 -> a
+    128:136:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):852 -> a
+    137:140:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):855:858 -> a
+    141:141:boolean lambda$defaultValuesForStaticFieldsMayTriggerAllocation$4(com.android.tools.r8.graph.DexEncodedField):905:905 -> a
+    142:150:void replaceInnerClassAttributeForThisClass(com.android.tools.r8.graph.InnerClassAttribute):944:952 -> a
+    151:152:void setNestHost(com.android.tools.r8.graph.DexType):984:985 -> a
+    153:153:boolean hasInstanceFieldsDirectlyOrIndirectly(com.android.tools.r8.graph.AppView):1026:1026 -> a
+    154:154:boolean hasInstanceFields():1022:1022 -> a
+    154:154:boolean hasInstanceFieldsDirectlyOrIndirectly(com.android.tools.r8.graph.AppView):1029 -> a
+    155:155:boolean hasInstanceFieldsDirectlyOrIndirectly(com.android.tools.r8.graph.AppView):1032:1032 -> a
+    156:156:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
+    156:156:boolean hasInstanceFieldsDirectlyOrIndirectly(com.android.tools.r8.graph.AppView):1032 -> a
+    157:157:boolean hasInstanceFieldsDirectlyOrIndirectly(com.android.tools.r8.graph.AppView):1033:1033 -> a
+    158:158:boolean isValid(com.android.tools.r8.utils.InternalOptions):1037:1037 -> a
+    159:159:boolean verifyNoAbstractMethodsOnNonAbstractClasses(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):322:322 -> a
+    159:159:boolean isValid(com.android.tools.r8.utils.InternalOptions):1037 -> a
+    160:160:boolean isAbstract():676:676 -> a
+    160:160:boolean verifyNoAbstractMethodsOnNonAbstractClasses(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):323 -> a
+    160:160:boolean isValid(com.android.tools.r8.utils.InternalOptions):1037 -> a
+    161:162:boolean verifyNoAbstractMethodsOnNonAbstractClasses(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):324:325 -> a
+    161:162:boolean isValid(com.android.tools.r8.utils.InternalOptions):1037 -> a
+    163:163:boolean com.android.tools.r8.graph.DexEncodedMethod.isAbstract():257:257 -> a
+    163:163:boolean verifyNoAbstractMethodsOnNonAbstractClasses(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):325 -> a
+    163:163:boolean isValid(com.android.tools.r8.utils.InternalOptions):1037 -> a
+    164:165:boolean verifyNoAbstractMethodsOnNonAbstractClasses(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):325:326 -> a
+    164:165:boolean isValid(com.android.tools.r8.utils.InternalOptions):1037 -> a
+    166:170:boolean isValid(com.android.tools.r8.utils.InternalOptions):1038:1042 -> a
+    1:5:void removeDirectMethod(int):188:192 -> b
+    6:14:java.util.Map kotlinExtensions(java.util.List,com.android.tools.r8.graph.AppView):234:242 -> b
+    15:20:void appendVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):262:267 -> b
+    21:30:void appendVirtualMethods(java.util.Collection):271:280 -> b
+    31:33:void setVirtualMethod(int,com.android.tools.r8.graph.DexEncodedMethod):292:294 -> b
+    34:36:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):298:300 -> b
+    37:38:boolean verifyCorrectnessOfMethodHolders(java.lang.Iterable):314:315 -> b
+    39:43:void forEachMethod(java.util.function.Consumer):343:347 -> b
+    44:44:int lambda$directMethodsSorted$1(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):366:366 -> b
+    45:47:void setStaticField(int,com.android.tools.r8.graph.DexEncodedField):483:485 -> b
+    48:50:void setStaticFields(com.android.tools.r8.graph.DexEncodedField[]):489:491 -> b
+    51:55:boolean verifyCorrectnessOfFieldHolder(com.android.tools.r8.graph.DexEncodedField):554:558 -> b
+    56:56:com.android.tools.r8.graph.DexEncodedField lookupInstanceField(com.android.tools.r8.graph.DexField):586:586 -> b
+    57:57:com.android.tools.r8.graph.DexEncodedMethod lookupDirectMethod(com.android.tools.r8.graph.DexMethod):610:610 -> b
+    57:57:com.android.tools.r8.graph.DexEncodedMethod lookupMethod(com.android.tools.r8.graph.DexMethod):630 -> b
+    58:58:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualMethod(com.android.tools.r8.graph.DexMethod):620:620 -> b
+    58:58:com.android.tools.r8.graph.DexEncodedMethod lookupMethod(com.android.tools.r8.graph.DexMethod):631 -> b
+    59:59:com.android.tools.r8.graph.DexEncodedMethod lookupDirectMethod(java.util.function.Predicate):615:615 -> b
+    60:60:boolean isFinal():684:684 -> b
+    60:60:boolean isEffectivelyFinal(com.android.tools.r8.graph.AppView):688 -> b
+    61:66:boolean initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):888:893 -> b
+    1:5:boolean verifyCorrectnessOfMethodHolder(com.android.tools.r8.graph.DexEncodedMethod):304:308 -> c
+    6:6:int lambda$virtualMethodsSorted$2(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):374:374 -> c
+    7:7:com.android.tools.r8.graph.DexEncodedField lookupStaticField(com.android.tools.r8.graph.DexField):581:581 -> c
+    8:8:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualMethod(com.android.tools.r8.graph.DexMethod):620:620 -> c
+    9:9:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualMethod(java.util.function.Predicate):625:625 -> c
+    10:16:boolean isResolvable(com.android.tools.r8.graph.AppView):808:814 -> c
+    17:17:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> c
+    17:17:boolean com.android.tools.r8.graph.DexType.isResolvable(com.android.tools.r8.graph.AppView):292 -> c
+    17:17:boolean isResolvable(com.android.tools.r8.graph.AppView):815 -> c
+    18:18:boolean com.android.tools.r8.graph.DexType.isResolvable(com.android.tools.r8.graph.AppView):293:293 -> c
+    18:18:boolean isResolvable(com.android.tools.r8.graph.AppView):815 -> c
+    19:19:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> c
+    19:19:boolean com.android.tools.r8.graph.DexType.isResolvable(com.android.tools.r8.graph.AppView):292 -> c
+    19:19:boolean isResolvable(com.android.tools.r8.graph.AppView):815 -> c
+    20:23:boolean isResolvable(com.android.tools.r8.graph.AppView):821:824 -> c
+    1:1:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):152:152 -> collectMixedSectionItems
     boolean isDexClass() -> d
-    1:3:java.lang.Iterable methods(java.util.function.Predicate):139:141 -> d
+    1:3:java.lang.Iterable methods(java.util.function.Predicate):145:147 -> d
     4:4:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> d
-    4:4:java.lang.Iterable methods(java.util.function.Predicate):139 -> d
-    5:5:boolean isSerializable(com.android.tools.r8.graph.AppView):778:778 -> d
-    1:2:void removeEnclosingMethod(java.util.function.Predicate):871:872 -> e
-    1:1:void removeInnerClasses(java.util.function.Predicate):881:881 -> f
+    4:4:java.lang.Iterable methods(java.util.function.Predicate):145 -> d
+    5:5:boolean isSerializable(com.android.tools.r8.graph.AppView):828:828 -> d
+    1:2:void removeEnclosingMethod(java.util.function.Predicate):921:922 -> e
+    1:1:void removeInnerClasses(java.util.function.Predicate):931:931 -> f
     boolean isStaticMember() -> g
-    1:1:com.android.tools.r8.graph.DexType getType():720:720 -> h
-    1:1:com.android.tools.r8.graph.DexReference toReference():653 -> h
-    1:3:java.lang.Iterable allImmediateSupertypes():825:827 -> i
-    4:7:java.lang.Iterable allImmediateSupertypes():826:829 -> i
-    1:6:com.android.tools.r8.graph.DexEncodedMethod[] allMethodsSorted():302:307 -> j
+    1:1:com.android.tools.r8.graph.DexType getType():770:770 -> h
+    1:1:com.android.tools.r8.graph.DexReference toReference():703 -> h
+    1:3:java.lang.Iterable allImmediateSupertypes():875:877 -> i
+    4:7:java.lang.Iterable allImmediateSupertypes():876:879 -> i
+    1:6:com.android.tools.r8.graph.DexEncodedMethod[] allMethodsSorted():352:357 -> j
     com.android.tools.r8.graph.DexLibraryClass asLibraryClass() -> k
     com.android.tools.r8.graph.DexProgramClass asProgramClass() -> l
-    1:1:void clearEnclosingMethod():867:867 -> m
-    1:1:void clearInnerClasses():877:877 -> n
-    1:1:void clearNestHost():930:930 -> o
-    1:2:boolean defaultValuesForStaticFieldsMayTriggerAllocation():854:855 -> p
-    1:5:java.util.List directMethods():150:154 -> q
-    1:3:com.android.tools.r8.graph.DexEncodedMethod[] directMethodsSorted():313:315 -> r
-    1:1:java.lang.Iterable fields():125:125 -> s
-    1:10:com.android.tools.r8.graph.DexEncodedMethod getClassInitializer():703:712 -> t
-    1:1:com.android.tools.r8.graph.EnclosingMethodAttribute getEnclosingMethod():863:863 -> u
-    1:2:com.android.tools.r8.graph.InnerClassAttribute getInnerClassAttributeForThisClass():885:886 -> v
-    1:1:java.util.List getInnerClasses():859:859 -> w
+    1:1:void clearEnclosingMethod():917:917 -> m
+    1:1:void clearInnerClasses():927:927 -> n
+    1:1:void clearNestHost():980:980 -> o
+    1:2:boolean defaultValuesForStaticFieldsMayTriggerAllocation():904:905 -> p
+    1:5:java.util.List directMethods():156:160 -> q
+    1:3:com.android.tools.r8.graph.DexEncodedMethod[] directMethodsSorted():363:365 -> r
+    1:1:java.lang.Iterable fields():131:131 -> s
+    1:10:com.android.tools.r8.graph.DexEncodedMethod getClassInitializer():753:762 -> t
+    1:1:com.android.tools.r8.graph.EnclosingMethodAttribute getEnclosingMethod():913:913 -> u
+    1:2:com.android.tools.r8.graph.InnerClassAttribute getInnerClassAttributeForThisClass():935:936 -> v
+    1:1:java.util.List getInnerClasses():909:909 -> w
     com.android.tools.r8.kotlin.KotlinInfo getKotlinInfo() -> x
-    1:5:com.android.tools.r8.graph.DexType getNestHost():947:951 -> y
-    1:1:com.android.tools.r8.graph.NestHostClassAttribute getNestHostClassAttribute():957:957 -> z
+    1:5:com.android.tools.r8.graph.DexType getNestHost():997:1001 -> y
+    1:1:com.android.tools.r8.graph.NestHostClassAttribute getNestHostClassAttribute():1007:1007 -> z
 com.android.tools.r8.graph.DexClass$FieldSetter -> com.android.tools.r8.graph.C$a:
     void setField(int,com.android.tools.r8.graph.DexEncodedField) -> a
 com.android.tools.r8.graph.DexClass$MethodSetter -> com.android.tools.r8.graph.C$b:
@@ -16858,7 +16880,7 @@
     5:5:boolean isStatic():124:124 -> a
     5:5:boolean mayTriggerClassInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):200 -> a
     6:6:boolean mayTriggerClassInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):203:203 -> a
-    7:7:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    7:7:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     7:7:boolean mayTriggerClassInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):203 -> a
     8:17:boolean mayTriggerClassInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):207:216 -> a
     18:18:boolean mayTriggerClassInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):215:215 -> a
@@ -16874,7 +16896,7 @@
     42:42:boolean isStatic():124:124 -> a
     42:42:com.android.tools.r8.ir.code.Instruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):183 -> a
     43:43:com.android.tools.r8.ir.code.Instruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):184:184 -> a
-    44:44:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    44:44:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     44:44:com.android.tools.r8.ir.code.Instruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):184 -> a
     45:49:com.android.tools.r8.ir.code.Instruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):185:189 -> a
     50:50:boolean com.android.tools.r8.graph.DexValue.isDefault(com.android.tools.r8.graph.DexType):183:183 -> a
@@ -16925,250 +16947,239 @@
     com.android.tools.r8.graph.MethodAccessFlags accessFlags -> b
     com.android.tools.r8.graph.DexEncodedMethod[] EMPTY_ARRAY -> n
     com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo optimizationInfo -> g
-    1:46:void <clinit>():78:123 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code):198:198 -> <init>
-    2:74:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code):133:205 -> <init>
-    75:76:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,int):215:216 -> <init>
-    1:2:boolean isDirectMethod():327:328 -> A
-    3:3:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():170:170 -> A
-    3:3:boolean isDirectMethod():328 -> A
-    4:4:boolean isDirectMethod():328:328 -> A
-    1:1:boolean isFinal():257:257 -> B
-    1:2:boolean isInitializer():261:262 -> C
-    1:2:boolean isInstanceInitializer():266:267 -> D
-    3:3:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():170:170 -> D
-    3:3:boolean isInstanceInitializer():267 -> D
-    4:4:boolean isInstanceInitializer():267:267 -> D
-    1:1:com.android.tools.r8.utils.OptionalBool isLibraryMethodOverride():220:220 -> E
-    1:2:boolean isNonAbstractNonNativeMethod():304:305 -> F
-    1:2:boolean isNonAbstractVirtualMethod():299:300 -> G
-    1:1:boolean isObsolete():157:157 -> H
-    1:1:boolean isOnlyInlinedIntoNestMembers():352:352 -> I
-    1:2:boolean isPrivateMethod():319:320 -> J
-    1:2:boolean isProcessed():248:249 -> K
-    1:2:boolean isPublicMethod():314:315 -> L
-    1:2:boolean isPublicized():309:310 -> M
-    1:2:boolean isStatic():333:334 -> N
-    1:2:boolean isSyntheticMethod():347:348 -> O
-    1:2:boolean isVirtualMethod():290:291 -> P
-    3:3:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():170:170 -> P
-    3:3:boolean isVirtualMethod():291 -> P
-    1:2:void markNotProcessed():456:457 -> Q
-    1:2:java.lang.String qualifiedName():582:583 -> R
-    1:2:void removeCode():559:560 -> S
-    1:1:void setObsolete():163:163 -> T
-    1:1:boolean shouldNotHaveCode():546:546 -> U
-    1:7:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():630:636 -> V
-    8:8:void com.android.tools.r8.graph.MethodAccessFlags.setAbstract():154:154 -> V
-    8:8:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():636 -> V
-    9:9:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():637:637 -> V
-    1:7:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethodCf():701:707 -> W
-    1:10:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethodDex():677:686 -> X
-    1:9:com.android.tools.r8.graph.DexEncodedMethod toStaticMethodWithoutThis():1036:1044 -> Y
-    10:10:void setObsolete():163:163 -> Y
-    10:10:com.android.tools.r8.graph.DexEncodedMethod toStaticMethodWithoutThis():1045 -> Y
-    1:1:void unsetObsolete():190:190 -> Z
-    1:1:com.android.tools.r8.graph.DexEncodedMethod$CompilationState access$302(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$CompilationState):78:78 -> a
-    2:2:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo access$402(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo):78:78 -> a
-    3:5:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):224:226 -> a
+    1:46:void <clinit>():82:127 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code):202:202 -> <init>
+    2:74:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code):137:209 -> <init>
+    75:76:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,int):219:220 -> <init>
+    1:2:boolean isDirectMethod():331:332 -> A
+    3:3:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():184:184 -> A
+    3:3:boolean isDirectMethod():332 -> A
+    4:4:boolean isDirectMethod():332:332 -> A
+    1:1:boolean isFinal():261:261 -> B
+    1:2:boolean isInitializer():265:266 -> C
+    1:2:boolean isInstanceInitializer():270:271 -> D
+    3:3:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():184:184 -> D
+    3:3:boolean isInstanceInitializer():271 -> D
+    4:4:boolean isInstanceInitializer():271:271 -> D
+    1:1:com.android.tools.r8.utils.OptionalBool isLibraryMethodOverride():224:224 -> E
+    1:2:boolean isNonAbstractNonNativeMethod():308:309 -> F
+    1:2:boolean isNonAbstractVirtualMethod():303:304 -> G
+    1:1:boolean isObsolete():161:161 -> H
+    1:1:boolean isOnlyInlinedIntoNestMembers():426:426 -> I
+    1:2:boolean isPrivateMethod():323:324 -> J
+    1:2:boolean isProcessed():252:253 -> K
+    1:2:boolean isPublicMethod():318:319 -> L
+    1:2:boolean isPublicized():313:314 -> M
+    1:2:boolean isStatic():337:338 -> N
+    1:2:boolean isSyntheticMethod():351:352 -> O
+    1:2:boolean isVirtualMethod():294:295 -> P
+    3:3:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():184:184 -> P
+    3:3:boolean isVirtualMethod():295 -> P
+    1:2:void markNotProcessed():530:531 -> Q
+    1:2:java.lang.String qualifiedName():656:657 -> R
+    1:2:void removeCode():633:634 -> S
+    1:1:void setObsolete():167:167 -> T
+    1:1:boolean shouldNotHaveCode():620:620 -> U
+    1:7:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():704:710 -> V
+    8:8:void com.android.tools.r8.graph.MethodAccessFlags.setAbstract():168:168 -> V
+    8:8:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():710 -> V
+    9:9:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():711:711 -> V
+    1:7:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethodCf():775:781 -> W
+    1:10:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethodDex():751:760 -> X
+    1:9:com.android.tools.r8.graph.DexEncodedMethod toStaticMethodWithoutThis():1113:1121 -> Y
+    10:10:void setObsolete():167:167 -> Y
+    10:10:com.android.tools.r8.graph.DexEncodedMethod toStaticMethodWithoutThis():1122 -> Y
+    1:1:void unsetObsolete():194:194 -> Z
+    1:1:com.android.tools.r8.graph.DexEncodedMethod$CompilationState access$302(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$CompilationState):82:82 -> a
+    2:2:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo access$402(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo):82:82 -> a
+    3:5:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):228:230 -> a
     6:6:boolean com.android.tools.r8.utils.BooleanLatticeElement.isPossiblyFalse():52:52 -> a
-    6:6:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):226 -> a
-    7:8:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):226:227 -> a
-    9:14:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):226:231 -> a
+    6:6:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):230 -> a
+    7:8:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):230:231 -> a
+    9:14:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):230:235 -> a
     15:15:boolean com.android.tools.r8.utils.BooleanLatticeElement.isPossiblyFalse():52:52 -> a
-    15:15:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):232 -> a
-    16:21:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):231:236 -> a
-    22:24:boolean isProgramMethod(com.android.tools.r8.graph.DexDefinitionSupplier):240:242 -> a
-    25:26:boolean isInliningCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):360:361 -> a
-    27:82:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):370:425 -> a
-    83:83:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):421:421 -> a
-    84:84:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):417:417 -> a
-    85:88:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):410:413 -> a
-    89:92:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):403:406 -> a
-    93:96:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):396:399 -> a
-    97:100:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):389:392 -> a
-    101:120:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):430:449 -> a
-    121:121:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):446:446 -> a
-    122:122:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):443:443 -> a
-    123:123:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):440:440 -> a
-    124:124:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):437:437 -> a
-    125:143:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):434:452 -> a
-    144:145:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):461:462 -> a
-    146:147:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):471:472 -> a
-    148:151:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):477:480 -> a
-    152:152:boolean hasParameterInfo():505:505 -> a
-    152:152:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):480 -> a
-    153:154:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):480:481 -> a
-    155:156:void setParameterInfo(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):500:501 -> a
-    155:156:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):481 -> a
-    157:157:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):483:483 -> a
-    158:160:void setCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.graph.AppView):487:489 -> a
-    161:164:boolean keepLocals(com.android.tools.r8.utils.InternalOptions):493:496 -> a
-    165:166:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo getOptimizationInfo():1127:1128 -> a
-    165:166:boolean keepLocals(com.android.tools.r8.utils.InternalOptions):496 -> a
-    167:167:boolean keepLocals(com.android.tools.r8.utils.InternalOptions):496:496 -> a
-    168:173:void collectMixedSectionItemsWithCodeMapping(com.android.tools.r8.dex.MixedSectionCollection,com.android.tools.r8.dex.MethodToCodeObjectMapping):537:542 -> a
-    174:182:java.lang.String descriptor(com.android.tools.r8.naming.NamingLens):592:600 -> a
-    183:195:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):604:616 -> a
-    196:253:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):332:389 -> a
-    196:253:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):617 -> a
-    254:257:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):617:620 -> a
-    258:267:com.android.tools.r8.graph.DexCode generateCodeFromTemplate(int,int,com.android.tools.r8.code.Instruction[]):647:656 -> a
-    268:269:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):711:712 -> a
-    270:274:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):731:735 -> a
-    270:274:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):712 -> a
-    275:282:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):734:741 -> a
-    275:282:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):712 -> a
-    283:289:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):740:746 -> a
-    283:289:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):712 -> a
-    290:305:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):744:759 -> a
-    290:305:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):712 -> a
-    306:306:void setObsolete():163:163 -> a
-    306:306:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):760 -> a
-    306:306:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):712 -> a
-    307:307:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):761:761 -> a
-    307:307:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):712 -> a
-    308:308:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):714:714 -> a
-    309:313:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):765:769 -> a
-    309:313:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):714 -> a
-    314:322:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):768:776 -> a
-    314:322:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):714 -> a
-    323:331:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):773:781 -> a
-    323:331:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):714 -> a
-    332:340:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):778:786 -> a
-    332:340:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):714 -> a
-    341:345:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):784:788 -> a
-    341:345:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):714 -> a
-    346:347:boolean isStaticMember():339:340 -> a
-    346:347:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):789 -> a
-    346:347:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):714 -> a
-    348:370:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):793:815 -> a
-    348:370:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):714 -> a
-    371:371:void setObsolete():163:163 -> a
-    371:371:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):816 -> a
-    371:371:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):714 -> a
-    372:372:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):817:817 -> a
-    372:372:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):714 -> a
-    373:377:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):719:723 -> a
-    378:382:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):722:726 -> a
-    383:383:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():324:324 -> a
-    383:383:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):726 -> a
-    384:384:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):726:726 -> a
-    385:386:com.android.tools.r8.graph.DexEncodedMethod toTypeSubstitutedMethod(com.android.tools.r8.graph.DexMethod):821:822 -> a
-    387:401:com.android.tools.r8.graph.DexEncodedMethod toTypeSubstitutedMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):826:840 -> a
-    402:420:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):856:874 -> a
-    421:421:void com.android.tools.r8.graph.AccessFlags.unsetPrivate():150:150 -> a
-    421:421:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):874 -> a
-    422:422:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):875:875 -> a
-    423:423:void com.android.tools.r8.graph.AccessFlags.setSynthetic():191:191 -> a
-    423:423:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):875 -> a
-    424:424:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):876:876 -> a
-    425:425:void com.android.tools.r8.graph.MethodAccessFlags.setConstructor():174:174 -> a
-    425:425:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):876 -> a
-    426:426:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):877:877 -> a
-    427:432:com.android.tools.r8.graph.DexEncodedMethod createFieldAccessorBridge(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):882:887 -> a
-    433:456:com.android.tools.r8.graph.DexEncodedMethod createFieldAccessorBridge(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):884:907 -> a
-    457:457:com.android.tools.r8.ir.conversion.SourceCode lambda$createFieldAccessorBridge$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.ir.code.Position):892:892 -> a
-    458:461:void lambda$createFieldAccessorBridge$2(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):895:898 -> a
-    462:462:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isInstance():466:466 -> a
-    462:462:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isInstancePut():482 -> a
-    462:462:void lambda$createFieldAccessorBridge$2(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):899 -> a
-    463:463:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isInstancePut():482:482 -> a
-    463:463:void lambda$createFieldAccessorBridge$2(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):899 -> a
-    464:466:void lambda$createFieldAccessorBridge$2(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):900:902 -> a
-    467:467:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isStaticPut():474:474 -> a
-    467:467:void lambda$createFieldAccessorBridge$2(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):902 -> a
-    468:469:void lambda$createFieldAccessorBridge$2(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):902:903 -> a
-    470:472:com.android.tools.r8.graph.DexEncodedMethod toRenamedHolderMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):911:913 -> a
-    473:480: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):924:931 -> a
-    481:486:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):966:971 -> a
-    487:487:void com.android.tools.r8.graph.AccessFlags.demote(int):246:246 -> a
-    487:487:void com.android.tools.r8.graph.AccessFlags.demoteFromFinal():203 -> a
-    487:487:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):971 -> a
-    488:495:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):973:980 -> a
-    496:496:void com.android.tools.r8.graph.MethodAccessFlags.setAbstract():154:154 -> a
-    496:496:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):980 -> a
-    497:497:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):983:983 -> a
-    498:498:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
-    498:498:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):983 -> a
-    499:516:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):985:1002 -> a
-    517:517:void com.android.tools.r8.graph.MethodAccessFlags.setBridge():126:126 -> a
-    517:517:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1002 -> a
-    518:518:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1004:1004 -> a
-    519:519:void com.android.tools.r8.graph.AccessFlags.setSynthetic():191:191 -> a
-    519:519:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1004 -> a
-    520:520:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1007:1007 -> a
-    521:526: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):1012:1017 -> a
-    527:527:void com.android.tools.r8.graph.AccessFlags.setSynthetic():191:191 -> a
-    527:527: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):1019 -> a
-    528:534: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):1021:1027 -> a
-    535:546:com.android.tools.r8.graph.DexCode rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexItemFactory,boolean):1052:1063 -> a
-    547:557:com.android.tools.r8.graph.DexCode rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexItemFactory,boolean):1062:1072 -> a
-    558:561:void registerCodeReferences(com.android.tools.r8.graph.UseRegistry):1113:1116 -> a
-    562:562:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    562:562:void registerCodeReferences(com.android.tools.r8.graph.UseRegistry):1116 -> a
-    563:563:void registerCodeReferences(com.android.tools.r8.graph.UseRegistry):1118:1118 -> a
-    564:565:void setOptimizationInfo(com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo):1140:1141 -> a
-    566:567:void joinCallSiteOptimizationInfo(com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo,com.android.tools.r8.graph.AppView):1151:1152 -> a
-    568:568:void copyMetadata(com.android.tools.r8.graph.DexEncodedMethod):1156:1156 -> a
-    569:570:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo getOptimizationInfo():1127:1128 -> a
-    569:570:void copyMetadata(com.android.tools.r8.graph.DexEncodedMethod):1158 -> a
-    571:575:void copyMetadata(com.android.tools.r8.graph.DexEncodedMethod):1158:1162 -> a
-    1:1:void checkIfObsolete():151:151 -> a0
-    1:5:void setDefaultInterfaceMethodImplementation(com.android.tools.r8.graph.DexEncodedMethod):171:175 -> b
-    6:6:void com.android.tools.r8.graph.MethodAccessFlags.setAbstract():154:154 -> b
-    6:6:void setDefaultInterfaceMethodImplementation(com.android.tools.r8.graph.DexEncodedMethod):175 -> b
-    7:8:void setDefaultInterfaceMethodImplementation(com.android.tools.r8.graph.DexEncodedMethod):176:177 -> b
-    9:12:void upgradeClassFileVersion(int):575:578 -> b
-    13:34:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):935:956 -> b
-    35:35:void com.android.tools.r8.graph.AccessFlags.setSynthetic():191:191 -> b
-    35:35:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):956 -> b
-    36:37:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):957:958 -> b
-    38:38:void com.android.tools.r8.graph.AccessFlags.unsetPrivate():150:150 -> b
-    38:38:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):958 -> b
-    39:42:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):959:962 -> b
-    43:46:void lambda$toForwardingMethod$4(com.android.tools.r8.graph.UseRegistry):996:999 -> b
-    1:1:com.android.tools.r8.graph.Code access$200(com.android.tools.r8.graph.DexEncodedMethod):78:78 -> c
-    2:2:void lambda$toInitializerForwardingBridge$0(com.android.tools.r8.graph.UseRegistry):871:871 -> c
-    3:3:com.android.tools.r8.graph.DexEncodedMethod asDexEncodedMethod():1103:1103 -> c
-    1:7:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):521:527 -> collectIndexedItems
-    1:1:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):532:532 -> collectMixedSectionItems
-    1:1:com.android.tools.r8.graph.DexEncodedMethod$CompilationState access$300(com.android.tools.r8.graph.DexEncodedMethod):78:78 -> d
-    2:5:void lambda$toStaticForwardingBridge$3(com.android.tools.r8.graph.UseRegistry):950:953 -> d
-    1:1:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo access$400(com.android.tools.r8.graph.DexEncodedMethod):78:78 -> e
-    1:1:int access$500(com.android.tools.r8.graph.DexEncodedMethod):78:78 -> f
-    2:2:boolean isDexEncodedMethod():1097:1097 -> f
-    1:2:boolean isStaticMember():339:340 -> g
-    3:3:com.android.tools.r8.graph.DexEncodedMethod$Builder builder(com.android.tools.r8.graph.DexEncodedMethod):1167:1167 -> g
-    1:2:com.android.tools.r8.graph.DexReference toReference():1091:1092 -> h
-    1:1:com.android.tools.r8.graph.DexMethod getKey():1086:1086 -> i
-    2:2:com.android.tools.r8.graph.DexMethod getKey():1086:1086 -> i
-    2:2:com.android.tools.r8.graph.PresortedComparable getKey():78 -> i
-    1:8:com.android.tools.r8.graph.CfCode buildEmptyThrowingCfCode():690:697 -> j
-    1:2:com.android.tools.r8.graph.DexCode buildEmptyThrowingDexCode():666:667 -> k
-    1:2:java.lang.String codeToString():1078:1079 -> l
-    1:2:java.lang.String descriptor():587:588 -> m
-    1:2:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo getCallSiteOptimizationInfo():1145:1146 -> n
-    1:3:int getClassFileVersion():564:566 -> o
-    1:2:com.android.tools.r8.graph.Code getCode():554:555 -> p
-    1:1:com.android.tools.r8.graph.DexEncodedMethod getDefaultInterfaceMethodImplementation():167:167 -> q
-    1:5:com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo getMutableOptimizationInfo():1132:1136 -> r
-    1:2:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo getOptimizationInfo():1127:1128 -> s
-    1:1:java.util.Map getParameterInfo():509:509 -> t
-    1:2:java.lang.String toSourceString():625:626 -> toSourceString
-    1:2:java.lang.String toString():514:515 -> toString
-    1:2:boolean hasAnnotation():1108:1109 -> u
-    1:2:boolean hasClassFileVersion():570:571 -> v
-    1:1:boolean hasCode():550:550 -> w
-    1:1:boolean hasParameterInfo():505:505 -> x
-    1:2:boolean isClassInitializer():276:277 -> y
-    3:3:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():170:170 -> y
-    3:3:boolean isClassInitializer():277 -> y
-    4:4:boolean isClassInitializer():277:277 -> y
-    1:1:boolean isDefaultMethod():282:282 -> z
-    2:2:boolean isAbstract():253:253 -> z
-    2:2:boolean isDefaultMethod():282 -> z
-    3:3:boolean isDefaultMethod():282:282 -> z
+    15:15:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):236 -> a
+    16:21:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):235:240 -> a
+    22:24:boolean isProgramMethod(com.android.tools.r8.graph.DexDefinitionSupplier):244:246 -> a
+    25:26:boolean isStaticMember():343:344 -> a
+    25:26:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction findCompatibleKotlinExtension(java.util.List,com.android.tools.r8.graph.AppView):371 -> a
+    27:28:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction findCompatibleKotlinExtension(java.util.List,com.android.tools.r8.graph.AppView):374:375 -> a
+    29:30:boolean isInliningCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):434:435 -> a
+    31:86:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):444:499 -> a
+    87:87:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):495:495 -> a
+    88:88:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):491:491 -> a
+    89:92:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):484:487 -> a
+    93:96:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):477:480 -> a
+    97:100:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):470:473 -> a
+    101:104:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):463:466 -> a
+    105:124:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):504:523 -> a
+    125:125:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):520:520 -> a
+    126:126:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):517:517 -> a
+    127:127:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):514:514 -> a
+    128:128:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):511:511 -> a
+    129:147:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):508:526 -> a
+    148:149:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):535:536 -> a
+    150:151:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):545:546 -> a
+    152:155:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):551:554 -> a
+    156:156:boolean hasParameterInfo():579:579 -> a
+    156:156:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):554 -> a
+    157:158:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):554:555 -> a
+    159:160:void setParameterInfo(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):574:575 -> a
+    159:160:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):555 -> a
+    161:161:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):557:557 -> a
+    162:164:void setCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.graph.AppView):561:563 -> a
+    165:168:boolean keepLocals(com.android.tools.r8.utils.InternalOptions):567:570 -> a
+    169:170:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo getOptimizationInfo():1204:1205 -> a
+    169:170:boolean keepLocals(com.android.tools.r8.utils.InternalOptions):570 -> a
+    171:171:boolean keepLocals(com.android.tools.r8.utils.InternalOptions):570:570 -> a
+    172:177:void collectMixedSectionItemsWithCodeMapping(com.android.tools.r8.dex.MixedSectionCollection,com.android.tools.r8.dex.MethodToCodeObjectMapping):611:616 -> a
+    178:186:java.lang.String descriptor(com.android.tools.r8.naming.NamingLens):666:674 -> a
+    187:199:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):678:690 -> a
+    200:257:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):332:389 -> a
+    200:257:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):691 -> a
+    258:261:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):691:694 -> a
+    262:271:com.android.tools.r8.graph.DexCode generateCodeFromTemplate(int,int,com.android.tools.r8.code.Instruction[]):721:730 -> a
+    272:273:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):785:786 -> a
+    274:278:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):808:812 -> a
+    274:278:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):786 -> a
+    279:286:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):811:818 -> a
+    279:286:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):786 -> a
+    287:293:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):817:823 -> a
+    287:293:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):786 -> a
+    294:309:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):821:836 -> a
+    294:309:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):786 -> a
+    310:310:void setObsolete():167:167 -> a
+    310:310:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):837 -> a
+    310:310:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):786 -> a
+    311:311:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):838:838 -> a
+    311:311:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):786 -> a
+    312:312:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):788:788 -> a
+    313:317:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):842:846 -> a
+    313:317:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):788 -> a
+    318:326:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):845:853 -> a
+    318:326:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):788 -> a
+    327:335:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):850:858 -> a
+    327:335:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):788 -> a
+    336:344:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):855:863 -> a
+    336:344:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):788 -> a
+    345:349:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):861:865 -> a
+    345:349:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):788 -> a
+    350:351:boolean isStaticMember():343:344 -> a
+    350:351:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):866 -> a
+    350:351:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):788 -> a
+    352:374:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):870:892 -> a
+    352:374:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):788 -> a
+    375:375:void setObsolete():167:167 -> a
+    375:375:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):893 -> a
+    375:375:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):788 -> a
+    376:376:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):894:894 -> a
+    376:376:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):788 -> a
+    377:381:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):793:797 -> a
+    382:385:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):796:799 -> a
+    386:386:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():316:316 -> a
+    386:386:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):799 -> a
+    387:387:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):800:800 -> a
+    388:392:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):799:803 -> a
+    393:394:com.android.tools.r8.graph.DexEncodedMethod toTypeSubstitutedMethod(com.android.tools.r8.graph.DexMethod):898:899 -> a
+    395:409:com.android.tools.r8.graph.DexEncodedMethod toTypeSubstitutedMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):903:917 -> a
+    410:430:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):933:953 -> a
+    431:431:void com.android.tools.r8.graph.MethodAccessFlags.setConstructor():188:188 -> a
+    431:431:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):953 -> a
+    432:432:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):954:954 -> a
+    433:438:com.android.tools.r8.graph.DexEncodedMethod createFieldAccessorBridge(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):959:964 -> a
+    439:462:com.android.tools.r8.graph.DexEncodedMethod createFieldAccessorBridge(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):961:984 -> a
+    463:463:com.android.tools.r8.ir.conversion.SourceCode lambda$createFieldAccessorBridge$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.ir.code.Position):969:969 -> a
+    464:467:void lambda$createFieldAccessorBridge$2(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):972:975 -> a
+    468:468:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isInstance():466:466 -> a
+    468:468:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isInstancePut():482 -> a
+    468:468:void lambda$createFieldAccessorBridge$2(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):976 -> a
+    469:469:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isInstancePut():482:482 -> a
+    469:469:void lambda$createFieldAccessorBridge$2(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):976 -> a
+    470:472:void lambda$createFieldAccessorBridge$2(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):977:979 -> a
+    473:473:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isStaticPut():474:474 -> a
+    473:473:void lambda$createFieldAccessorBridge$2(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):979 -> a
+    474:475:void lambda$createFieldAccessorBridge$2(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):979:980 -> a
+    476:478:com.android.tools.r8.graph.DexEncodedMethod toRenamedHolderMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):988:990 -> a
+    479:486: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):1001:1008 -> a
+    487:492:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1043:1048 -> a
+    493:493:void com.android.tools.r8.graph.AccessFlags.demote(int):276:276 -> a
+    493:493:void com.android.tools.r8.graph.AccessFlags.demoteFromFinal():233 -> a
+    493:493:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1048 -> a
+    494:501:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1050:1057 -> a
+    502:502:void com.android.tools.r8.graph.MethodAccessFlags.setAbstract():168:168 -> a
+    502:502:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1057 -> a
+    503:503:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1060:1060 -> a
+    504:504:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
+    504:504:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1060 -> a
+    505:522:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1062:1079 -> a
+    523:523:void com.android.tools.r8.graph.MethodAccessFlags.setBridge():140:140 -> a
+    523:523:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1079 -> a
+    524:527:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1081:1084 -> a
+    528:543: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):1089:1104 -> a
+    544:555:com.android.tools.r8.graph.DexCode rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexItemFactory,boolean):1129:1140 -> a
+    556:566:com.android.tools.r8.graph.DexCode rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexItemFactory,boolean):1139:1149 -> a
+    567:570:void registerCodeReferences(com.android.tools.r8.graph.UseRegistry):1190:1193 -> a
+    571:571:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    571:571:void registerCodeReferences(com.android.tools.r8.graph.UseRegistry):1193 -> a
+    572:572:void registerCodeReferences(com.android.tools.r8.graph.UseRegistry):1195:1195 -> a
+    573:574:void setOptimizationInfo(com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo):1217:1218 -> a
+    575:576:void joinCallSiteOptimizationInfo(com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo,com.android.tools.r8.graph.AppView):1228:1229 -> a
+    577:577:void copyMetadata(com.android.tools.r8.graph.DexEncodedMethod):1233:1233 -> a
+    578:579:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo getOptimizationInfo():1204:1205 -> a
+    578:579:void copyMetadata(com.android.tools.r8.graph.DexEncodedMethod):1235 -> a
+    580:584:void copyMetadata(com.android.tools.r8.graph.DexEncodedMethod):1235:1239 -> a
+    1:1:void checkIfObsolete():155:155 -> a0
+    1:5:void setDefaultInterfaceMethodImplementation(com.android.tools.r8.graph.DexEncodedMethod):175:179 -> b
+    6:6:void com.android.tools.r8.graph.MethodAccessFlags.setAbstract():168:168 -> b
+    6:6:void setDefaultInterfaceMethodImplementation(com.android.tools.r8.graph.DexEncodedMethod):179 -> b
+    7:8:void setDefaultInterfaceMethodImplementation(com.android.tools.r8.graph.DexEncodedMethod):180:181 -> b
+    9:10:boolean isStaticMember():343:344 -> b
+    9:10:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction findCompatibleKotlinFunction(java.util.List,com.android.tools.r8.graph.AppView):383 -> b
+    11:12:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction findCompatibleKotlinFunction(java.util.List,com.android.tools.r8.graph.AppView):386:387 -> b
+    13:16:void upgradeClassFileVersion(int):649:652 -> b
+    17:44:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):1012:1039 -> b
+    45:48:void lambda$toForwardingMethod$4(com.android.tools.r8.graph.UseRegistry):1073:1076 -> b
+    1:1:com.android.tools.r8.graph.Code access$200(com.android.tools.r8.graph.DexEncodedMethod):82:82 -> c
+    2:2:void lambda$toInitializerForwardingBridge$0(com.android.tools.r8.graph.UseRegistry):948:948 -> c
+    3:3:com.android.tools.r8.graph.DexEncodedMethod asDexEncodedMethod():1180:1180 -> c
+    1:7:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):595:601 -> collectIndexedItems
+    1:1:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):606:606 -> collectMixedSectionItems
+    1:1:com.android.tools.r8.graph.DexEncodedMethod$CompilationState access$300(com.android.tools.r8.graph.DexEncodedMethod):82:82 -> d
+    2:5:void lambda$toStaticForwardingBridge$3(com.android.tools.r8.graph.UseRegistry):1027:1030 -> d
+    1:1:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo access$400(com.android.tools.r8.graph.DexEncodedMethod):82:82 -> e
+    1:1:int access$500(com.android.tools.r8.graph.DexEncodedMethod):82:82 -> f
+    2:2:boolean isDexEncodedMethod():1174:1174 -> f
+    1:2:boolean isStaticMember():343:344 -> g
+    3:3:com.android.tools.r8.graph.DexEncodedMethod$Builder builder(com.android.tools.r8.graph.DexEncodedMethod):1244:1244 -> g
+    1:2:com.android.tools.r8.graph.DexReference toReference():1168:1169 -> h
+    1:1:com.android.tools.r8.graph.DexMethod getKey():1163:1163 -> i
+    2:2:com.android.tools.r8.graph.DexMethod getKey():1163:1163 -> i
+    2:2:com.android.tools.r8.graph.PresortedComparable getKey():82 -> i
+    1:8:com.android.tools.r8.graph.CfCode buildEmptyThrowingCfCode():764:771 -> j
+    1:2:com.android.tools.r8.graph.DexCode buildEmptyThrowingDexCode():740:741 -> k
+    1:2:java.lang.String codeToString():1155:1156 -> l
+    1:2:java.lang.String descriptor():661:662 -> m
+    1:2:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo getCallSiteOptimizationInfo():1222:1223 -> n
+    1:3:int getClassFileVersion():638:640 -> o
+    1:2:com.android.tools.r8.graph.Code getCode():628:629 -> p
+    1:1:com.android.tools.r8.graph.DexEncodedMethod getDefaultInterfaceMethodImplementation():171:171 -> q
+    1:5:com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo getMutableOptimizationInfo():1209:1213 -> r
+    1:2:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo getOptimizationInfo():1204:1205 -> s
+    1:1:java.util.Map getParameterInfo():583:583 -> t
+    1:2:java.lang.String toSourceString():699:700 -> toSourceString
+    1:2:java.lang.String toString():588:589 -> toString
+    1:2:boolean hasAnnotation():1185:1186 -> u
+    1:2:boolean hasClassFileVersion():644:645 -> v
+    1:1:boolean hasCode():624:624 -> w
+    1:1:boolean hasParameterInfo():579:579 -> x
+    1:2:boolean isClassInitializer():280:281 -> y
+    3:3:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():184:184 -> y
+    3:3:boolean isClassInitializer():281 -> y
+    4:4:boolean isClassInitializer():281:281 -> y
+    1:1:boolean isDefaultMethod():286:286 -> z
+    2:2:boolean isAbstract():257:257 -> z
+    2:2:boolean isDefaultMethod():286 -> z
+    3:3:boolean isDefaultMethod():286:286 -> z
 com.android.tools.r8.graph.DexEncodedMethod$1 -> com.android.tools.r8.graph.T$a:
 com.android.tools.r8.graph.DexEncodedMethod$Builder -> com.android.tools.r8.graph.T$b:
     com.android.tools.r8.graph.DexEncodedMethod$CompilationState compilationState -> f
@@ -17180,26 +17191,26 @@
     com.android.tools.r8.graph.MethodAccessFlags accessFlags -> b
     com.android.tools.r8.graph.DexMethod method -> a
     com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo optimizationInfo -> g
-    1:1:void <clinit>():1170:1170 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$1):1170:1170 -> <init>
-    2:18:void <init>(com.android.tools.r8.graph.DexEncodedMethod):1181:1197 -> <init>
-    19:19:void <init>(com.android.tools.r8.graph.DexEncodedMethod):1193:1193 -> <init>
-    1:1:com.android.tools.r8.graph.MethodAccessFlags access$000(com.android.tools.r8.graph.DexEncodedMethod$Builder):1170:1170 -> a
-    2:2:void setMethod(com.android.tools.r8.graph.DexMethod):1202:1202 -> a
-    3:22:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1211:1230 -> a
-    23:23:com.android.tools.r8.graph.DexEncodedMethod$Builder setParameterAnnotations(com.android.tools.r8.graph.ParameterAnnotationsList):1206:1206 -> a
-    23:23:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1230 -> a
-    24:26:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1233:1235 -> a
-    27:27:com.android.tools.r8.graph.DexEncodedMethod$Builder setParameterAnnotations(com.android.tools.r8.graph.ParameterAnnotationsList):1206:1206 -> a
-    27:27:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1233 -> a
-    28:30:com.android.tools.r8.graph.DexEncodedMethod$Builder adjustOptimizationInfoAfterRemovingThisParameter():1255:1257 -> a
-    31:31:void setCode(com.android.tools.r8.graph.Code):1263:1263 -> a
-    1:6:com.android.tools.r8.graph.DexEncodedMethod build():1267:1272 -> b
-    7:13:com.android.tools.r8.graph.DexEncodedMethod build():1271:1277 -> b
-    1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder promoteToStatic():1240:1240 -> c
-    2:2:void com.android.tools.r8.graph.AccessFlags.promoteToStatic():216:216 -> c
-    2:2:com.android.tools.r8.graph.DexEncodedMethod$Builder promoteToStatic():1240 -> c
-    1:5:com.android.tools.r8.graph.DexEncodedMethod$Builder withoutThisParameter():1245:1249 -> d
+    1:1:void <clinit>():1247:1247 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$1):1247:1247 -> <init>
+    2:18:void <init>(com.android.tools.r8.graph.DexEncodedMethod):1258:1274 -> <init>
+    19:19:void <init>(com.android.tools.r8.graph.DexEncodedMethod):1270:1270 -> <init>
+    1:1:com.android.tools.r8.graph.MethodAccessFlags access$000(com.android.tools.r8.graph.DexEncodedMethod$Builder):1247:1247 -> a
+    2:2:void setMethod(com.android.tools.r8.graph.DexMethod):1279:1279 -> a
+    3:22:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1288:1307 -> a
+    23:23:com.android.tools.r8.graph.DexEncodedMethod$Builder setParameterAnnotations(com.android.tools.r8.graph.ParameterAnnotationsList):1283:1283 -> a
+    23:23:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1307 -> a
+    24:26:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1310:1312 -> a
+    27:27:com.android.tools.r8.graph.DexEncodedMethod$Builder setParameterAnnotations(com.android.tools.r8.graph.ParameterAnnotationsList):1283:1283 -> a
+    27:27:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1310 -> a
+    28:30:com.android.tools.r8.graph.DexEncodedMethod$Builder adjustOptimizationInfoAfterRemovingThisParameter():1332:1334 -> a
+    31:31:void setCode(com.android.tools.r8.graph.Code):1340:1340 -> a
+    1:6:com.android.tools.r8.graph.DexEncodedMethod build():1344:1349 -> b
+    7:13:com.android.tools.r8.graph.DexEncodedMethod build():1348:1354 -> b
+    1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder promoteToStatic():1317:1317 -> c
+    2:2:void com.android.tools.r8.graph.AccessFlags.promoteToStatic():246:246 -> c
+    2:2:com.android.tools.r8.graph.DexEncodedMethod$Builder promoteToStatic():1317 -> c
+    1:5:com.android.tools.r8.graph.DexEncodedMethod$Builder withoutThisParameter():1322:1326 -> d
 com.android.tools.r8.graph.DexEncodedMethod$CompilationState -> com.android.tools.r8.graph.T$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
@@ -17209,9 +17220,9 @@
     com.android.tools.r8.graph.DexEncodedMethod$CompilationState PROCESSED_INLINING_CANDIDATE_SAME_PACKAGE -> e
     com.android.tools.r8.graph.DexEncodedMethod$CompilationState NOT_PROCESSED -> a
     com.android.tools.r8.graph.DexEncodedMethod$CompilationState[] $VALUES -> h
-    1:24:void <clinit>():92:115 -> <clinit>
-    25:25:void <clinit>():88:88 -> <clinit>
-    1:1:void <init>(java.lang.String,int):88:88 -> <init>
+    1:24:void <clinit>():96:119 -> <clinit>
+    25:25:void <clinit>():92:92 -> <clinit>
+    1:1:void <init>(java.lang.String,int):92:92 -> <init>
 com.android.tools.r8.graph.DexField -> com.android.tools.r8.graph.U:
     com.android.tools.r8.graph.DexString name -> e
     com.android.tools.r8.graph.DexType type -> d
@@ -17223,17 +17234,17 @@
     4:4:int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):63:63 -> a
     5:13:int slowCompareTo(com.android.tools.r8.graph.DexField):83:91 -> a
     14:14:int layeredCompareTo(com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.NamingLens):109:109 -> a
-    15:15:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):160:160 -> a
+    15:15:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):166:166 -> a
     15:15:int layeredCompareTo(com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.NamingLens):109 -> a
     16:16:int layeredCompareTo(com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.NamingLens):113:113 -> a
     17:17:int com.android.tools.r8.graph.DexString.compareTo(com.android.tools.r8.graph.DexString):255:255 -> a
     17:17:int layeredCompareTo(com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.NamingLens):113 -> a
     18:18:int layeredCompareTo(com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.NamingLens):117:117 -> a
-    19:19:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):160:160 -> a
+    19:19:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):166:166 -> a
     19:19:int layeredCompareTo(com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.NamingLens):117 -> a
     20:20:int com.android.tools.r8.graph.DexString.compareTo(com.android.tools.r8.graph.DexString):255:255 -> a
     20:20:int layeredCompareTo(com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.NamingLens):113 -> a
-    21:21:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):160:160 -> a
+    21:21:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):166:166 -> a
     21:21:int layeredCompareTo(com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.NamingLens):109 -> a
     22:22:boolean match(com.android.tools.r8.graph.DexEncodedField):127:127 -> a
     23:23:boolean match(com.android.tools.r8.graph.DexField):122:122 -> a
@@ -17266,392 +17277,393 @@
     1:1:java.lang.String toSmaliString():60:60 -> toSmaliString
     1:1:java.lang.String toSourceString():64:64 -> toSourceString
 com.android.tools.r8.graph.DexItemFactory -> com.android.tools.r8.graph.W:
-    com.android.tools.r8.graph.DexString getDeclaredFieldName -> A0
-    com.android.tools.r8.graph.DexString unboxLongMethodName -> Q
-    com.android.tools.r8.graph.DexString mathDescriptor -> b1
-    com.android.tools.r8.graph.DexType methodType -> F2
-    com.android.tools.r8.graph.DexItemFactory$AssertionErrorMethods assertionErrorMethods -> w3
-    com.android.tools.r8.graph.DexType throwableType -> g3
+    com.android.tools.r8.graph.DexString getFieldName -> A0
+    com.android.tools.r8.graph.DexString unboxIntMethodName -> Q
+    com.android.tools.r8.graph.DexString iterableDescriptor -> b1
+    com.android.tools.r8.graph.DexType fieldType -> F2
+    com.android.tools.r8.graph.DexType runtimeExceptionType -> g3
+    com.android.tools.r8.graph.DexItemFactory$ProxyMethods proxyMethods -> G3
     com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd setPrologueEnd -> m
     java.util.concurrent.ConcurrentHashMap classTypeLatticeInterfaces -> q
-    com.android.tools.r8.graph.DexMethod metafactoryMethod -> k4
-    com.android.tools.r8.graph.DexString assertionErrorDescriptor -> I0
-    com.android.tools.r8.graph.DexString proxyDescriptor -> j1
-    com.android.tools.r8.graph.DexString nameMethodName -> r0
+    com.android.tools.r8.graph.DexString runtimeExceptionDescriptor -> I0
+    com.android.tools.r8.graph.DexString invocationHandlerDescriptor -> j1
+    com.android.tools.r8.graph.DexString ordinalMethodName -> r0
     com.android.tools.r8.graph.DexString shortDescriptor -> A
-    com.android.tools.r8.graph.DexString enumValuesFieldName -> R1
+    com.android.tools.r8.graph.DexString thisName -> R1
+    com.android.tools.r8.graph.DexType nullValueType -> x4
     java.util.Map fields -> c
-    com.android.tools.r8.graph.DexType annotationReachabilitySensitive -> W3
-    com.android.tools.r8.graph.DexType booleanType -> V1
-    com.android.tools.r8.graph.DexType objectsType -> w2
-    com.android.tools.r8.graph.DexString getFieldName -> z0
-    com.android.tools.r8.graph.DexType annotationMemberClasses -> O3
-    com.android.tools.r8.graph.DexType charSequenceArrayType -> o2
-    com.android.tools.r8.graph.DexItemFactory$ConstructorMethods constructorMethods -> y3
-    com.android.tools.r8.graph.DexString contentEqualsMethodName -> a0
-    com.android.tools.r8.graph.DexString unboxFloatMethodName -> R
-    com.android.tools.r8.graph.DexType comparableType -> h4
-    com.android.tools.r8.graph.DexType boxedCharType -> g2
-    com.android.tools.r8.graph.DexString npeDescriptor -> I1
-    com.android.tools.r8.graph.DexString valueOfMethodName -> i0
-    com.android.tools.r8.graph.DexString thisName -> Q1
-    com.android.tools.r8.graph.DexString classLoaderDescriptor -> Q0
-    com.android.tools.r8.graph.DexString comparatorDescriptor -> r1
+    com.android.tools.r8.graph.DexType annotationCovariantReturnTypes -> W3
+    com.android.tools.r8.graph.DexType annotationType -> w2
+    com.android.tools.r8.graph.DexItemFactory$ObjectsMethods objectsMethods -> s3
+    com.android.tools.r8.graph.DexProto deserializeLambdaMethodProto -> K3
+    java.util.Map libraryMethodsWithoutSideEffects -> s4
+    com.android.tools.r8.graph.DexString getDeclaredConstructorName -> z0
+    com.android.tools.r8.graph.DexItemFactory$AtomicFieldUpdaterMethods atomicFieldUpdaterMethods -> D3
+    com.android.tools.r8.graph.DexType annotationInnerClass -> O3
+    com.android.tools.r8.graph.DexType charSequenceType -> o2
+    com.android.tools.r8.graph.DexString equalsIgnoreCaseMethodName -> a0
+    com.android.tools.r8.graph.DexString unboxLongMethodName -> R
+    com.android.tools.r8.graph.DexType externalizableType -> h4
+    com.android.tools.r8.graph.DexType boxedByteType -> g2
+    com.android.tools.r8.graph.DexString deserializeLambdaMethodName -> J3
+    com.android.tools.r8.graph.DexString noSuchFieldErrorDescriptor -> I1
+    com.android.tools.r8.graph.DexString trimName -> i0
+    com.android.tools.r8.graph.DexString classConstructorMethodName -> Q1
+    com.android.tools.r8.graph.DexString classDescriptor -> Q0
+    com.android.tools.r8.graph.DexString collectionDescriptor -> r1
     com.android.tools.r8.graph.DexString voidDescriptor -> B
-    com.android.tools.r8.com.google.common.collect.BiMap primitiveToBoxed -> j4
     java.util.Map protos -> d
-    com.android.tools.r8.graph.DexType callableType -> W2
+    com.android.tools.r8.graph.DexType comparatorType -> W2
     java.util.concurrent.ConcurrentHashMap referenceTypeLatticeElements -> p
-    com.android.tools.r8.graph.DexString objectsDescriptor -> Y0
-    com.android.tools.r8.graph.DexString optionalLongDescriptor -> z1
-    com.android.tools.r8.graph.DexType serviceLoaderType -> O2
-    com.android.tools.r8.graph.DexString streamDescriptor -> A1
-    com.android.tools.r8.graph.DexString unboxDoubleMethodName -> S
+    com.android.tools.r8.graph.DexString annotationDescriptor -> Y0
+    com.android.tools.r8.graph.DexString optionalIntDescriptor -> z1
+    com.android.tools.r8.graph.DexType proxyType -> O2
+    com.android.tools.r8.graph.DexString optionalLongDescriptor -> A1
+    com.android.tools.r8.graph.DexString unboxFloatMethodName -> S
     com.android.tools.r8.graph.DexString booleanDescriptor -> t
-    com.android.tools.r8.graph.DexType runtimeExceptionType -> f3
-    com.android.tools.r8.graph.DexString invocationHandlerDescriptor -> i1
-    com.android.tools.r8.graph.DexType fieldType -> E2
-    com.android.tools.r8.graph.DexString runtimeExceptionDescriptor -> H0
-    com.android.tools.r8.graph.DexString classDescriptor -> P0
-    com.android.tools.r8.graph.DexString collectionDescriptor -> q1
-    com.android.tools.r8.graph.DexString ordinalMethodName -> q0
-    com.android.tools.r8.graph.DexType annotationType -> v2
-    com.android.tools.r8.graph.DexString boxedBooleanDescriptor -> C
-    com.android.tools.r8.graph.DexType nullValueType -> w4
-    com.android.tools.r8.graph.DexProto deserializeLambdaMethodProto -> J3
-    com.android.tools.r8.graph.DexType annotationCovariantReturnTypes -> V3
+    com.android.tools.r8.graph.DexType streamType -> f3
+    com.android.tools.r8.graph.DexString methodTypeDescriptor -> i1
+    com.android.tools.r8.graph.DexType classLoaderType -> E2
+    com.android.tools.r8.graph.DexString invokeExactMethodName -> H0
+    com.android.tools.r8.graph.DexString objectArrayDescriptor -> P0
+    com.android.tools.r8.graph.DexString mapEntryDescriptor -> q1
+    com.android.tools.r8.graph.DexString finalizeMethodName -> q0
+    com.android.tools.r8.graph.DexType charArrayType -> U1
+    com.android.tools.r8.graph.DexType enumType -> v2
+    com.android.tools.r8.graph.DexString descriptorSeparator -> C
+    com.android.tools.r8.graph.DexType annotationCovariantReturnType -> V3
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap advanceLines -> g
-    java.util.Map libraryMethodsWithoutSideEffects -> r4
-    com.android.tools.r8.graph.DexString getDeclaredConstructorName -> y0
-    com.android.tools.r8.graph.DexItemFactory$AtomicFieldUpdaterMethods atomicFieldUpdaterMethods -> C3
-    com.android.tools.r8.graph.DexType charSequenceType -> n2
+    com.android.tools.r8.graph.DexString getTypeNameName -> y0
+    com.android.tools.r8.graph.DexType boxedNumberType -> n2
     java.util.Map methods -> e
-    com.android.tools.r8.graph.DexType annotationInnerClass -> N3
-    com.android.tools.r8.graph.DexString iterableDescriptor -> a1
-    com.android.tools.r8.graph.DexType boxedByteType -> f2
-    com.android.tools.r8.graph.DexString isEmptyMethodName -> T
+    com.android.tools.r8.graph.DexItemFactory$ConstructorMethods constructorMethods -> z3
+    com.android.tools.r8.graph.DexType annotationEnclosingMethod -> N3
+    com.android.tools.r8.graph.DexString collectionsDescriptor -> a1
+    com.android.tools.r8.graph.DexType boxedBooleanType -> f2
+    com.android.tools.r8.graph.DexString unboxDoubleMethodName -> T
     com.android.tools.r8.graph.DexString byteDescriptor -> u
-    com.android.tools.r8.graph.DexString deserializeLambdaMethodName -> I3
-    com.android.tools.r8.graph.DexType externalizableType -> g4
-    com.android.tools.r8.graph.DexString trimName -> h0
-    com.android.tools.r8.graph.DexString noSuchFieldErrorDescriptor -> H1
-    com.android.tools.r8.graph.DexString finalizeMethodName -> p0
-    com.android.tools.r8.graph.DexString classConstructorMethodName -> P1
-    com.android.tools.r8.graph.DexType comparatorType -> V2
-    com.android.tools.r8.graph.DexString boxedByteDescriptor -> D
-    com.android.tools.r8.graph.DexItemFactory$ClassMethods classMethods -> x3
+    com.android.tools.r8.graph.DexType serializableType -> g4
+    com.android.tools.r8.graph.DexString substringName -> h0
+    com.android.tools.r8.graph.DexString noClassDefFoundErrorDescriptor -> H1
+    java.util.Set libraryClassesWithoutStaticInitialization -> v4
+    com.android.tools.r8.graph.DexString getClassMethodName -> p0
+    com.android.tools.r8.graph.DexString constructorMethodName -> P1
+    com.android.tools.r8.graph.DexItemFactory$NullPointerExceptionMethods npeMethods -> B3
+    com.android.tools.r8.graph.DexType collectionType -> V2
+    com.android.tools.r8.graph.DexString boxedBooleanDescriptor -> D
+    com.android.tools.r8.com.google.common.collect.BiMap primitiveToBoxed -> k4
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap advancePCs -> h
-    com.android.tools.r8.graph.DexString annotationDescriptor -> X0
-    com.android.tools.r8.graph.DexString optionalIntDescriptor -> y1
-    com.android.tools.r8.graph.DexType proxyType -> N2
+    com.android.tools.r8.graph.DexString enumDescriptor -> X0
+    com.android.tools.r8.graph.DexString optionalDoubleDescriptor -> y1
+    com.android.tools.r8.graph.DexType invocationHandlerType -> N2
+    com.android.tools.r8.graph.DexType reflectiveOperationExceptionType -> o3
     java.util.Map methodHandles -> f
-    com.android.tools.r8.graph.DexString getDeclaredMethodName -> C0
-    com.android.tools.r8.graph.DexString stringBuilderDescriptor -> d1
-    com.android.tools.r8.graph.DexType streamType -> e3
+    com.android.tools.r8.graph.DexString getMethodName -> C0
+    com.android.tools.r8.graph.DexString strictMathDescriptor -> d1
+    com.android.tools.r8.graph.DexType optionalLongType -> e3
     java.util.Map setInlineFrames -> o
-    com.android.tools.r8.graph.DexType classLoaderType -> D2
-    com.android.tools.r8.graph.DexString charSequenceArrayDescriptor -> K0
-    com.android.tools.r8.graph.DexString serviceLoaderConfigurationErrorDescriptor -> l1
+    com.android.tools.r8.graph.DexType classType -> D2
+    com.android.tools.r8.graph.DexMethod metafactoryAltMethod -> m4
+    com.android.tools.r8.graph.DexString charSequenceDescriptor -> K0
+    com.android.tools.r8.graph.DexString serviceLoaderDescriptor -> l1
     com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin setEpilogueBegin -> l
-    com.android.tools.r8.graph.DexString forNameMethodName -> t0
-    java.util.Set libraryMethodsReturningNonNull -> q4
-    com.android.tools.r8.graph.DexType annotationCovariantReturnType -> U3
-    com.android.tools.r8.graph.DexType charArrayType -> T1
-    com.android.tools.r8.graph.DexType enumType -> u2
-    com.android.tools.r8.graph.DexType annotationEnclosingMethod -> M3
-    com.android.tools.r8.graph.DexString unboxByteMethodName -> M
-    com.android.tools.r8.graph.DexType boxedNumberType -> m2
-    com.android.tools.r8.graph.DexString throwableDescriptor -> C1
-    com.android.tools.r8.graph.DexString lastIndexOfMethodName -> c0
-    com.android.tools.r8.graph.DexType serializableType -> f4
-    com.android.tools.r8.graph.DexType boxedBooleanType -> e2
-    com.android.tools.r8.graph.DexItemFactory$ObjectMethods objectMethods -> s3
-    com.android.tools.r8.graph.DexString intFieldUpdaterDescriptor -> K1
-    com.android.tools.r8.graph.DexString internMethodName -> k0
-    com.android.tools.r8.graph.DexItemFactory$NullPointerExceptionMethods npeMethods -> A3
-    com.android.tools.r8.graph.DexString classArrayDescriptor -> S0
-    com.android.tools.r8.graph.DexString supplierDescriptor -> t1
-    com.android.tools.r8.graph.DexType collectionType -> U2
-    boolean skipNameValidationForTesting -> v4
-    com.android.tools.r8.graph.DexType invocationHandlerType -> M2
-    com.android.tools.r8.graph.DexType reflectiveOperationExceptionType -> n3
-    com.android.tools.r8.graph.DexString unboxCharMethodName -> N
-    com.android.tools.r8.graph.DexString strictMathDescriptor -> c1
-    com.android.tools.r8.graph.DexString getMethodName -> B0
-    com.android.tools.r8.graph.DexItemFactory$ProxyMethods proxyMethods -> F3
-    com.android.tools.r8.graph.DexType classType -> C2
-    com.android.tools.r8.graph.DexMethod metafactoryAltMethod -> l4
-    com.android.tools.r8.graph.DexType optionalLongType -> d3
-    com.android.tools.r8.graph.DexString serviceLoaderDescriptor -> k1
-    com.android.tools.r8.graph.DexString charSequenceDescriptor -> J0
-    com.android.tools.r8.graph.DexProto twrCloseResourceMethodProto -> H3
+    com.android.tools.r8.graph.DexString desiredAssertionStatusMethodName -> t0
+    java.util.Set libraryMethodsReturningReceiver -> q4
+    com.android.tools.r8.graph.DexString charArrayDescriptor -> T1
+    com.android.tools.r8.graph.DexProto twrCloseResourceMethodProto -> I3
+    com.android.tools.r8.graph.DexType annotationSynthesizedClassMap -> U3
+    com.android.tools.r8.graph.DexType classArrayType -> u2
+    com.android.tools.r8.graph.DexItemFactory$StringMethods stringMethods -> u3
+    com.android.tools.r8.graph.DexType annotationEnclosingClass -> M3
+    com.android.tools.r8.graph.DexType stringConcatFactoryType -> n4
+    com.android.tools.r8.graph.DexString unboxBooleanMethodName -> M
+    com.android.tools.r8.graph.DexType boxedShortType -> m2
+    com.android.tools.r8.graph.DexString arraysDescriptor -> C1
+    com.android.tools.r8.graph.DexString indexOfMethodName -> c0
+    com.android.tools.r8.graph.DexType enumerationType -> f4
+    com.android.tools.r8.graph.DexType voidType -> e2
+    com.android.tools.r8.graph.DexString reflectiveOperationExceptionDescriptor -> K1
+    com.android.tools.r8.graph.DexString toStringMethodName -> k0
+    com.android.tools.r8.graph.DexString autoCloseableDescriptor -> S0
+    com.android.tools.r8.graph.DexString callableDescriptor -> t1
+    com.android.tools.r8.graph.DexType mapEntryType -> U2
+    com.android.tools.r8.graph.DexType methodTypeType -> M2
+    com.android.tools.r8.graph.DexType npeType -> n3
+    com.android.tools.r8.graph.DexString unboxByteMethodName -> N
+    com.android.tools.r8.graph.DexString mathDescriptor -> c1
+    com.android.tools.r8.graph.DexString getDeclaredFieldName -> B0
+    com.android.tools.r8.graph.DexItemFactory$AssertionErrorMethods assertionErrorMethods -> x3
+    com.android.tools.r8.graph.DexType referenceFieldUpdaterType -> C2
+    com.android.tools.r8.graph.DexMethod metafactoryMethod -> l4
+    com.android.tools.r8.graph.DexType optionalIntType -> d3
+    com.android.tools.r8.graph.DexString proxyDescriptor -> k1
+    com.android.tools.r8.graph.DexString assertionErrorDescriptor -> J0
     java.util.Map strings -> a
-    com.android.tools.r8.graph.DexString charArrayDescriptor -> S1
-    com.android.tools.r8.graph.DexString desiredAssertionStatusMethodName -> s0
-    java.util.Set libraryMethodsReturningReceiver -> p4
-    com.android.tools.r8.graph.DexType classArrayType -> t2
-    com.android.tools.r8.graph.DexItemFactory$ObjectsMethods objectsMethods -> r3
-    com.android.tools.r8.graph.DexType annotationSynthesizedClassMap -> T3
-    com.android.tools.r8.graph.DexType boxedShortType -> l2
-    com.android.tools.r8.graph.DexString unboxShortMethodName -> O
-    com.android.tools.r8.graph.DexType annotationEnclosingClass -> L3
-    com.android.tools.r8.graph.DexType stringConcatFactoryType -> m4
-    com.android.tools.r8.graph.DexString unboxIntMethodName -> P
-    com.android.tools.r8.graph.DexString indexOfMethodName -> b0
-    com.android.tools.r8.graph.DexString arraysDescriptor -> B1
-    com.android.tools.r8.graph.DexType voidType -> d2
-    com.android.tools.r8.graph.DexType enumerationType -> e4
-    com.android.tools.r8.graph.DexString toStringMethodName -> j0
-    com.android.tools.r8.graph.DexString reflectiveOperationExceptionDescriptor -> J1
-    com.android.tools.r8.graph.DexString autoCloseableDescriptor -> R0
-    com.android.tools.r8.graph.DexString callableDescriptor -> s1
+    com.android.tools.r8.graph.DexString enumValuesFieldName -> S1
+    com.android.tools.r8.graph.DexString nameMethodName -> s0
+    com.android.tools.r8.graph.DexType objectArrayType -> t2
+    com.android.tools.r8.graph.DexType annotationThrows -> T3
+    com.android.tools.r8.graph.DexType boxedLongType -> l2
+    com.android.tools.r8.graph.DexString unboxCharMethodName -> O
+    com.android.tools.r8.graph.DexType annotationDefault -> L3
+    com.android.tools.r8.graph.DexString unboxShortMethodName -> P
+    com.android.tools.r8.graph.DexString contentEqualsMethodName -> b0
+    com.android.tools.r8.graph.DexString streamDescriptor -> B1
+    com.android.tools.r8.graph.DexType shortType -> d2
+    com.android.tools.r8.graph.DexItemFactory$ObjectMethods objectMethods -> t3
+    com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods serviceLoaderMethods -> j4
+    com.android.tools.r8.graph.DexType listIteratorType -> e4
+    com.android.tools.r8.graph.DexString valueOfMethodName -> j0
+    com.android.tools.r8.graph.DexString npeDescriptor -> J1
+    com.android.tools.r8.graph.DexString classLoaderDescriptor -> R0
+    com.android.tools.r8.graph.DexString comparatorDescriptor -> s1
     java.util.Map types -> b
-    com.android.tools.r8.graph.DexType mapEntryType -> T2
-    com.android.tools.r8.graph.DexString collectionsDescriptor -> Z0
-    com.android.tools.r8.graph.DexType methodTypeType -> L2
-    com.android.tools.r8.graph.DexType npeType -> m3
-    com.android.tools.r8.graph.DexString assertionsDisabled -> E0
-    com.android.tools.r8.graph.DexString varHandleDescriptor -> f1
-    com.android.tools.r8.graph.DexType referenceFieldUpdaterType -> B2
-    com.android.tools.r8.graph.DexType optionalIntType -> c3
-    com.android.tools.r8.graph.DexString equalsMethodName -> Y
+    com.android.tools.r8.graph.DexType mapType -> T2
+    boolean skipNameValidationForTesting -> w4
+    com.android.tools.r8.graph.DexString objectsDescriptor -> Z0
+    com.android.tools.r8.graph.DexType methodHandleType -> L2
+    com.android.tools.r8.graph.DexType noSuchFieldErrorType -> m3
+    com.android.tools.r8.graph.DexString newInstanceName -> E0
+    com.android.tools.r8.graph.DexString stringBufferDescriptor -> f1
+    com.android.tools.r8.graph.DexType strictMathType -> B2
+    com.android.tools.r8.graph.DexType optionalDoubleType -> c3
+    com.android.tools.r8.graph.DexItemFactory$ThrowableMethods throwableMethods -> w3
+    com.android.tools.r8.graph.DexString endsWithMethodName -> Y
     com.android.tools.r8.graph.DexString longDescriptor -> z
-    com.android.tools.r8.graph.DexMethod stringConcatMethod -> o4
-    com.android.tools.r8.graph.DexString stringArrayDescriptor -> M0
-    com.android.tools.r8.graph.DexString setDescriptor -> n1
-    com.android.tools.r8.graph.DexType floatType -> Z1
-    com.android.tools.r8.graph.DexString unknownTypeName -> x4
-    com.android.tools.r8.graph.DexString getCanonicalNameName -> v0
-    com.android.tools.r8.graph.DexType annotationThrows -> S3
-    com.android.tools.r8.graph.DexType objectArrayType -> s2
-    com.android.tools.r8.graph.DexString boxedLongDescriptor -> I
-    com.android.tools.r8.graph.DexType annotationDefault -> K3
-    com.android.tools.r8.graph.DexType boxedLongType -> k2
-    java.util.IdentityHashMap internalSentinels -> y4
-    com.android.tools.r8.graph.DexString icceDescriptor -> E1
+    com.android.tools.r8.graph.DexItemFactory$PrimitiveTypesBoxedTypeFields primitiveTypesBoxedTypeFields -> C3
+    com.android.tools.r8.graph.DexMethod stringConcatWithConstantsMethod -> o4
+    com.android.tools.r8.graph.DexString stringDescriptor -> M0
+    com.android.tools.r8.graph.DexString listDescriptor -> n1
+    com.android.tools.r8.graph.DexItemFactory$JavaUtilArraysMethods utilArraysMethods -> v3
+    com.android.tools.r8.graph.DexType doubleType -> Z1
+    com.android.tools.r8.graph.DexString getNameName -> v0
+    com.android.tools.r8.graph.DexString throwableArrayDescriptor -> V1
+    com.android.tools.r8.graph.DexType annotationSourceDebugExtension -> S3
+    com.android.tools.r8.graph.DexType objectType -> s2
+    com.android.tools.r8.kotlin.Kotlin kotlin -> E3
+    com.android.tools.r8.graph.DexString boxedIntDescriptor -> I
+    com.android.tools.r8.graph.DexType boxedIntType -> k2
+    com.android.tools.r8.graph.DexString illegalAccessErrorDescriptor -> E1
     com.android.tools.r8.utils.LRUCacheTable leastUpperBoundOfInterfacesTable -> r
-    com.android.tools.r8.graph.DexString compareToIgnoreCaseMethodName -> e0
-    com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods serviceLoaderMethods -> i4
-    com.android.tools.r8.graph.DexType listIteratorType -> d4
-    com.android.tools.r8.graph.DexType shortType -> c2
-    com.android.tools.r8.graph.DexString equalsIgnoreCaseMethodName -> Z
-    com.android.tools.r8.graph.DexString referenceFieldUpdaterDescriptor -> M1
-    java.util.Set libraryMethodsWithReturnValueDependingOnlyOnArguments -> s4
-    com.android.tools.r8.graph.DexString wrapperFieldName -> m0
-    com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods stringBuilderMethods -> o3
-    com.android.tools.r8.graph.DexString fieldDescriptor -> U0
-    com.android.tools.r8.graph.DexString runnableDescriptor -> v1
-    com.android.tools.r8.graph.DexType mapType -> S2
-    com.android.tools.r8.graph.DexString boxedShortDescriptor -> J
-    com.android.tools.r8.graph.DexType methodHandleType -> K2
-    com.android.tools.r8.graph.DexType noSuchFieldErrorType -> l3
-    com.android.tools.r8.graph.DexType exceptionInInitializerErrorType -> j3
-    com.android.tools.r8.graph.DexString stringBufferDescriptor -> e1
-    com.android.tools.r8.graph.DexType stringBufferType -> I2
-    com.android.tools.r8.graph.DexString newInstanceName -> D0
-    com.android.tools.r8.graph.DexItemFactory$ThrowableMethods throwableMethods -> v3
-    com.android.tools.r8.graph.DexMethod stringConcatWithConstantsMethod -> n4
-    com.android.tools.r8.graph.DexType optionalDoubleType -> b3
-    com.android.tools.r8.graph.DexString stringDescriptor -> L0
-    com.android.tools.r8.graph.DexString listDescriptor -> m1
-    com.android.tools.r8.graph.DexType strictMathType -> A2
-    com.android.tools.r8.graph.DexType doubleType -> Y1
-    com.android.tools.r8.graph.DexType mathType -> z2
-    com.android.tools.r8.graph.DexType metafactoryType -> Z3
-    com.android.tools.r8.graph.DexString throwableArrayDescriptor -> U1
-    com.android.tools.r8.graph.DexItemFactory$StringMethods stringMethods -> t3
-    com.android.tools.r8.graph.DexString getNameName -> u0
-    com.android.tools.r8.graph.DexType objectType -> r2
-    com.android.tools.r8.kotlin.Kotlin kotlin -> D3
-    com.android.tools.r8.graph.DexType annotationSourceDebugExtension -> R3
-    com.android.tools.r8.graph.DexString boxedNumberDescriptor -> K
-    com.android.tools.r8.graph.DexType boxedIntType -> j2
-    com.android.tools.r8.graph.DexString compareToMethodName -> d0
-    com.android.tools.r8.graph.DexString illegalAccessErrorDescriptor -> D1
+    com.android.tools.r8.graph.DexString compareToMethodName -> e0
+    com.android.tools.r8.graph.DexType iteratorType -> d4
+    com.android.tools.r8.graph.DexType longType -> c2
+    com.android.tools.r8.graph.DexString equalsMethodName -> Z
+    com.android.tools.r8.graph.DexString longFieldUpdaterDescriptor -> M1
+    com.android.tools.r8.graph.DexString convertMethodName -> m0
+    com.android.tools.r8.graph.DexString constructorDescriptor -> U0
+    com.android.tools.r8.graph.DexString consumerDescriptor -> v1
+    com.android.tools.r8.graph.DexType setType -> S2
+    com.android.tools.r8.graph.DexString boxedLongDescriptor -> J
+    com.android.tools.r8.graph.DexType varHandleType -> K2
+    com.android.tools.r8.graph.DexType noClassDefFoundErrorType -> l3
+    com.android.tools.r8.graph.DexType icceType -> j3
+    com.android.tools.r8.graph.DexString stringBuilderDescriptor -> e1
+    com.android.tools.r8.graph.DexType stringBuilderType -> I2
+    com.android.tools.r8.graph.DexString getDeclaredMethodName -> D0
+    com.android.tools.r8.graph.DexType optionalType -> b3
+    com.android.tools.r8.graph.DexString charSequenceArrayDescriptor -> L0
+    com.android.tools.r8.graph.DexString serviceLoaderConfigurationErrorDescriptor -> m1
+    com.android.tools.r8.graph.DexType mathType -> A2
+    com.android.tools.r8.graph.DexType charType -> Y1
+    com.android.tools.r8.graph.DexType iterableType -> z2
+    com.android.tools.r8.graph.DexType dalvikCriticalNativeAnnotation -> Z3
+    com.android.tools.r8.graph.DexString forNameMethodName -> u0
+    com.android.tools.r8.graph.DexType stringArrayType -> r2
+    com.android.tools.r8.graph.DexType annotationSignature -> R3
+    com.android.tools.r8.graph.DexString boxedShortDescriptor -> K
+    com.android.tools.r8.graph.DexType boxedFloatType -> j2
+    com.android.tools.r8.graph.DexString lastIndexOfMethodName -> d0
+    com.android.tools.r8.graph.DexString throwableDescriptor -> D1
     java.util.Map setFiles -> n
-    com.android.tools.r8.graph.DexType longType -> b2
-    com.android.tools.r8.graph.DexType iteratorType -> c4
-    com.android.tools.r8.graph.DexString convertMethodName -> l0
-    com.android.tools.r8.graph.DexString longFieldUpdaterDescriptor -> L1
-    com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods stringBufferMethods -> p3
-    com.android.tools.r8.graph.DexType runnableType -> Z2
-    com.android.tools.r8.graph.DexString constructorDescriptor -> T0
-    com.android.tools.r8.graph.DexString consumerDescriptor -> u1
-    com.android.tools.r8.graph.DexType setType -> R2
-    com.android.tools.r8.graph.DexString unboxBooleanMethodName -> L
-    com.android.tools.r8.graph.DexType varHandleType -> J2
-    com.android.tools.r8.graph.DexType noClassDefFoundErrorType -> k3
-    com.android.tools.r8.graph.DexType icceType -> i3
-    com.android.tools.r8.graph.DexType stringBuilderType -> H2
-    com.android.tools.r8.graph.DexString lengthMethodName -> U
+    com.android.tools.r8.graph.DexType intType -> b2
+    com.android.tools.r8.graph.DexType lookupType -> c4
+    com.android.tools.r8.graph.DexString internMethodName -> l0
+    com.android.tools.r8.graph.DexString intFieldUpdaterDescriptor -> L1
+    com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods stringBuilderMethods -> p3
+    java.util.Set libraryMethodsReturningNonNull -> r4
+    com.android.tools.r8.graph.DexType consumerType -> Z2
+    com.android.tools.r8.graph.DexString classArrayDescriptor -> T0
+    com.android.tools.r8.graph.DexString supplierDescriptor -> u1
+    com.android.tools.r8.graph.DexType listType -> R2
+    com.android.tools.r8.graph.DexString boxedNumberDescriptor -> L
+    com.android.tools.r8.graph.DexType stringBufferType -> J2
+    com.android.tools.r8.graph.DexType exceptionInInitializerErrorType -> k3
+    com.android.tools.r8.graph.DexType illegalAccessErrorType -> i3
+    com.android.tools.r8.graph.DexType autoCloseableType -> H2
+    com.android.tools.r8.graph.DexString isEmptyMethodName -> U
     com.android.tools.r8.graph.DexString charDescriptor -> v
-    com.android.tools.r8.graph.DexString invokeExactMethodName -> G0
-    com.android.tools.r8.graph.DexString methodTypeDescriptor -> h1
-    com.android.tools.r8.graph.DexType optionalType -> a3
-    com.android.tools.r8.graph.DexString objectArrayDescriptor -> O0
-    com.android.tools.r8.graph.DexString mapEntryDescriptor -> p1
-    com.android.tools.r8.graph.DexType dalvikCriticalNativeAnnotation -> Y3
-    com.android.tools.r8.graph.DexType charType -> X1
-    com.android.tools.r8.graph.DexType iterableType -> y2
+    com.android.tools.r8.graph.DexString invokeMethodName -> G0
+    com.android.tools.r8.graph.DexString methodHandleDescriptor -> h1
+    com.android.tools.r8.graph.DexType runnableType -> a3
+    com.android.tools.r8.graph.DexString objectDescriptor -> O0
+    com.android.tools.r8.graph.DexString mapDescriptor -> p1
+    com.android.tools.r8.graph.DexType dalvikFastNativeAnnotation -> Y3
+    com.android.tools.r8.graph.DexType byteType -> X1
+    com.android.tools.r8.graph.DexType collectionsType -> y2
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap defaults -> i
-    com.android.tools.r8.graph.DexString boxedCharDescriptor -> E
-    com.android.tools.r8.graph.DexString getTypeNameName -> x0
-    com.android.tools.r8.graph.DexType annotationSignature -> Q3
-    com.android.tools.r8.graph.DexType stringArrayType -> q2
-    com.android.tools.r8.graph.DexType boxedFloatType -> i2
-    com.android.tools.r8.graph.DexString noClassDefFoundErrorDescriptor -> G1
-    com.android.tools.r8.graph.DexString containsMethodName -> V
+    com.android.tools.r8.graph.DexString boxedByteDescriptor -> E
+    com.android.tools.r8.graph.DexString getSimpleNameName -> x0
+    com.android.tools.r8.graph.DexType annotationMethodParameters -> Q3
+    com.android.tools.r8.graph.DexType stringType -> q2
+    com.android.tools.r8.graph.DexType boxedDoubleType -> i2
+    com.android.tools.r8.graph.DexString twrCloseResourceMethodName -> H3
+    com.android.tools.r8.graph.DexString exceptionInInitializerErrorDescriptor -> G1
+    com.android.tools.r8.graph.DexString lengthMethodName -> V
     com.android.tools.r8.graph.DexString doubleDescriptor -> w
-    com.android.tools.r8.graph.DexString substringName -> g0
-    com.android.tools.r8.graph.DexType lookupType -> b4
-    com.android.tools.r8.graph.DexType intType -> a2
-    com.android.tools.r8.graph.DexItemFactory$PolymorphicMethods polymorphicMethods -> E3
-    com.android.tools.r8.graph.DexString constructorMethodName -> O1
-    java.util.Set libraryClassesWithoutStaticInitialization -> u4
-    com.android.tools.r8.graph.DexString getClassMethodName -> o0
-    com.android.tools.r8.graph.DexType consumerType -> Y2
-    boolean $assertionsDisabled -> z4
+    com.android.tools.r8.graph.DexString cloneMethodName -> g0
+    com.android.tools.r8.graph.DexType callSiteType -> b4
+    boolean $assertionsDisabled -> A4
+    com.android.tools.r8.graph.DexType floatType -> a2
+    com.android.tools.r8.graph.DexString newUpdaterName -> O1
+    java.util.Set libraryTypesAssumedToBePresent -> u4
+    com.android.tools.r8.graph.DexString initMethodName -> o0
+    com.android.tools.r8.graph.DexType supplierType -> Y2
+    com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods stringBufferMethods -> q3
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap endLocals -> j
-    com.android.tools.r8.graph.DexString boxedDoubleDescriptor -> F
-    com.android.tools.r8.graph.DexString enumDescriptor -> W0
-    com.android.tools.r8.graph.DexString optionalDoubleDescriptor -> x1
-    com.android.tools.r8.graph.DexType listType -> Q2
-    com.android.tools.r8.graph.DexType autoCloseableType -> G2
-    com.android.tools.r8.graph.DexType illegalAccessErrorType -> h3
-    com.android.tools.r8.graph.DexString methodHandleDescriptor -> g1
-    com.android.tools.r8.graph.DexString invokeMethodName -> F0
-    com.android.tools.r8.graph.DexString startsWithMethodName -> W
+    com.android.tools.r8.graph.DexItemFactory$ClassMethods classMethods -> y3
+    com.android.tools.r8.graph.DexString boxedCharDescriptor -> F
+    com.android.tools.r8.graph.DexString methodDescriptor -> W0
+    com.android.tools.r8.graph.DexString optionalDescriptor -> x1
+    com.android.tools.r8.graph.DexItemFactory$BooleanMembers booleanMembers -> r3
+    com.android.tools.r8.graph.DexType serviceLoaderConfigurationErrorType -> Q2
+    com.android.tools.r8.graph.DexType methodType -> G2
+    com.android.tools.r8.graph.DexType throwableType -> h3
+    com.android.tools.r8.graph.DexString varHandleDescriptor -> g1
+    com.android.tools.r8.graph.DexString assertionsDisabled -> F0
+    com.android.tools.r8.graph.DexString containsMethodName -> W
     com.android.tools.r8.graph.DexString floatDescriptor -> x
-    com.android.tools.r8.graph.DexItemFactory$JavaUtilArraysMethods utilArraysMethods -> u3
-    com.android.tools.r8.graph.DexString objectDescriptor -> N0
-    com.android.tools.r8.graph.DexString mapDescriptor -> o1
+    com.android.tools.r8.graph.DexMethod stringConcatMethod -> p4
+    com.android.tools.r8.graph.DexString stringArrayDescriptor -> N0
+    com.android.tools.r8.graph.DexString setDescriptor -> o1
+    com.android.tools.r8.graph.DexItemFactory$EnumMethods enumMethods -> A3
     boolean sorted -> s
-    com.android.tools.r8.graph.DexType byteType -> W1
-    com.android.tools.r8.graph.DexType collectionsType -> x2
+    com.android.tools.r8.graph.DexType booleanType -> W1
+    com.android.tools.r8.graph.DexType objectsType -> x2
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap restartLocals -> k
-    com.android.tools.r8.graph.DexType dalvikFastNativeAnnotation -> X3
-    com.android.tools.r8.graph.DexString boxedFloatDescriptor -> G
-    com.android.tools.r8.graph.DexString getSimpleNameName -> w0
-    com.android.tools.r8.graph.DexType stringType -> p2
-    com.android.tools.r8.graph.DexType annotationMethodParameters -> P3
-    com.android.tools.r8.graph.DexType boxedDoubleType -> h2
-    com.android.tools.r8.graph.DexString twrCloseResourceMethodName -> G3
-    com.android.tools.r8.graph.DexString cloneMethodName -> f0
-    com.android.tools.r8.graph.DexString exceptionInInitializerErrorDescriptor -> F1
-    com.android.tools.r8.graph.DexString endsWithMethodName -> X
+    com.android.tools.r8.graph.DexType annotationReachabilitySensitive -> X3
+    com.android.tools.r8.graph.DexString unknownTypeName -> y4
+    com.android.tools.r8.graph.DexString boxedDoubleDescriptor -> G
+    com.android.tools.r8.graph.DexString getCanonicalNameName -> w0
+    com.android.tools.r8.graph.DexType charSequenceArrayType -> p2
+    com.android.tools.r8.graph.DexType annotationMemberClasses -> P3
+    com.android.tools.r8.graph.DexType boxedCharType -> h2
+    java.util.IdentityHashMap internalSentinels -> z4
+    com.android.tools.r8.graph.DexType comparableType -> i4
+    com.android.tools.r8.graph.DexString compareToIgnoreCaseMethodName -> f0
+    com.android.tools.r8.graph.DexString icceDescriptor -> F1
+    com.android.tools.r8.graph.DexString startsWithMethodName -> X
     com.android.tools.r8.graph.DexString intDescriptor -> y
-    com.android.tools.r8.graph.DexType callSiteType -> a4
-    com.android.tools.r8.graph.DexString initMethodName -> n0
-    com.android.tools.r8.graph.DexString newUpdaterName -> N1
-    java.util.Set libraryTypesAssumedToBePresent -> t4
-    com.android.tools.r8.graph.DexType supplierType -> X2
-    com.android.tools.r8.graph.DexString methodDescriptor -> V0
-    com.android.tools.r8.graph.DexString optionalDescriptor -> w1
-    com.android.tools.r8.graph.DexItemFactory$EnumMethods enumMethods -> z3
-    com.android.tools.r8.graph.DexItemFactory$PrimitiveTypesBoxedTypeFields primitiveTypesBoxedTypeFields -> B3
-    com.android.tools.r8.graph.DexItemFactory$BooleanMembers booleanMembers -> q3
-    com.android.tools.r8.graph.DexString boxedIntDescriptor -> H
-    com.android.tools.r8.graph.DexType serviceLoaderConfigurationErrorType -> P2
+    com.android.tools.r8.graph.DexItemFactory$PolymorphicMethods polymorphicMethods -> F3
+    com.android.tools.r8.graph.DexType metafactoryType -> a4
+    com.android.tools.r8.graph.DexString wrapperFieldName -> n0
+    com.android.tools.r8.graph.DexString referenceFieldUpdaterDescriptor -> N1
+    java.util.Set libraryMethodsWithReturnValueDependingOnlyOnArguments -> t4
+    com.android.tools.r8.graph.DexType callableType -> X2
+    com.android.tools.r8.graph.DexString fieldDescriptor -> V0
+    com.android.tools.r8.graph.DexString runnableDescriptor -> w1
+    com.android.tools.r8.graph.DexString boxedFloatDescriptor -> H
+    com.android.tools.r8.graph.DexType serviceLoaderType -> P2
     1:41:void <clinit>():59:99 -> <clinit>
     1:1:void <init>():103:103 -> <init>
-    2:376:void <init>():63:437 -> <init>
-    377:425:void <init>():427:475 -> <init>
-    426:442:void <init>():465:481 -> <init>
-    443:461:void <init>():478:496 -> <init>
-    462:482:void <init>():487:507 -> <init>
-    483:516:void <init>():500:533 -> <init>
-    517:521:void <init>():532:536 -> <init>
-    522:525:void <init>():535:538 -> <init>
-    526:564:void <init>():528:566 -> <init>
-    565:567:void <init>():104:106 -> <init>
-    568:568:void <init>():105:105 -> <init>
+    2:377:void <init>():63:438 -> <init>
+    378:426:void <init>():428:476 -> <init>
+    427:443:void <init>():466:482 -> <init>
+    444:462:void <init>():479:497 -> <init>
+    463:483:void <init>():488:508 -> <init>
+    484:517:void <init>():501:534 -> <init>
+    518:522:void <init>():533:537 -> <init>
+    523:526:void <init>():536:539 -> <init>
+    527:565:void <init>():529:567 -> <init>
+    566:568:void <init>():104:106 -> <init>
+    569:569:void <init>():105:105 -> <init>
     com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame lambda$createSetInlineFrame$2(com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame) -> a
     1:1:com.android.tools.r8.graph.DexType access$2000(com.android.tools.r8.graph.DexItemFactory):59:59 -> a
     2:2:boolean isInternalSentinel(com.android.tools.r8.graph.DexItem):110:110 -> a
-    3:4:com.android.tools.r8.graph.DexType getBoxedForPrimitiveType(com.android.tools.r8.graph.DexType):440:441 -> a
-    5:7:com.android.tools.r8.graph.DexMethod lambda$boxedValueOfMethods$0(java.util.Map$Entry):453:455 -> a
-    8:8:com.android.tools.r8.utils.Pair lambda$mapToPredicate$1(java.util.function.Predicate,com.android.tools.r8.graph.DexMethod):543:543 -> a
-    9:9:java.util.stream.Stream mapToPredicate(java.util.Set,java.util.function.Predicate):543:543 -> a
-    10:10:void setSkipNameValidationForTesting(boolean):569:569 -> a
-    11:12:com.android.tools.r8.graph.DexItem canonicalize(java.util.Map,com.android.tools.r8.graph.DexItem):1200:1201 -> a
+    3:4:com.android.tools.r8.graph.DexType getBoxedForPrimitiveType(com.android.tools.r8.graph.DexType):441:442 -> a
+    5:7:com.android.tools.r8.graph.DexMethod lambda$boxedValueOfMethods$0(java.util.Map$Entry):454:456 -> a
+    8:8:com.android.tools.r8.utils.Pair lambda$mapToPredicate$1(java.util.function.Predicate,com.android.tools.r8.graph.DexMethod):544:544 -> a
+    9:9:java.util.stream.Stream mapToPredicate(java.util.Set,java.util.function.Predicate):544:544 -> a
+    10:10:void setSkipNameValidationForTesting(boolean):570:570 -> a
+    11:12:com.android.tools.r8.graph.DexItem canonicalize(java.util.Map,com.android.tools.r8.graph.DexItem):1201:1202 -> a
     13:13:boolean isInternalSentinel(com.android.tools.r8.graph.DexItem):110:110 -> a
-    13:13:com.android.tools.r8.graph.DexItem canonicalize(java.util.Map,com.android.tools.r8.graph.DexItem):1201 -> a
-    14:15:com.android.tools.r8.graph.DexItem canonicalize(java.util.Map,com.android.tools.r8.graph.DexItem):1201:1202 -> a
-    16:17:com.android.tools.r8.graph.DexString createString(int,byte[]):1207:1208 -> a
-    18:19:com.android.tools.r8.graph.DexString createString(java.lang.String):1212:1213 -> a
-    20:21:com.android.tools.r8.graph.DexType createArrayType(int,com.android.tools.r8.graph.DexType):1261:1262 -> a
-    22:24: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):1266:1268 -> a
-    25:25:com.android.tools.r8.graph.DexField createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String):1272:1272 -> a
-    26:28: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):1276:1278 -> a
-    29:32:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1282:1285 -> a
-    33:38:com.android.tools.r8.graph.DexString createShorty(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1351:1356 -> a
-    33:38:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1286 -> a
-    39:39:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1283:1283 -> a
-    40:40:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,java.util.List):1290:1290 -> a
-    41:43:com.android.tools.r8.graph.DexProto protoWithDifferentFirstParameter(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1294:1296 -> a
-    44:47:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):1300:1303 -> a
-    48:50:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):1302:1304 -> a
-    51:55:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1317:1321 -> a
-    56:65:com.android.tools.r8.graph.DexType[] applyClassMappingToDexTypes(com.android.tools.r8.graph.DexType[],java.util.function.Function):1338:1347 -> a
-    56:65:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1321 -> a
-    66:72:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1322:1328 -> a
-    73:77:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1327:1331 -> a
-    78:80: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):1360:1362 -> a
-    81:81:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1366:1366 -> a
-    82:84:com.android.tools.r8.graph.DexMethodHandle createMethodHandle(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.Descriptor,boolean):1373:1375 -> a
-    85:86: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):1384:1385 -> a
-    87:96: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[]):1393:1402 -> a
-    97:99:com.android.tools.r8.graph.DexDebugEvent$AdvanceLine createAdvanceLine(int):1406:1408 -> a
-    100:102:com.android.tools.r8.graph.DexDebugEvent$SetFile createSetFile(com.android.tools.r8.graph.DexString):1444:1446 -> a
-    103:105:com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame createSetInlineFrame(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):1451:1453 -> a
-    106:106:boolean isClassConstructor(com.android.tools.r8.graph.DexMethod):1461:1461 -> a
-    107:109:void clearTypeLatticeElementsCache():1465:1467 -> a
-    110:117:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement createReferenceTypeLatticeElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):1494:1501 -> a
-    118:146:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement createReferenceTypeLatticeElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):1500:1528 -> a
-    147:155:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement lambda$createReferenceTypeLatticeElement$3(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.TypeLatticeElement,com.android.tools.r8.graph.DexType):1508:1516 -> a
-    156:167:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement lambda$createReferenceTypeLatticeElement$3(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.TypeLatticeElement,com.android.tools.r8.graph.DexType):1515:1526 -> a
-    168:169:java.util.Set getOrComputeLeastUpperBoundOfImplementedInterfaces(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1533:1534 -> a
-    170:171:java.util.Set lambda$getOrComputeLeastUpperBoundOfImplementedInterfaces$4(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):1537:1538 -> a
-    172:176:void assignSortedIndices(java.util.Collection,com.android.tools.r8.naming.NamingLens):1545:1549 -> a
-    177:177:int lambda$assignSortedIndices$5(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.PresortedComparable,com.android.tools.r8.graph.PresortedComparable):1546:1546 -> a
-    178:184:void sort(com.android.tools.r8.naming.NamingLens):1554:1560 -> a
-    185:185:void forAllTypes(java.util.function.Consumer):1577:1577 -> a
-    1:1:com.android.tools.r8.graph.DexString lookupString(int,byte[]):1217:1217 -> b
-    2:8:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):1239:1245 -> b
-    9:11:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):1244:1246 -> b
+    13:13:com.android.tools.r8.graph.DexItem canonicalize(java.util.Map,com.android.tools.r8.graph.DexItem):1202 -> a
+    14:15:com.android.tools.r8.graph.DexItem canonicalize(java.util.Map,com.android.tools.r8.graph.DexItem):1202:1203 -> a
+    16:17:com.android.tools.r8.graph.DexString createString(int,byte[]):1208:1209 -> a
+    18:19:com.android.tools.r8.graph.DexString createString(java.lang.String):1213:1214 -> a
+    20:21:com.android.tools.r8.graph.DexType createArrayType(int,com.android.tools.r8.graph.DexType):1262:1263 -> a
+    22:24: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):1267:1269 -> a
+    25:25:com.android.tools.r8.graph.DexField createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String):1273:1273 -> a
+    26:28: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):1277:1279 -> a
+    29:32:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1283:1286 -> a
+    33:38:com.android.tools.r8.graph.DexString createShorty(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1352:1357 -> a
+    33:38:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1287 -> a
+    39:39:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1284:1284 -> a
+    40:40:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,java.util.List):1291:1291 -> a
+    41:43:com.android.tools.r8.graph.DexProto protoWithDifferentFirstParameter(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1295:1297 -> a
+    44:47:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):1301:1304 -> a
+    48:50:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):1303:1305 -> a
+    51:55:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1318:1322 -> a
+    56:65:com.android.tools.r8.graph.DexType[] applyClassMappingToDexTypes(com.android.tools.r8.graph.DexType[],java.util.function.Function):1339:1348 -> a
+    56:65:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1322 -> a
+    66:72:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1323:1329 -> a
+    73:77:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1328:1332 -> a
+    78:80: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):1361:1363 -> a
+    81:81:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1367:1367 -> a
+    82:84:com.android.tools.r8.graph.DexMethodHandle createMethodHandle(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.Descriptor,boolean):1374:1376 -> a
+    85:86: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):1385:1386 -> a
+    87:96: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[]):1394:1403 -> a
+    97:99:com.android.tools.r8.graph.DexDebugEvent$AdvanceLine createAdvanceLine(int):1407:1409 -> a
+    100:102:com.android.tools.r8.graph.DexDebugEvent$SetFile createSetFile(com.android.tools.r8.graph.DexString):1445:1447 -> a
+    103:105:com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame createSetInlineFrame(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):1452:1454 -> a
+    106:106:boolean isClassConstructor(com.android.tools.r8.graph.DexMethod):1462:1462 -> a
+    107:109:void clearTypeLatticeElementsCache():1466:1468 -> a
+    110:117:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement createReferenceTypeLatticeElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):1495:1502 -> a
+    118:146:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement createReferenceTypeLatticeElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):1501:1529 -> a
+    147:155:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement lambda$createReferenceTypeLatticeElement$3(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.TypeLatticeElement,com.android.tools.r8.graph.DexType):1509:1517 -> a
+    156:167:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement lambda$createReferenceTypeLatticeElement$3(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.TypeLatticeElement,com.android.tools.r8.graph.DexType):1516:1527 -> a
+    168:169:java.util.Set getOrComputeLeastUpperBoundOfImplementedInterfaces(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1534:1535 -> a
+    170:171:java.util.Set lambda$getOrComputeLeastUpperBoundOfImplementedInterfaces$4(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):1538:1539 -> a
+    172:176:void assignSortedIndices(java.util.Collection,com.android.tools.r8.naming.NamingLens):1546:1550 -> a
+    177:177:int lambda$assignSortedIndices$5(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.PresortedComparable,com.android.tools.r8.graph.PresortedComparable):1547:1547 -> a
+    178:184:void sort(com.android.tools.r8.naming.NamingLens):1555:1561 -> a
+    185:185:void forAllTypes(java.util.function.Consumer):1578:1578 -> a
+    1:1:com.android.tools.r8.graph.DexString lookupString(int,byte[]):1218:1218 -> b
+    2:8:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):1240:1246 -> b
+    9:11:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):1245:1247 -> b
     12:12:boolean isInternalSentinel(com.android.tools.r8.graph.DexItem):110:110 -> b
-    12:12:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):1246 -> b
-    13:14:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):1246:1247 -> b
-    15:15:com.android.tools.r8.graph.DexType createType(java.lang.String):1253:1253 -> b
-    16:18:com.android.tools.r8.graph.DexDebugEvent$AdvancePC createAdvancePC(int):1412:1414 -> b
-    19:19:com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin createSetEpilogueBegin():1436:1436 -> b
-    20:20:boolean isConstructor(com.android.tools.r8.graph.DexMethod):1457:1457 -> b
-    1:1:boolean isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexMethod):577:577 -> c
-    2:2:com.android.tools.r8.graph.DexString lookupString(java.lang.String):1221:1221 -> c
-    3:3:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexString):1257:1257 -> c
-    4:6:com.android.tools.r8.graph.DexDebugEvent$Default createDefault(int):1418:1420 -> c
-    7:7:com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd createSetPrologueEnd():1440:1440 -> c
-    1:5:java.util.List extractMarkers():1228:1232 -> d
-    6:8:com.android.tools.r8.graph.DexDebugEvent$EndLocal createEndLocal(int):1424:1426 -> d
-    1:1:boolean getSkipNameValidationForTesting():573:573 -> e
-    2:4:com.android.tools.r8.graph.DexDebugEvent$RestartLocal createRestartLocal(int):1430:1432 -> e
-    1:10:void resetSortedIndices():1564:1573 -> f
-    1:3:boolean verifyNoCachedTypeLatticeElements():1471:1473 -> g
-    1:12:java.util.Set boxedValueOfMethods():450:461 -> h
+    12:12:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):1247 -> b
+    13:14:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):1247:1248 -> b
+    15:15:com.android.tools.r8.graph.DexType createType(java.lang.String):1254:1254 -> b
+    16:18:com.android.tools.r8.graph.DexDebugEvent$AdvancePC createAdvancePC(int):1413:1415 -> b
+    19:19:com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin createSetEpilogueBegin():1437:1437 -> b
+    20:20:boolean isConstructor(com.android.tools.r8.graph.DexMethod):1458:1458 -> b
+    1:1:boolean isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexMethod):578:578 -> c
+    2:2:com.android.tools.r8.graph.DexString lookupString(java.lang.String):1222:1222 -> c
+    3:3:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexString):1258:1258 -> c
+    4:6:com.android.tools.r8.graph.DexDebugEvent$Default createDefault(int):1419:1421 -> c
+    7:7:com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd createSetPrologueEnd():1441:1441 -> c
+    1:5:java.util.List extractMarkers():1229:1233 -> d
+    6:8:com.android.tools.r8.graph.DexDebugEvent$EndLocal createEndLocal(int):1425:1427 -> d
+    1:1:boolean getSkipNameValidationForTesting():574:574 -> e
+    2:4:com.android.tools.r8.graph.DexDebugEvent$RestartLocal createRestartLocal(int):1431:1433 -> e
+    1:10:void resetSortedIndices():1565:1574 -> f
+    1:3:boolean verifyNoCachedTypeLatticeElements():1472:1474 -> g
+    1:12:java.util.Set boxedValueOfMethods():451:462 -> h
 com.android.tools.r8.graph.DexItemFactory$1 -> com.android.tools.r8.graph.W$a:
 com.android.tools.r8.graph.DexItemFactory$AssertionErrorMethods -> com.android.tools.r8.graph.W$b:
     com.android.tools.r8.graph.DexMethod initMessageAndCause -> b
     com.android.tools.r8.graph.DexMethod initMessage -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):641:641 -> <init>
-    2:7:void <init>(com.android.tools.r8.graph.DexItemFactory):645:650 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):642:642 -> <init>
+    2:7:void <init>(com.android.tools.r8.graph.DexItemFactory):646:651 -> <init>
 com.android.tools.r8.graph.DexItemFactory$AtomicFieldUpdaterMethods -> com.android.tools.r8.graph.W$c:
     java.util.Set updaters -> d
     com.android.tools.r8.graph.DexMethod referenceUpdater -> c
     com.android.tools.r8.graph.DexMethod longUpdater -> b
     com.android.tools.r8.graph.DexMethod intUpdater -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):874:874 -> <init>
-    2:21:void <init>(com.android.tools.r8.graph.DexItemFactory):880:899 -> <init>
-    1:1:boolean isFieldUpdater(com.android.tools.r8.graph.DexMethod):903:903 -> a
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):875:875 -> <init>
+    2:21:void <init>(com.android.tools.r8.graph.DexItemFactory):881:900 -> <init>
+    1:1:boolean isFieldUpdater(com.android.tools.r8.graph.DexMethod):904:904 -> a
 com.android.tools.r8.graph.DexItemFactory$BooleanMembers -> com.android.tools.r8.graph.W$d:
     com.android.tools.r8.graph.DexItemFactory this$0 -> f
     com.android.tools.r8.graph.DexField TRUE -> b
@@ -17659,9 +17671,9 @@
     com.android.tools.r8.graph.DexMethod valueOf -> e
     com.android.tools.r8.graph.DexField TYPE -> c
     com.android.tools.r8.graph.DexMethod booleanValue -> d
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):580:580 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):591:591 -> <init>
-    3:10:void <init>(com.android.tools.r8.graph.DexItemFactory):582:589 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):581:581 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):592:592 -> <init>
+    3:10:void <init>(com.android.tools.r8.graph.DexItemFactory):583:590 -> <init>
 com.android.tools.r8.graph.DexItemFactory$ClassMethods -> com.android.tools.r8.graph.W$e:
     com.android.tools.r8.graph.DexMethod newInstance -> m
     com.android.tools.r8.graph.DexMethod getDeclaredMethod -> l
@@ -17678,16 +17690,16 @@
     com.android.tools.r8.graph.DexMethod desiredAssertionStatus -> a
     java.util.Set getNames -> o
     java.util.Set getMembers -> n
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):684:684 -> <init>
-    2:41:void <init>(com.android.tools.r8.graph.DexItemFactory):702:741 -> <init>
-    1:1:java.util.Set access$1800(com.android.tools.r8.graph.DexItemFactory$ClassMethods):684:684 -> a
-    2:2:boolean isReflectiveClassLookup(com.android.tools.r8.graph.DexMethod):745:745 -> a
-    1:1:boolean isReflectiveMemberLookup(com.android.tools.r8.graph.DexMethod):749:749 -> b
-    1:1:boolean isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):753:753 -> c
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):685:685 -> <init>
+    2:41:void <init>(com.android.tools.r8.graph.DexItemFactory):703:742 -> <init>
+    1:1:java.util.Set access$1800(com.android.tools.r8.graph.DexItemFactory$ClassMethods):685:685 -> a
+    2:2:boolean isReflectiveClassLookup(com.android.tools.r8.graph.DexMethod):746:746 -> a
+    1:1:boolean isReflectiveMemberLookup(com.android.tools.r8.graph.DexMethod):750:750 -> b
+    1:1:boolean isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):754:754 -> c
 com.android.tools.r8.graph.DexItemFactory$ConstructorMethods -> com.android.tools.r8.graph.W$f:
     com.android.tools.r8.graph.DexMethod newInstance -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):757:757 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):761:763 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):758:758 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):762:764 -> <init>
 com.android.tools.r8.graph.DexItemFactory$EnumMethods -> com.android.tools.r8.graph.W$g:
     com.android.tools.r8.graph.DexItemFactory this$0 -> g
     com.android.tools.r8.graph.DexMethod finalize -> f
@@ -17696,34 +17708,34 @@
     com.android.tools.r8.graph.DexMethod name -> c
     com.android.tools.r8.graph.DexMethod ordinal -> b
     com.android.tools.r8.graph.DexMethod valueOf -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):771:771 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):783:783 -> <init>
-    3:28:void <init>(com.android.tools.r8.graph.DexItemFactory):778:803 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):772:772 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):784:784 -> <init>
+    3:28:void <init>(com.android.tools.r8.graph.DexItemFactory):779:804 -> <init>
 com.android.tools.r8.graph.DexItemFactory$JavaUtilArraysMethods -> com.android.tools.r8.graph.W$h:
     com.android.tools.r8.graph.DexMethod asList -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):604:604 -> <init>
-    2:6:void <init>(com.android.tools.r8.graph.DexItemFactory):608:612 -> <init>
-    7:7:void <init>(com.android.tools.r8.graph.DexItemFactory):610:610 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):605:605 -> <init>
+    2:6:void <init>(com.android.tools.r8.graph.DexItemFactory):609:613 -> <init>
+    7:7:void <init>(com.android.tools.r8.graph.DexItemFactory):611:611 -> <init>
 com.android.tools.r8.graph.DexItemFactory$LongMethods -> com.android.tools.r8.graph.W$i:
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):594:594 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):598:600 -> <init>
-    5:5:void <init>(com.android.tools.r8.graph.DexItemFactory):599:599 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):595:595 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):599:601 -> <init>
+    5:5:void <init>(com.android.tools.r8.graph.DexItemFactory):600:600 -> <init>
 com.android.tools.r8.graph.DexItemFactory$NullPointerExceptionMethods -> com.android.tools.r8.graph.W$j:
     com.android.tools.r8.graph.DexMethod init -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):811:811 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):815:817 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):812:812 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):816:818 -> <init>
 com.android.tools.r8.graph.DexItemFactory$ObjectMethods -> com.android.tools.r8.graph.W$k:
     com.android.tools.r8.graph.DexMethod toString -> d
     com.android.tools.r8.graph.DexMethod finalize -> c
     com.android.tools.r8.graph.DexMethod constructor -> b
     com.android.tools.r8.graph.DexMethod getClass -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):655:655 -> <init>
-    2:9:void <init>(com.android.tools.r8.graph.DexItemFactory):662:669 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):656:656 -> <init>
+    2:9:void <init>(com.android.tools.r8.graph.DexItemFactory):663:670 -> <init>
 com.android.tools.r8.graph.DexItemFactory$ObjectsMethods -> com.android.tools.r8.graph.W$l:
     com.android.tools.r8.graph.DexMethod requireNonNull -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):674:674 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):678:680 -> <init>
-    5:5:void <init>(com.android.tools.r8.graph.DexItemFactory):679:679 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):675:675 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):679:681 -> <init>
+    5:5:void <init>(com.android.tools.r8.graph.DexItemFactory):680:680 -> <init>
 com.android.tools.r8.graph.DexItemFactory$PolymorphicMethods -> com.android.tools.r8.graph.W$m:
     com.android.tools.r8.graph.DexProto compareAndSetSignature -> c
     java.util.Set varHandleMethods -> d
@@ -17732,9 +17744,9 @@
     java.util.Set varHandleCompareAndSetMethods -> f
     com.android.tools.r8.graph.DexProto signature -> a
     com.android.tools.r8.graph.DexProto setSignature -> b
-    1:36:void <init>(com.android.tools.r8.graph.DexItemFactory):1088:1123 -> <init>
-    1:11:com.android.tools.r8.graph.DexMethod canonicalize(com.android.tools.r8.graph.DexMethod):1131:1141 -> a
-    12:17:java.util.Set createStrings(java.lang.String[]):1148:1153 -> a
+    1:36:void <init>(com.android.tools.r8.graph.DexItemFactory):1089:1124 -> <init>
+    1:11:com.android.tools.r8.graph.DexMethod canonicalize(com.android.tools.r8.graph.DexMethod):1132:1142 -> a
+    12:17:java.util.Set createStrings(java.lang.String[]):1149:1154 -> a
 com.android.tools.r8.graph.DexItemFactory$PrimitiveTypesBoxedTypeFields -> com.android.tools.r8.graph.W$n:
     com.android.tools.r8.graph.DexField floatTYPE -> f
     com.android.tools.r8.graph.DexField longTYPE -> e
@@ -17744,24 +17756,24 @@
     com.android.tools.r8.graph.DexField intTYPE -> d
     com.android.tools.r8.graph.DexField shortTYPE -> c
     java.util.Map boxedFieldTypeToPrimitiveType -> h
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):831:831 -> <init>
-    2:21:void <init>(com.android.tools.r8.graph.DexItemFactory):843:862 -> <init>
-    1:1:com.android.tools.r8.graph.DexType boxedFieldTypeToPrimitiveType(com.android.tools.r8.graph.DexField):866:866 -> a
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):832:832 -> <init>
+    2:21:void <init>(com.android.tools.r8.graph.DexItemFactory):844:863 -> <init>
+    1:1:com.android.tools.r8.graph.DexType boxedFieldTypeToPrimitiveType(com.android.tools.r8.graph.DexField):867:867 -> a
 com.android.tools.r8.graph.DexItemFactory$ProxyMethods -> com.android.tools.r8.graph.W$o:
     com.android.tools.r8.graph.DexMethod newProxyInstance -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1157:1157 -> <init>
-    2:7:void <init>(com.android.tools.r8.graph.DexItemFactory):1161:1166 -> <init>
-    8:8:void <init>(com.android.tools.r8.graph.DexItemFactory):1163:1163 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1158:1158 -> <init>
+    2:7:void <init>(com.android.tools.r8.graph.DexItemFactory):1162:1167 -> <init>
+    8:8:void <init>(com.android.tools.r8.graph.DexItemFactory):1164:1164 -> <init>
 com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods -> com.android.tools.r8.graph.W$p:
     com.android.tools.r8.graph.DexMethod iterator -> d
     com.android.tools.r8.graph.DexMethod loadInstalled -> c
     com.android.tools.r8.graph.DexMethod loadWithClassLoader -> b
     com.android.tools.r8.graph.DexMethod load -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1170:1170 -> <init>
-    2:8:void <init>(com.android.tools.r8.graph.DexItemFactory):1177:1183 -> <init>
-    9:17:void <init>(com.android.tools.r8.graph.DexItemFactory):1181:1189 -> <init>
-    18:23:void <init>(com.android.tools.r8.graph.DexItemFactory):1186:1191 -> <init>
-    1:1:boolean isLoadMethod(com.android.tools.r8.graph.DexMethod):1195:1195 -> a
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1171:1171 -> <init>
+    2:8:void <init>(com.android.tools.r8.graph.DexItemFactory):1178:1184 -> <init>
+    9:17:void <init>(com.android.tools.r8.graph.DexItemFactory):1182:1190 -> <init>
+    18:23:void <init>(com.android.tools.r8.graph.DexItemFactory):1187:1192 -> <init>
+    1:1:boolean isLoadMethod(com.android.tools.r8.graph.DexMethod):1196:1196 -> a
 com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods -> com.android.tools.r8.graph.W$q:
     com.android.tools.r8.graph.DexMethod defaultConstructor -> o
     com.android.tools.r8.graph.DexMethod charSequenceConstructor -> n
@@ -17784,13 +17796,13 @@
     com.android.tools.r8.graph.DexMethod toString -> r
     com.android.tools.r8.graph.DexMethod stringConstructor -> q
     com.android.tools.r8.graph.DexMethod intConstructor -> p
-    1:1:void <clinit>():980:980 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory$1):980:980 -> <init>
-    2:46:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):1004:1048 -> <init>
-    1:1:java.util.Set access$1700(com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods):980:980 -> a
-    2:2:boolean isAppendMethod(com.android.tools.r8.graph.DexMethod):1053:1053 -> a
-    3:29:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.ir.code.InvokeMethod):1057:1083 -> a
-    1:1:java.util.Set access$1900(com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods):980:980 -> b
+    1:1:void <clinit>():981:981 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory$1):981:981 -> <init>
+    2:46:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):1005:1049 -> <init>
+    1:1:java.util.Set access$1700(com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods):981:981 -> a
+    2:2:boolean isAppendMethod(com.android.tools.r8.graph.DexMethod):1054:1054 -> a
+    3:29:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.ir.code.InvokeMethod):1058:1084 -> a
+    1:1:java.util.Set access$1900(com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods):981:981 -> b
 com.android.tools.r8.graph.DexItemFactory$StringMethods -> com.android.tools.r8.graph.W$r:
     com.android.tools.r8.graph.DexMethod hashCode -> o
     com.android.tools.r8.graph.DexMethod compareToIgnoreCase -> n
@@ -17812,19 +17824,19 @@
     com.android.tools.r8.graph.DexMethod intern -> r
     com.android.tools.r8.graph.DexMethod toString -> q
     com.android.tools.r8.graph.DexMethod valueOf -> p
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):907:907 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):932:932 -> <init>
-    3:48:void <init>(com.android.tools.r8.graph.DexItemFactory):930:975 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):908:908 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):933:933 -> <init>
+    3:48:void <init>(com.android.tools.r8.graph.DexItemFactory):931:976 -> <init>
 com.android.tools.r8.graph.DexItemFactory$ThrowableMethods -> com.android.tools.r8.graph.W$s:
     com.android.tools.r8.graph.DexMethod initCause -> d
     com.android.tools.r8.graph.DexMethod getSuppressed -> c
     com.android.tools.r8.graph.DexMethod getMessage -> b
     com.android.tools.r8.graph.DexMethod addSuppressed -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):618:618 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):625:627 -> <init>
-    5:8:void <init>(com.android.tools.r8.graph.DexItemFactory):626:629 -> <init>
-    9:16:void <init>(com.android.tools.r8.graph.DexItemFactory):628:635 -> <init>
-    17:17:void <init>(com.android.tools.r8.graph.DexItemFactory):633:633 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):619:619 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):626:628 -> <init>
+    5:8:void <init>(com.android.tools.r8.graph.DexItemFactory):627:630 -> <init>
+    9:16:void <init>(com.android.tools.r8.graph.DexItemFactory):629:636 -> <init>
+    17:17:void <init>(com.android.tools.r8.graph.DexItemFactory):634:634 -> <init>
 com.android.tools.r8.graph.DexLibraryClass -> com.android.tools.r8.graph.X:
     boolean $assertionsDisabled -> s
     1:1:void <clinit>():17:17 -> <clinit>
@@ -17874,7 +17886,7 @@
     4:4:int slowCompareTo(java.lang.Object):12:12 -> a
     5:5:int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):67:67 -> a
     6:6:int layeredCompareTo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.NamingLens):139:139 -> a
-    7:7:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):160:160 -> a
+    7:7:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):166:166 -> a
     7:7:int layeredCompareTo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.NamingLens):139 -> a
     8:8:int layeredCompareTo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.NamingLens):143:143 -> a
     9:9:int com.android.tools.r8.graph.DexString.compareTo(com.android.tools.r8.graph.DexString):255:255 -> a
@@ -17884,7 +17896,7 @@
     11:11:int layeredCompareTo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.NamingLens):147 -> a
     12:12:int com.android.tools.r8.graph.DexString.compareTo(com.android.tools.r8.graph.DexString):255:255 -> a
     12:12:int layeredCompareTo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.NamingLens):143 -> a
-    13:13:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):160:160 -> a
+    13:13:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):166:166 -> a
     13:13:int layeredCompareTo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.NamingLens):139 -> a
     14:14:boolean match(com.android.tools.r8.graph.DexMethod):152:152 -> a
     15:26:java.lang.String toSourceString(boolean):179:190 -> a
@@ -18114,14 +18126,14 @@
     4:6:void synchronizedCollectAll(com.android.tools.r8.dex.MixedSectionCollection,com.android.tools.r8.graph.DexItem[]):217:219 -> b
     7:7:java.util.Iterator lambda$asProgramClasses$2(java.lang.Iterable,com.android.tools.r8.graph.DexDefinitionSupplier):483:483 -> b
     8:8:long checksumFromType(com.android.tools.r8.graph.DexProgramClass):520:520 -> b
-    9:9:boolean com.android.tools.r8.graph.DexClass.isFinal():634:634 -> b
+    9:9:boolean com.android.tools.r8.graph.DexClass.isFinal():684:684 -> b
     9:9:boolean isEffectivelyFinal(com.android.tools.r8.graph.AppView):238 -> b
     10:16:boolean isEffectivelyFinal(com.android.tools.r8.graph.AppView):241:247 -> b
     1:1:java.util.Collection getSynthesizedFrom():178:178 -> b0
     1:3:boolean hasAnnotations(com.android.tools.r8.graph.DexEncodedField[]):309:311 -> c
     4:6:boolean hasAnnotations(com.android.tools.r8.graph.DexEncodedMethod[]):315:317 -> c
     7:7:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):396:396 -> c
-    8:8:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():170:170 -> c
+    8:8:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():184:184 -> c
     8:8:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):397 -> c
     9:12:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):396:399 -> c
     13:14:void setInitialClassFileVersion(int):427:428 -> c
@@ -18139,7 +18151,7 @@
     12:24:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):154:166 -> collectIndexedItems
     1:4:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):183:186 -> collectMixedSectionItems
     1:2:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):378:379 -> d
-    3:3:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():170:170 -> d
+    3:3:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():184:184 -> d
     3:3:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):380 -> d
     4:4:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):383:383 -> d
     5:5:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):381:381 -> d
@@ -18147,7 +18159,7 @@
     9:11:void sortEncodedMethods(com.android.tools.r8.graph.DexEncodedMethod[]):416:418 -> d
     1:1:boolean hasClassFileVersion():432:432 -> d0
     1:3:void addVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):388:390 -> e
-    4:4:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():170:170 -> e
+    4:4:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():184:184 -> e
     4:4:void addVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):390 -> e
     5:7:void addVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):390:392 -> e
     1:1:boolean hasMethods():286:286 -> e0
@@ -18186,10 +18198,10 @@
     2:2:int slowCompareTo(java.lang.Object):9:9 -> a
     3:3:int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):58:58 -> a
     4:4:int layeredCompareTo(com.android.tools.r8.graph.DexProto,com.android.tools.r8.naming.NamingLens):86:86 -> a
-    5:5:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):160:160 -> a
+    5:5:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):166:166 -> a
     5:5:int layeredCompareTo(com.android.tools.r8.graph.DexProto,com.android.tools.r8.naming.NamingLens):86 -> a
     6:6:int layeredCompareTo(com.android.tools.r8.graph.DexProto,com.android.tools.r8.naming.NamingLens):88:88 -> a
-    7:7:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):160:160 -> a
+    7:7:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):166:166 -> a
     7:7:int layeredCompareTo(com.android.tools.r8.graph.DexProto,com.android.tools.r8.naming.NamingLens):86 -> a
     8:15:java.lang.String toDescriptorString(com.android.tools.r8.naming.NamingLens):103:110 -> a
     1:3:int slowCompareTo(com.android.tools.r8.graph.DexProto):68:70 -> b
@@ -18242,7 +18254,7 @@
     50:57:int encodeToMutf8(char,byte[],int):230:237 -> a
     58:58:int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):250:250 -> a
     59:66:boolean isValidSimpleName(int,java.lang.String):394:401 -> a
-    67:71:boolean endsWith(com.android.tools.r8.graph.DexString):446:450 -> a
+    67:71:boolean endsWith(com.android.tools.r8.graph.DexString):462:466 -> a
     1:1:int layeredCompareTo(com.android.tools.r8.graph.DexString,com.android.tools.r8.naming.NamingLens):300:300 -> b
     1:32:int decodedHashCode():161:192 -> c
     33:46:int decodedHashCode():175:188 -> c
@@ -18286,73 +18298,76 @@
     1:1:boolean hasNext():70:70 -> hasNext
 com.android.tools.r8.graph.DexType -> com.android.tools.r8.graph.f0:
     com.android.tools.r8.graph.DexString descriptor -> c
-    boolean $assertionsDisabled -> f
+    java.util.List OLD_SYNTHESIZED_NAMES -> f
+    boolean $assertionsDisabled -> g
     com.android.tools.r8.graph.DexType[] EMPTY_ARRAY -> e
     java.lang.String toStringCache -> d
-    1:2:void <clinit>():31:32 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexString):37:37 -> <init>
-    2:7:void <init>(com.android.tools.r8.graph.DexString):35:40 -> <init>
-    1:1:char toShorty():114:114 -> A
-    1:1:int layeredCompareTo(java.lang.Object,com.android.tools.r8.naming.NamingLens):31:31 -> a
-    2:3:int layeredCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.NamingLens):177:178 -> a
-    2:3:int layeredCompareTo(java.lang.Object,com.android.tools.r8.naming.NamingLens):31 -> a
+    1:6:void <clinit>():33:38 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexString):43:43 -> <init>
+    2:7:void <init>(com.android.tools.r8.graph.DexString):41:46 -> <init>
+    1:1:char toShorty():120:120 -> A
+    1:1:int layeredCompareTo(java.lang.Object,com.android.tools.r8.naming.NamingLens):33:33 -> a
+    2:3:int layeredCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.NamingLens):183:184 -> a
+    2:3:int layeredCompareTo(java.lang.Object,com.android.tools.r8.naming.NamingLens):33 -> a
     4:4:int com.android.tools.r8.graph.DexString.compareTo(com.android.tools.r8.graph.DexString):255:255 -> a
-    4:4:int layeredCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.NamingLens):179 -> a
-    4:4:int layeredCompareTo(java.lang.Object,com.android.tools.r8.naming.NamingLens):31 -> a
-    5:5:int slowCompareTo(java.lang.Object):31:31 -> a
-    6:6:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):77:77 -> a
-    7:7:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
-    7:7:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):78 -> a
-    8:9:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):78:79 -> a
-    10:10:boolean isSamePackage(com.android.tools.r8.graph.DexType):85:85 -> a
-    11:11:int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):145:145 -> a
-    12:12:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
-    12:12:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):62 -> a
-    13:13:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):63:63 -> a
-    14:16:com.android.tools.r8.graph.DexType replaceBaseType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):334:336 -> a
-    17:21:com.android.tools.r8.graph.DexType toArrayType(int,com.android.tools.r8.graph.DexItemFactory):340:344 -> a
-    22:24:com.android.tools.r8.graph.DexType toArrayElementType(com.android.tools.r8.graph.DexItemFactory):348:350 -> a
-    25:27:com.android.tools.r8.graph.DexType toArrayElementType(com.android.tools.r8.graph.DexItemFactory):349:351 -> a
-    28:35:java.lang.String getPackageOrName(boolean):355:362 -> a
-    1:1:int slowCompareTo(com.android.tools.r8.graph.DexType):165:165 -> b
-    2:7:com.android.tools.r8.graph.DexType toBaseType(com.android.tools.r8.graph.DexItemFactory):309:314 -> b
-    8:10:com.android.tools.r8.graph.DexType toBaseType(com.android.tools.r8.graph.DexItemFactory):313:315 -> b
-    1:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):131:132 -> collectIndexedItems
+    4:4:int layeredCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.NamingLens):185 -> a
+    4:4:int layeredCompareTo(java.lang.Object,com.android.tools.r8.naming.NamingLens):33 -> a
+    5:5:int slowCompareTo(java.lang.Object):33:33 -> a
+    6:6:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):83:83 -> a
+    7:7:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
+    7:7:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):84 -> a
+    8:9:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):84:85 -> a
+    10:10:boolean isSamePackage(com.android.tools.r8.graph.DexType):91:91 -> a
+    11:11:int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):151:151 -> a
+    12:12:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
+    12:12:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):68 -> a
+    13:13:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):69:69 -> a
+    14:16:com.android.tools.r8.graph.DexType replaceBaseType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):350:352 -> a
+    17:21:com.android.tools.r8.graph.DexType toArrayType(int,com.android.tools.r8.graph.DexItemFactory):356:360 -> a
+    22:24:com.android.tools.r8.graph.DexType toArrayElementType(com.android.tools.r8.graph.DexItemFactory):364:366 -> a
+    25:27:com.android.tools.r8.graph.DexType toArrayElementType(com.android.tools.r8.graph.DexItemFactory):365:367 -> a
+    28:35:java.lang.String getPackageOrName(boolean):371:378 -> a
+    1:1:int slowCompareTo(com.android.tools.r8.graph.DexType):171:171 -> b
+    2:7:com.android.tools.r8.graph.DexType toBaseType(com.android.tools.r8.graph.DexItemFactory):325:330 -> b
+    8:10:com.android.tools.r8.graph.DexType toBaseType(com.android.tools.r8.graph.DexItemFactory):329:331 -> b
+    1:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):137:138 -> collectIndexedItems
     3:3:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):245:245 -> collectIndexedItems
-    3:3:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):132 -> collectIndexedItems
-    1:1:int compareTo(java.lang.Object):31:31 -> compareTo
-    2:2:int compareTo(com.android.tools.r8.graph.DexType):160:160 -> compareTo
-    2:2:int compareTo(java.lang.Object):31 -> compareTo
-    1:2:boolean computeEquals(java.lang.Object):50:51 -> computeEquals
-    1:1:int computeHashCode():45:45 -> computeHashCode
+    3:3:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):138 -> collectIndexedItems
+    1:1:int compareTo(java.lang.Object):33:33 -> compareTo
+    2:2:int compareTo(com.android.tools.r8.graph.DexType):166:166 -> compareTo
+    2:2:int compareTo(java.lang.Object):33 -> compareTo
+    1:2:boolean computeEquals(java.lang.Object):56:57 -> computeEquals
+    1:1:int computeHashCode():51:51 -> computeHashCode
     com.android.tools.r8.graph.DexType asDexType() -> e
-    1:2:void flushCachedValues():139:140 -> flushCachedValues
+    1:2:void flushCachedValues():145:146 -> flushCachedValues
     boolean isDexType() -> h
-    1:16:int elementSizeForPrimitiveArrayType():281:296 -> i
-    1:2:java.lang.String getInternalName():379:380 -> j
-    1:4:java.lang.String getName():371:374 -> k
-    1:1:int getNumberOfLeadingSquareBrackets():302:302 -> l
-    1:1:java.lang.String getPackageDescriptor():367:367 -> m
-    1:4:java.lang.String toBinaryName():93:96 -> n
-    1:4:java.lang.String getPackageName():384 -> n
-    5:8:java.lang.String toBinaryName():94:97 -> n
-    5:8:java.lang.String getPackageName():384 -> n
-    9:9:java.lang.String getPackageName():384:384 -> n
-    1:1:boolean isArrayType():223:223 -> o
-    1:1:boolean isBooleanType():191:191 -> p
-    1:1:boolean isClassType():228:228 -> q
-    1:13:boolean isD8R8SynthesizedClassType():255:267 -> r
-    1:1:boolean isDoubleType():219:219 -> s
-    1:1:boolean isIntType():207:207 -> t
-    1:1:java.lang.String toSmaliString():120:120 -> toSmaliString
-    1:9:java.lang.String toSourceString():102:110 -> toSourceString
-    1:1:java.lang.String toString():125:125 -> toString
-    1:1:boolean isLongType():215:215 -> u
-    1:4:boolean isPrimitiveArrayType():239:242 -> v
-    1:1:boolean isPrimitiveType():183:183 -> w
-    1:2:boolean isReferenceType():233:234 -> x
-    1:1:boolean isVoidType():187:187 -> y
-    1:1:java.lang.String toDescriptorString():89:89 -> z
+    1:16:int elementSizeForPrimitiveArrayType():297:312 -> i
+    1:2:java.lang.String getInternalName():395:396 -> j
+    1:4:java.lang.String getName():387:390 -> k
+    1:1:int getNumberOfLeadingSquareBrackets():318:318 -> l
+    1:1:java.lang.String getPackageDescriptor():383:383 -> m
+    1:4:java.lang.String toBinaryName():99:102 -> n
+    1:4:java.lang.String getPackageName():400 -> n
+    5:8:java.lang.String toBinaryName():100:103 -> n
+    5:8:java.lang.String getPackageName():400 -> n
+    9:9:java.lang.String getPackageName():400:400 -> n
+    1:1:boolean isArrayType():229:229 -> o
+    1:1:boolean isBooleanType():197:197 -> p
+    1:1:boolean isClassType():234:234 -> q
+    1:13:boolean isD8R8SynthesizedClassType():261:273 -> r
+    14:15:boolean oldSynthesizedName(java.lang.String):278:279 -> r
+    14:15:boolean isD8R8SynthesizedClassType():274 -> r
+    1:1:boolean isDoubleType():225:225 -> s
+    1:1:boolean isIntType():213:213 -> t
+    1:1:java.lang.String toSmaliString():126:126 -> toSmaliString
+    1:9:java.lang.String toSourceString():108:116 -> toSourceString
+    1:1:java.lang.String toString():131:131 -> toString
+    1:1:boolean isLongType():221:221 -> u
+    1:4:boolean isPrimitiveArrayType():245:248 -> v
+    1:1:boolean isPrimitiveType():189:189 -> w
+    1:2:boolean isReferenceType():239:240 -> x
+    1:1:boolean isVoidType():193:193 -> y
+    1:1:java.lang.String toDescriptorString():95:95 -> z
 com.android.tools.r8.graph.DexTypeList -> com.android.tools.r8.graph.g0:
     com.android.tools.r8.graph.DexType[] values -> a
     com.android.tools.r8.graph.DexTypeList theEmptyTypeList -> b
@@ -18362,7 +18377,7 @@
     3:5:void <init>(com.android.tools.r8.graph.DexType[]):26:28 -> <init>
     1:1:boolean isEmpty():59:59 -> a
     2:8:int compareTo(com.android.tools.r8.graph.DexTypeList):80:86 -> a
-    9:9:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):160:160 -> a
+    9:9:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):166:166 -> a
     9:9:int compareTo(com.android.tools.r8.graph.DexTypeList):86 -> a
     10:10:int compareTo(com.android.tools.r8.graph.DexTypeList):92:92 -> a
     1:1:int size():63:63 -> b
@@ -18836,27 +18851,27 @@
     1:2:int hashCode():56:57 -> hashCode
     1:4:java.lang.String toString():78:81 -> toString
 com.android.tools.r8.graph.FieldAccessFlags -> com.android.tools.r8.graph.k0:
-    boolean $assertionsDisabled -> e
-    1:1:void <clinit>():11:11 -> <clinit>
-    1:1:void <init>(int,int):44:44 -> <init>
-    1:1:int com.android.tools.r8.graph.AccessFlags.materialize():61:61 -> A
-    1:1:int getAsCfAccessFlags():72 -> A
-    1:1:int com.android.tools.r8.graph.AccessFlags.materialize():61:61 -> B
-    1:1:int getAsDexAccessFlags():77 -> B
-    1:1:boolean isEnum():97:97 -> C
-    1:1:boolean isTransient():89:89 -> D
-    1:1:boolean isVolatile():81:81 -> E
-    1:6:java.util.List getNames():21:26 -> b
-    1:6:java.util.List getPredicates():31:36 -> d
-    1:1:com.android.tools.r8.graph.FieldAccessFlags fromCfAccessFlags(int):67:67 -> e
-    2:2:void <init>(int):40:40 -> e
-    2:2:com.android.tools.r8.graph.FieldAccessFlags fromCfAccessFlags(int):67 -> e
-    1:1:com.android.tools.r8.graph.FieldAccessFlags fromDexAccessFlags(int):63:63 -> f
-    2:2:void <init>(int):40:40 -> f
-    2:2:com.android.tools.r8.graph.FieldAccessFlags fromDexAccessFlags(int):63 -> f
-    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
+    boolean $assertionsDisabled -> f
+    1:1:void <clinit>():12:12 -> <clinit>
+    1:1:void <init>(int,int):45:45 -> <init>
+    1:1:int com.android.tools.r8.graph.AccessFlags.materialize():67:67 -> A
+    1:1:int getAsCfAccessFlags():73 -> A
+    1:1:int com.android.tools.r8.graph.AccessFlags.materialize():67:67 -> B
+    1:1:int getAsDexAccessFlags():78 -> B
+    1:1:boolean isEnum():103:103 -> C
+    1:1:boolean isTransient():95:95 -> D
+    1:1:boolean isVolatile():87:87 -> E
+    1:6:java.util.List getNames():22:27 -> b
+    1:6:java.util.List getPredicates():32:37 -> d
+    1:1:com.android.tools.r8.graph.FieldAccessFlags fromCfAccessFlags(int):68:68 -> e
+    2:2:void <init>(int):41:41 -> e
+    2:2:com.android.tools.r8.graph.FieldAccessFlags fromCfAccessFlags(int):68 -> e
+    1:1:com.android.tools.r8.graph.FieldAccessFlags fromDexAccessFlags(int):64:64 -> f
+    2:2:void <init>(int):41:41 -> f
+    2:2:com.android.tools.r8.graph.FieldAccessFlags fromDexAccessFlags(int):64 -> f
+    1:2:com.android.tools.r8.graph.FieldAccessFlags fromSharedAccessFlags(int):59:60 -> g
+    3:3:void <init>(int):41:41 -> g
+    3:3:com.android.tools.r8.graph.FieldAccessFlags fromSharedAccessFlags(int):60 -> g
 com.android.tools.r8.graph.FieldAccessInfo -> com.android.tools.r8.graph.l0:
 com.android.tools.r8.graph.FieldAccessInfoCollection -> com.android.tools.r8.graph.m0:
 com.android.tools.r8.graph.FieldAccessInfoCollectionImpl -> com.android.tools.r8.graph.n0:
@@ -18986,10 +19001,10 @@
     1:1:com.android.tools.r8.graph.DexMethod lookupPutFieldForMethod(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexMethod):976:976 -> lookupPutFieldForMethod
     1:19:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexType):926:944 -> lookupType
     1:12:com.android.tools.r8.ir.code.Invoke$Type mapVirtualInterfaceInvocationTypes(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):999:1010 -> mapVirtualInterfaceInvocationTypes
-    13:13:boolean com.android.tools.r8.graph.ClassAccessFlags.isInterface():125:125 -> mapVirtualInterfaceInvocationTypes
+    13:13:boolean com.android.tools.r8.graph.ClassAccessFlags.isInterface():155:155 -> mapVirtualInterfaceInvocationTypes
     13:13:com.android.tools.r8.ir.code.Invoke$Type mapVirtualInterfaceInvocationTypes(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):1010 -> mapVirtualInterfaceInvocationTypes
     14:16:com.android.tools.r8.ir.code.Invoke$Type mapVirtualInterfaceInvocationTypes(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):1010:1012 -> mapVirtualInterfaceInvocationTypes
-    17:17:boolean com.android.tools.r8.graph.ClassAccessFlags.isInterface():125:125 -> mapVirtualInterfaceInvocationTypes
+    17:17:boolean com.android.tools.r8.graph.ClassAccessFlags.isInterface():155:155 -> mapVirtualInterfaceInvocationTypes
     17:17:com.android.tools.r8.ir.code.Invoke$Type mapVirtualInterfaceInvocationTypes(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):1012 -> mapVirtualInterfaceInvocationTypes
     18:18:com.android.tools.r8.ir.code.Invoke$Type mapVirtualInterfaceInvocationTypes(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):1012:1012 -> mapVirtualInterfaceInvocationTypes
     1:17:java.lang.String toString():1044:1060 -> toString
@@ -19109,22 +19124,11 @@
     1:1:com.android.tools.r8.graph.DexProto getProto(java.lang.String):113:113 -> c
     2:2:boolean isValidDescriptor(java.lang.String):138:138 -> c
     2:2:com.android.tools.r8.graph.DexProto getProto(java.lang.String):113 -> c
-    3:3:com.android.tools.r8.graph.DexProto getProto(java.lang.String):113:113 -> c
-    4:5:java.lang.String getReturnTypeDescriptor(java.lang.String):150:151 -> c
-    4:5:com.android.tools.r8.graph.DexProto getProto(java.lang.String):114 -> c
-    6:40:java.lang.String[] getArgumentTypeDescriptors(java.lang.String):180:214 -> c
-    6:40:com.android.tools.r8.graph.DexProto getProto(java.lang.String):115 -> c
-    41:46:java.lang.String[] getArgumentTypeDescriptors(java.lang.String):201:206 -> c
-    41:46:com.android.tools.r8.graph.DexProto getProto(java.lang.String):115 -> c
-    47:70:java.lang.String[] getArgumentTypeDescriptors(java.lang.String):188:211 -> c
-    47:70:com.android.tools.r8.graph.DexProto getProto(java.lang.String):115 -> c
-    71:71:java.lang.String[] getArgumentTypeDescriptors(java.lang.String):197:197 -> c
-    71:71:com.android.tools.r8.graph.DexProto getProto(java.lang.String):115 -> c
-    72:79:com.android.tools.r8.graph.DexProto getProto(java.lang.String):116:123 -> c
-    80:86:com.android.tools.r8.graph.DexTypeList getTypeListFromDescriptors(java.lang.String[]):74:80 -> c
-    80:86:com.android.tools.r8.graph.DexProto getProto(java.lang.String):124 -> c
-    87:87:com.android.tools.r8.graph.DexProto getProto(java.lang.String):125:125 -> c
-    88:88:com.android.tools.r8.graph.DexProto getProto(java.lang.String):122:122 -> c
+    3:13:com.android.tools.r8.graph.DexProto getProto(java.lang.String):113:123 -> c
+    14:21:com.android.tools.r8.graph.DexTypeList getTypeListFromDescriptors(java.lang.String[]):73:80 -> c
+    14:21:com.android.tools.r8.graph.DexProto getProto(java.lang.String):124 -> c
+    22:22:com.android.tools.r8.graph.DexProto getProto(java.lang.String):125:125 -> c
+    23:23:com.android.tools.r8.graph.DexProto getProto(java.lang.String):122:122 -> c
     1:1:com.android.tools.r8.graph.DexString getString(java.lang.String):44:44 -> d
     1:1:com.android.tools.r8.graph.DexType getTypeFromDescriptor(java.lang.String):57:57 -> e
     2:2:boolean isValidDescriptor(java.lang.String):138:138 -> e
@@ -19136,10 +19140,7 @@
     3:4:com.android.tools.r8.graph.DexType getTypeFromName(java.lang.String):52:53 -> f
     5:5:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.org.objectweb.asm.Type):48:48 -> f
     5:5:com.android.tools.r8.graph.DexType getTypeFromName(java.lang.String):53 -> f
-    1:3:int getArgumentCount(java.lang.String):158:160 -> g
-    1:4:java.lang.String getShortyDescriptor(java.lang.String):130:133 -> h
-    1:1:com.android.tools.r8.org.objectweb.asm.Type lambda$getAsmObjectType$0(java.lang.String):32:32 -> i
-    1:1:com.android.tools.r8.org.objectweb.asm.Type lambda$getAsmType$1(java.lang.String):36:36 -> j
+    1:4:java.lang.String getShortyDescriptor(java.lang.String):130:133 -> g
 com.android.tools.r8.graph.JarClassFileReader -> com.android.tools.r8.graph.u0:
     java.util.function.Consumer classConsumer -> b
     com.android.tools.r8.graph.JarApplicationReader application -> a
@@ -19255,7 +19256,7 @@
     33:33:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,int,java.lang.String):291:291 -> a
     34:34:java.lang.String illegalClassFilePrefix(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String):279:279 -> a
     34:34:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,int,java.lang.String):291 -> a
-    35:35:boolean com.android.tools.r8.graph.ClassAccessFlags.isInterface():125:125 -> a
+    35:35:boolean com.android.tools.r8.graph.ClassAccessFlags.isInterface():155:155 -> a
     35:35:java.lang.String illegalClassFilePrefix(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String):280 -> a
     35:35:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,int,java.lang.String):291 -> a
     36:36:java.lang.String illegalClassFilePrefix(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String):280:280 -> a
@@ -19269,7 +19270,7 @@
     56:56:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
     56:56:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):314 -> a
     57:60:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):314:317 -> a
-    61:61:boolean com.android.tools.r8.graph.ClassAccessFlags.isInterface():125:125 -> a
+    61:61:boolean com.android.tools.r8.graph.ClassAccessFlags.isInterface():155:155 -> a
     61:61:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):317 -> a
     62:65:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):318:321 -> a
     66:66:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):320:320 -> a
@@ -19306,7 +19307,7 @@
     111:111:void visitSource(java.lang.String,java.lang.String):339:339 -> a
     112:120:com.android.tools.r8.org.objectweb.asm.FieldVisitor visitField(int,java.lang.String,java.lang.String,java.lang.String,java.lang.Object):348:356 -> a
     121:123:com.android.tools.r8.org.objectweb.asm.MethodVisitor visitMethod(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):362:364 -> a
-    124:124:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():170:170 -> a
+    124:124:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():184:184 -> a
     124:124:com.android.tools.r8.org.objectweb.asm.MethodVisitor visitMethod(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):364 -> a
     125:130:com.android.tools.r8.org.objectweb.asm.MethodVisitor visitMethod(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):364:369 -> a
     131:131:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):374:374 -> a
@@ -19432,8 +19433,8 @@
     1:2:void visitEnd():796:797 -> c
     3:5:boolean classRequiresCode():787:789 -> c
     3:5:void visitEnd():797 -> c
-    6:6:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():345:345 -> c
-    6:6:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1113 -> c
+    6:6:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():337:337 -> c
+    6:6:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1105 -> c
     6:6:boolean classRequiresCode():789 -> c
     6:6:void visitEnd():797 -> c
     7:9:boolean classRequiresCode():789:791 -> c
@@ -19456,7 +19457,7 @@
     62:64:boolean isReachabilitySensitive():852:854 -> c
     62:64:void visitEnd():831 -> c
     65:66:void visitEnd():831:832 -> c
-    67:67:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():170:170 -> c
+    67:67:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():184:184 -> c
     67:67:void visitEnd():832 -> c
     68:71:void visitEnd():832:835 -> c
     72:82:void visitEnd():833:843 -> c
@@ -19621,7 +19622,7 @@
     363:366: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):885:888 -> a
     367:372: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):894:899 -> a
     373:379: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):895:901 -> a
-    380:381: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):55:56 -> a
+    380:381: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):59:60 -> a
     380:381: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):901 -> a
     382:382: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):900:900 -> a
     383:383:com.android.tools.r8.graph.DebugLocalInfo canonicalize(com.android.tools.r8.graph.DebugLocalInfo):905:905 -> a
@@ -19731,49 +19732,57 @@
     4:10:com.android.tools.r8.graph.LazyLoadedDexApplication build():228:234 -> a
     com.android.tools.r8.graph.DexApplication$Builder self() -> e
 com.android.tools.r8.graph.MethodAccessFlags -> com.android.tools.r8.graph.D0:
-    boolean $assertionsDisabled -> e
-    1:1:void <clinit>():11:11 -> <clinit>
-    1:1:void <init>(int,int):61:61 -> <init>
-    1:1:com.android.tools.r8.graph.MethodAccessFlags copy():66:66 -> A
-    1:1:int com.android.tools.r8.graph.AccessFlags.materialize():61:61 -> B
-    1:1:int getAsCfAccessFlags():106 -> B
-    1:1:int getAsDexAccessFlags():96:96 -> C
-    2:2:boolean isSynchronized():110:110 -> C
-    2:2:int getAsDexAccessFlags():97 -> C
-    3:3:int getAsDexAccessFlags():97:97 -> C
-    4:4:void unsetSynchronized():118:118 -> C
-    4:4:int getAsDexAccessFlags():98 -> C
-    5:5:void setDeclaredSynchronized():188:188 -> C
-    5:5:int getAsDexAccessFlags():99 -> C
-    6:6:int com.android.tools.r8.graph.AccessFlags.materialize():61:61 -> C
-    6:6:int getAsDexAccessFlags():101 -> C
-    1:1:boolean isAbstract():150:150 -> D
-    1:1:boolean isBridge():122:122 -> E
-    1:1:boolean isConstructor():170:170 -> F
-    1:1:boolean isNative():142:142 -> G
-    1:1:boolean isStrict():162:162 -> H
-    1:1:boolean isSynchronized():110:110 -> I
-    1:1:boolean isVarargs():134:134 -> J
-    1:1:void setBridge():126:126 -> K
-    1:1:void setNative():146:146 -> L
-    1:1:void unsetAbstract():158:158 -> M
-    1:1:void unsetBridge():130:130 -> N
-    1:1:void unsetConstructor():178:178 -> O
-    1:1:com.android.tools.r8.graph.MethodAccessFlags fromCfAccessFlags(int,boolean):81:81 -> a
-    2:2:void <init>(int):57:57 -> a
-    2:2:com.android.tools.r8.graph.MethodAccessFlags fromCfAccessFlags(int,boolean):82 -> a
-    1:9:java.util.List getNames():32:40 -> b
-    10:12:com.android.tools.r8.graph.MethodAccessFlags fromSharedAccessFlags(int,boolean):75:77 -> b
-    1:9:java.util.List getPredicates():45:53 -> d
-    1:1:com.android.tools.r8.graph.MethodAccessFlags fromDexAccessFlags(int):86:86 -> e
-    2:2:void <init>(int):57:57 -> e
-    2:2:com.android.tools.r8.graph.MethodAccessFlags fromDexAccessFlags(int):86 -> e
-    3:3:boolean isDeclaredSynchronized():184:184 -> e
-    3:3:com.android.tools.r8.graph.MethodAccessFlags fromDexAccessFlags(int):87 -> e
-    4:4:void setSynchronized():114:114 -> e
-    4:4:com.android.tools.r8.graph.MethodAccessFlags fromDexAccessFlags(int):88 -> e
-    5:5:void unsetDeclaredSynchronized():192:192 -> e
-    5:5:com.android.tools.r8.graph.MethodAccessFlags fromDexAccessFlags(int):89 -> e
+    boolean $assertionsDisabled -> f
+    1:1:void <clinit>():15:15 -> <clinit>
+    1:1:void <init>(int,int):65:65 -> <init>
+    1:1:com.android.tools.r8.graph.MethodAccessFlags copy():70:70 -> A
+    1:1:int com.android.tools.r8.graph.AccessFlags.materialize():67:67 -> B
+    1:1:int getAsCfAccessFlags():100 -> B
+    1:1:int getAsDexAccessFlags():105:105 -> C
+    2:2:boolean isSynchronized():124:124 -> C
+    2:2:int getAsDexAccessFlags():106 -> C
+    3:3:int getAsDexAccessFlags():106:106 -> C
+    4:4:void unsetSynchronized():132:132 -> C
+    4:4:int getAsDexAccessFlags():107 -> C
+    5:5:void setDeclaredSynchronized():202:202 -> C
+    5:5:int getAsDexAccessFlags():108 -> C
+    6:6:int com.android.tools.r8.graph.AccessFlags.materialize():67:67 -> C
+    6:6:int getAsDexAccessFlags():110 -> C
+    1:12:int com.android.tools.r8.graph.AccessFlags.getAsKotlinFlags():75:86 -> D
+    1:12:int getAsKotlinFlags():115 -> D
+    13:13:boolean com.android.tools.r8.graph.AccessFlags.isOpen():201:201 -> D
+    13:13:int com.android.tools.r8.graph.AccessFlags.getAsKotlinFlags():88 -> D
+    13:13:int getAsKotlinFlags():115 -> D
+    14:16:int com.android.tools.r8.graph.AccessFlags.getAsKotlinFlags():89:91 -> D
+    14:16:int getAsKotlinFlags():115 -> D
+    17:21:int getAsKotlinFlags():116:120 -> D
+    1:1:boolean isAbstract():164:164 -> E
+    1:1:boolean isBridge():136:136 -> F
+    1:1:boolean isConstructor():184:184 -> G
+    1:1:boolean isNative():156:156 -> H
+    1:1:boolean isStrict():176:176 -> I
+    1:1:boolean isSynchronized():124:124 -> J
+    1:1:boolean isVarargs():148:148 -> K
+    1:1:void setBridge():140:140 -> L
+    1:1:void setNative():160:160 -> M
+    1:1:void unsetAbstract():172:172 -> N
+    1:1:void unsetBridge():144:144 -> O
+    1:1:void unsetConstructor():192:192 -> P
+    1:1:com.android.tools.r8.graph.MethodAccessFlags fromCfAccessFlags(int,boolean):85:85 -> a
+    2:2:void <init>(int):61:61 -> a
+    2:2:com.android.tools.r8.graph.MethodAccessFlags fromCfAccessFlags(int,boolean):86 -> a
+    1:9:java.util.List getNames():36:44 -> b
+    10:12:com.android.tools.r8.graph.MethodAccessFlags fromSharedAccessFlags(int,boolean):79:81 -> b
+    1:9:java.util.List getPredicates():49:57 -> d
+    1:1:com.android.tools.r8.graph.MethodAccessFlags fromDexAccessFlags(int):90:90 -> e
+    2:2:void <init>(int):61:61 -> e
+    2:2:com.android.tools.r8.graph.MethodAccessFlags fromDexAccessFlags(int):90 -> e
+    3:3:boolean isDeclaredSynchronized():198:198 -> e
+    3:3:com.android.tools.r8.graph.MethodAccessFlags fromDexAccessFlags(int):91 -> e
+    4:4:void setSynchronized():128:128 -> e
+    4:4:com.android.tools.r8.graph.MethodAccessFlags fromDexAccessFlags(int):92 -> e
+    5:5:void unsetDeclaredSynchronized():206:206 -> e
+    5:5:com.android.tools.r8.graph.MethodAccessFlags fromDexAccessFlags(int):93 -> e
 com.android.tools.r8.graph.NestHostClassAttribute -> com.android.tools.r8.graph.E0:
     com.android.tools.r8.graph.DexType nestHost -> a
     boolean $assertionsDisabled -> b
@@ -19811,7 +19820,7 @@
     9:16:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap createMap(java.util.Collection,java.util.function.Consumer):79:86 -> a
     17:28:com.android.tools.r8.graph.DexProgramClass[] sortClasses(com.android.tools.r8.graph.DexApplication,java.util.Collection):140:151 -> a
     29:31:int lambda$sortClasses$0(com.android.tools.r8.graph.ObjectToOffsetMapping$ProgramClassDepthsMemoized,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):146:148 -> a
-    32:32:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):160:160 -> a
+    32:32:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):166:166 -> a
     32:32:int lambda$sortClasses$0(com.android.tools.r8.graph.ObjectToOffsetMapping$ProgramClassDepthsMemoized,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):148 -> a
     33:33:java.util.Collection keysOrEmpty(java.util.Map):155:155 -> a
     34:34:java.util.Collection getCallSites():183:183 -> a
@@ -19922,7 +19931,7 @@
     16:17:void accept(com.android.tools.r8.graph.DexClass):60 -> b
     18:19:void accept(com.android.tools.r8.graph.DexClass):61:62 -> b
 com.android.tools.r8.graph.ResolutionResult -> com.android.tools.r8.graph.L0:
-    1:1:void <init>():17:17 -> <init>
+    1:1:void <init>():18:18 -> <init>
     com.android.tools.r8.graph.ResolutionResult$FailedResolutionResult asFailedResolution() -> a
     boolean isAccessibleForVirtualDispatchFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithSubtyping) -> a
     boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions) -> a
@@ -19932,32 +19941,33 @@
     boolean isAccessibleFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithSubtyping) -> b
     java.util.Set lookupVirtualTargets(com.android.tools.r8.graph.AppInfoWithSubtyping) -> b
     com.android.tools.r8.graph.DexEncodedMethod lookupInvokeSpecialTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithSubtyping) -> c
-    1:1:com.android.tools.r8.graph.DexEncodedMethod getSingleTarget():51:51 -> c
+    1:1:com.android.tools.r8.graph.DexEncodedMethod getSingleTarget():52:52 -> c
     boolean isFailedResolution() -> d
     com.android.tools.r8.graph.DexEncodedMethod lookupInvokeSuperTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithSubtyping) -> d
     boolean isSingleResolution() -> e
     boolean isValidVirtualTargetForDynamicDispatch() -> f
-com.android.tools.r8.graph.ResolutionResult$ArrayCloneMethodResult -> com.android.tools.r8.graph.L0$a:
+com.android.tools.r8.graph.ResolutionResult$1 -> com.android.tools.r8.graph.L0$a:
+com.android.tools.r8.graph.ResolutionResult$ArrayCloneMethodResult -> com.android.tools.r8.graph.L0$b:
     com.android.tools.r8.graph.ResolutionResult$ArrayCloneMethodResult INSTANCE -> a
-    1:1:void <clinit>():443:443 -> <clinit>
-    1:1:void <init>():445:445 -> <init>
+    1:1:void <clinit>():436:436 -> <clinit>
+    1:1:void <init>():438:438 -> <init>
     boolean isAccessibleForVirtualDispatchFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithSubtyping) -> a
     boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions) -> a
     boolean isAccessibleFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithSubtyping) -> b
     com.android.tools.r8.graph.DexEncodedMethod lookupInvokeSuperTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithSubtyping) -> d
     boolean isValidVirtualTargetForDynamicDispatch() -> f
-com.android.tools.r8.graph.ResolutionResult$ClassNotFoundResult -> com.android.tools.r8.graph.L0$b:
+com.android.tools.r8.graph.ResolutionResult$ClassNotFoundResult -> com.android.tools.r8.graph.L0$c:
     com.android.tools.r8.graph.ResolutionResult$ClassNotFoundResult INSTANCE -> a
-    1:1:void <clinit>():511:511 -> <clinit>
-    1:1:void <init>():513:513 -> <init>
-com.android.tools.r8.graph.ResolutionResult$EmptyResult -> com.android.tools.r8.graph.L0$c:
-    1:1:void <init>():410:410 -> <init>
+    1:1:void <clinit>():504:504 -> <clinit>
+    1:1:void <init>():506:506 -> <init>
+com.android.tools.r8.graph.ResolutionResult$EmptyResult -> com.android.tools.r8.graph.L0$d:
+    1:1:void <init>():403:403 -> <init>
     java.util.Set lookupInterfaceTargets(com.android.tools.r8.graph.AppInfoWithSubtyping) -> a
     com.android.tools.r8.graph.DexEncodedMethod lookupInvokeSuperTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo) -> a
     java.util.Set lookupVirtualTargets(com.android.tools.r8.graph.AppInfoWithSubtyping) -> b
     com.android.tools.r8.graph.DexEncodedMethod lookupInvokeSpecialTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithSubtyping) -> c
-com.android.tools.r8.graph.ResolutionResult$FailedResolutionResult -> com.android.tools.r8.graph.L0$d:
-    1:1:void <init>():472:472 -> <init>
+com.android.tools.r8.graph.ResolutionResult$FailedResolutionResult -> com.android.tools.r8.graph.L0$e:
+    1:1:void <init>():465:465 -> <init>
     com.android.tools.r8.graph.ResolutionResult$FailedResolutionResult asFailedResolution() -> a
     void forEachFailureDependency(java.util.function.Consumer) -> a
     boolean isAccessibleForVirtualDispatchFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithSubtyping) -> a
@@ -19966,68 +19976,81 @@
     boolean isFailedResolution() -> d
     com.android.tools.r8.graph.DexEncodedMethod lookupInvokeSuperTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithSubtyping) -> d
     boolean isValidVirtualTargetForDynamicDispatch() -> f
-com.android.tools.r8.graph.ResolutionResult$IncompatibleClassResult -> com.android.tools.r8.graph.L0$e:
+com.android.tools.r8.graph.ResolutionResult$FailedResolutionWithCausingMethods -> com.android.tools.r8.graph.L0$f:
     java.util.Collection methodsCausingError -> a
+    1:1:void <init>(java.util.Collection,com.android.tools.r8.graph.ResolutionResult$1):511:511 -> <init>
+    2:3:void <init>(java.util.Collection):515:516 -> <init>
+    1:1:void forEachFailureDependency(java.util.function.Consumer):521:521 -> a
+com.android.tools.r8.graph.ResolutionResult$IllegalAccessOrNoSuchMethodResult -> com.android.tools.r8.graph.L0$g:
+    boolean $assertionsDisabled -> b
+    1:1:void <clinit>():545:545 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):548:549 -> <init>
+    1:1:void forEachFailureDependency(java.util.function.Consumer):545:545 -> a
+com.android.tools.r8.graph.ResolutionResult$IncompatibleClassResult -> com.android.tools.r8.graph.L0$h:
     com.android.tools.r8.graph.ResolutionResult$IncompatibleClassResult INSTANCE -> b
-    1:2:void <clinit>():519:520 -> <clinit>
-    1:2:void <init>(java.util.Collection):524:525 -> <init>
-    1:3:com.android.tools.r8.graph.ResolutionResult$IncompatibleClassResult create(java.util.Collection):529:531 -> a
-    4:4:void forEachFailureDependency(java.util.function.Consumer):536:536 -> a
-com.android.tools.r8.graph.ResolutionResult$NoSuchMethodResult -> com.android.tools.r8.graph.L0$f:
+    1:2:void <clinit>():526:527 -> <clinit>
+    1:1:void <init>(java.util.Collection):530:530 -> <init>
+    1:1:void forEachFailureDependency(java.util.function.Consumer):525:525 -> a
+    2:4:com.android.tools.r8.graph.ResolutionResult$IncompatibleClassResult create(java.util.Collection):534:536 -> a
+com.android.tools.r8.graph.ResolutionResult$NoSuchMethodResult -> com.android.tools.r8.graph.L0$i:
     com.android.tools.r8.graph.ResolutionResult$NoSuchMethodResult INSTANCE -> a
-    1:1:void <clinit>():541:541 -> <clinit>
-    1:1:void <init>():543:543 -> <init>
-com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult -> com.android.tools.r8.graph.L0$g:
+    1:1:void <clinit>():542:542 -> <clinit>
+    1:1:void <init>():540:540 -> <init>
+com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult -> com.android.tools.r8.graph.L0$j:
     com.android.tools.r8.graph.DexClass initialResolutionHolder -> a
     com.android.tools.r8.graph.DexClass resolvedHolder -> b
     com.android.tools.r8.graph.DexEncodedMethod resolvedMethod -> c
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():84:84 -> <clinit>
-    1:8:void <init>(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):98:105 -> <init>
-    1:3:boolean isAccessibleForVirtualDispatchFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithSubtyping):137:139 -> a
-    4:4:boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions):144:144 -> a
-    5:13:com.android.tools.r8.graph.DexEncodedMethod lookupInvokeSuperTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):274:282 -> a
-    14:14:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():716:716 -> a
-    14:14:com.android.tools.r8.graph.DexEncodedMethod lookupInvokeSuperTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):283 -> a
-    15:15:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    15:15:com.android.tools.r8.graph.DexEncodedMethod lookupInvokeSuperTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):283 -> a
-    16:37:com.android.tools.r8.graph.DexEncodedMethod lookupInvokeSuperTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):283:304 -> a
-    38:105:java.util.Set lookupInterfaceTargets(com.android.tools.r8.graph.AppInfoWithSubtyping):335:402 -> a
-    106:106:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():345:345 -> a
-    106:106:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1113 -> a
-    106:106:boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):90 -> a
-    107:107:boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):91:91 -> a
-    108:108:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():170:170 -> a
-    108:108:boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):91 -> a
-    109:109:boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):92:92 -> a
-    110:111:void lambda$lookupInterfaceTargets$0(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):374:375 -> a
+    1:1:void <clinit>():85:85 -> <clinit>
+    1:8:void <init>(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):99:106 -> <init>
+    boolean lambda$lookupInvokeSuperTarget$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass) -> a
+    1:1:com.android.tools.r8.graph.DexEncodedMethod getResolvedMethod():114:114 -> a
+    1:1:com.android.tools.r8.graph.DexEncodedMethod internalInvokeSpecialOrSuper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo,java.util.function.BiPredicate):230 -> a
+    2:22:com.android.tools.r8.graph.DexEncodedMethod internalInvokeSpecialOrSuper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo,java.util.function.BiPredicate):230:250 -> a
+    23:23:com.android.tools.r8.graph.DexEncodedMethod getResolvedMethod():114:114 -> a
+    23:23:com.android.tools.r8.graph.DexEncodedMethod internalInvokeSpecialOrSuper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo,java.util.function.BiPredicate):260 -> a
+    24:49:com.android.tools.r8.graph.DexEncodedMethod internalInvokeSpecialOrSuper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo,java.util.function.BiPredicate):260:285 -> a
+    50:50:boolean com.android.tools.r8.graph.DexEncodedMethod.isAbstract():257:257 -> a
+    50:50:com.android.tools.r8.graph.DexEncodedMethod internalInvokeSpecialOrSuper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo,java.util.function.BiPredicate):291 -> a
+    51:53:boolean isAccessibleForVirtualDispatchFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithSubtyping):138:140 -> a
+    54:54:boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions):145:145 -> a
+    55:59:com.android.tools.r8.graph.DexEncodedMethod lookupInvokeSuperTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):215:219 -> a
+    60:60:boolean isSuperclass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithSubtyping):298:298 -> a
+    60:60:com.android.tools.r8.graph.DexEncodedMethod lookupInvokeSuperTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):219 -> a
+    61:61:com.android.tools.r8.graph.DexEncodedMethod lookupInvokeSuperTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):223:223 -> a
+    62:63:com.android.tools.r8.graph.DexEncodedMethod lookupInvokeSuperTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):220:221 -> a
+    64:64:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():766:766 -> a
+    64:64:com.android.tools.r8.graph.DexEncodedMethod lookupInvokeSuperTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):221 -> a
+    65:65:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):34:34 -> a
+    65:65:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
+    65:65:com.android.tools.r8.graph.DexEncodedMethod lookupInvokeSuperTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):221 -> a
+    66:66:com.android.tools.r8.graph.DexEncodedMethod lookupInvokeSuperTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):221:221 -> a
+    67:67:boolean isSuperclass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithSubtyping):298:298 -> a
+    67:67:boolean lambda$lookupInvokeSpecialTarget$0(com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):168 -> a
+    68:135:java.util.Set lookupInterfaceTargets(com.android.tools.r8.graph.AppInfoWithSubtyping):328:395 -> a
+    136:136:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():337:337 -> a
+    136:136:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1105 -> a
+    136:136:boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):91 -> a
+    137:137:boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):92:92 -> a
+    138:138:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():184:184 -> a
+    138:138:boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):92 -> a
+    139:139:boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):93:93 -> a
+    140:141:void lambda$lookupInterfaceTargets$2(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):367:368 -> a
     com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult asSingleResolution() -> b
-    1:1:boolean isAccessibleFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithSubtyping):128:128 -> b
-    2:4:java.util.Set lookupVirtualTargets(com.android.tools.r8.graph.AppInfoWithSubtyping):311:313 -> b
+    1:1:boolean isAccessibleFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithSubtyping):129:129 -> b
+    2:4:java.util.Set lookupVirtualTargets(com.android.tools.r8.graph.AppInfoWithSubtyping):304:306 -> b
     5:6:java.util.Set com.android.tools.r8.utils.SetUtils.newIdentityHashSet(java.lang.Object):16:17 -> b
-    5:6:java.util.Set lookupVirtualTargets(com.android.tools.r8.graph.AppInfoWithSubtyping):314 -> b
-    7:16:java.util.Set lookupVirtualTargets(com.android.tools.r8.graph.AppInfoWithSubtyping):316:325 -> b
-    17:18:void lambda$lookupInterfaceTargets$1(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):385:386 -> b
-    1:1:com.android.tools.r8.graph.DexEncodedMethod lookupInvokeSpecialTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithSubtyping):162:162 -> c
-    2:2:com.android.tools.r8.graph.DexEncodedMethod getResolvedMethod():113:113 -> c
-    2:2:com.android.tools.r8.graph.DexEncodedMethod lookupInvokeSpecialTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithSubtyping):167 -> c
-    3:20:com.android.tools.r8.graph.DexEncodedMethod lookupInvokeSpecialTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithSubtyping):167:184 -> c
-    21:21:boolean isSuperclass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithSubtyping):239:239 -> c
-    21:21:com.android.tools.r8.graph.DexEncodedMethod lookupInvokeSpecialTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithSubtyping):185 -> c
-    22:22:com.android.tools.r8.graph.DexEncodedMethod lookupInvokeSpecialTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithSubtyping):187:187 -> c
-    23:23:com.android.tools.r8.graph.DexEncodedMethod getResolvedMethod():113:113 -> c
-    23:23:com.android.tools.r8.graph.DexEncodedMethod lookupInvokeSpecialTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithSubtyping):197 -> c
-    24:49:com.android.tools.r8.graph.DexEncodedMethod lookupInvokeSpecialTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithSubtyping):197:222 -> c
-    50:50:boolean com.android.tools.r8.graph.DexEncodedMethod.isAbstract():253:253 -> c
-    50:50:com.android.tools.r8.graph.DexEncodedMethod lookupInvokeSpecialTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithSubtyping):228 -> c
-    51:51:com.android.tools.r8.graph.DexEncodedMethod lookupInvokeSpecialTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithSubtyping):232:232 -> c
-    1:4:com.android.tools.r8.graph.DexEncodedMethod lookupInvokeSuperTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithSubtyping):266:269 -> d
-    5:5:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexClass.asDexClass():0:0 -> d
-    5:5:com.android.tools.r8.graph.DexEncodedMethod lookupInvokeSuperTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithSubtyping):269 -> d
+    5:6:java.util.Set lookupVirtualTargets(com.android.tools.r8.graph.AppInfoWithSubtyping):307 -> b
+    7:16:java.util.Set lookupVirtualTargets(com.android.tools.r8.graph.AppInfoWithSubtyping):309:318 -> b
+    17:18:void lambda$lookupInterfaceTargets$3(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):378:379 -> b
+    1:12:com.android.tools.r8.graph.DexEncodedMethod lookupInvokeSpecialTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithSubtyping):163:174 -> c
+    1:10:com.android.tools.r8.graph.DexEncodedMethod lookupInvokeSuperTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithSubtyping):198:207 -> d
+    11:11:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexClass.asDexClass():0:0 -> d
+    11:11:com.android.tools.r8.graph.DexEncodedMethod lookupInvokeSuperTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithSubtyping):201 -> d
     boolean isSingleResolution() -> e
-    1:1:boolean isValidVirtualTargetForDynamicDispatch():149:149 -> f
-    1:1:com.android.tools.r8.graph.DexClass getResolvedHolder():109:109 -> g
-    1:1:com.android.tools.r8.graph.DexEncodedMethod getResolvedMethod():113:113 -> h
+    1:1:boolean isValidVirtualTargetForDynamicDispatch():150:150 -> f
+    1:1:com.android.tools.r8.graph.DexClass getResolvedHolder():110:110 -> g
+    1:1:com.android.tools.r8.graph.DexEncodedMethod getResolvedMethod():114:114 -> h
 com.android.tools.r8.graph.SmaliWriter -> com.android.tools.r8.graph.M0:
     1:1:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.InternalOptions):22:22 -> <init>
     java.lang.String getFileEnding() -> a
@@ -20052,14 +20075,14 @@
     29:29:boolean com.android.tools.r8.graph.ClassHierarchyTraversal$Scope.shouldBePassedToVisitor(com.android.tools.r8.graph.DexClass):30:30 -> a
     29:29:void addDependentsToWorklist(com.android.tools.r8.graph.DexClass):69 -> a
     30:35:void addDependentsToWorklist(com.android.tools.r8.graph.DexClass):72:77 -> a
-    36:36:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    36:36:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     36:36:void addDependentsToWorklist(com.android.tools.r8.graph.DexClass):77 -> a
     37:46:boolean shouldTraverseUpwardsFrom(com.android.tools.r8.graph.DexClass):95:104 -> a
     37:46:void addDependentsToWorklist(com.android.tools.r8.graph.DexClass):78 -> a
     47:47:boolean shouldTraverseUpwardsFrom(com.android.tools.r8.graph.DexClass):101:101 -> a
     47:47:void addDependentsToWorklist(com.android.tools.r8.graph.DexClass):78 -> a
     48:55:void addDependentsToWorklist(com.android.tools.r8.graph.DexClass):79:86 -> a
-    56:56:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    56:56:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     56:56:void addDependentsToWorklist(com.android.tools.r8.graph.DexClass):86 -> a
     57:66:boolean shouldTraverseUpwardsFrom(com.android.tools.r8.graph.DexClass):95:104 -> a
     57:66:void addDependentsToWorklist(com.android.tools.r8.graph.DexClass):87 -> a
@@ -20132,7 +20155,7 @@
     1:1:void <init>(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$1):19:19 -> <init>
     2:4:void <init>(com.android.tools.r8.graph.AppView,java.util.Map):25:27 -> <init>
     1:15:boolean isClassDefinitelyLoadedInInstanceMethodsOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):33:47 -> a
-    16:16:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    16:16:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     16:16:boolean isClassDefinitelyLoadedInInstanceMethodsOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):47 -> a
     17:17:boolean isClassDefinitelyLoadedInInstanceMethodsOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):48:48 -> a
 com.android.tools.r8.graph.classmerging.HorizontallyMergedLambdaClasses -> com.android.tools.r8.graph.Q0.a:
@@ -20162,7 +20185,7 @@
     1:2:com.android.tools.r8.graph.DexType getTargetFor(com.android.tools.r8.graph.DexType):34:35 -> b
     1:1:boolean hasBeenMergedIntoSubtype(com.android.tools.r8.graph.DexType):39:39 -> c
     1:1:java.util.List lambda$new$0(com.android.tools.r8.graph.DexType):24:24 -> d
-com.android.tools.r8.ir.analysis.AbstractError -> com.android.tools.r8.s.a.a:
+com.android.tools.r8.ir.analysis.AbstractError -> com.android.tools.r8.r.a.a:
     com.android.tools.r8.graph.DexType simulatedError -> a
     com.android.tools.r8.ir.analysis.AbstractError TOP -> b
     com.android.tools.r8.ir.analysis.AbstractError BOTTOM -> c
@@ -20176,7 +20199,7 @@
     1:1:boolean isThrowing():48:48 -> b
     1:1:com.android.tools.r8.ir.analysis.AbstractError bottom():36:36 -> c
     1:1:com.android.tools.r8.ir.analysis.AbstractError top():32:32 -> d
-com.android.tools.r8.ir.analysis.ClassInitializationAnalysis -> com.android.tools.r8.s.a.c:
+com.android.tools.r8.ir.analysis.ClassInitializationAnalysis -> com.android.tools.r8.r.a.c:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.code.DominatorTree dominatorTree -> d
@@ -20201,36 +20224,36 @@
     2:4:void returnMarkingColor():247:249 -> b
     2:4:void notifyCodeHasChanged():238 -> b
     1:1:com.android.tools.r8.ir.analysis.ClassInitializationAnalysis trivial():91:91 -> c
-com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$1 -> com.android.tools.r8.s.a.b:
+com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$1 -> com.android.tools.r8.r.a.b:
     1:1:void <init>():61:61 -> <init>
     boolean isClassDefinitelyLoadedBeforeInstruction(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction) -> a
-com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption -> com.android.tools.r8.s.a.c$a:
+com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption -> com.android.tools.r8.r.a.c$a:
     com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption NONE -> b
     com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption INSTRUCTION_DOES_NOT_THROW -> a
     1:2:void <clinit>():51:52 -> <clinit>
     1:1:void <init>(java.lang.String,int):50:50 -> <init>
-com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$InstructionUtils -> com.android.tools.r8.s.a.c$b:
+com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$InstructionUtils -> com.android.tools.r8.r.a.c$b:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():253:253 -> <clinit>
     1:1:boolean forInstanceGet(com.android.tools.r8.ir.code.InstanceGet,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):261:261 -> a
     2:2:boolean forInstancePut(com.android.tools.r8.ir.code.InstancePut,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):270:270 -> a
     3:15:boolean forInstanceGetOrPut(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):279:291 -> a
     16:22:boolean forInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):300:306 -> a
-    23:23:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):184:184 -> a
+    23:23:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):186:186 -> a
     23:23:boolean forInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):306 -> a
     24:24:boolean forInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):307:307 -> a
     25:51:boolean forInvokeInterface(com.android.tools.r8.ir.code.InvokeInterface,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):317:343 -> a
     52:56:boolean forInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):352:356 -> a
-    57:57:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):184:184 -> a
+    57:57:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):186:186 -> a
     57:57:boolean forInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):356 -> a
     58:58:boolean forInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):357:357 -> a
     59:79:boolean forInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):367:387 -> a
-    80:80:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    80:80:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     80:80:boolean forInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):387 -> a
     81:91:boolean forInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):391:401 -> a
     92:118:boolean forInvokeVirtual(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):411:437 -> a
     119:123:boolean forNewInstance(com.android.tools.r8.ir.code.NewInstance,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):446:450 -> a
-    124:124:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    124:124:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     124:124:boolean forNewInstance(com.android.tools.r8.ir.code.NewInstance,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):450 -> a
     125:125:boolean forNewInstance(com.android.tools.r8.ir.code.NewInstance,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):451:451 -> a
     126:126:boolean forStaticGet(com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):460:460 -> a
@@ -20239,7 +20262,7 @@
     154:155:void enqueueInitializedClassesOnNormalExit(com.android.tools.r8.graph.DexEncodedMethod,java.util.Set,java.util.Deque):548:549 -> a
     154:155:boolean isTypeInitializedBy(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query):515 -> a
     156:163:boolean isTypeInitializedBy(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query):517:524 -> a
-    164:164:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    164:164:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     164:164:boolean isTypeInitializedBy(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query):528 -> a
     165:165:boolean isTypeInitializedBy(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query):530:530 -> a
     166:167:void enqueueInitializedClassesOnNormalExit(com.android.tools.r8.graph.DexEncodedMethod,java.util.Set,java.util.Deque):548:549 -> a
@@ -20247,19 +20270,19 @@
     168:168:boolean isTypeInitializedBy(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query):517:517 -> a
     169:170:void enqueue(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Deque):541:542 -> a
     1:7:boolean forStaticGetOrPut(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):478:484 -> b
-com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query -> com.android.tools.r8.s.a.c$c:
+com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query -> com.android.tools.r8.r.a.c$c:
     com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query DIRECTLY_OR_INDIRECTLY -> b
     com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query DIRECTLY -> a
     1:2:void <clinit>():56:57 -> <clinit>
     1:1:void <init>(java.lang.String,int):55:55 -> <init>
-com.android.tools.r8.ir.analysis.DeterminismAnalysis -> com.android.tools.r8.s.a.d:
+com.android.tools.r8.ir.analysis.DeterminismAnalysis -> com.android.tools.r8.r.a.d:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():18:18 -> <clinit>
     1:47:boolean returnValueOnlyDependsOnArguments(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):22:68 -> a
     48:48:boolean returnValueOnlyDependsOnArguments(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):58:58 -> a
-com.android.tools.r8.ir.analysis.InitializedClassesOnNormalExitAnalysis -> com.android.tools.r8.s.a.f:
+com.android.tools.r8.ir.analysis.InitializedClassesOnNormalExitAnalysis -> com.android.tools.r8.r.a.f:
     1:15:java.util.Set computeInitializedClassesOnNormalExit(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):38:52 -> a
-com.android.tools.r8.ir.analysis.InitializedClassesOnNormalExitAnalysis$Visitor -> com.android.tools.r8.s.a.e:
+com.android.tools.r8.ir.analysis.InitializedClassesOnNormalExitAnalysis$Visitor -> com.android.tools.r8.r.a.e:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set initializedClassesOnNormalExit -> c
     com.android.tools.r8.graph.DexType context -> b
@@ -20270,10 +20293,10 @@
     1:1:java.util.Set build():67:67 -> a
     2:2:void markInitializedOnNormalExit(java.lang.Iterable):71:71 -> a
     3:8:void markInitializedOnNormalExit(com.android.tools.r8.graph.DexType):75:80 -> a
-    9:9:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    9:9:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     9:9:void markInitializedOnNormalExit(com.android.tools.r8.graph.DexType):80 -> a
     10:14:void markInitializedOnNormalExit(com.android.tools.r8.graph.DexType):84:88 -> a
-    15:15:boolean com.android.tools.r8.graph.DexClass.classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView):786:786 -> a
+    15:15:boolean com.android.tools.r8.graph.DexClass.classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView):836:836 -> a
     15:15:void markInitializedOnNormalExit(com.android.tools.r8.graph.DexType):88 -> a
     16:33:void markInitializedOnNormalExit(com.android.tools.r8.graph.DexType):93:110 -> a
     34:39:java.lang.Void handleFieldInstruction(com.android.tools.r8.ir.code.FieldInstruction):116:121 -> a
@@ -20284,7 +20307,7 @@
     49:52:java.lang.Object handleInvoke(com.android.tools.r8.ir.code.Invoke):55 -> a
     53:53:java.lang.Void visit(com.android.tools.r8.ir.code.NewInstance):148:148 -> a
     53:53:java.lang.Object visit(com.android.tools.r8.ir.code.NewInstance):55 -> a
-com.android.tools.r8.ir.analysis.TypeChecker -> com.android.tools.r8.s.a.g:
+com.android.tools.r8.ir.analysis.TypeChecker -> com.android.tools.r8.r.a.g:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():31:31 -> <clinit>
@@ -20297,7 +20320,7 @@
     7:13:boolean check(com.android.tools.r8.ir.code.IRCode):46 -> a
     14:23:boolean check(com.android.tools.r8.ir.code.Return,com.android.tools.r8.graph.DexEncodedMethod):72:81 -> a
     14:23:boolean check(com.android.tools.r8.ir.code.IRCode):46 -> a
-    24:24:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    24:24:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     24:24:boolean check(com.android.tools.r8.ir.code.Return,com.android.tools.r8.graph.DexEncodedMethod):81 -> a
     24:24:boolean check(com.android.tools.r8.ir.code.IRCode):46 -> a
     25:25:boolean check(com.android.tools.r8.ir.code.Return,com.android.tools.r8.graph.DexEncodedMethod):82:82 -> a
@@ -20312,11 +20335,11 @@
     35:37:boolean check(com.android.tools.r8.ir.code.IRCode):54 -> a
     38:42:boolean checkFieldPut(com.android.tools.r8.ir.code.FieldInstruction):93:97 -> a
     43:52:boolean checkFieldPut(com.android.tools.r8.ir.code.FieldInstruction):96:105 -> a
-    53:53:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    53:53:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     53:53:boolean checkFieldPut(com.android.tools.r8.ir.code.FieldInstruction):105 -> a
     54:54:boolean checkFieldPut(com.android.tools.r8.ir.code.FieldInstruction):106:106 -> a
     55:57:boolean isSubtypeOf(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):122:124 -> a
-com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis -> com.android.tools.r8.s.a.h:
+com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis -> com.android.tools.r8.r.a.h:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set knownNotToDependOnEnvironment -> d
     java.util.Set visited -> e
@@ -20342,10 +20365,10 @@
     1:2:boolean valueMayDependOnEnvironment(com.android.tools.r8.ir.code.Value):91:92 -> b
     3:119:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.ir.code.Value,java.util.Set):161:277 -> b
     1:8:boolean isNewInstanceWithoutEnvironmentDependentFields(com.android.tools.r8.ir.code.Value,java.util.Set):285:292 -> c
-    9:9:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> c
+    9:9:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> c
     9:9:boolean isNewInstanceWithoutEnvironmentDependentFields(com.android.tools.r8.ir.code.Value,java.util.Set):292 -> c
     10:45:boolean isNewInstanceWithoutEnvironmentDependentFields(com.android.tools.r8.ir.code.Value,java.util.Set):292:327 -> c
-    46:46:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):184:184 -> c
+    46:46:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):186:186 -> c
     46:46:boolean isNewInstanceWithoutEnvironmentDependentFields(com.android.tools.r8.ir.code.Value,java.util.Set):327 -> c
     47:64:boolean isNewInstanceWithoutEnvironmentDependentFields(com.android.tools.r8.ir.code.Value,java.util.Set):332:349 -> c
     65:72:boolean isNewInstanceWithoutEnvironmentDependentFields(com.android.tools.r8.ir.code.Value,java.util.Set):348:355 -> c
@@ -20356,14 +20379,14 @@
     71:77:boolean valueMayDependOnEnvironment(com.android.tools.r8.ir.code.Value,java.util.Set):122:128 -> d
     78:79:boolean valueMayDependOnEnvironment(com.android.tools.r8.ir.code.Value,java.util.Set):127:128 -> d
     80:82:boolean valueMayDependOnEnvironment(com.android.tools.r8.ir.code.Value,java.util.Set):127:129 -> d
-com.android.tools.r8.ir.analysis.constant.Bottom -> com.android.tools.r8.s.a.i.a:
+com.android.tools.r8.ir.analysis.constant.Bottom -> com.android.tools.r8.r.a.i.a:
     com.android.tools.r8.ir.analysis.constant.Bottom INSTANCE -> a
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>():9:9 -> <init>
     com.android.tools.r8.ir.analysis.constant.LatticeElement meet(com.android.tools.r8.ir.analysis.constant.LatticeElement) -> a
     boolean isBottom() -> c
     1:1:com.android.tools.r8.ir.analysis.constant.Bottom getInstance():13:13 -> g
-com.android.tools.r8.ir.analysis.constant.ConstLatticeElement -> com.android.tools.r8.s.a.i.b:
+com.android.tools.r8.ir.analysis.constant.ConstLatticeElement -> com.android.tools.r8.r.a.i.b:
     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
@@ -20372,7 +20395,7 @@
     1:1:com.android.tools.r8.ir.code.ConstNumber getConstNumber():47:47 -> g
     1:1:int getIntValue():51:51 -> h
     1:1:java.lang.String toString():43:43 -> toString
-com.android.tools.r8.ir.analysis.constant.ConstRangeLatticeElement -> com.android.tools.r8.s.a.i.c:
+com.android.tools.r8.ir.analysis.constant.ConstRangeLatticeElement -> com.android.tools.r8.r.a.i.c:
     com.android.tools.r8.ir.code.Value value -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():8:8 -> <clinit>
@@ -20388,7 +20411,7 @@
     boolean isValueRange() -> f
     1:1:com.android.tools.r8.ir.code.Value getConstRange():44:44 -> g
     1:1:java.lang.String toString():40:40 -> toString
-com.android.tools.r8.ir.analysis.constant.LatticeElement -> com.android.tools.r8.s.a.i.d:
+com.android.tools.r8.ir.analysis.constant.LatticeElement -> com.android.tools.r8.r.a.i.d:
     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
@@ -20397,7 +20420,7 @@
     boolean isConst() -> d
     boolean isTop() -> e
     boolean isValueRange() -> f
-com.android.tools.r8.ir.analysis.constant.SparseConditionalConstantPropagation -> com.android.tools.r8.s.a.i.e:
+com.android.tools.r8.ir.analysis.constant.SparseConditionalConstantPropagation -> com.android.tools.r8.r.a.i.e:
     java.util.Deque flowEdges -> d
     java.util.BitSet visitedBlocks -> g
     java.util.Map mapping -> b
@@ -20432,14 +20455,14 @@
     53:110:void addFlowEdgesForJumpInstruction(com.android.tools.r8.ir.code.JumpInstruction):178:235 -> b
     53:110:void visitInstruction(com.android.tools.r8.ir.code.Instruction):173 -> b
     111:116:void setExecutableEdge(int,int):241:246 -> b
-com.android.tools.r8.ir.analysis.constant.Top -> com.android.tools.r8.s.a.i.f:
+com.android.tools.r8.ir.analysis.constant.Top -> com.android.tools.r8.r.a.i.f:
     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
     boolean isTop() -> e
     1:1:com.android.tools.r8.ir.analysis.constant.Top getInstance():13:13 -> g
-com.android.tools.r8.ir.analysis.equivalence.BasicBlockBehavioralSubsumption -> com.android.tools.r8.s.a.j.a:
+com.android.tools.r8.ir.analysis.equivalence.BasicBlockBehavioralSubsumption -> com.android.tools.r8.r.a.j.a:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.DexType context -> b
     boolean $assertionsDisabled -> c
@@ -20472,7 +20495,7 @@
     1:1:boolean isBlockLocalInstructionWithoutSideEffects(com.android.tools.r8.ir.code.Instruction):151 -> c
     2:2:boolean instructionMayHaveSideEffects(com.android.tools.r8.ir.code.Instruction):174:174 -> c
     2:2:boolean isBlockLocalInstructionWithoutSideEffects(com.android.tools.r8.ir.code.Instruction):151 -> c
-com.android.tools.r8.ir.analysis.escape.EscapeAnalysis -> com.android.tools.r8.s.a.k.a:
+com.android.tools.r8.ir.analysis.escape.EscapeAnalysis -> com.android.tools.r8.r.a.k.a:
     java.util.Deque valuesToTrack -> d
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set trackedValues -> c
@@ -20501,8 +20524,8 @@
     102:102:boolean isValueOfInterestOrAlias(com.android.tools.r8.ir.code.Value):212:212 -> a
     1:9:boolean isEscaping(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):55:63 -> b
     10:12:void addToWorklist(com.android.tools.r8.ir.code.Value):170:172 -> b
-com.android.tools.r8.ir.analysis.escape.EscapeAnalysisConfiguration -> com.android.tools.r8.s.a.k.b:
-com.android.tools.r8.ir.analysis.fieldaccess.FieldBitAccessAnalysis -> com.android.tools.r8.s.a.l.a:
+com.android.tools.r8.ir.analysis.escape.EscapeAnalysisConfiguration -> com.android.tools.r8.r.a.k.b:
+com.android.tools.r8.ir.analysis.fieldaccess.FieldBitAccessAnalysis -> com.android.tools.r8.r.a.l.a:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():20:20 -> <clinit>
@@ -20516,7 +20539,7 @@
     51:62:int computeBitsRead(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField):70:81 -> a
     51:62:void recordFieldAccesses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):52 -> a
     63:63:void recordFieldAccesses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):52:52 -> a
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet -> com.android.tools.r8.s.a.m.a:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet -> com.android.tools.r8.r.a.m.a:
     1:1:void <clinit>():25:25 -> <clinit>
     1:1:void <init>():25:25 -> <init>
     boolean contains(com.android.tools.r8.graph.DexEncodedField) -> a
@@ -20526,7 +20549,7 @@
     boolean isBottom() -> d
     boolean isKnownFieldSet() -> e
     boolean isTop() -> f
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.ConcreteMutableFieldSet -> com.android.tools.r8.s.a.m.b:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.ConcreteMutableFieldSet -> com.android.tools.r8.r.a.m.b:
     java.util.Set fields -> a
     1:2:void <init>():18:19 -> <init>
     3:4:void <init>(com.android.tools.r8.graph.DexEncodedField):22:23 -> <init>
@@ -20540,7 +20563,7 @@
     1:5:boolean equals(java.lang.Object):82:86 -> equals
     1:1:int hashCode():74:74 -> hashCode
     1:1:int size():69:69 -> size
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.EmptyFieldSet -> com.android.tools.r8.s.a.m.c:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.EmptyFieldSet -> com.android.tools.r8.r.a.m.c:
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.EmptyFieldSet INSTANCE -> a
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>():13:13 -> <init>
@@ -20549,7 +20572,7 @@
     boolean isBottom() -> d
     boolean isKnownFieldSet() -> e
     1:1:com.android.tools.r8.ir.analysis.fieldvalueanalysis.EmptyFieldSet getInstance():16:16 -> g
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.FieldValueAnalysis -> com.android.tools.r8.s.a.m.d:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.FieldValueAnalysis -> com.android.tools.r8.r.a.m.d:
     com.android.tools.r8.ir.optimize.info.OptimizationFeedback feedback -> d
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.DexProgramClass clazz -> b
@@ -20560,7 +20583,7 @@
     1:1:void <clinit>():45:45 -> <clinit>
     1:8:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):60:67 -> <init>
     1:8:void run(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod):72:79 -> a
-    9:9:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    9:9:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     9:9:void run(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod):79 -> a
     10:25:void run(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod):79:94 -> a
     26:26:boolean lambda$run$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):85:85 -> a
@@ -20623,21 +20646,21 @@
     178:178:java.util.LinkedList lambda$computeFieldOptimizationInfo$1(com.android.tools.r8.graph.DexEncodedField):123:123 -> a
     179:179:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet lambda$createFieldsMaybeReadBeforeBlockInclusive$2(com.android.tools.r8.ir.code.BasicBlock):209:209 -> a
     1:70:java.util.Map createFieldsMaybeReadBeforeBlockInclusive():202:271 -> b
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.KnownFieldSet -> com.android.tools.r8.s.a.m.e:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.KnownFieldSet -> com.android.tools.r8.r.a.m.e:
     boolean isConcreteFieldSet() -> a
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.ConcreteMutableFieldSet asConcreteFieldSet() -> b
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.UnknownFieldSet -> com.android.tools.r8.s.a.m.f:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.UnknownFieldSet -> com.android.tools.r8.r.a.m.f:
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.UnknownFieldSet INSTANCE -> a
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>():13:13 -> <init>
     boolean contains(com.android.tools.r8.graph.DexEncodedField) -> a
     boolean isTop() -> f
     1:1:com.android.tools.r8.ir.analysis.fieldvalueanalysis.UnknownFieldSet getInstance():16:16 -> g
-com.android.tools.r8.ir.analysis.modeling.LibraryMethodReadSetModeling -> com.android.tools.r8.s.a.n.a:
+com.android.tools.r8.ir.analysis.modeling.LibraryMethodReadSetModeling -> com.android.tools.r8.r.a.n.a:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():17:17 -> <clinit>
     1:23:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet getModeledReadSetOrUnknown(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexItemFactory):21:43 -> a
-com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker -> com.android.tools.r8.s.a.o.c:
+com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker -> com.android.tools.r8.r.a.o.c:
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> b
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set classesWithRemovedExtensionFields -> c
@@ -20657,7 +20680,7 @@
     33:37:boolean isDeadProtoExtensionField(com.android.tools.r8.graph.DexField):181:185 -> a
     38:38:boolean isDeadProtoExtensionField(com.android.tools.r8.graph.DexField):184:184 -> a
     39:48:boolean isDeadProtoExtensionField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.FieldAccessInfoCollection,java.util.Set):194:203 -> a
-    49:49:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    49:49:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     49:49:boolean isDeadProtoExtensionField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.FieldAccessInfoCollection,java.util.Set):203 -> a
     50:61:boolean isDeadProtoExtensionField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.FieldAccessInfoCollection,java.util.Set):204:215 -> a
     62:64:void forEachDeadProtoExtensionField(java.util.function.Consumer):219:221 -> a
@@ -20672,16 +20695,16 @@
     1:1:boolean wasRemoved(com.android.tools.r8.graph.DexField):154:154 -> b
     2:9:void forEachFindLiteExtensionByNumberMethod(java.util.function.Consumer):167:174 -> b
     1:2:void recordDeadProtoExtensionField(com.android.tools.r8.graph.DexField):106:107 -> c
-com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker$1 -> com.android.tools.r8.s.a.o.a:
+com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker$1 -> com.android.tools.r8.r.a.o.a:
     com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker this$0 -> a
     1:1:void <init>(com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):112:112 -> <init>
     1:1:boolean isReachableOrReferencedField(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexEncodedField):117:117 -> isReachableOrReferencedField
-com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker$2 -> com.android.tools.r8.s.a.o.b:
+com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker$2 -> com.android.tools.r8.r.a.o.b:
     java.util.function.Predicate val$skip -> a
     java.util.Set val$remainingProtoExtensionFieldReads -> b
     1:1:void <init>(com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker,com.android.tools.r8.graph.DexItemFactory,java.util.function.Predicate,java.util.Set):247:247 -> <init>
     1:2:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):251:252 -> registerStaticFieldRead
-com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker -> com.android.tools.r8.s.a.o.e:
+com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker -> com.android.tools.r8.r.a.o.e:
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> a
     1:2:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences):27:28 -> <init>
     1:1:boolean deferDeadProtoBuilders(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BooleanSupplier):34:34 -> a
@@ -20692,7 +20715,7 @@
     4:4:boolean deferDeadProtoBuilders(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BooleanSupplier):34 -> a
     5:5:void addInliningHeuristicsForBuilderInlining(com.android.tools.r8.graph.AppView,java.util.Set,java.util.Set,java.util.Set):45:45 -> a
     6:15:void preprocessCallGraphBeforeCycleElimination(java.util.Map):49:58 -> a
-com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker$RootSetExtension -> com.android.tools.r8.s.a.o.d:
+com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker$RootSetExtension -> com.android.tools.r8.r.a.o.d:
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> b
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set alwaysInline -> c
@@ -20714,10 +20737,10 @@
     13:13:void alwaysInlineBuildPartialFromGeneratedMessageLiteBuilder():112:112 -> a
     13:13:void extend():94 -> a
     1:2:void bypassClinitforInliningNewBuilderMethods():98:99 -> b
-    3:3:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> b
+    3:3:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> b
     3:3:void bypassClinitforInliningNewBuilderMethods():99 -> b
     4:10:void bypassClinitforInliningNewBuilderMethods():99:105 -> b
-com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker -> com.android.tools.r8.s.a.o.f:
+com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker -> com.android.tools.r8.r.a.o.f:
     com.android.tools.r8.ir.analysis.type.TypeLatticeElement objectArrayType -> f
     com.android.tools.r8.ir.analysis.proto.RawMessageInfoEncoder encoder -> c
     com.android.tools.r8.graph.AppView appView -> a
@@ -20734,7 +20757,7 @@
     2:2:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):67 -> a
     3:3:void rewriteDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):99:99 -> a
     3:3:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):68 -> a
-    4:4:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    4:4:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     4:4:void rewriteDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):99 -> a
     4:4:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):68 -> a
     5:17:void rewriteDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):100:112 -> a
@@ -20824,7 +20847,7 @@
     66:66:void lambda$postOptimizeDynamicMethods$0(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexEncodedMethod):75:75 -> a
     67:70:void forEachDynamicMethod(java.util.function.Consumer):82:85 -> a
     71:74:com.android.tools.r8.ir.code.InvokeMethod getNewMessageInfoInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.ProtoReferences):191:194 -> a
-com.android.tools.r8.ir.analysis.proto.ProtoEnqueuerUseRegistry -> com.android.tools.r8.s.a.o.g:
+com.android.tools.r8.ir.analysis.proto.ProtoEnqueuerUseRegistry -> com.android.tools.r8.r.a.o.g:
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> a
     com.android.tools.r8.shaking.EnqueuerUseRegistryFactory FACTORY -> b
     1:1:void <clinit>():19:19 -> <clinit>
@@ -20832,7 +20855,7 @@
     1:1:com.android.tools.r8.shaking.EnqueuerUseRegistryFactory getFactory():33:33 -> a
     1:4:boolean registerConstClass(com.android.tools.r8.graph.DexType):45:48 -> registerConstClass
     1:4:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):60:63 -> registerStaticFieldRead
-com.android.tools.r8.ir.analysis.proto.ProtoInliningReasonStrategy -> com.android.tools.r8.s.a.o.h:
+com.android.tools.r8.ir.analysis.proto.ProtoInliningReasonStrategy -> com.android.tools.r8.r.a.o.h:
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> b
     com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy parent -> a
     boolean $assertionsDisabled -> c
@@ -20852,7 +20875,7 @@
     22:25:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReasonForDynamicMethod(com.android.tools.r8.ir.code.InvokeMethod):61:64 -> a
     22:25:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):36 -> a
     26:26:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):37:37 -> a
-com.android.tools.r8.ir.analysis.proto.ProtoReferences -> com.android.tools.r8.s.a.o.i:
+com.android.tools.r8.ir.analysis.proto.ProtoReferences -> com.android.tools.r8.r.a.o.i:
     com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers methodToInvokeMembers -> j
     com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteMethods generatedMessageLiteMethods -> h
     com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteBuilderMethods generatedMessageLiteBuilderMethods -> i
@@ -20885,15 +20908,15 @@
     2:2:boolean isDynamicMethodBridge(com.android.tools.r8.graph.DexMethod):103:103 -> b
     2:2:boolean isDynamicMethodBridge(com.android.tools.r8.graph.DexEncodedMethod):107 -> b
     3:3:boolean isMessageInfoConstructionMethod(com.android.tools.r8.graph.DexMethod):120:120 -> b
-com.android.tools.r8.ir.analysis.proto.ProtoReferences$1 -> com.android.tools.r8.s.a.o.i$a:
-com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteBuilderMethods -> com.android.tools.r8.s.a.o.i$b:
+com.android.tools.r8.ir.analysis.proto.ProtoReferences$1 -> com.android.tools.r8.r.a.o.i$a:
+com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteBuilderMethods -> com.android.tools.r8.r.a.o.i$b:
     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):148:148 -> <init>
     2:6:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):153:157 -> <init>
     7:14:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):155:162 -> <init>
     15:15:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):160:160 -> <init>
-com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteMethods -> com.android.tools.r8.s.a.o.i$c:
+com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteMethods -> com.android.tools.r8.r.a.o.i$c:
     com.android.tools.r8.graph.DexMethod isInitializedMethod -> c
     com.android.tools.r8.graph.DexMethod dynamicMethodBridgeMethod -> b
     com.android.tools.r8.graph.DexMethod createBuilderMethod -> a
@@ -20902,7 +20925,7 @@
     7:14:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):131:138 -> <init>
     15:22:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):136:143 -> <init>
     23:23:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):141:141 -> <init>
-com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers -> com.android.tools.r8.s.a.o.i$d:
+com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers -> com.android.tools.r8.r.a.o.i$d:
     com.android.tools.r8.graph.DexField newMutableInstanceField -> f
     com.android.tools.r8.graph.DexField newBuilderField -> e
     com.android.tools.r8.graph.DexField setMemoizedIsInitializedField -> g
@@ -20912,7 +20935,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):167:167 -> <init>
     2:19:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):177:194 -> <init>
-com.android.tools.r8.ir.analysis.proto.ProtoShrinker -> com.android.tools.r8.s.a.o.j:
+com.android.tools.r8.ir.analysis.proto.ProtoShrinker -> com.android.tools.r8.r.a.o.j:
     com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory factory -> b
     com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker generatedMessageLiteBuilderShrinker -> e
     com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder decoder -> a
@@ -20920,13 +20943,13 @@
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> f
     com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker generatedMessageLiteShrinker -> d
     1:18:void <init>(com.android.tools.r8.graph.AppView):20:37 -> <init>
-com.android.tools.r8.ir.analysis.proto.ProtoUtils -> com.android.tools.r8.s.a.o.k:
+com.android.tools.r8.ir.analysis.proto.ProtoUtils -> com.android.tools.r8.r.a.o.k:
     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.s.a.o.m:
+com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder -> com.android.tools.r8.r.a.o.m:
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> b
     com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory factory -> a
     boolean $assertionsDisabled -> c
@@ -20944,7 +20967,7 @@
     83:120:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):147:184 -> a
     121:127:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):181:187 -> a
     128:136:com.android.tools.r8.ir.analysis.proto.schema.ProtoObject createProtoObject(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexClass):194:202 -> a
-    137:138:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexClass.lookupUniqueInstanceFieldWithName(com.android.tools.r8.graph.DexString):541:542 -> a
+    137:138:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexClass.lookupUniqueInstanceFieldWithName(com.android.tools.r8.graph.DexString):591:592 -> a
     137:138:com.android.tools.r8.ir.analysis.proto.schema.ProtoObject createProtoObject(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexClass):202 -> a
     139:158:com.android.tools.r8.ir.analysis.proto.schema.ProtoObject createProtoObject(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexClass):204:223 -> a
     159:159:boolean com.android.tools.r8.naming.dexitembasedstring.FieldNameComputationInfo.isForFieldName():0:0 -> a
@@ -20959,7 +20982,7 @@
     2:21:com.android.tools.r8.utils.ThrowingIterator createObjectIterator(com.android.tools.r8.ir.code.Value):303:322 -> b
     22:22:com.android.tools.r8.utils.ThrowingIterator createObjectIterator(com.android.tools.r8.ir.code.Value):315:315 -> b
     23:23:com.android.tools.r8.utils.ThrowingIterator createObjectIterator(com.android.tools.r8.ir.code.Value):304:304 -> b
-com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$1 -> com.android.tools.r8.s.a.o.l:
+com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$1 -> com.android.tools.r8.r.a.o.l:
     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):257:259 -> <init>
@@ -20972,7 +20995,7 @@
     9:9:int nextInt():289:289 -> b
     10:10:int nextInt():278:278 -> b
     11:11:int nextInt():269:269 -> b
-com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$2 -> com.android.tools.r8.s.a.o.m$a:
+com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$2 -> com.android.tools.r8.r.a.o.m$a:
     com.android.tools.r8.ir.code.Value val$objectsValue -> c
     com.android.tools.r8.ir.code.InstructionIterator val$instructionIterator -> b
     int expectedNextIndex -> a
@@ -20987,10 +21010,10 @@
     16:16:java.lang.Object next():322 -> b
     17:17:com.android.tools.r8.ir.code.Value next():344:344 -> b
     17:17:java.lang.Object next():322 -> b
-com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$InvalidRawMessageInfoException -> com.android.tools.r8.s.a.o.m$b:
+com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$InvalidRawMessageInfoException -> com.android.tools.r8.r.a.o.m$b:
     1:1:void <init>():367:367 -> <init>
     2:2:void <init>(com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$1):367:367 -> <init>
-com.android.tools.r8.ir.analysis.proto.RawMessageInfoEncoder -> com.android.tools.r8.s.a.o.n:
+com.android.tools.r8.ir.analysis.proto.RawMessageInfoEncoder -> com.android.tools.r8.r.a.o.n:
     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
@@ -21003,14 +21026,14 @@
     55:70:com.android.tools.r8.graph.DexString 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.s.a.o.o.a:
+com.android.tools.r8.ir.analysis.proto.schema.DeadProtoFieldObject -> com.android.tools.r8.r.a.o.o.a:
     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
     boolean isDeadProtoFieldObject() -> e
     1:1:java.lang.String toString():37:37 -> toString
-com.android.tools.r8.ir.analysis.proto.schema.LiveProtoFieldObject -> com.android.tools.r8.s.a.o.o.b:
+com.android.tools.r8.ir.analysis.proto.schema.LiveProtoFieldObject -> com.android.tools.r8.r.a.o.o.b:
     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
@@ -21021,7 +21044,7 @@
     boolean isLiveProtoFieldObject() -> f
     1:1:com.android.tools.r8.graph.DexField getField():28:28 -> j
     1:1:java.lang.String toString():56:56 -> toString
-com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension -> com.android.tools.r8.s.a.o.o.c:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension -> com.android.tools.r8.r.a.o.o.c:
     com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory factory -> c
     java.util.Set dynamicMethodsWithTracedProtoObjects -> h
     com.android.tools.r8.graph.AppView appView -> a
@@ -21037,7 +21060,7 @@
     boolean lambda$markMapOrRequiredFieldsAsReachable$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod) -> a
     1:15:void processNewlyLiveMethod(com.android.tools.r8.graph.DexEncodedMethod):85:99 -> a
     16:19:void createProtoMessageInfoFromDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.Map):104:107 -> a
-    20:20:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    20:20:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     20:20:void createProtoMessageInfoFromDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.Map):107 -> a
     21:35:void createProtoMessageInfoFromDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.Map):108:122 -> a
     36:36:void createProtoMessageInfoFromDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.Map):111:111 -> a
@@ -21049,7 +21072,7 @@
     78:78:void tracePendingInstructionsInDynamicMethods(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):279:279 -> a
     78:78:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):137 -> a
     79:92:void registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):303:316 -> a
-    93:93:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    93:93:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     93:93:void registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):316 -> a
     94:129:void registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):317:352 -> a
     130:130:void registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):351:351 -> a
@@ -21063,27 +21086,27 @@
     155:168:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):395:408 -> a
     155:168:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo):380 -> a
     169:177:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo getOrCreateProtoMessageInfo(com.android.tools.r8.graph.DexType):417:425 -> a
-    178:178:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    178:178:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     178:178:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo getOrCreateProtoMessageInfo(com.android.tools.r8.graph.DexType):425 -> a
     179:192:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo getOrCreateProtoMessageInfo(com.android.tools.r8.graph.DexType):426:439 -> a
     193:193:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo getOrCreateProtoMessageInfo(com.android.tools.r8.graph.DexType):427:427 -> a
     1:7:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):150:156 -> b
-    8:8:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> b
+    8:8:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> b
     8:8:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):156 -> b
     9:34:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):156:181 -> b
     35:69:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):180:214 -> b
     70:71:int com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo.getHazzerBitFieldIndex(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):135:136 -> b
     70:71:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):215 -> b
     72:72:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):216:216 -> b
-    73:73:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():742:742 -> b
+    73:73:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():792:792 -> b
     73:73:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):228 -> b
     74:86:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):229:241 -> b
     87:87:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):240:240 -> b
-    88:88:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():742:742 -> b
+    88:88:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():792:792 -> b
     88:88:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):228 -> b
     89:94:void registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):291:296 -> b
     89:94:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):246 -> b
-com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo -> com.android.tools.r8.s.a.o.o.d:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo -> com.android.tools.r8.r.a.o.o.d:
     com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType type -> b
     java.util.List objects -> d
     boolean $assertionsDisabled -> e
@@ -21113,11 +21136,11 @@
     1:1:com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType getType():64:64 -> d
     1:1:boolean hasAuxData():42:42 -> e
     1:15:java.lang.String toString():190:204 -> toString
-com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldObject -> com.android.tools.r8.s.a.o.o.e:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldObject -> com.android.tools.r8.r.a.o.o.e:
     1:1:void <init>():7:7 -> <init>
     com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldObject asProtoFieldObject() -> b
     boolean isProtoFieldObject() -> g
-com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType -> com.android.tools.r8.s.a.o.o.f:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType -> com.android.tools.r8.r.a.o.o.f:
     boolean $assertionsDisabled -> e
     boolean isRequired -> b
     boolean needsIsInitializedCheck -> c
@@ -21145,11 +21168,11 @@
     1:1:boolean isValid():115:115 -> l
     1:1:boolean needsIsInitializedCheck():120:120 -> m
     1:8:int serialize():140:147 -> n
-com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory -> com.android.tools.r8.s.a.o.o.g:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory -> com.android.tools.r8.r.a.o.o.g:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap fieldTypes -> a
     1:3:void <init>():10:12 -> <init>
     1:4:com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType createField(int):15:18 -> a
-com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo -> com.android.tools.r8.s.a.o.o.i:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo -> com.android.tools.r8.r.a.o.o.i:
     com.android.tools.r8.graph.DexEncodedMethod dynamicMethod -> a
     java.util.LinkedList hasBitsObjects -> d
     java.util.LinkedList oneOfObjects -> e
@@ -21169,8 +21192,8 @@
     1:1:int numberOfHasBitsObjects():230:230 -> i
     1:1:int numberOfOneOfObjects():234:234 -> j
     1:9:java.lang.String toString():239:247 -> toString
-com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo$1 -> com.android.tools.r8.s.a.o.o.h:
-com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo$Builder -> com.android.tools.r8.s.a.o.o.i$a:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo$1 -> com.android.tools.r8.r.a.o.o.h:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo$Builder -> com.android.tools.r8.r.a.o.o.i$a:
     com.android.tools.r8.graph.DexEncodedMethod dynamicMethod -> a
     java.util.LinkedList hasBitsObjects -> d
     boolean $assertionsDisabled -> f
@@ -21192,7 +21215,7 @@
     49:86:void removeUnusedSharedData():128:165 -> c
     87:87:void removeUnusedSharedData():164:164 -> c
     88:89:void removeUnusedSharedData():83:84 -> c
-com.android.tools.r8.ir.analysis.proto.schema.ProtoObject -> com.android.tools.r8.s.a.o.o.j:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoObject -> com.android.tools.r8.r.a.o.o.j:
     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
@@ -21204,7 +21227,7 @@
     boolean isProtoFieldObject() -> g
     boolean isProtoObjectFromStaticGet() -> h
     boolean isProtoTypeObject() -> i
-com.android.tools.r8.ir.analysis.proto.schema.ProtoObjectFromInvokeStatic -> com.android.tools.r8.s.a.o.o.k:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoObjectFromInvokeStatic -> com.android.tools.r8.r.a.o.o.k:
     com.android.tools.r8.graph.DexMethod method -> a
     1:2:void <init>(com.android.tools.r8.graph.DexMethod):21:22 -> <init>
     1:4:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):27:30 -> a
@@ -21212,7 +21235,7 @@
     6:6:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1045:1045 -> a
     6:6:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):28 -> a
     7:7:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):31:31 -> a
-com.android.tools.r8.ir.analysis.proto.schema.ProtoObjectFromStaticGet -> com.android.tools.r8.s.a.o.o.l:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoObjectFromStaticGet -> com.android.tools.r8.r.a.o.o.l:
     com.android.tools.r8.graph.DexField field -> a
     1:2:void <init>(com.android.tools.r8.graph.DexField):20:21 -> <init>
     1:3:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):30:32 -> a
@@ -21222,7 +21245,7 @@
     com.android.tools.r8.ir.analysis.proto.schema.ProtoObjectFromStaticGet asProtoObjectFromStaticGet() -> c
     boolean isProtoObjectFromStaticGet() -> h
     1:1:com.android.tools.r8.graph.DexField getField():25:25 -> j
-com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfFieldType -> com.android.tools.r8.s.a.o.o.m:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfFieldType -> com.android.tools.r8.r.a.o.o.m:
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:void <init>(int,boolean,boolean,boolean):18:18 -> <init>
@@ -21235,7 +21258,7 @@
     boolean isRepeated() -> i
     boolean isSingular() -> k
     1:1:boolean isValid():52:52 -> l
-com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair -> com.android.tools.r8.s.a.o.o.n:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair -> com.android.tools.r8.r.a.o.o.n:
     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>
@@ -21243,7 +21266,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.s.a.o.o.o:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoTypeObject -> com.android.tools.r8.r.a.o.o.o:
     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
@@ -21257,7 +21280,7 @@
     com.android.tools.r8.ir.analysis.proto.schema.ProtoTypeObject asProtoTypeObject() -> d
     boolean isProtoTypeObject() -> i
     1:1:com.android.tools.r8.graph.DexType getType():21:21 -> j
-com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect -> com.android.tools.r8.s.a.p.a:
+com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect -> com.android.tools.r8.r.a.p.a:
     com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect SIDE_EFFECTS_THAT_CANNOT_BE_POSTPONED -> a
     com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect SIDE_EFFECTS_THAT_CAN_BE_POSTPONED -> b
     com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect NONE -> c
@@ -21347,7 +21370,7 @@
     14:16:boolean isBasedOnMissingClass(com.android.tools.r8.graph.AppView):103:105 -> a
     17:17:boolean lambda$isBasedOnMissingClass$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):105:105 -> a
     18:32:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement fixupClassTypeReferences(java.util.function.Function,com.android.tools.r8.graph.AppView):147:161 -> a
-    33:33:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    33:33:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     33:33:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement fixupClassTypeReferences(java.util.function.Function,com.android.tools.r8.graph.AppView):164 -> a
     34:36:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement fixupClassTypeReferences(java.util.function.Function,com.android.tools.r8.graph.AppView):165:167 -> a
     37:37:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
@@ -21362,7 +21385,7 @@
     101:101:java.lang.Object com.android.tools.r8.utils.LRUCacheTable.get(java.lang.Object,java.lang.Object):55:55 -> a
     101:101:java.util.Set computeLeastUpperBoundOfInterfaces(com.android.tools.r8.graph.AppView,java.util.Set,java.util.Set):247 -> a
     102:129:java.util.Set computeLeastUpperBoundOfInterfaces(com.android.tools.r8.graph.AppView,java.util.Set,java.util.Set):247:274 -> a
-    130:130:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    130:130:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     130:130:java.util.Set computeLeastUpperBoundOfInterfaces(com.android.tools.r8.graph.AppView,java.util.Set,java.util.Set):276 -> a
     131:170:java.util.Set computeLeastUpperBoundOfInterfaces(com.android.tools.r8.graph.AppView,java.util.Set,java.util.Set):278:317 -> a
     171:171:java.lang.Object com.android.tools.r8.utils.LRUCacheTable.get(java.lang.Object,java.lang.Object):55:55 -> a
@@ -21660,7 +21683,7 @@
     1:1:com.android.tools.r8.ir.analysis.type.WidePrimitiveTypeLatticeElement getInstance():17:17 -> D
     1:1:int hashCode():42:42 -> hashCode
     boolean isWidePrimitive() -> z
-com.android.tools.r8.ir.analysis.value.AbstractValue -> com.android.tools.r8.s.a.q.a:
+com.android.tools.r8.ir.analysis.value.AbstractValue -> com.android.tools.r8.r.a.q.a:
     1:1:void <init>():7:7 -> <init>
     com.android.tools.r8.ir.analysis.value.SingleNumberValue asSingleNumberValue() -> a
     com.android.tools.r8.ir.analysis.value.SingleStringValue asSingleStringValue() -> b
@@ -21671,7 +21694,7 @@
     boolean isSingleStringValue() -> g
     boolean isSingleValue() -> h
     boolean isUnknown() -> i
-com.android.tools.r8.ir.analysis.value.AbstractValueFactory -> com.android.tools.r8.s.a.q.b:
+com.android.tools.r8.ir.analysis.value.AbstractValueFactory -> com.android.tools.r8.r.a.q.b:
     java.util.concurrent.ConcurrentHashMap singleStringValues -> c
     java.util.concurrent.ConcurrentHashMap singleNumberValues -> b
     java.util.concurrent.ConcurrentHashMap singleEnumValues -> a
@@ -21679,7 +21702,7 @@
     1:1:com.android.tools.r8.ir.analysis.value.SingleEnumValue createSingleEnumValue(com.android.tools.r8.graph.DexField):19:19 -> a
     2:2:com.android.tools.r8.ir.analysis.value.SingleNumberValue createSingleNumberValue(long):23:23 -> a
     3:3:com.android.tools.r8.ir.analysis.value.SingleStringValue createSingleStringValue(com.android.tools.r8.graph.DexString):27:27 -> a
-com.android.tools.r8.ir.analysis.value.SingleEnumValue -> com.android.tools.r8.s.a.q.c:
+com.android.tools.r8.ir.analysis.value.SingleEnumValue -> com.android.tools.r8.r.a.q.c:
     com.android.tools.r8.graph.DexField field -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():22:22 -> <clinit>
@@ -21689,7 +21712,7 @@
     boolean isSingleEnumValue() -> e
     1:1:int hashCode():48:48 -> hashCode
     1:1:java.lang.String toString():53:53 -> toString
-com.android.tools.r8.ir.analysis.value.SingleNumberValue -> com.android.tools.r8.s.a.q.d:
+com.android.tools.r8.ir.analysis.value.SingleNumberValue -> com.android.tools.r8.r.a.q.d:
     long value -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():18:18 -> <clinit>
@@ -21702,7 +21725,7 @@
     1:1:int hashCode():53:53 -> hashCode
     1:2:boolean getBooleanValue():38:39 -> j
     1:1:java.lang.String toString():58:58 -> toString
-com.android.tools.r8.ir.analysis.value.SingleStringValue -> com.android.tools.r8.s.a.q.e:
+com.android.tools.r8.ir.analysis.value.SingleStringValue -> com.android.tools.r8.r.a.q.e:
     com.android.tools.r8.graph.DexString string -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():23:23 -> <clinit>
@@ -21716,14 +21739,14 @@
     1:1:int hashCode():53:53 -> hashCode
     1:1:com.android.tools.r8.graph.DexString getDexString():43:43 -> j
     1:1:java.lang.String toString():58:58 -> toString
-com.android.tools.r8.ir.analysis.value.SingleValue -> com.android.tools.r8.s.a.q.f:
+com.android.tools.r8.ir.analysis.value.SingleValue -> com.android.tools.r8.r.a.q.f:
     1:1:void <init>():14:14 -> <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 isMaterializableInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> a
     com.android.tools.r8.ir.analysis.value.SingleValue asSingleValue() -> c
     boolean isNonTrivial() -> d
     boolean isSingleValue() -> h
-com.android.tools.r8.ir.analysis.value.UnknownValue -> com.android.tools.r8.s.a.q.g:
+com.android.tools.r8.ir.analysis.value.UnknownValue -> com.android.tools.r8.r.a.q.g:
     com.android.tools.r8.ir.analysis.value.UnknownValue INSTANCE -> a
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:void <init>():11:11 -> <init>
@@ -21731,7 +21754,7 @@
     1:1:int hashCode():34:34 -> hashCode
     boolean isUnknown() -> i
     1:1:com.android.tools.r8.ir.analysis.value.UnknownValue getInstance():14:14 -> j
-com.android.tools.r8.ir.code.Add -> com.android.tools.r8.s.b.a:
+com.android.tools.r8.ir.code.Add -> com.android.tools.r8.r.b.a:
     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() -> E2
     boolean isCommutative() -> J2
@@ -21754,7 +21777,7 @@
     2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):82:82 -> e
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):47:47 -> f
     com.android.tools.r8.ir.code.Add asAdd() -> h
-com.android.tools.r8.ir.code.AlwaysMaterializingDefinition -> com.android.tools.r8.s.b.b:
+com.android.tools.r8.ir.code.AlwaysMaterializingDefinition -> com.android.tools.r8.r.b.b:
     1:1:void <init>(com.android.tools.r8.ir.code.Value):18:18 -> <init>
     1:1:int maxInValueRegister():56:56 -> C2
     int maxOutValueRegister() -> D2
@@ -21766,7 +21789,7 @@
     4:4:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):40:40 -> a
     5:5:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):46:46 -> a
     6:6:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):66:66 -> a
-com.android.tools.r8.ir.code.AlwaysMaterializingNop -> com.android.tools.r8.s.b.c:
+com.android.tools.r8.ir.code.AlwaysMaterializingNop -> com.android.tools.r8.r.b.c:
     1:1:void <init>():19:19 -> <init>
     1:1:int maxInValueRegister():54:54 -> C2
     1:1:int maxOutValueRegister():59:59 -> D2
@@ -21780,7 +21803,7 @@
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):49:49 -> a
     4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):65:65 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> d
-com.android.tools.r8.ir.code.AlwaysMaterializingUser -> com.android.tools.r8.s.b.d:
+com.android.tools.r8.ir.code.AlwaysMaterializingUser -> com.android.tools.r8.r.b.d:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():15:15 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value):18:18 -> <init>
@@ -21797,7 +21820,7 @@
     3:3:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):66 -> a
     4:4:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):71:71 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> d
-com.android.tools.r8.ir.code.And -> com.android.tools.r8.s.b.e:
+com.android.tools.r8.ir.code.And -> com.android.tools.r8.r.b.e:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):19:19 -> <init>
     int opcode() -> E2
     boolean isCommutative() -> J2
@@ -21815,7 +21838,7 @@
     2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):69:69 -> c
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):54:54 -> d
     com.android.tools.r8.ir.code.And asAnd() -> i
-com.android.tools.r8.ir.code.Argument -> com.android.tools.r8.s.b.f:
+com.android.tools.r8.ir.code.Argument -> com.android.tools.r8.r.b.f:
     boolean $assertionsDisabled -> i
     boolean knownToBeBoolean -> h
     1:1:void <clinit>():22:22 -> <clinit>
@@ -21838,7 +21861,7 @@
     6:6:boolean outTypeKnownToBeBoolean(java.util.Set):114:114 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> d
     com.android.tools.r8.ir.code.Argument asArgument() -> j
-com.android.tools.r8.ir.code.ArithmeticBinop -> com.android.tools.r8.s.b.g:
+com.android.tools.r8.ir.code.ArithmeticBinop -> com.android.tools.r8.r.b.g:
     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>
@@ -21867,7 +21890,7 @@
     com.android.tools.r8.code.Instruction CreateLong2Addr(int,int) -> e
     com.android.tools.r8.code.Instruction CreateLong(int,int,int) -> f
     com.android.tools.r8.ir.code.ArithmeticBinop asArithmeticBinop() -> k
-com.android.tools.r8.ir.code.ArrayGet -> com.android.tools.r8.s.b.h:
+com.android.tools.r8.ir.code.ArrayGet -> com.android.tools.r8.r.b.h:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.ir.code.MemberType type -> h
     1:1:void <clinit>():33:33 -> <clinit>
@@ -21947,7 +21970,7 @@
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> d
     1:1:com.android.tools.r8.ir.code.MemberType getMemberType():66:66 -> e
     com.android.tools.r8.ir.code.ArrayGet asArrayGet() -> l
-com.android.tools.r8.ir.code.ArrayLength -> com.android.tools.r8.s.b.i:
+com.android.tools.r8.ir.code.ArrayLength -> com.android.tools.r8.r.b.i:
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):24:24 -> <init>
     int maxInValueRegister() -> C2
     int maxOutValueRegister() -> D2
@@ -21977,7 +22000,7 @@
     1:1:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):88:88 -> c
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> d
     com.android.tools.r8.ir.code.ArrayLength asArrayLength() -> m
-com.android.tools.r8.ir.code.ArrayPut -> com.android.tools.r8.s.b.j:
+com.android.tools.r8.ir.code.ArrayPut -> com.android.tools.r8.r.b.j:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.ir.code.MemberType type -> h
     1:1:void <clinit>():30:30 -> <clinit>
@@ -22018,7 +22041,7 @@
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> d
     1:1:com.android.tools.r8.ir.code.MemberType getMemberType():71:71 -> e
     com.android.tools.r8.ir.code.ArrayPut asArrayPut() -> n
-com.android.tools.r8.ir.code.Assume -> com.android.tools.r8.s.b.k:
+com.android.tools.r8.ir.code.Assume -> com.android.tools.r8.r.b.k:
     com.android.tools.r8.ir.code.Instruction origin -> i
     boolean $assertionsDisabled -> j
     com.android.tools.r8.ir.code.Assume$Assumption assumption -> h
@@ -22087,14 +22110,14 @@
     6:6:java.lang.String toString():307 -> toString
     7:16:java.lang.String toString():307:316 -> toString
     17:17:java.lang.String toString():304:304 -> toString
-com.android.tools.r8.ir.code.Assume$1 -> com.android.tools.r8.s.b.k$a:
-com.android.tools.r8.ir.code.Assume$Assumption -> com.android.tools.r8.s.b.k$b:
+com.android.tools.r8.ir.code.Assume$1 -> com.android.tools.r8.r.b.k$a:
+com.android.tools.r8.ir.code.Assume$Assumption -> com.android.tools.r8.r.b.k$b:
     1:1:void <init>():319:319 -> <init>
     boolean isAssumeDynamicType() -> a
     boolean verifyCorrectnessOfValues(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView) -> a
     boolean isAssumeNonNull() -> b
     boolean isAssumeNone() -> c
-com.android.tools.r8.ir.code.Assume$DynamicTypeAssumption -> com.android.tools.r8.s.b.k$c:
+com.android.tools.r8.ir.code.Assume$DynamicTypeAssumption -> com.android.tools.r8.r.b.k$c:
     com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement dynamicLowerBoundType -> b
     com.android.tools.r8.ir.analysis.type.TypeLatticeElement dynamicUpperBoundType -> a
     boolean $assertionsDisabled -> c
@@ -22111,7 +22134,7 @@
     1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getDynamicUpperBoundType():371:371 -> e
     1:5:boolean equals(java.lang.Object):394:398 -> equals
     1:1:int hashCode():404:404 -> hashCode
-com.android.tools.r8.ir.code.Assume$NoAssumption -> com.android.tools.r8.s.b.k$d:
+com.android.tools.r8.ir.code.Assume$NoAssumption -> com.android.tools.r8.r.b.k$d:
     com.android.tools.r8.ir.code.Assume$NoAssumption instance -> a
     boolean $assertionsDisabled -> b
     1:2:void <clinit>():338:339 -> <clinit>
@@ -22121,7 +22144,7 @@
     boolean isAssumeNonNull() -> b
     boolean isAssumeNone() -> c
     1:1:com.android.tools.r8.ir.code.Assume$NoAssumption get():344:344 -> d
-com.android.tools.r8.ir.code.Assume$NonNullAssumption -> com.android.tools.r8.s.b.k$e:
+com.android.tools.r8.ir.code.Assume$NonNullAssumption -> com.android.tools.r8.r.b.k$e:
     com.android.tools.r8.ir.code.Assume$NonNullAssumption instance -> a
     boolean $assertionsDisabled -> b
     1:3:void <clinit>():408:410 -> <clinit>
@@ -22131,7 +22154,7 @@
     boolean isAssumeNonNull() -> b
     boolean isAssumeNone() -> c
     1:1:com.android.tools.r8.ir.code.Assume$NonNullAssumption get():415:415 -> d
-com.android.tools.r8.ir.code.BasicBlock -> com.android.tools.r8.s.b.l:
+com.android.tools.r8.ir.code.BasicBlock -> com.android.tools.r8.r.b.l:
     int color -> n
     int estimatedPredecessorsCount -> l
     boolean $assertionsDisabled -> p
@@ -22385,7 +22408,7 @@
     1:1:java.util.List getPhis():531:531 -> x
     1:1:java.util.List getPredecessors():234:234 -> y
     1:1:java.util.List getSuccessors():188:188 -> z
-com.android.tools.r8.ir.code.BasicBlock$1 -> com.android.tools.r8.s.b.l$a:
+com.android.tools.r8.ir.code.BasicBlock$1 -> com.android.tools.r8.r.b.l$a:
     com.android.tools.r8.ir.code.Instruction next -> b
     com.android.tools.r8.ir.code.Instruction val$instruction -> c
     com.android.tools.r8.ir.code.BasicBlock this$0 -> d
@@ -22397,14 +22420,14 @@
     1:5:java.lang.Object next():579 -> next
     6:6:com.android.tools.r8.ir.code.Instruction next():603:603 -> next
     6:6:java.lang.Object next():579 -> next
-com.android.tools.r8.ir.code.BasicBlock$BasicBlockChangeListener -> com.android.tools.r8.s.b.l$b:
-com.android.tools.r8.ir.code.BasicBlock$EdgeType -> com.android.tools.r8.s.b.l$c:
+com.android.tools.r8.ir.code.BasicBlock$BasicBlockChangeListener -> com.android.tools.r8.r.b.l$b:
+com.android.tools.r8.ir.code.BasicBlock$EdgeType -> com.android.tools.r8.r.b.l$c:
     com.android.tools.r8.ir.code.BasicBlock$EdgeType NORMAL -> b
     com.android.tools.r8.ir.code.BasicBlock$EdgeType EXCEPTIONAL -> c
     com.android.tools.r8.ir.code.BasicBlock$EdgeType NON_EDGE -> a
     1:3:void <clinit>():113:115 -> <clinit>
     1:1:void <init>(java.lang.String,int):112:112 -> <init>
-com.android.tools.r8.ir.code.BasicBlock$PhiEquivalence -> com.android.tools.r8.s.b.l$d:
+com.android.tools.r8.ir.code.BasicBlock$PhiEquivalence -> com.android.tools.r8.r.b.l$d:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():1904:1904 -> <clinit>
     1:1:void <init>():1904:1904 -> <init>
@@ -22415,15 +22438,15 @@
     1:1:int doHash(java.lang.Object):1904:1904 -> doHash
     2:3:int doHash(com.android.tools.r8.ir.code.Phi):1919:1920 -> doHash
     2:3:int doHash(java.lang.Object):1904 -> doHash
-com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo -> com.android.tools.r8.s.b.l$e:
+com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo -> com.android.tools.r8.r.b.l$e:
     com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo CAN_THROW -> b
     com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo NO_THROW -> a
     1:2:void <clinit>():104:105 -> <clinit>
     1:1:void <init>(java.lang.String,int):103:103 -> <init>
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():345:345 -> a
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():337:337 -> a
     1:1:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo defaultForConstString(com.android.tools.r8.utils.InternalOptions):108 -> a
     2:2:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo defaultForConstString(com.android.tools.r8.utils.InternalOptions):108:108 -> a
-com.android.tools.r8.ir.code.BasicBlockInstructionIterator -> com.android.tools.r8.s.b.m:
+com.android.tools.r8.ir.code.BasicBlockInstructionIterator -> com.android.tools.r8.r.b.m:
     java.util.ListIterator instructionIterator -> a
     1:2:void <init>(com.android.tools.r8.ir.code.BasicBlock):13:14 -> <init>
     3:4:void <init>(com.android.tools.r8.ir.code.BasicBlock,int):17:18 -> <init>
@@ -22434,7 +22457,7 @@
     1:1:com.android.tools.r8.ir.code.Instruction next():43:43 -> next
     1:1:java.lang.Object next():9 -> next
     1:1:com.android.tools.r8.ir.code.Instruction previous():33:33 -> previous
-com.android.tools.r8.ir.code.BasicBlockInstructionListIterator -> com.android.tools.r8.s.b.n:
+com.android.tools.r8.ir.code.BasicBlockInstructionListIterator -> com.android.tools.r8.r.b.n:
     com.android.tools.r8.ir.code.IRMetadata metadata -> e
     java.util.ListIterator listIterator -> b
     com.android.tools.r8.ir.code.Instruction current -> c
@@ -22561,7 +22584,7 @@
     1:1:void set(java.lang.Object):29:29 -> set
     2:5:void set(com.android.tools.r8.ir.code.Instruction):122:125 -> set
     2:5:void set(java.lang.Object):29 -> set
-com.android.tools.r8.ir.code.BasicBlockIterator -> com.android.tools.r8.s.b.o:
+com.android.tools.r8.ir.code.BasicBlockIterator -> com.android.tools.r8.r.b.o:
     java.util.ListIterator listIterator -> b
     com.android.tools.r8.ir.code.IRCode code -> a
     com.android.tools.r8.ir.code.BasicBlock current -> c
@@ -22583,7 +22606,7 @@
     1:1:void set(java.lang.Object):9:9 -> set
     2:2:void set(com.android.tools.r8.ir.code.BasicBlock):64:64 -> set
     2:2:void set(java.lang.Object):9 -> set
-com.android.tools.r8.ir.code.Binop -> com.android.tools.r8.s.b.p:
+com.android.tools.r8.ir.code.Binop -> com.android.tools.r8.r.b.p:
     com.android.tools.r8.ir.code.NumericType type -> h
     1:8:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):24:31 -> <init>
     1:1:int maxInValueRegister():90:90 -> C2
@@ -22595,7 +22618,7 @@
     boolean hasInvariantOutType() -> M0
     1:1:com.android.tools.r8.ir.code.Value rightValue():44:44 -> M2
     1:8:boolean isTwoAddr(com.android.tools.r8.ir.regalloc.RegisterAllocator):51:58 -> a
-    9:9:boolean com.android.tools.r8.utils.InternalOptions.canHaveMul2AddrBug():1315:1315 -> a
+    9:9:boolean com.android.tools.r8.utils.InternalOptions.canHaveMul2AddrBug():1307:1307 -> a
     9:9:boolean isTwoAddr(com.android.tools.r8.ir.regalloc.RegisterAllocator):58 -> a
     10:10:boolean isTwoAddr(com.android.tools.r8.ir.regalloc.RegisterAllocator):58:58 -> a
     11:11:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forBinop():75:75 -> a
@@ -22612,7 +22635,7 @@
     1:3:boolean fitsInDexInstruction(com.android.tools.r8.ir.code.Value):64 -> g
     1:3:boolean fitsInLit8Instruction(com.android.tools.r8.ir.code.Value):74:76 -> h
     com.android.tools.r8.ir.code.Binop asBinop() -> r
-com.android.tools.r8.ir.code.CanonicalPositions -> com.android.tools.r8.s.b.q:
+com.android.tools.r8.ir.code.CanonicalPositions -> com.android.tools.r8.r.b.q:
     java.util.Map canonicalPositions -> b
     boolean $assertionsDisabled -> e
     com.android.tools.r8.ir.code.Position callerPosition -> a
@@ -22632,7 +22655,7 @@
     22:22:com.android.tools.r8.ir.code.Position getExceptionalExitPosition(boolean,java.util.function.Supplier,com.android.tools.r8.graph.DexMethod):93 -> a
     23:32:com.android.tools.r8.ir.code.Position getExceptionalExitPosition(boolean,java.util.function.Supplier,com.android.tools.r8.graph.DexMethod):94:103 -> a
     1:1:com.android.tools.r8.ir.code.Position getCanonical(com.android.tools.r8.ir.code.Position):50:50 -> b
-com.android.tools.r8.ir.code.CatchHandlers -> com.android.tools.r8.s.b.r:
+com.android.tools.r8.ir.code.CatchHandlers -> com.android.tools.r8.r.b.r:
     java.util.List targets -> b
     java.util.List guards -> a
     java.util.Set uniqueTargets -> c
@@ -22662,18 +22685,18 @@
     1:1:boolean isEmpty():51:51 -> isEmpty
     1:1:java.util.Iterator iterator():107:107 -> iterator
     1:2:int size():55:56 -> size
-com.android.tools.r8.ir.code.CatchHandlers$1 -> com.android.tools.r8.s.b.r$a:
+com.android.tools.r8.ir.code.CatchHandlers$1 -> com.android.tools.r8.r.b.r$a:
     com.android.tools.r8.ir.code.CatchHandlers this$0 -> b
     int nextIndex -> a
     1:3:void <init>(com.android.tools.r8.ir.code.CatchHandlers):107:109 -> <init>
     1:1:boolean hasNext():113:113 -> hasNext
     1:4:com.android.tools.r8.ir.code.CatchHandlers$CatchHandler next():118:121 -> next
     1:4:java.lang.Object next():107 -> next
-com.android.tools.r8.ir.code.CatchHandlers$CatchHandler -> com.android.tools.r8.s.b.r$b:
+com.android.tools.r8.ir.code.CatchHandlers$CatchHandler -> com.android.tools.r8.r.b.r$b:
     java.lang.Object target -> b
     com.android.tools.r8.graph.DexType guard -> a
     1:3:void <init>(com.android.tools.r8.graph.DexType,java.lang.Object):24:26 -> <init>
-com.android.tools.r8.ir.code.CheckCast -> com.android.tools.r8.s.b.s:
+com.android.tools.r8.ir.code.CheckCast -> com.android.tools.r8.r.b.s:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.graph.DexType type -> h
     1:1:void <clinit>():21:21 -> <clinit>
@@ -22703,7 +22726,7 @@
     boolean isCheckCast() -> f1
     com.android.tools.r8.ir.code.CheckCast asCheckCast() -> s
     1:1:java.lang.String toString():108:108 -> toString
-com.android.tools.r8.ir.code.Cmp -> com.android.tools.r8.s.b.t:
+com.android.tools.r8.ir.code.Cmp -> com.android.tools.r8.r.b.t:
     boolean $assertionsDisabled -> j
     com.android.tools.r8.ir.code.Cmp$Bias bias -> i
     1:1:void <clinit>():26:26 -> <clinit>
@@ -22734,7 +22757,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.s.b.t$a:
+com.android.tools.r8.ir.code.Cmp$Bias -> com.android.tools.r8.r.b.t$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
@@ -22743,7 +22766,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.s.b.u:
+com.android.tools.r8.ir.code.ConstClass -> com.android.tools.r8.r.b.u:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.graph.DexType clazz -> h
     1:1:void <clinit>():24:24 -> <clinit>
@@ -22776,7 +22799,7 @@
     1:1:com.android.tools.r8.graph.DexType getValue():62:62 -> b
     1:1:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):104 -> b
     2:13:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):104:115 -> b
-    14:14:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> b
+    14:14:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> b
     14:14:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):118 -> b
     15:26:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):121:132 -> b
     1:1:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):137:137 -> c
@@ -22784,7 +22807,7 @@
     boolean isOutConstant() -> l2
     1:1:java.lang.String toString():84:84 -> toString
     com.android.tools.r8.ir.code.ConstClass asConstClass() -> u
-com.android.tools.r8.ir.code.ConstInstruction -> com.android.tools.r8.s.b.v:
+com.android.tools.r8.ir.code.ConstInstruction -> com.android.tools.r8.r.b.v:
     1:1:void <init>(com.android.tools.r8.ir.code.Value):33:33 -> <init>
     com.android.tools.r8.ir.code.ConstInstruction getOutConstantConstInstruction() -> H0
     boolean hasInvariantOutType() -> M0
@@ -22794,7 +22817,7 @@
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> d
     boolean isConstInstruction() -> i1
     com.android.tools.r8.ir.code.ConstInstruction asConstInstruction() -> v
-com.android.tools.r8.ir.code.ConstMethodHandle -> com.android.tools.r8.s.b.w:
+com.android.tools.r8.ir.code.ConstMethodHandle -> com.android.tools.r8.r.b.w:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.graph.DexMethodHandle methodHandle -> h
     1:1:void <clinit>():20:20 -> <clinit>
@@ -22824,7 +22847,7 @@
     boolean isOutConstant() -> l2
     1:1:java.lang.String toString():95:95 -> toString
     com.android.tools.r8.ir.code.ConstMethodHandle asConstMethodHandle() -> w
-com.android.tools.r8.ir.code.ConstMethodType -> com.android.tools.r8.s.b.x:
+com.android.tools.r8.ir.code.ConstMethodType -> com.android.tools.r8.r.b.x:
     com.android.tools.r8.graph.DexProto methodType -> h
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():20:20 -> <clinit>
@@ -22854,7 +22877,7 @@
     boolean isOutConstant() -> l2
     1:1:java.lang.String toString():89:89 -> toString
     com.android.tools.r8.ir.code.ConstMethodType asConstMethodType() -> x
-com.android.tools.r8.ir.code.ConstNumber -> com.android.tools.r8.s.b.y:
+com.android.tools.r8.ir.code.ConstNumber -> com.android.tools.r8.r.b.y:
     boolean $assertionsDisabled -> i
     long value -> h
     1:1:void <clinit>():33:33 -> <clinit>
@@ -22922,7 +22945,7 @@
     boolean isOutConstant() -> l2
     1:4:java.lang.String toString():252:255 -> toString
     com.android.tools.r8.ir.code.ConstNumber asConstNumber() -> y
-com.android.tools.r8.ir.code.ConstString -> com.android.tools.r8.s.b.z:
+com.android.tools.r8.ir.code.ConstString -> com.android.tools.r8.r.b.z:
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.DexString value -> h
     com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfo -> i
@@ -22946,7 +22969,7 @@
     11:12:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):71:72 -> a
     13:13:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):77:77 -> a
     14:14:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):137:137 -> a
-    15:15:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():345:345 -> a
+    15:15:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():337:337 -> a
     15:15:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):137 -> a
     16:16:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):137:137 -> a
     17:17:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):142:142 -> a
@@ -22959,7 +22982,7 @@
     boolean isConstString() -> m1
     1:1:java.lang.String toString():93:93 -> toString
     com.android.tools.r8.ir.code.ConstString asConstString() -> z
-com.android.tools.r8.ir.code.ConstantValueUtils -> com.android.tools.r8.s.b.A:
+com.android.tools.r8.ir.code.ConstantValueUtils -> com.android.tools.r8.r.b.A:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():12:12 -> <clinit>
     1:14:com.android.tools.r8.graph.DexType getDexTypeRepresentedByValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexDefinitionSupplier):20:33 -> a
@@ -22975,7 +22998,7 @@
     22:22:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):45 -> a
     23:27:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):45:49 -> a
     28:36:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):48:56 -> a
-com.android.tools.r8.ir.code.DebugLocalRead -> com.android.tools.r8.s.b.B:
+com.android.tools.r8.ir.code.DebugLocalRead -> com.android.tools.r8.r.b.B:
     1:1:void <init>():19:19 -> <init>
     1:1:int maxInValueRegister():59:59 -> C2
     1:1:int maxOutValueRegister():64:64 -> D2
@@ -22992,12 +23015,12 @@
     4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):70 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> d
     boolean isDebugLocalRead() -> q1
-com.android.tools.r8.ir.code.DebugLocalUninitialized -> com.android.tools.r8.s.b.C:
+com.android.tools.r8.ir.code.DebugLocalUninitialized -> com.android.tools.r8.r.b.C:
     1:1:void <init>(com.android.tools.r8.ir.code.Value):21:21 -> <init>
     boolean isAllowedAfterThrowingInstruction() -> U0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     boolean isDebugLocalUninitialized() -> r1
-com.android.tools.r8.ir.code.DebugLocalWrite -> com.android.tools.r8.s.b.D:
+com.android.tools.r8.ir.code.DebugLocalWrite -> com.android.tools.r8.r.b.D:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():26:26 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):29:30 -> <init>
@@ -23011,7 +23034,7 @@
     1:2:boolean verifyTypes(com.android.tools.r8.graph.AppView):81:82 -> b
     boolean isOutConstant() -> l2
     boolean isDebugLocalWrite() -> s1
-com.android.tools.r8.ir.code.DebugLocalsChange -> com.android.tools.r8.s.b.E:
+com.android.tools.r8.ir.code.DebugLocalsChange -> com.android.tools.r8.r.b.E:
     boolean $assertionsDisabled -> j
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap starting -> i
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap ending -> h
@@ -23042,7 +23065,7 @@
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> d
     boolean isDebugLocalsChange() -> t1
     1:6:java.lang.String toString():92:97 -> toString
-com.android.tools.r8.ir.code.DebugPosition -> com.android.tools.r8.s.b.F:
+com.android.tools.r8.ir.code.DebugPosition -> com.android.tools.r8.r.b.F:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():16:16 -> <clinit>
     1:1:void <init>():19:19 -> <init>
@@ -23062,7 +23085,7 @@
     7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):66 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> d
     boolean isDebugPosition() -> u1
-com.android.tools.r8.ir.code.DefaultInstructionVisitor -> com.android.tools.r8.s.b.G:
+com.android.tools.r8.ir.code.DefaultInstructionVisitor -> com.android.tools.r8.r.b.G:
     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
@@ -23076,7 +23099,7 @@
     2:2:java.lang.Object visit(com.android.tools.r8.ir.code.InstancePut):174:174 -> a
     3:3:java.lang.Object visit(com.android.tools.r8.ir.code.StaticGet):309:309 -> a
     4:4:java.lang.Object visit(com.android.tools.r8.ir.code.StaticPut):314:314 -> a
-com.android.tools.r8.ir.code.DexItemBasedConstString -> com.android.tools.r8.s.b.H:
+com.android.tools.r8.ir.code.DexItemBasedConstString -> com.android.tools.r8.r.b.H:
     com.android.tools.r8.graph.DexReference item -> h
     boolean $assertionsDisabled -> k
     com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfo -> j
@@ -23111,7 +23134,7 @@
     boolean isOutConstant() -> l2
     1:1:java.lang.String toString():114:114 -> toString
     boolean isDexItemBasedConstString() -> v1
-com.android.tools.r8.ir.code.Div -> com.android.tools.r8.s.b.I:
+com.android.tools.r8.ir.code.Div -> com.android.tools.r8.r.b.I:
     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() -> E
     int opcode() -> E2
@@ -23136,7 +23159,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
     boolean isDiv() -> w1
-com.android.tools.r8.ir.code.DominatorTree -> com.android.tools.r8.s.b.K:
+com.android.tools.r8.ir.code.DominatorTree -> com.android.tools.r8.r.b.K:
     com.android.tools.r8.ir.code.BasicBlock[] sorted -> a
     com.android.tools.r8.ir.code.BasicBlock[] doms -> b
     boolean obsolete -> e
@@ -23169,7 +23192,7 @@
     1:2:void numberBlocks():236:237 -> d
     3:3:void onSuccessorsMayChange(com.android.tools.r8.ir.code.BasicBlock):324:324 -> d
     1:9:java.lang.String toString():304:312 -> toString
-com.android.tools.r8.ir.code.DominatorTree$1 -> com.android.tools.r8.s.b.J:
+com.android.tools.r8.ir.code.DominatorTree$1 -> com.android.tools.r8.r.b.J:
     com.android.tools.r8.ir.code.DominatorTree this$0 -> c
     com.android.tools.r8.ir.code.BasicBlock val$dominated -> b
     boolean $assertionsDisabled -> d
@@ -23179,17 +23202,17 @@
     1:1:boolean hasNext():197:197 -> hasNext
     1:9:com.android.tools.r8.ir.code.BasicBlock next():202:210 -> next
     1:9:java.lang.Object next():192 -> next
-com.android.tools.r8.ir.code.DominatorTree$Assumption -> com.android.tools.r8.s.b.K$a:
+com.android.tools.r8.ir.code.DominatorTree$Assumption -> com.android.tools.r8.r.b.K$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.s.b.L:
+com.android.tools.r8.ir.code.DominatorTree$Inclusive -> com.android.tools.r8.r.b.L:
     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.s.b.N:
+com.android.tools.r8.ir.code.Dup -> com.android.tools.r8.r.b.N:
     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>
@@ -23216,7 +23239,7 @@
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> d
     1:6:void setOutValue(com.android.tools.r8.ir.code.Value):41:46 -> e
     boolean isDup() -> x1
-com.android.tools.r8.ir.code.Dup2 -> com.android.tools.r8.s.b.M:
+com.android.tools.r8.ir.code.Dup2 -> com.android.tools.r8.r.b.M:
     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>
@@ -23235,7 +23258,7 @@
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> d
     1:6:void setOutValue(com.android.tools.r8.ir.code.Value):55:60 -> e
     boolean isDup2() -> y1
-com.android.tools.r8.ir.code.FieldInstruction -> com.android.tools.r8.s.b.O:
+com.android.tools.r8.ir.code.FieldInstruction -> com.android.tools.r8.r.b.O:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.graph.DexField field -> h
     1:1:void <clinit>():27:27 -> <clinit>
@@ -23278,7 +23301,7 @@
     29:29:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):210 -> a
     30:34:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):210:214 -> a
     1:7:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):64:70 -> b
-    8:8:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> b
+    8:8:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> b
     8:8:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):73 -> b
     9:21:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):75:87 -> b
     22:22:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():124:124 -> b
@@ -23291,10 +23314,10 @@
     7:7:com.android.tools.r8.graph.DexField getField():48:48 -> e
     7:7:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):152 -> e
     8:11:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):154:157 -> e
-    12:12:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> e
+    12:12:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> e
     12:12:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):157 -> e
     13:23:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):159:169 -> e
-com.android.tools.r8.ir.code.FieldMemberType -> com.android.tools.r8.s.b.P:
+com.android.tools.r8.ir.code.FieldMemberType -> com.android.tools.r8.r.b.P:
     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
@@ -23308,7 +23331,7 @@
     1:9:void <clinit>():12:20 -> <clinit>
     10:10:void <clinit>():11:11 -> <clinit>
     1:1:void <init>(java.lang.String,int):11:11 -> <init>
-com.android.tools.r8.ir.code.FixedRegisterValue -> com.android.tools.r8.s.b.Q:
+com.android.tools.r8.ir.code.FixedRegisterValue -> com.android.tools.r8.r.b.Q:
     int register -> r
     boolean $assertionsDisabled -> s
     1:1:void <clinit>():11:11 -> <clinit>
@@ -23320,7 +23343,7 @@
     com.android.tools.r8.ir.code.FixedRegisterValue asFixedRegisterValue() -> e
     1:1:int getRegister():49:49 -> i0
     1:1:java.lang.String toString():69:69 -> toString
-com.android.tools.r8.ir.code.Goto -> com.android.tools.r8.s.b.S:
+com.android.tools.r8.ir.code.Goto -> com.android.tools.r8.r.b.S:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:void <init>():17:17 -> <init>
@@ -23338,7 +23361,7 @@
     4:4:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):85:85 -> a
     5:5:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):117:117 -> a
     1:4:java.lang.String toString():71:74 -> toString
-com.android.tools.r8.ir.code.IRCode -> com.android.tools.r8.s.b.T:
+com.android.tools.r8.ir.code.IRCode -> com.android.tools.r8.r.b.T:
     com.android.tools.r8.ir.code.ValueNumberGenerator valueNumberGenerator -> c
     com.android.tools.r8.graph.DexEncodedMethod method -> a
     boolean $assertionsDisabled -> k
@@ -23547,10 +23570,10 @@
     34:34:boolean noColorsInUse():1182:1182 -> z
     34:34:void traceBlocks():431 -> z
     35:35:void traceBlocks():431:431 -> z
-com.android.tools.r8.ir.code.IRCode$BlockMarker -> com.android.tools.r8.s.b.T$a:
+com.android.tools.r8.ir.code.IRCode$BlockMarker -> com.android.tools.r8.r.b.T$a:
     com.android.tools.r8.ir.code.BasicBlock block -> a
     1:2:void <init>(com.android.tools.r8.ir.code.BasicBlock):91:92 -> <init>
-com.android.tools.r8.ir.code.IRCode$LiveAtEntrySets -> com.android.tools.r8.s.b.T$b:
+com.android.tools.r8.ir.code.IRCode$LiveAtEntrySets -> com.android.tools.r8.r.b.T$b:
     java.util.Deque liveStackValues -> c
     java.util.Set liveValues -> a
     java.util.Set liveLocalValues -> b
@@ -23559,7 +23582,7 @@
     1:5:void <init>(java.util.Set,java.util.Set,java.util.Deque):64:68 -> <init>
     1:2:boolean equals(java.lang.Object):78:79 -> equals
     1:1:int hashCode():73:73 -> hashCode
-com.android.tools.r8.ir.code.IRCodeInstructionIterator -> com.android.tools.r8.s.b.U:
+com.android.tools.r8.ir.code.IRCodeInstructionIterator -> com.android.tools.r8.r.b.U:
     java.util.ListIterator blockIterator -> a
     com.android.tools.r8.ir.code.InstructionListIterator instructionIterator -> b
     com.android.tools.r8.ir.code.IRCode code -> c
@@ -23574,7 +23597,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.s.b.V:
+com.android.tools.r8.ir.code.IRCodeInstructionListIterator -> com.android.tools.r8.r.b.V:
     java.util.ListIterator blockIterator -> a
     com.android.tools.r8.ir.code.InstructionListIterator instructionIterator -> b
     com.android.tools.r8.ir.code.IRCode code -> c
@@ -23609,7 +23632,7 @@
     1:1:void set(java.lang.Object):17:17 -> set
     2:2:void set(com.android.tools.r8.ir.code.Instruction):146:146 -> set
     2:2:void set(java.lang.Object):17 -> set
-com.android.tools.r8.ir.code.IRCodeUtils -> com.android.tools.r8.s.b.W:
+com.android.tools.r8.ir.code.IRCodeUtils -> com.android.tools.r8.r.b.W:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():13:13 -> <clinit>
     1:27:void removeArrayAndTransitiveInputsIfNotUsed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):24:50 -> a
@@ -23619,7 +23642,7 @@
     58:61:void internalRemoveInstructionAndTransitiveInputsIfNotUsed(com.android.tools.r8.ir.code.IRCode,java.util.Deque):96:99 -> a
     1:1:void removeInstructionAndTransitiveInputsIfNotUsed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):62:62 -> b
     2:2:void removeInstructionAndTransitiveInputsIfNotUsed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):61:61 -> b
-com.android.tools.r8.ir.code.IRMetadata -> com.android.tools.r8.s.b.X:
+com.android.tools.r8.ir.code.IRMetadata -> com.android.tools.r8.r.b.X:
     long second -> b
     long first -> a
     boolean $assertionsDisabled -> c
@@ -23730,7 +23753,7 @@
     1:1:boolean mayHaveMonitorInstruction():202:202 -> x
     1:1:boolean mayHaveMul():206:206 -> y
     1:1:boolean mayHaveOr():210:210 -> z
-com.android.tools.r8.ir.code.If -> com.android.tools.r8.s.b.Y:
+com.android.tools.r8.ir.code.If -> com.android.tools.r8.r.b.Y:
     boolean $assertionsDisabled -> j
     com.android.tools.r8.ir.code.If$Type type -> i
     1:1:void <clinit>():20:20 -> <clinit>
@@ -23772,7 +23795,7 @@
     24:24:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(int):223:223 -> b
     1:4:void setTrueTarget(com.android.tools.r8.ir.code.BasicBlock):124:127 -> c
     1:8:java.lang.String toString():161:168 -> toString
-com.android.tools.r8.ir.code.If$Type -> com.android.tools.r8.s.b.Y$a:
+com.android.tools.r8.ir.code.If$Type -> com.android.tools.r8.r.b.Y$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
@@ -23790,10 +23813,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.s.b.Z:
+com.android.tools.r8.ir.code.ImpreciseMemberTypeInstruction -> com.android.tools.r8.r.b.Z:
     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.s.b.a0:
+com.android.tools.r8.ir.code.Inc -> com.android.tools.r8.r.b.a0:
     boolean $assertionsDisabled -> i
     int increment -> h
     1:1:void <clinit>():20:20 -> <clinit>
@@ -23809,7 +23832,7 @@
     5:15:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):86:96 -> a
     1:2:void addInValue(com.android.tools.r8.ir.code.Value):43:44 -> b
     1:1:java.lang.String toString():102:102 -> toString
-com.android.tools.r8.ir.code.InstanceGet -> com.android.tools.r8.s.b.b0:
+com.android.tools.r8.ir.code.InstanceGet -> com.android.tools.r8.r.b.b0:
     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.ir.code.Value,com.android.tools.r8.graph.DexField):37:37 -> <init>
@@ -23851,7 +23874,7 @@
     1:1:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):119:119 -> c
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> d
     1:1:java.lang.String toString():169:169 -> toString
-com.android.tools.r8.ir.code.InstanceOf -> com.android.tools.r8.s.b.c0:
+com.android.tools.r8.ir.code.InstanceOf -> com.android.tools.r8.r.b.c0:
     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):24:25 -> <init>
     int maxInValueRegister() -> C2
@@ -23874,7 +23897,7 @@
     8:9:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):105:106 -> a
     10:10:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):111:111 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> d
-com.android.tools.r8.ir.code.InstancePut -> com.android.tools.r8.s.b.d0:
+com.android.tools.r8.ir.code.InstancePut -> com.android.tools.r8.r.b.d0:
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():34:34 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):37:39 -> <init>
@@ -23911,7 +23934,7 @@
     1:11:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):104:114 -> c
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> d
     1:1:java.lang.String toString():193:193 -> toString
-com.android.tools.r8.ir.code.Instruction -> com.android.tools.r8.s.b.e0:
+com.android.tools.r8.ir.code.Instruction -> com.android.tools.r8.r.b.e0:
     java.util.List inValues -> b
     java.util.LinkedHashSet debugValues -> e
     boolean $assertionsDisabled -> g
@@ -24188,11 +24211,11 @@
     com.android.tools.r8.ir.code.Xor asXor() -> z0
     1:1:boolean isFieldGet():886:886 -> z1
     boolean isUnop() -> z2
-com.android.tools.r8.ir.code.InstructionIterator -> com.android.tools.r8.s.b.f0:
+com.android.tools.r8.ir.code.InstructionIterator -> com.android.tools.r8.r.b.f0:
     1:3:com.android.tools.r8.ir.code.Instruction peekNext():30:32 -> b
     1:3:com.android.tools.r8.ir.code.Instruction peekPrevious():45:47 -> f
     1:1:void remove():15:15 -> remove
-com.android.tools.r8.ir.code.InstructionListIterator -> com.android.tools.r8.s.b.g0:
+com.android.tools.r8.ir.code.InstructionListIterator -> com.android.tools.r8.r.b.g0:
     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 insertConstIntInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,int) -> a
     com.android.tools.r8.ir.code.Value insertConstNullInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions) -> a
@@ -24210,12 +24233,12 @@
     1:3:java.lang.Object com.android.tools.r8.ir.code.PreviousUntilIterator.previousUntil(java.util.function.Predicate):0 -> b
     void removeOrReplaceByDebugLocalRead() -> e
     1:1:void removeInstructionIgnoreOutValue():44:44 -> g
-com.android.tools.r8.ir.code.InstructionOrPhi -> com.android.tools.r8.s.b.h0:
+com.android.tools.r8.ir.code.InstructionOrPhi -> com.android.tools.r8.r.b.h0:
     boolean isPhi() -> b
     com.android.tools.r8.ir.code.Instruction asInstruction() -> d
     com.android.tools.r8.ir.code.Phi asPhi() -> f
     com.android.tools.r8.ir.code.BasicBlock getBlock() -> g
-com.android.tools.r8.ir.code.IntSwitch -> com.android.tools.r8.s.b.i0:
+com.android.tools.r8.ir.code.IntSwitch -> com.android.tools.r8.r.b.i0:
     boolean $assertionsDisabled -> m
     int[] keys -> l
     1:1:void <clinit>():27:27 -> <clinit>
@@ -24281,7 +24304,7 @@
     5:5:int getKey(int):206:206 -> toString
     5:5:java.lang.String toString():268 -> toString
     6:11:java.lang.String toString():268:273 -> toString
-com.android.tools.r8.ir.code.Invoke -> com.android.tools.r8.s.b.j0:
+com.android.tools.r8.ir.code.Invoke -> com.android.tools.r8.r.b.j0:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():24:24 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value,java.util.List):61:61 -> <init>
@@ -24368,7 +24391,7 @@
     11:11:java.util.List arguments():103:103 -> c
     11:11:boolean needsRangedInvoke(com.android.tools.r8.ir.conversion.DexBuilder):255 -> c
     12:13:boolean needsRangedInvoke(com.android.tools.r8.ir.conversion.DexBuilder):255:256 -> c
-com.android.tools.r8.ir.code.Invoke$Type -> com.android.tools.r8.s.b.j0$a:
+com.android.tools.r8.ir.code.Invoke$Type -> com.android.tools.r8.r.b.j0$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[] $VALUES -> j
@@ -24389,7 +24412,7 @@
     21:24:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType toMethodHandle(com.android.tools.r8.graph.DexMethod):44:47 -> a
     25:25:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType toMethodHandle(com.android.tools.r8.graph.DexMethod):42:42 -> a
     26:26:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType toMethodHandle(com.android.tools.r8.graph.DexMethod):40:40 -> a
-com.android.tools.r8.ir.code.InvokeCustom -> com.android.tools.r8.s.b.k0:
+com.android.tools.r8.ir.code.InvokeCustom -> com.android.tools.r8.r.b.k0:
     com.android.tools.r8.graph.DexCallSite callSite -> i
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():25:25 -> <clinit>
@@ -24436,7 +24459,7 @@
     84:84:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):42 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> d
     1:1:java.lang.String toString():120:120 -> toString
-com.android.tools.r8.ir.code.InvokeDirect -> com.android.tools.r8.s.b.l0:
+com.android.tools.r8.ir.code.InvokeDirect -> com.android.tools.r8.r.b.l0:
     boolean $assertionsDisabled -> m
     boolean itf -> l
     1:1:void <clinit>():32:32 -> <clinit>
@@ -24460,15 +24483,15 @@
     63:63:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):273:273 -> a
     64:64:boolean lambda$canBeDeadCode$0(java.util.List,com.android.tools.r8.ir.code.Instruction):267:267 -> a
     1:37:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):170:206 -> c
-    38:38:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> c
+    38:38:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> c
     38:38:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):206 -> c
     39:55:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):208:224 -> c
     1:14:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):283:296 -> e
     1:8:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):125:132 -> f
-    9:9:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> f
+    9:9:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> f
     9:9:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):133 -> f
     10:16:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):134:140 -> f
-com.android.tools.r8.ir.code.InvokeInterface -> com.android.tools.r8.s.b.m0:
+com.android.tools.r8.ir.code.InvokeInterface -> com.android.tools.r8.r.b.m0:
     boolean $assertionsDisabled -> l
     1:1:void <clinit>():23:23 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):26:26 -> <init>
@@ -24486,7 +24509,7 @@
     24:24:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):36 -> a
     1:8:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):90:97 -> f
     9:9:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):93:93 -> f
-com.android.tools.r8.ir.code.InvokeMethod -> com.android.tools.r8.s.b.n0:
+com.android.tools.r8.ir.code.InvokeMethod -> com.android.tools.r8.r.b.n0:
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.DexMethod method -> i
     1:1:void <clinit>():31:31 -> <clinit>
@@ -24519,7 +24542,7 @@
     1:29:java.util.Collection lookupTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):79:107 -> g
     30:43:java.util.Collection lookupTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):106:119 -> g
     1:1:java.lang.String toString():56:56 -> toString
-com.android.tools.r8.ir.code.InvokeMethodWithReceiver -> com.android.tools.r8.s.b.o0:
+com.android.tools.r8.ir.code.InvokeMethodWithReceiver -> com.android.tools.r8.r.b.o0:
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():22:22 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):25:25 -> <init>
@@ -24532,7 +24555,7 @@
     2:2:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):56:56 -> a
     1:15:boolean verifyTypes(com.android.tools.r8.graph.AppView):71:85 -> b
     16:16:boolean verifyTypes(com.android.tools.r8.graph.AppView):84:84 -> b
-com.android.tools.r8.ir.code.InvokeMultiNewArray -> com.android.tools.r8.s.b.p0:
+com.android.tools.r8.ir.code.InvokeMultiNewArray -> com.android.tools.r8.r.b.p0:
     com.android.tools.r8.graph.DexType type -> i
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():25:25 -> <clinit>
@@ -24563,15 +24586,15 @@
     12:12:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeMultiNewArray):194:194 -> a
     12:12:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):41 -> a
     1:4:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):117:120 -> b
-    5:5:boolean com.android.tools.r8.graph.DexType.isWideType():246:246 -> b
+    5:5:boolean com.android.tools.r8.graph.DexType.isWideType():252:252 -> b
     5:5:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):120 -> b
     6:20:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):120:134 -> b
-    21:21:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> b
+    21:21:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> b
     21:21:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):138 -> b
     22:36:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):140:154 -> b
     1:6:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):176:181 -> c
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> d
-com.android.tools.r8.ir.code.InvokeNewArray -> com.android.tools.r8.s.b.q0:
+com.android.tools.r8.ir.code.InvokeNewArray -> com.android.tools.r8.r.b.q0:
     com.android.tools.r8.graph.DexType type -> i
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():25:25 -> <clinit>
@@ -24597,16 +24620,16 @@
     26:26:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):41 -> a
     27:27:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):199:199 -> a
     1:4:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):144:147 -> b
-    5:5:boolean com.android.tools.r8.graph.DexType.isWideType():246:246 -> b
+    5:5:boolean com.android.tools.r8.graph.DexType.isWideType():252:252 -> b
     5:5:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):147 -> b
     6:20:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):147:161 -> b
-    21:21:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> b
+    21:21:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> b
     21:21:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):165 -> b
     22:38:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):167:183 -> b
     1:6:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):189:194 -> c
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> d
     1:1:java.lang.String toString():65:65 -> toString
-com.android.tools.r8.ir.code.InvokePolymorphic -> com.android.tools.r8.s.b.r0:
+com.android.tools.r8.ir.code.InvokePolymorphic -> com.android.tools.r8.r.b.r0:
     boolean $assertionsDisabled -> l
     com.android.tools.r8.graph.DexProto proto -> k
     1:1:void <clinit>():28:28 -> <clinit>
@@ -24638,7 +24661,7 @@
     43:43:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):44 -> a
     com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> f
     java.util.Collection lookupTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> g
-com.android.tools.r8.ir.code.InvokeStatic -> com.android.tools.r8.s.b.s0:
+com.android.tools.r8.ir.code.InvokeStatic -> com.android.tools.r8.r.b.s0:
     boolean itf -> k
     boolean $assertionsDisabled -> l
     1:1:void <clinit>():30:30 -> <clinit>
@@ -24661,10 +24684,10 @@
     27:27:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):213:213 -> a
     1:38:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):161:198 -> c
     1:8:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):105:112 -> f
-    9:9:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> f
+    9:9:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> f
     9:9:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):113 -> f
     10:16:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):114:120 -> f
-com.android.tools.r8.ir.code.InvokeSuper -> com.android.tools.r8.s.b.t0:
+com.android.tools.r8.ir.code.InvokeSuper -> com.android.tools.r8.r.b.t0:
     boolean $assertionsDisabled -> m
     boolean itf -> l
     1:1:void <clinit>():22:22 -> <clinit>
@@ -24682,7 +24705,7 @@
     24:24:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeSuper):214:214 -> a
     24:24:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):38 -> a
     1:5:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):97:101 -> f
-com.android.tools.r8.ir.code.InvokeVirtual -> com.android.tools.r8.s.b.u0:
+com.android.tools.r8.ir.code.InvokeVirtual -> com.android.tools.r8.r.b.u0:
     boolean $assertionsDisabled -> l
     1:1:void <clinit>():26:26 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):29:29 -> <init>
@@ -24702,7 +24725,7 @@
     1:41:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):129:169 -> c
     1:8:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):93:100 -> f
     9:9:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):96:96 -> f
-com.android.tools.r8.ir.code.JumpInstruction -> com.android.tools.r8.s.b.v0:
+com.android.tools.r8.ir.code.JumpInstruction -> com.android.tools.r8.r.b.v0:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():12:12 -> <clinit>
     1:1:void <init>():15:15 -> <init>
@@ -24717,7 +24740,7 @@
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):52 -> a
     1:1:void setFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):31:31 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> d
-com.android.tools.r8.ir.code.LinearFlowInstructionListIterator -> com.android.tools.r8.s.b.w0:
+com.android.tools.r8.ir.code.LinearFlowInstructionListIterator -> com.android.tools.r8.r.b.w0:
     com.android.tools.r8.ir.code.IRCode code -> a
     com.android.tools.r8.ir.code.InstructionListIterator currentBlockIterator -> c
     com.android.tools.r8.ir.code.BasicBlock currentBlock -> b
@@ -24752,7 +24775,7 @@
     1:1:void set(java.lang.Object):15:15 -> set
     2:2:void set(com.android.tools.r8.ir.code.Instruction):202:202 -> set
     2:2:void set(java.lang.Object):15 -> set
-com.android.tools.r8.ir.code.Load -> com.android.tools.r8.s.b.x0:
+com.android.tools.r8.ir.code.Load -> com.android.tools.r8.r.b.x0:
     1:1:void <init>(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.Value):22:22 -> <init>
     int maxInValueRegister() -> C2
     1:1:int maxOutValueRegister():61:61 -> D2
@@ -24771,7 +24794,7 @@
     7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):67 -> a
     com.android.tools.r8.ir.code.Load asLoad() -> a0
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> d
-com.android.tools.r8.ir.code.LogicalBinop -> com.android.tools.r8.s.b.y0:
+com.android.tools.r8.ir.code.LogicalBinop -> com.android.tools.r8.r.b.y0:
     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>
@@ -24791,7 +24814,7 @@
     com.android.tools.r8.code.Instruction CreateLong2Addr(int,int) -> c
     1:5:boolean needsValueInRegister(com.android.tools.r8.ir.code.Value):44:48 -> c
     com.android.tools.r8.code.Instruction CreateLong(int,int,int) -> d
-com.android.tools.r8.ir.code.MemberType -> com.android.tools.r8.s.b.z0:
+com.android.tools.r8.ir.code.MemberType -> com.android.tools.r8.r.b.z0:
     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
@@ -24807,7 +24830,7 @@
     11:11:void <clinit>() -> <clinit>
     1:1:void <init>(java.lang.String,int):11:11 -> <init>
     1:1:boolean isPrecise():24:24 -> a
-com.android.tools.r8.ir.code.Monitor -> com.android.tools.r8.s.b.A0:
+com.android.tools.r8.ir.code.Monitor -> com.android.tools.r8.r.b.A0:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.ir.code.Monitor$Type type -> h
     1:1:void <clinit>():22:22 -> <clinit>
@@ -24835,14 +24858,14 @@
     1:1:boolean isMonitorEnter():103 -> a2
     com.android.tools.r8.ir.code.Monitor asMonitor() -> c0
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> d
-com.android.tools.r8.ir.code.Monitor$Type -> com.android.tools.r8.s.b.A0$a:
+com.android.tools.r8.ir.code.Monitor$Type -> com.android.tools.r8.r.b.A0$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>():25:25 -> <clinit>
     2:2:void <clinit>():24:24 -> <clinit>
     1:1:void <init>(java.lang.String,int):24:24 -> <init>
-com.android.tools.r8.ir.code.Move -> com.android.tools.r8.s.b.B0:
+com.android.tools.r8.ir.code.Move -> com.android.tools.r8.r.b.B0:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():18:18 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):23:23 -> <init>
@@ -24868,7 +24891,7 @@
     com.android.tools.r8.ir.code.Move asMove() -> d0
     1:1:boolean isOutConstant():81:81 -> l2
     1:1:java.lang.String toString():76:76 -> toString
-com.android.tools.r8.ir.code.MoveException -> com.android.tools.r8.s.b.C0:
+com.android.tools.r8.ir.code.MoveException -> com.android.tools.r8.r.b.C0:
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.DexType exceptionType -> h
     com.android.tools.r8.utils.InternalOptions options -> i
@@ -24885,7 +24908,7 @@
     1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):45 -> a
     2:3:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):45:46 -> a
     4:7:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):62:65 -> a
-    8:8:boolean com.android.tools.r8.utils.InternalOptions.canHaveExceptionTypeBug():1452:1452 -> a
+    8:8:boolean com.android.tools.r8.utils.InternalOptions.canHaveExceptionTypeBug():1444:1444 -> a
     8:8:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):65 -> a
     9:9:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):66:66 -> a
     10:11:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):83:84 -> a
@@ -24897,7 +24920,7 @@
     boolean isMoveException() -> c2
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> d
     com.android.tools.r8.ir.code.MoveException asMoveException() -> e0
-com.android.tools.r8.ir.code.Mul -> com.android.tools.r8.s.b.D0:
+com.android.tools.r8.ir.code.Mul -> com.android.tools.r8.r.b.D0:
     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() -> E2
     boolean isCommutative() -> J2
@@ -24920,7 +24943,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):53:53 -> f
     com.android.tools.r8.ir.code.Mul asMul() -> f0
-com.android.tools.r8.ir.code.Neg -> com.android.tools.r8.s.b.E0:
+com.android.tools.r8.ir.code.Neg -> com.android.tools.r8.r.b.E0:
     com.android.tools.r8.ir.code.NumericType type -> h
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():21:21 -> <clinit>
@@ -24939,7 +24962,7 @@
     57:57:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):111:111 -> a
     boolean isNeg() -> e2
     com.android.tools.r8.ir.code.Neg asNeg() -> g0
-com.android.tools.r8.ir.code.NewArrayEmpty -> com.android.tools.r8.s.b.F0:
+com.android.tools.r8.ir.code.NewArrayEmpty -> com.android.tools.r8.r.b.F0:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.graph.DexType type -> h
     1:1:void <clinit>():20:20 -> <clinit>
@@ -24957,7 +24980,7 @@
     3:3:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):55 -> a
     4:5:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):55:56 -> a
     6:11:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):85:90 -> a
-    12:12:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    12:12:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     12:12:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):90 -> a
     13:13:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):95:95 -> a
     14:14:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):111:111 -> a
@@ -24969,7 +24992,7 @@
     boolean isNewArrayEmpty() -> f2
     com.android.tools.r8.ir.code.NewArrayEmpty asNewArrayEmpty() -> h0
     1:1:java.lang.String toString():41:41 -> toString
-com.android.tools.r8.ir.code.NewArrayFilledData -> com.android.tools.r8.s.b.G0:
+com.android.tools.r8.ir.code.NewArrayFilledData -> com.android.tools.r8.r.b.G0:
     long size -> i
     short[] data -> j
     boolean $assertionsDisabled -> k
@@ -24995,7 +25018,7 @@
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> d
     boolean isNewArrayFilledData() -> g2
     com.android.tools.r8.ir.code.NewArrayFilledData asNewArrayFilledData() -> i0
-com.android.tools.r8.ir.code.NewInstance -> com.android.tools.r8.s.b.H0:
+com.android.tools.r8.ir.code.NewInstance -> com.android.tools.r8.r.b.H0:
     boolean allowSpilling -> i
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.DexType clazz -> h
@@ -25027,7 +25050,7 @@
     2:5:boolean verifyTypes(com.android.tools.r8.graph.AppView):220:223 -> b
     6:8:boolean verifyTypes(com.android.tools.r8.graph.AppView):222:224 -> b
     1:10:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):140:149 -> c
-    11:11:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> c
+    11:11:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> c
     11:11:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):149 -> c
     12:42:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):150:180 -> c
     43:43:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):145:145 -> c
@@ -25035,9 +25058,9 @@
     boolean isNewInstance() -> h2
     com.android.tools.r8.ir.code.NewInstance asNewInstance() -> j0
     1:1:java.lang.String toString():61:61 -> toString
-com.android.tools.r8.ir.code.NextUntilIterator -> com.android.tools.r8.s.b.I0:
+com.android.tools.r8.ir.code.NextUntilIterator -> com.android.tools.r8.r.b.I0:
     1:3:java.lang.Object nextUntil(java.util.function.Predicate):18:20 -> a
-com.android.tools.r8.ir.code.Not -> com.android.tools.r8.s.b.J0:
+com.android.tools.r8.ir.code.Not -> com.android.tools.r8.r.b.J0:
     com.android.tools.r8.ir.code.NumericType type -> h
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():19:19 -> <clinit>
@@ -25055,7 +25078,7 @@
     40:40:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):105:105 -> a
     boolean isNot() -> i2
     com.android.tools.r8.ir.code.Not asNot() -> k0
-com.android.tools.r8.ir.code.NumberConversion -> com.android.tools.r8.s.b.K0:
+com.android.tools.r8.ir.code.NumberConversion -> com.android.tools.r8.r.b.K0:
     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>
@@ -25085,7 +25108,7 @@
     248:248:boolean outTypeKnownToBeBoolean(java.util.Set):167:167 -> a
     boolean isNumberConversion() -> j2
     com.android.tools.r8.ir.code.NumberConversion asNumberConversion() -> l0
-com.android.tools.r8.ir.code.NumericType -> com.android.tools.r8.s.b.L0:
+com.android.tools.r8.ir.code.NumericType -> com.android.tools.r8.r.b.L0:
     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
@@ -25111,7 +25134,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.s.b.M0:
+com.android.tools.r8.ir.code.Or -> com.android.tools.r8.r.b.M0:
     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() -> E2
     boolean isCommutative() -> J2
@@ -25129,7 +25152,7 @@
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):53:53 -> d
     boolean isOr() -> k2
     com.android.tools.r8.ir.code.Or asOr() -> m0
-com.android.tools.r8.ir.code.Phi -> com.android.tools.r8.s.b.N0:
+com.android.tools.r8.ir.code.Phi -> com.android.tools.r8.r.b.N0:
     com.android.tools.r8.ir.code.Phi$RegisterReadType readType -> t
     java.util.List definitionUsers -> v
     java.util.List operands -> s
@@ -25212,12 +25235,12 @@
     5:5:void removeDeadPhi():305 -> m0
     6:6:void removeDeadPhi():305:305 -> m0
     1:1:boolean removeTrivialPhi():233:233 -> n0
-com.android.tools.r8.ir.code.Phi$RegisterReadType -> com.android.tools.r8.s.b.N0$a:
+com.android.tools.r8.ir.code.Phi$RegisterReadType -> com.android.tools.r8.r.b.N0$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>():37:38 -> <clinit>
     1:1:void <init>(java.lang.String,int):36:36 -> <init>
-com.android.tools.r8.ir.code.Pop -> com.android.tools.r8.s.b.O0:
+com.android.tools.r8.ir.code.Pop -> com.android.tools.r8.r.b.O0:
     1:1:void <init>(com.android.tools.r8.ir.code.StackValue):19:19 -> <init>
     1:1:int maxInValueRegister():59:59 -> C2
     1:1:int maxOutValueRegister():64:64 -> D2
@@ -25237,7 +25260,7 @@
     1:5:void addInValue(com.android.tools.r8.ir.code.Value):34:38 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> d
     boolean isPop() -> m2
-com.android.tools.r8.ir.code.Position -> com.android.tools.r8.s.b.P0:
+com.android.tools.r8.ir.code.Position -> com.android.tools.r8.r.b.P0:
     com.android.tools.r8.ir.code.Position TESTING_POSITION -> h
     com.android.tools.r8.ir.code.Position NO_POSITION_SYNTHETIC -> g
     com.android.tools.r8.graph.DexString file -> b
@@ -25265,7 +25288,7 @@
     1:5:int hashCode():134:138 -> hashCode
     1:19:java.lang.String toString(boolean):143:161 -> toString
     1:19:java.lang.String toString():166 -> toString
-com.android.tools.r8.ir.code.Rem -> com.android.tools.r8.s.b.Q0:
+com.android.tools.r8.ir.code.Rem -> com.android.tools.r8.r.b.Q0:
     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>
     int opcode() -> E2
     boolean isCommutative() -> J2
@@ -25290,7 +25313,7 @@
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):59:59 -> f
     com.android.tools.r8.ir.code.Rem asRem() -> n0
     boolean isRem() -> n2
-com.android.tools.r8.ir.code.Return -> com.android.tools.r8.s.b.R0:
+com.android.tools.r8.ir.code.Return -> com.android.tools.r8.r.b.R0:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():21:21 -> <clinit>
     1:1:void <init>():24:24 -> <init>
@@ -25314,7 +25337,7 @@
     1:15:com.android.tools.r8.code.Instruction createDexInstruction(com.android.tools.r8.ir.conversion.DexBuilder):56:70 -> b
     com.android.tools.r8.ir.code.Return asReturn() -> o0
     boolean isReturn() -> o2
-com.android.tools.r8.ir.code.Shl -> com.android.tools.r8.s.b.S0:
+com.android.tools.r8.ir.code.Shl -> com.android.tools.r8.r.b.S0:
     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() -> E2
     boolean isCommutative() -> J2
@@ -25332,7 +25355,7 @@
     1:1:boolean fitsInDexInstruction(com.android.tools.r8.ir.code.Value):33:33 -> g
     com.android.tools.r8.ir.code.Shl asShl() -> p0
     boolean isShl() -> p2
-com.android.tools.r8.ir.code.Shr -> com.android.tools.r8.s.b.T0:
+com.android.tools.r8.ir.code.Shr -> com.android.tools.r8.r.b.T0:
     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() -> E2
     boolean isCommutative() -> J2
@@ -25350,9 +25373,9 @@
     1:1:boolean fitsInDexInstruction(com.android.tools.r8.ir.code.Value):33:33 -> g
     com.android.tools.r8.ir.code.Shr asShr() -> q0
     boolean isShr() -> q2
-com.android.tools.r8.ir.code.SingleConstant -> com.android.tools.r8.s.b.U0:
+com.android.tools.r8.ir.code.SingleConstant -> com.android.tools.r8.r.b.U0:
     int decodedValue() -> a
-com.android.tools.r8.ir.code.StackValue -> com.android.tools.r8.s.b.V0:
+com.android.tools.r8.ir.code.StackValue -> com.android.tools.r8.r.b.V0:
     int height -> r
     com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo typeInfo -> s
     boolean $assertionsDisabled -> t
@@ -25366,7 +25389,7 @@
     1:1:int getHeight():31:31 -> i0
     1:1:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo getTypeInfo():35:35 -> j0
     1:1:java.lang.String toString():59:59 -> toString
-com.android.tools.r8.ir.code.StackValues -> com.android.tools.r8.s.b.W0:
+com.android.tools.r8.ir.code.StackValues -> com.android.tools.r8.r.b.W0:
     com.android.tools.r8.ir.code.StackValue[] stackValues -> r
     boolean $assertionsDisabled -> s
     1:1:void <clinit>():14:14 -> <clinit>
@@ -25377,7 +25400,7 @@
     1:1:com.android.tools.r8.ir.code.StackValue[] getStackValues():25:25 -> i0
     1:10:java.lang.String toString():40:49 -> toString
     1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getTypeLattice():59:59 -> w
-com.android.tools.r8.ir.code.StaticGet -> com.android.tools.r8.s.b.X0:
+com.android.tools.r8.ir.code.StaticGet -> com.android.tools.r8.r.b.X0:
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():32:32 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):35:35 -> <init>
@@ -25422,7 +25445,7 @@
     com.android.tools.r8.ir.code.StaticGet asStaticGet() -> r0
     boolean isStaticGet() -> r2
     1:1:java.lang.String toString():179:179 -> toString
-com.android.tools.r8.ir.code.StaticPut -> com.android.tools.r8.s.b.Y0:
+com.android.tools.r8.ir.code.StaticPut -> com.android.tools.r8.r.b.Y0:
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():32:32 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):35:35 -> <init>
@@ -25458,7 +25481,7 @@
     com.android.tools.r8.ir.code.StaticPut asStaticPut() -> s0
     boolean isStaticPut() -> s2
     1:1:java.lang.String toString():193:193 -> toString
-com.android.tools.r8.ir.code.Store -> com.android.tools.r8.s.b.Z0:
+com.android.tools.r8.ir.code.Store -> com.android.tools.r8.r.b.Z0:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():20:20 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.StackValue):23:23 -> <init>
@@ -25481,7 +25504,7 @@
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> d
     com.android.tools.r8.ir.code.Store asStore() -> t0
     boolean isStore() -> t2
-com.android.tools.r8.ir.code.StringSwitch -> com.android.tools.r8.s.b.a1:
+com.android.tools.r8.ir.code.StringSwitch -> com.android.tools.r8.r.b.a1:
     boolean $assertionsDisabled -> m
     com.android.tools.r8.graph.DexString[] keys -> l
     1:1:void <clinit>():15:15 -> <clinit>
@@ -25505,7 +25528,7 @@
     6:11:java.lang.String toString():71:76 -> toString
     com.android.tools.r8.ir.code.StringSwitch asStringSwitch() -> u0
     boolean isStringSwitch() -> u2
-com.android.tools.r8.ir.code.Sub -> com.android.tools.r8.s.b.b1:
+com.android.tools.r8.ir.code.Sub -> com.android.tools.r8.r.b.b1:
     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>
@@ -25538,7 +25561,7 @@
     1:3:boolean negativeFitsInDexInstruction(com.android.tools.r8.ir.code.Value):123:125 -> i
     com.android.tools.r8.ir.code.Sub asSub() -> v0
     boolean isSub() -> v2
-com.android.tools.r8.ir.code.Swap -> com.android.tools.r8.s.b.c1:
+com.android.tools.r8.ir.code.Swap -> com.android.tools.r8.r.b.c1:
     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>
@@ -25557,7 +25580,7 @@
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> d
     1:6:void setOutValue(com.android.tools.r8.ir.code.Value):44:49 -> e
     boolean isSwap() -> w2
-com.android.tools.r8.ir.code.Switch -> com.android.tools.r8.s.b.d1:
+com.android.tools.r8.ir.code.Switch -> com.android.tools.r8.r.b.d1:
     int[] targetBlockIndices -> i
     int fallthroughBlockIndex -> j
     boolean $assertionsDisabled -> k
@@ -25583,7 +25606,7 @@
     3:3:com.android.tools.r8.ir.code.BasicBlock targetBlock(int):32:32 -> d
     com.android.tools.r8.ir.code.Switch asSwitch() -> w0
     boolean isSwitch() -> x2
-com.android.tools.r8.ir.code.Throw -> com.android.tools.r8.s.b.e1:
+com.android.tools.r8.ir.code.Throw -> com.android.tools.r8.r.b.e1:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value):20:20 -> <init>
@@ -25602,17 +25625,17 @@
     23:23:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):76 -> a
     com.android.tools.r8.ir.code.Throw asThrow() -> x0
     boolean isThrow() -> y2
-com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier -> com.android.tools.r8.s.b.g1:
+com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier -> com.android.tools.r8.r.b.g1:
     com.android.tools.r8.ir.analysis.type.TypeLatticeElement getTypeLattice() -> a
     1:1:com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier create(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):15:15 -> a
     com.android.tools.r8.graph.DebugLocalInfo getLocalInfo() -> c
-com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier$1 -> com.android.tools.r8.s.b.f1:
+com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier$1 -> com.android.tools.r8.r.b.f1:
     com.android.tools.r8.ir.analysis.type.TypeLatticeElement 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.TypeLatticeElement):15:15 -> <init>
     1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getTypeLattice():24:24 -> a
     1:1:com.android.tools.r8.graph.DebugLocalInfo getLocalInfo():19:19 -> c
-com.android.tools.r8.ir.code.Unop -> com.android.tools.r8.s.b.h1:
+com.android.tools.r8.ir.code.Unop -> com.android.tools.r8.r.b.h1:
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):17:17 -> <init>
     int maxInValueRegister() -> C2
     int maxOutValueRegister() -> D2
@@ -25624,7 +25647,7 @@
     4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):51 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> d
     boolean isUnop() -> z2
-com.android.tools.r8.ir.code.Ushr -> com.android.tools.r8.s.b.i1:
+com.android.tools.r8.ir.code.Ushr -> com.android.tools.r8.r.b.i1:
     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>
     boolean isUshr() -> A2
     int opcode() -> E2
@@ -25642,7 +25665,7 @@
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):58:58 -> d
     1:1:boolean fitsInDexInstruction(com.android.tools.r8.ir.code.Value):33:33 -> g
     com.android.tools.r8.ir.code.Ushr asUshr() -> y0
-com.android.tools.r8.ir.code.Value -> com.android.tools.r8.s.b.j1:
+com.android.tools.r8.ir.code.Value -> com.android.tools.r8.r.b.j1:
     int needsRegister -> j
     boolean isThis -> k
     boolean isArgument -> l
@@ -25757,10 +25780,10 @@
     338:338:void setTypeLattice(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1080:1080 -> a
     338:338:void narrowing(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1108 -> a
     339:346:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1156:1163 -> a
-    347:347:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    347:347:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     347:347:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1164 -> a
     348:368:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1165:1185 -> a
-    369:369:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    369:369:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     369:369:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1186 -> a
     370:370:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1187:1187 -> a
     1:5:int numberOfUsers():495:499 -> a0
@@ -25821,12 +25844,12 @@
     1:11:com.android.tools.r8.utils.LongInterval getValueRange():996:1006 -> x
     1:1:boolean hasAliasedValue():253:253 -> y
     1:1:boolean hasAnyUsers():479:479 -> z
-com.android.tools.r8.ir.code.Value$DebugData -> com.android.tools.r8.s.b.j1$a:
+com.android.tools.r8.ir.code.Value$DebugData -> com.android.tools.r8.r.b.j1$a:
     java.util.Map users -> b
     com.android.tools.r8.graph.DebugLocalInfo local -> a
     1:1:void <init>(com.android.tools.r8.graph.DebugLocalInfo):157:157 -> <init>
     2:5:void <init>(com.android.tools.r8.graph.DebugLocalInfo):155:158 -> <init>
-com.android.tools.r8.ir.code.Value$DebugUse -> com.android.tools.r8.s.b.j1$b:
+com.android.tools.r8.ir.code.Value$DebugUse -> com.android.tools.r8.r.b.j1$b:
     com.android.tools.r8.ir.code.Value$DebugUse START -> b
     com.android.tools.r8.ir.code.Value$DebugUse[] $VALUES -> e
     com.android.tools.r8.ir.code.Value$DebugUse LIVE -> a
@@ -25836,11 +25859,11 @@
     1:2:void <clinit>():165:166 -> <clinit>
     3:3:void <clinit>():165:165 -> <clinit>
     1:1:void <init>(java.lang.String,int):165:165 -> <init>
-com.android.tools.r8.ir.code.ValueNumberGenerator -> com.android.tools.r8.s.b.k1:
+com.android.tools.r8.ir.code.ValueNumberGenerator -> com.android.tools.r8.r.b.k1:
     int nextValueNumber -> a
     1:2:void <init>():6:7 -> <init>
     1:1:int next():10:10 -> a
-com.android.tools.r8.ir.code.ValueType -> com.android.tools.r8.s.b.l1:
+com.android.tools.r8.ir.code.ValueType -> com.android.tools.r8.r.b.l1:
     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
@@ -25870,7 +25893,7 @@
     40:55:com.android.tools.r8.ir.code.ValueType fromTypeLattice(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):106:121 -> a
     1:1:boolean isWide():29:29 -> b
     1:1:int requiredRegisters():33:33 -> c
-com.android.tools.r8.ir.code.ValueTypeConstraint -> com.android.tools.r8.s.b.m1:
+com.android.tools.r8.ir.code.ValueTypeConstraint -> com.android.tools.r8.r.b.m1:
     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
@@ -25904,9 +25927,9 @@
     58:82:com.android.tools.r8.ir.code.ValueTypeConstraint fromTypeLattice(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):133:157 -> a
     83:83:com.android.tools.r8.ir.code.ValueTypeConstraint fromTypeLattice(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):137:137 -> a
     1:1:int requiredRegisters():42:42 -> b
-com.android.tools.r8.ir.code.WideConstant -> com.android.tools.r8.s.b.n1:
+com.android.tools.r8.ir.code.WideConstant -> com.android.tools.r8.r.b.n1:
     long decodedValue() -> a
-com.android.tools.r8.ir.code.Xor -> com.android.tools.r8.s.b.o1:
+com.android.tools.r8.ir.code.Xor -> com.android.tools.r8.r.b.o1:
     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>
     boolean isXor() -> B2
     int opcode() -> E2
@@ -26126,21 +26149,21 @@
     1:4:void <init>(com.android.tools.r8.ir.conversion.CallGraphBuilderBase,com.android.tools.r8.ir.conversion.CallGraph$Node,java.util.function.Predicate):89:92 -> <init>
     1:3:void addClassInitializerTarget(com.android.tools.r8.graph.DexClass):96:98 -> a
     4:5:void addClassInitializerTarget(com.android.tools.r8.graph.DexType):103:104 -> a
-    6:6:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    6:6:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     6:6:void addClassInitializerTarget(com.android.tools.r8.graph.DexType):104 -> a
     7:7:void addClassInitializerTarget(com.android.tools.r8.graph.DexType):106:106 -> a
     8:22:void addTarget(com.android.tools.r8.graph.DexEncodedMethod,boolean):111:125 -> a
     23:41:void processInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):129:147 -> a
-    42:42:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    42:42:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     42:42:void processInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):147 -> a
     43:49:void processInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):148:154 -> a
     50:53:void processInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):137:140 -> a
     54:55:void processInvokeWithDynamicDispatch(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexEncodedMethod):162:163 -> a
-    56:56:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    56:56:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     56:56:void processInvokeWithDynamicDispatch(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexEncodedMethod):163 -> a
     57:85:void processInvokeWithDynamicDispatch(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexEncodedMethod):165:193 -> a
     86:89:java.util.Set lambda$processInvokeWithDynamicDispatch$0(boolean,com.android.tools.r8.graph.DexMethod):181:184 -> a
-    90:90:java.util.Set com.android.tools.r8.graph.ResolutionResult.lookupVirtualDispatchTargets(boolean,com.android.tools.r8.graph.AppInfoWithSubtyping):76:76 -> a
+    90:90:java.util.Set com.android.tools.r8.graph.ResolutionResult.lookupVirtualDispatchTargets(boolean,com.android.tools.r8.graph.AppInfoWithSubtyping):77:77 -> a
     90:90:java.util.Set lambda$processInvokeWithDynamicDispatch$0(boolean,com.android.tools.r8.graph.DexMethod):184 -> a
     91:92:void processFieldAccess(com.android.tools.r8.graph.DexField):201:202 -> a
     93:93:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():124:124 -> a
@@ -26298,7 +26321,7 @@
     308:308:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):164:164 -> a
     309:316:boolean verifyInvokeInterface(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.AppView):169:176 -> a
     309:316:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):164 -> a
-    317:317:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    317:317:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     317:317:boolean verifyInvokeInterface(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.AppView):176 -> a
     317:317:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):164 -> a
     318:318:boolean verifyInvokeInterface(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.AppView):177:177 -> a
@@ -26365,7 +26388,7 @@
     1:1:int instructionCount():262:262 -> a
     2:6:boolean canThrowHelper(com.android.tools.r8.cf.code.CfInstruction):290:294 -> a
     7:9:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):299:301 -> a
-    10:10:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():345:345 -> a
+    10:10:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():337:337 -> a
     10:10:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):301 -> a
     11:12:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):301:302 -> a
     13:39:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):301:327 -> a
@@ -26701,7 +26724,7 @@
     180:183:void reset():165:168 -> a
     180:183:com.android.tools.r8.graph.DexCode build():191 -> a
     184:225:com.android.tools.r8.graph.DexCode build():196:237 -> a
-    226:226:boolean com.android.tools.r8.utils.InternalOptions.canHaveTracingPastInstructionsStreamBug():1388:1388 -> a
+    226:226:boolean com.android.tools.r8.utils.InternalOptions.canHaveTracingPastInstructionsStreamBug():1380:1380 -> a
     226:226:com.android.tools.r8.graph.DexCode build():237 -> a
     227:270:com.android.tools.r8.graph.DexCode build():238:281 -> a
     271:290:com.android.tools.r8.code.Nop createSwitchPayload(com.android.tools.r8.ir.conversion.DexBuilder$SwitchPayloadInfo,int):714:733 -> a
@@ -27288,7 +27311,7 @@
     345:345:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):623 -> a
     346:346:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):623:623 -> a
     347:364:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):620:637 -> a
-    365:365:boolean com.android.tools.r8.utils.InternalOptions.isStringSwitchConversionEnabled():1139:1139 -> a
+    365:365:boolean com.android.tools.r8.utils.InternalOptions.isStringSwitchConversionEnabled():1131:1131 -> a
     365:365:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):637 -> a
     366:366:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):638:638 -> a
     367:378:java.util.List com.android.tools.r8.ir.conversion.StringSwitchConverter.getRewritingCandidates(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):124:135 -> a
@@ -27383,7 +27406,7 @@
     557:558:void addConstString(int,com.android.tools.r8.graph.DexString):1155:1156 -> a
     559:559:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1149:1149 -> a
     559:559:void addConstString(int,com.android.tools.r8.graph.DexString):1157 -> a
-    560:560:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():345:345 -> a
+    560:560:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():337:337 -> a
     560:560:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1149 -> a
     560:560:void addConstString(int,com.android.tools.r8.graph.DexString):1157 -> a
     561:562:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1150:1151 -> a
@@ -27392,7 +27415,7 @@
     564:566:void addDexItemBasedConstString(int,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):1163:1165 -> a
     567:567:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1149:1149 -> a
     567:567:void addDexItemBasedConstString(int,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):1166 -> a
-    568:568:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():345:345 -> a
+    568:568:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():337:337 -> a
     568:568:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1149 -> a
     568:568:void addDexItemBasedConstString(int,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):1166 -> a
     569:570:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1150:1151 -> a
@@ -27420,7 +27443,7 @@
     616:616:void addInstanceOf(int,int,com.android.tools.r8.graph.DexType):1364 -> a
     617:626:void addInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,java.util.List,boolean):1376:1385 -> a
     627:647:void addInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,java.util.List,boolean):1379:1399 -> a
-    648:648:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    648:648:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     648:648:void addInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,java.util.List,boolean):1399 -> a
     649:659:void addInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,java.util.List,boolean):1400:1410 -> a
     660:664:void addInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,java.util.List,java.util.List,boolean):1420:1424 -> a
@@ -27664,7 +27687,7 @@
     82:87:void addConstClass(int,com.android.tools.r8.graph.DexType):1110:1115 -> b
     88:91:void addInstancePut(int,int,com.android.tools.r8.graph.DexField):1368:1371 -> b
     92:92:void addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1539:1539 -> b
-    93:93:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():345:345 -> b
+    93:93:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():337:337 -> b
     93:93:void addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1539 -> b
     94:100:void addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1539:1545 -> b
     101:107:void addNewArrayEmpty(int,int,com.android.tools.r8.graph.DexType):1672:1678 -> b
@@ -28024,7 +28047,7 @@
     1:1:int access$400(com.android.tools.r8.ir.conversion.IRBuilder$WorklistItem):181:181 -> b
 com.android.tools.r8.ir.conversion.IRConverter -> com.android.tools.r8.ir.conversion.O:
     com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer covariantReturnTypeAnnotationTransformer -> C
-    java.util.List neverMergePrefixes -> Q
+    java.util.List onWaveDoneActions -> Q
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.analysis.TypeChecker typeChecker -> F
     com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization classInitializerDefaultsOptimization -> d
@@ -28032,308 +28055,309 @@
     com.android.tools.r8.ir.optimize.MemberValuePropagation memberValuePropagation -> x
     com.android.tools.r8.ir.optimize.DynamicTypeOptimization dynamicTypeOptimization -> J
     com.android.tools.r8.ir.optimize.ServiceLoaderRewriter serviceLoaderRewriter -> H
-    com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed delayedOptimizationFeedback -> M
     java.util.Collection assumers -> I
     com.android.tools.r8.ir.desugar.InterfaceMethodRewriter interfaceMethodRewriter -> n
-    boolean seenNotNeverMergePrefix -> R
     com.android.tools.r8.ir.optimize.classinliner.ClassInliner classInliner -> r
-    boolean $assertionsDisabled -> T
     com.android.tools.r8.shaking.LibraryMethodOverrideAnalysis libraryMethodOverrideAnalysis -> g
     com.android.tools.r8.ir.desugar.LambdaRewriter lambdaRewriter -> l
+    boolean seenNeverMergePrefix -> T
     com.android.tools.r8.ir.optimize.lambda.LambdaMerger lambdaMerger -> q
     com.android.tools.r8.ir.optimize.Devirtualizer devirtualizer -> B
     com.android.tools.r8.ir.desugar.TwrCloseResourceRewriter twrCloseResourceRewriter -> o
+    com.android.tools.r8.ir.optimize.AssertionsRewriter assertionsRewriter -> K
+    com.android.tools.r8.ir.optimize.info.OptimizationFeedback simpleOptimizationFeedback -> O
     com.android.tools.r8.utils.Timing timing -> b
-    com.android.tools.r8.ir.optimize.DeadCodeRemover deadCodeRemover -> K
     com.android.tools.r8.ir.conversion.LensCodeRewriter lensCodeRewriter -> y
-    com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector methodOptimizationInfoCollector -> L
     com.android.tools.r8.ir.optimize.string.StringOptimizer stringOptimizer -> i
-    com.android.tools.r8.graph.DexString highestSortingString -> O
-    java.util.List onWaveDoneActions -> P
+    com.android.tools.r8.graph.DexString highestSortingString -> P
+    java.util.List neverMergePrefixes -> R
     com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization uninstantiatedTypeOptimization -> E
+    com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed delayedOptimizationFeedback -> N
+    boolean $assertionsDisabled -> U
     com.android.tools.r8.utils.CfgPrinter printer -> u
     com.android.tools.r8.ir.optimize.ConstantCanonicalizer constantCanonicalizer -> w
     com.android.tools.r8.ir.optimize.Outliner outliner -> c
     com.android.tools.r8.ir.desugar.StringConcatRewriter stringConcatRewriter -> h
-    boolean seenNeverMergePrefix -> S
+    boolean seenNotNeverMergePrefix -> S
     com.android.tools.r8.ir.optimize.Inliner inliner -> z
     com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer stringBuilderOptimizer -> j
     com.android.tools.r8.ir.optimize.CodeRewriter codeRewriter -> v
     com.android.tools.r8.ir.optimize.library.LibraryMethodOptimizer libraryMethodOptimizer -> f
     com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer classStaticizer -> s
     com.android.tools.r8.ir.desugar.BackportedMethodRewriter backportedMethodRewriter -> p
+    com.android.tools.r8.ir.optimize.DeadCodeRemover deadCodeRemover -> L
     com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer idempotentFunctionCallCanonicalizer -> k
-    com.android.tools.r8.ir.optimize.info.OptimizationFeedback simpleOptimizationFeedback -> N
     com.android.tools.r8.utils.InternalOptions options -> t
     com.android.tools.r8.ir.conversion.StringSwitchRemover stringSwitchRemover -> D
     com.android.tools.r8.ir.analysis.fieldaccess.FieldBitAccessAnalysis fieldBitAccessAnalysis -> e
+    com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector methodOptimizationInfoCollector -> M
     com.android.tools.r8.ir.desugar.D8NestBasedAccessDesugaring d8NestBasedAccessDesugaring -> m
     com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter desugaredLibraryAPIConverter -> G
-    1:1:void <clinit>():119:119 -> <clinit>
+    1:1:void <clinit>():118:118 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter,com.android.tools.r8.shaking.MainDexClasses):185:185 -> <init>
-    2:189:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter,com.android.tools.r8.shaking.MainDexClasses):161:348 -> <init>
-    190:190:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing):361:361 -> <init>
+    2:191:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter,com.android.tools.r8.shaking.MainDexClasses):160:349 -> <init>
+    192:192:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing):362:362 -> <init>
     boolean lambda$materializeInstructionBeforeLongOperationsWorkaround$17(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction) -> a
-    1:1:java.lang.String lambda$new$0(java.lang.String):205:205 -> a
-    2:5:java.util.Set getDesugaredCallSites():352:355 -> a
-    6:13:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):456:463 -> a
-    14:15:void desugarNestBasedAccess(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):396:397 -> a
-    14:15:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):465 -> a
-    16:18:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):403:405 -> a
-    16:18:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):466 -> a
-    19:19:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):467:467 -> a
-    20:21:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):427:428 -> a
-    20:21:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):467 -> a
-    22:23:void synthesizeTwrCloseResourceUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):436:437 -> a
-    22:23:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):468 -> a
-    24:25:void synthesizeJava8UtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):443:444 -> a
-    24:25:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):469 -> a
-    26:27:void processCovariantReturnTypeAnnotations(com.android.tools.r8.graph.DexApplication$Builder):449:450 -> a
-    26:27:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):470 -> a
-    28:29:void generateDesugaredLibraryAPIWrappers(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):907:908 -> a
-    28:29:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):471 -> a
-    30:33:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):473:476 -> a
-    34:40:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):480:486 -> a
-    41:42:void clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):511:512 -> a
-    41:42:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):487 -> a
+    1:1:java.lang.String lambda$new$0(java.lang.String):206:206 -> a
+    2:5:java.util.Set getDesugaredCallSites():353:356 -> a
+    6:13:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):457:464 -> a
+    14:15:void desugarNestBasedAccess(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):397:398 -> a
+    14:15:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):466 -> a
+    16:18:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):404:406 -> a
+    16:18:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):467 -> a
+    19:19:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):468:468 -> a
+    20:21:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):428:429 -> a
+    20:21:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):468 -> a
+    22:23:void synthesizeTwrCloseResourceUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):437:438 -> a
+    22:23:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):469 -> a
+    24:25:void synthesizeJava8UtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):444:445 -> a
+    24:25:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):470 -> a
+    26:27:void processCovariantReturnTypeAnnotations(com.android.tools.r8.graph.DexApplication$Builder):450:451 -> a
+    26:27:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):471 -> a
+    28:29:void generateDesugaredLibraryAPIWrappers(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):908:909 -> a
+    28:29:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):472 -> a
+    30:33:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):474:477 -> a
+    34:40:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):481:487 -> a
+    41:42:void clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):512:513 -> a
+    41:42:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):488 -> a
     43:50:com.android.tools.r8.graph.DexAnnotationSet com.android.tools.r8.graph.DexAnnotationSet.getWithout(com.android.tools.r8.graph.DexType):106:113 -> a
-    43:50:void clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):513 -> a
-    43:50:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):487 -> a
-    51:51:void clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):513:513 -> a
-    51:51:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):487 -> a
-    52:54:void lambda$convertMethods$3(boolean,com.android.tools.r8.graph.DexEncodedMethod):559:561 -> a
-    55:63:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):627:635 -> a
-    64:65:void collectLambdaMergingCandidates(com.android.tools.r8.graph.DexApplication):887:888 -> a
-    64:65:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):636 -> a
-    66:67:void collectStaticizerCandidates(com.android.tools.r8.graph.DexApplication):417:418 -> a
-    66:67:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):637 -> a
-    68:79:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):645:656 -> a
-    80:126:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):655:701 -> a
-    127:127:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():345:345 -> a
-    127:127:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):701 -> a
-    128:128:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):702:702 -> a
-    129:130:void staticizeClasses(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):411:412 -> a
-    129:130:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):704 -> a
-    131:138:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):705:712 -> a
-    139:141:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):403:405 -> a
-    139:141:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):713 -> a
-    142:143:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):715:716 -> a
-    144:145:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):427:428 -> a
-    144:145:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):716 -> a
-    146:146:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):718:718 -> a
-    147:148:void synthesizeTwrCloseResourceUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):436:437 -> a
-    147:148:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):719 -> a
-    149:150:void synthesizeJava8UtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):443:444 -> a
-    149:150:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):720 -> a
-    151:153:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):721:723 -> a
-    154:155:void finalizeLambdaMerging(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):898:899 -> a
-    154:155:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):725 -> a
-    156:156:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):727:727 -> a
-    157:158:void generateDesugaredLibraryAPIWrappers(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):907:908 -> a
-    157:158:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):728 -> a
-    159:161:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):730:732 -> a
-    162:181:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):731:750 -> a
-    182:194:com.android.tools.r8.graph.DexType computeOutlineClassType():948:960 -> a
-    182:194:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):750 -> a
-    195:195:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
-    195:195:com.android.tools.r8.graph.DexType computeOutlineClassType():960 -> a
-    195:195:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):750 -> a
-    196:252:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):750:806 -> a
-    253:260:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):800:807 -> a
-    261:261:void lambda$optimize$4(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.ir.conversion.PrimaryMethodProcessor,com.android.tools.r8.graph.DexEncodedMethod):663:663 -> a
-    262:263:void lambda$optimize$5(com.android.tools.r8.ir.code.IRCode):746:747 -> a
-    264:264:void addWaveDoneAction(com.android.tools.r8.utils.Action):827:827 -> a
-    265:265:boolean isInWave():837:837 -> a
-    265:265:void addWaveDoneAction(com.android.tools.r8.utils.Action):830 -> a
-    266:266:void addWaveDoneAction(com.android.tools.r8.utils.Action):833:833 -> a
-    267:267:void addWaveDoneAction(com.android.tools.r8.utils.Action):831:831 -> a
-    268:268:void addWaveDoneAction(com.android.tools.r8.utils.Action):828:828 -> a
-    269:269:void computeReachabilitySensitivity(com.android.tools.r8.graph.DexApplication):841:841 -> a
-    270:272:void forEachSelectedOutliningMethod(java.util.function.Consumer,java.util.concurrent.ExecutorService):851:853 -> a
-    273:283:void lambda$forEachSelectedOutliningMethod$9(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod):856:866 -> a
-    284:284:void processSynthesizedServiceLoaderMethods(com.android.tools.r8.graph.DexClass,java.util.concurrent.ExecutorService):874:874 -> a
-    285:285:void processSynthesizedServiceLoaderMethods(com.android.tools.r8.graph.DexClass,java.util.concurrent.ExecutorService):873:873 -> a
-    286:286:void clearDexMethodCompilationState(com.android.tools.r8.graph.DexProgramClass):917:917 -> a
-    287:296:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):930:939 -> a
-    297:297:java.lang.String logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):1018:1018 -> a
-    297:297:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):939 -> a
-    298:298:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):939:939 -> a
-    299:299:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):938:938 -> a
-    300:303:void optimizeSynthesizedClass(com.android.tools.r8.graph.DexProgramClass,java.util.concurrent.ExecutorService):967:970 -> a
-    304:308:void optimizeSynthesizedClasses(java.util.Collection,java.util.concurrent.ExecutorService):976:980 -> a
-    309:309:void lambda$optimizeSynthesizedLambdaClasses$10(com.android.tools.r8.ir.conversion.LambdaMethodProcessor,com.android.tools.r8.graph.DexEncodedMethod):994:994 -> a
-    310:315:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):1000:1005 -> a
-    316:316:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):1002:1002 -> a
-    317:317:void lambda$processMethodsConcurrently$11(com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.graph.DexEncodedMethod):1014:1014 -> a
-    318:324:void processMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1036:1042 -> a
-    325:327:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.origin.Origin):1077:1079 -> a
-    328:333:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.origin.Origin):1078:1083 -> a
-    334:334:java.lang.String logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):1018:1018 -> a
-    334:334:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.origin.Origin):1083 -> a
-    335:335:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.origin.Origin):1083:1083 -> a
-    336:348:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.origin.Origin):1082:1094 -> a
-    349:352:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1103:1106 -> a
-    353:358:void printC1VisualizerHeader(com.android.tools.r8.graph.DexEncodedMethod):1728:1733 -> a
-    353:358:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1109 -> a
-    359:365:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1110:1116 -> a
-    366:366:boolean com.android.tools.r8.utils.InternalOptions.canHaveArtStringNewInitBug():1340:1340 -> a
-    366:366:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1116 -> a
-    367:402:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1117:1152 -> a
-    403:403:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1481:1481 -> a
-    403:403:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1153 -> a
-    404:404:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():345:345 -> a
-    404:404:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1481 -> a
-    404:404:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1153 -> a
-    405:407:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1481:1483 -> a
-    405:407:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1153 -> a
-    408:408:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():345:345 -> a
-    408:408:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1483 -> a
-    408:408:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1153 -> a
-    409:412:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1484:1487 -> a
-    409:412:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1153 -> a
-    413:420:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1161:1168 -> a
-    421:421:void com.android.tools.r8.naming.IdentifierNameStringMarker.decoupleIdentifierNameStringsInMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):90:90 -> a
-    421:421:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1169 -> a
-    422:521:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1170:1269 -> a
-    522:524:void invertConditionalsForTesting(com.android.tools.r8.ir.code.IRCode):1047:1049 -> a
-    522:524:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1270 -> a
-    525:533:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1273:1281 -> a
-    534:570:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1280:1316 -> a
-    571:634:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1308:1371 -> a
+    43:50:void clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):514 -> a
+    43:50:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):488 -> a
+    51:51:void clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):514:514 -> a
+    51:51:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):488 -> a
+    52:54:void lambda$convertMethods$3(boolean,com.android.tools.r8.graph.DexEncodedMethod):560:562 -> a
+    55:63:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):628:636 -> a
+    64:65:void collectLambdaMergingCandidates(com.android.tools.r8.graph.DexApplication):888:889 -> a
+    64:65:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):637 -> a
+    66:67:void collectStaticizerCandidates(com.android.tools.r8.graph.DexApplication):418:419 -> a
+    66:67:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):638 -> a
+    68:79:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):646:657 -> a
+    80:126:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):656:702 -> a
+    127:127:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():337:337 -> a
+    127:127:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):702 -> a
+    128:128:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):703:703 -> a
+    129:130:void staticizeClasses(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):412:413 -> a
+    129:130:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):705 -> a
+    131:138:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):706:713 -> a
+    139:141:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):404:406 -> a
+    139:141:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):714 -> a
+    142:143:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):716:717 -> a
+    144:145:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):428:429 -> a
+    144:145:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):717 -> a
+    146:146:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):719:719 -> a
+    147:148:void synthesizeTwrCloseResourceUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):437:438 -> a
+    147:148:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):720 -> a
+    149:150:void synthesizeJava8UtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):444:445 -> a
+    149:150:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):721 -> a
+    151:153:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):722:724 -> a
+    154:155:void finalizeLambdaMerging(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):899:900 -> a
+    154:155:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):726 -> a
+    156:156:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):728:728 -> a
+    157:158:void generateDesugaredLibraryAPIWrappers(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):908:909 -> a
+    157:158:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):729 -> a
+    159:161:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):731:733 -> a
+    162:181:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):732:751 -> a
+    182:194:com.android.tools.r8.graph.DexType computeOutlineClassType():949:961 -> a
+    182:194:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):751 -> a
+    195:195:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
+    195:195:com.android.tools.r8.graph.DexType computeOutlineClassType():961 -> a
+    195:195:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):751 -> a
+    196:252:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):751:807 -> a
+    253:260:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):801:808 -> a
+    261:261:void lambda$optimize$4(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.ir.conversion.PrimaryMethodProcessor,com.android.tools.r8.graph.DexEncodedMethod):664:664 -> a
+    262:263:void lambda$optimize$5(com.android.tools.r8.ir.code.IRCode):747:748 -> a
+    264:264:void addWaveDoneAction(com.android.tools.r8.utils.Action):828:828 -> a
+    265:265:boolean isInWave():838:838 -> a
+    265:265:void addWaveDoneAction(com.android.tools.r8.utils.Action):831 -> a
+    266:266:void addWaveDoneAction(com.android.tools.r8.utils.Action):834:834 -> a
+    267:267:void addWaveDoneAction(com.android.tools.r8.utils.Action):832:832 -> a
+    268:268:void addWaveDoneAction(com.android.tools.r8.utils.Action):829:829 -> a
+    269:269:void computeReachabilitySensitivity(com.android.tools.r8.graph.DexApplication):842:842 -> a
+    270:272:void forEachSelectedOutliningMethod(java.util.function.Consumer,java.util.concurrent.ExecutorService):852:854 -> a
+    273:283:void lambda$forEachSelectedOutliningMethod$9(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod):857:867 -> a
+    284:284:void processSynthesizedServiceLoaderMethods(com.android.tools.r8.graph.DexClass,java.util.concurrent.ExecutorService):875:875 -> a
+    285:285:void processSynthesizedServiceLoaderMethods(com.android.tools.r8.graph.DexClass,java.util.concurrent.ExecutorService):874:874 -> a
+    286:286:void clearDexMethodCompilationState(com.android.tools.r8.graph.DexProgramClass):918:918 -> a
+    287:296:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):931:940 -> a
+    297:297:java.lang.String logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):1019:1019 -> a
+    297:297:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):940 -> a
+    298:298:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):940:940 -> a
+    299:299:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):939:939 -> a
+    300:303:void optimizeSynthesizedClass(com.android.tools.r8.graph.DexProgramClass,java.util.concurrent.ExecutorService):968:971 -> a
+    304:308:void optimizeSynthesizedClasses(java.util.Collection,java.util.concurrent.ExecutorService):977:981 -> a
+    309:309:void lambda$optimizeSynthesizedLambdaClasses$10(com.android.tools.r8.ir.conversion.LambdaMethodProcessor,com.android.tools.r8.graph.DexEncodedMethod):995:995 -> a
+    310:315:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):1001:1006 -> a
+    316:316:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):1003:1003 -> a
+    317:317:void lambda$processMethodsConcurrently$11(com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.graph.DexEncodedMethod):1015:1015 -> a
+    318:324:void processMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1037:1043 -> a
+    325:327:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.origin.Origin):1078:1080 -> a
+    328:333:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.origin.Origin):1079:1084 -> a
+    334:334:java.lang.String logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):1019:1019 -> a
+    334:334:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.origin.Origin):1084 -> a
+    335:335:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.origin.Origin):1084:1084 -> a
+    336:348:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.origin.Origin):1083:1095 -> a
+    349:352:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1104:1107 -> a
+    353:358:void printC1VisualizerHeader(com.android.tools.r8.graph.DexEncodedMethod):1729:1734 -> a
+    353:358:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1110 -> a
+    359:365:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1111:1117 -> a
+    366:366:boolean com.android.tools.r8.utils.InternalOptions.canHaveArtStringNewInitBug():1332:1332 -> a
+    366:366:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1117 -> a
+    367:402:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1118:1153 -> a
+    403:403:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1482:1482 -> a
+    403:403:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1154 -> a
+    404:404:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():337:337 -> a
+    404:404:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1482 -> a
+    404:404:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1154 -> a
+    405:407:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1482:1484 -> a
+    405:407:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1154 -> a
+    408:408:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():337:337 -> a
+    408:408:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1484 -> a
+    408:408:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1154 -> a
+    409:412:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1485:1488 -> a
+    409:412:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1154 -> a
+    413:420:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1162:1169 -> a
+    421:421:void com.android.tools.r8.naming.IdentifierNameStringMarker.decoupleIdentifierNameStringsInMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):97:97 -> a
+    421:421:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1170 -> a
+    422:521:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1171:1270 -> a
+    522:524:void invertConditionalsForTesting(com.android.tools.r8.ir.code.IRCode):1048:1050 -> a
+    522:524:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1271 -> a
+    525:533:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1274:1282 -> a
+    534:570:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1281:1317 -> a
+    571:634:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1309:1372 -> a
     635:635:boolean com.android.tools.r8.ir.conversion.MethodProcessor.isPrimary():20:20 -> a
-    635:635:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1371 -> a
-    636:645:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1372:1381 -> a
-    646:646:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():345:345 -> a
-    646:646:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1381 -> a
-    647:657:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1382:1392 -> a
-    658:663:boolean com.android.tools.r8.utils.InternalOptions.methodMatchesLogArgumentsFilter(com.android.tools.r8.graph.DexEncodedMethod):913:918 -> a
-    658:663:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1392 -> a
-    664:706:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1393:1435 -> a
-    707:707:boolean com.android.tools.r8.utils.InternalOptions.canHaveNumberConversionRegisterAllocationBug():1348:1348 -> a
-    707:707:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1435 -> a
-    708:724:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1436:1452 -> a
-    725:730:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1451:1456 -> a
-    731:731:void lambda$optimize$12(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):1190:1190 -> a
-    732:732:void lambda$optimize$13(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):1194:1194 -> a
-    733:733:com.android.tools.r8.ir.optimize.InliningOracle lambda$optimize$14(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):1318:1318 -> a
-    734:739:void collectOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1462:1467 -> a
-    740:741:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1471:1472 -> a
-    742:742:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():345:345 -> a
-    742:742:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1472 -> a
-    743:747:void finalizeToCf(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1491:1495 -> a
-    743:747:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1473 -> a
-    748:748:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1475:1475 -> a
-    749:752:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1500:1503 -> a
-    749:752:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1476 -> a
-    753:757:void updateHighestSortingStrings(com.android.tools.r8.graph.DexEncodedMethod):1527:1531 -> a
-    753:757:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1504 -> a
-    753:757:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1476 -> a
-    758:760:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1505:1507 -> a
-    758:760:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1476 -> a
-    761:761:java.lang.String logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):1018:1018 -> a
-    761:761:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1507 -> a
-    761:761:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1476 -> a
-    762:762:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1507:1507 -> a
-    762:762:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1476 -> a
-    763:767:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1506:1510 -> a
-    763:767:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1476 -> a
-    768:773:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1539:1544 -> a
-    774:774:boolean com.android.tools.r8.utils.InternalOptions.canHaveExceptionTargetingLoopHeaderBug():1373:1373 -> a
-    774:774:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1544 -> a
-    775:775:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1545:1545 -> a
-    776:788:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3797:3809 -> a
-    776:788:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1545 -> a
+    635:635:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1372 -> a
+    636:645:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1373:1382 -> a
+    646:646:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():337:337 -> a
+    646:646:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1382 -> a
+    647:657:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1383:1393 -> a
+    658:663:boolean com.android.tools.r8.utils.InternalOptions.methodMatchesLogArgumentsFilter(com.android.tools.r8.graph.DexEncodedMethod):905:910 -> a
+    658:663:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1393 -> a
+    664:706:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1394:1436 -> a
+    707:707:boolean com.android.tools.r8.utils.InternalOptions.canHaveNumberConversionRegisterAllocationBug():1340:1340 -> a
+    707:707:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1436 -> a
+    708:724:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1437:1453 -> a
+    725:730:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1452:1457 -> a
+    731:731:void lambda$optimize$12(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):1191:1191 -> a
+    732:732:void lambda$optimize$13(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):1195:1195 -> a
+    733:733:com.android.tools.r8.ir.optimize.InliningOracle lambda$optimize$14(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):1319:1319 -> a
+    734:739:void collectOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1463:1468 -> a
+    740:741:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1472:1473 -> a
+    742:742:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():337:337 -> a
+    742:742:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1473 -> a
+    743:747:void finalizeToCf(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1492:1496 -> a
+    743:747:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1474 -> a
+    748:748:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1476:1476 -> a
+    749:752:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1501:1504 -> a
+    749:752:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1477 -> a
+    753:757:void updateHighestSortingStrings(com.android.tools.r8.graph.DexEncodedMethod):1528:1532 -> a
+    753:757:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1505 -> a
+    753:757:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1477 -> a
+    758:760:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1506:1508 -> a
+    758:760:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1477 -> a
+    761:761:java.lang.String logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):1019:1019 -> a
+    761:761:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1508 -> a
+    761:761:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1477 -> a
+    762:762:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1508:1508 -> a
+    762:762:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1477 -> a
+    763:767:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1507:1511 -> a
+    763:767:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1477 -> a
+    768:773:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1540:1545 -> a
+    774:774:boolean com.android.tools.r8.utils.InternalOptions.canHaveExceptionTargetingLoopHeaderBug():1365:1365 -> a
+    774:774:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1545 -> a
+    775:775:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1546:1546 -> a
+    776:788:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3707:3719 -> a
+    776:788:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1546 -> a
     789:789:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1514:1514 -> a
-    789:789:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3810 -> a
-    789:789:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1545 -> a
-    790:791:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3810:3811 -> a
-    790:791:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1545 -> a
-    792:792:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3797:3797 -> a
-    792:792:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1545 -> a
-    793:802:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1547:1556 -> a
-    803:803:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1555:1555 -> a
-    804:805:com.android.tools.r8.graph.DexMethod lambda$materializeInstructionBeforeLongOperationsWorkaround$16(com.android.tools.r8.graph.DexItemFactory):1621:1622 -> a
-    806:806:com.android.tools.r8.graph.DexMethod lambda$materializeInstructionBeforeLongOperationsWorkaround$16(com.android.tools.r8.graph.DexItemFactory):1620:1620 -> a
-    807:807:boolean isNotPseudoInstruction(com.android.tools.r8.ir.code.Instruction):1668:1668 -> a
-    808:808:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1744:1744 -> a
+    789:789:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3720 -> a
+    789:789:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1546 -> a
+    790:791:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3720:3721 -> a
+    790:791:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1546 -> a
+    792:792:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3707:3707 -> a
+    792:792:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1546 -> a
+    793:802:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1548:1557 -> a
+    803:803:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1556:1556 -> a
+    804:805:com.android.tools.r8.graph.DexMethod lambda$materializeInstructionBeforeLongOperationsWorkaround$16(com.android.tools.r8.graph.DexItemFactory):1622:1623 -> a
+    806:806:com.android.tools.r8.graph.DexMethod lambda$materializeInstructionBeforeLongOperationsWorkaround$16(com.android.tools.r8.graph.DexItemFactory):1621:1621 -> a
+    807:807:boolean isNotPseudoInstruction(com.android.tools.r8.ir.code.Instruction):1669:1669 -> a
+    808:808:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1745:1745 -> a
     809:809:void com.android.tools.r8.utils.CfgPrinter.resetUnusedValue():24:24 -> a
-    809:809:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1745 -> a
-    810:827:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1746:1763 -> a
-    1:6:void updateMainDexListWithSynthesizedClassMap(com.android.tools.r8.graph.DexApplication$Builder):492:497 -> b
-    7:18:void updateMainDexListWithSynthesizedClassMap(com.android.tools.r8.graph.DexApplication$Builder):495:506 -> b
-    19:28:void convertMethods(com.android.tools.r8.graph.DexProgramClass):548:557 -> b
-    29:57:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):567:595 -> b
+    809:809:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1746 -> a
+    810:827:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1747:1764 -> a
+    1:6:void updateMainDexListWithSynthesizedClassMap(com.android.tools.r8.graph.DexApplication$Builder):493:498 -> b
+    7:18:void updateMainDexListWithSynthesizedClassMap(com.android.tools.r8.graph.DexApplication$Builder):496:507 -> b
+    19:28:void convertMethods(com.android.tools.r8.graph.DexProgramClass):549:558 -> b
+    29:57:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):568:596 -> b
     58:58:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> b
-    58:58:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):595 -> b
+    58:58:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):596 -> b
     59:59:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> b
     59:59:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> b
-    59:59:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):595 -> b
-    60:64:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):595:599 -> b
-    65:65:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():345:345 -> b
-    65:65:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):599 -> b
-    66:74:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):599:607 -> b
-    75:78:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):602:605 -> b
-    79:86:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):602:609 -> b
-    87:87:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():345:345 -> b
-    87:87:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):609 -> b
-    88:92:void updateHighestSortingStrings(com.android.tools.r8.graph.DexEncodedMethod):1527:1531 -> b
-    88:92:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):610 -> b
-    93:95:void lambda$optimize$6(com.android.tools.r8.ir.code.IRCode):755:757 -> b
-    96:103:void optimizeSynthesizedLambdaClasses(java.util.Collection,java.util.concurrent.ExecutorService):986:993 -> b
-    104:104:java.util.List getOptimizationsForPostIRProcessing():1028:1028 -> b
-    105:112:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1056:1063 -> b
-    113:113:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1061:1061 -> b
-    114:119:void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1516:1521 -> b
-    120:124:void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1519:1523 -> b
-    125:129:boolean lambda$workaroundForwardingInitializerBug$15(com.android.tools.r8.ir.code.Instruction):1584:1588 -> b
-    130:131:void printPhase(java.lang.String):1738:1739 -> b
-    1:20:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):519:538 -> c
-    21:27:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):537:543 -> c
+    59:59:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):596 -> b
+    60:64:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):596:600 -> b
+    65:65:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():337:337 -> b
+    65:65:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):600 -> b
+    66:74:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):600:608 -> b
+    75:78:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):603:606 -> b
+    79:86:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):603:610 -> b
+    87:87:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():337:337 -> b
+    87:87:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):610 -> b
+    88:92:void updateHighestSortingStrings(com.android.tools.r8.graph.DexEncodedMethod):1528:1532 -> b
+    88:92:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):611 -> b
+    93:95:void lambda$optimize$6(com.android.tools.r8.ir.code.IRCode):756:758 -> b
+    96:103:void optimizeSynthesizedLambdaClasses(java.util.Collection,java.util.concurrent.ExecutorService):987:994 -> b
+    104:104:java.util.List getOptimizationsForPostIRProcessing():1029:1029 -> b
+    105:112:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1057:1064 -> b
+    113:113:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1062:1062 -> b
+    114:119:void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1517:1522 -> b
+    120:124:void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1520:1524 -> b
+    125:129:boolean lambda$workaroundForwardingInitializerBug$15(com.android.tools.r8.ir.code.Instruction):1585:1589 -> b
+    130:131:void printPhase(java.lang.String):1739:1740 -> b
+    1:20:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):520:539 -> c
+    21:27:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):538:544 -> c
     28:41:com.android.tools.r8.graph.DexAnnotationSet com.android.tools.r8.graph.DexAnnotationSet.getWithAddedOrReplaced(com.android.tools.r8.graph.DexAnnotation):129:142 -> c
-    28:41:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):543 -> c
-    42:42:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):543:543 -> c
-    43:43:boolean isInWave():837:837 -> c
-    44:45:void lambda$computeReachabilitySensitivity$8(com.android.tools.r8.graph.DexProgramClass):842:843 -> c
-    46:49:void forEachSynthesizedServiceLoaderMethod(com.android.tools.r8.graph.DexEncodedMethod):880:883 -> c
-    50:51:void processMethodsConcurrently(java.util.Collection,java.util.concurrent.ExecutorService):1012:1013 -> c
-    52:52:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1613:1613 -> c
-    53:53:boolean com.android.tools.r8.utils.InternalOptions.canHaveDex2OatLinkedListBug():1324:1324 -> c
-    53:53:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1613 -> c
-    54:65:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1616:1627 -> c
-    66:68:boolean isLongMul(com.android.tools.r8.ir.code.Instruction):1673:1675 -> c
-    66:68:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1628 -> c
-    69:69:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1631:1631 -> c
-    70:71:boolean isLongAddOrSub(com.android.tools.r8.ir.code.Instruction):1680:1681 -> c
-    70:71:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1632 -> c
-    72:73:boolean isFallthoughTarget(com.android.tools.r8.ir.code.BasicBlock):1685:1686 -> c
-    72:73:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1635 -> c
-    74:75:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1638:1639 -> c
-    76:80:boolean isAliasOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):1659:1663 -> c
-    76:80:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1640 -> c
-    81:86:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1641:1646 -> c
-    87:98:void ensureThrowingInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction):1695:1706 -> c
-    87:98:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1647 -> c
-    1:1:com.android.tools.r8.graph.DexType lambda$updateMainDexListWithSynthesizedClassMap$1(com.android.tools.r8.graph.DexProgramClass):496:496 -> d
-    2:6:com.android.tools.r8.graph.DexApplication optimize():617:621 -> d
-    7:10:void waveStart(java.util.Collection,java.util.concurrent.ExecutorService):812:815 -> d
-    11:11:void lambda$computeReachabilitySensitivity$7(com.android.tools.r8.graph.DexEncodedMethod):843:843 -> d
-    12:12:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1562:1562 -> d
-    13:13:boolean com.android.tools.r8.utils.InternalOptions.canHaveForwardingInitInliningBug():1361:1361 -> d
-    13:13:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1562 -> d
-    14:30:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1566:1582 -> d
-    31:34:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1712:1715 -> d
-    31:34:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1593 -> d
+    28:41:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):544 -> c
+    42:42:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):544:544 -> c
+    43:43:boolean isInWave():838:838 -> c
+    44:45:void lambda$computeReachabilitySensitivity$8(com.android.tools.r8.graph.DexProgramClass):843:844 -> c
+    46:49:void forEachSynthesizedServiceLoaderMethod(com.android.tools.r8.graph.DexEncodedMethod):881:884 -> c
+    50:51:void processMethodsConcurrently(java.util.Collection,java.util.concurrent.ExecutorService):1013:1014 -> c
+    52:52:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1614:1614 -> c
+    53:53:boolean com.android.tools.r8.utils.InternalOptions.canHaveDex2OatLinkedListBug():1316:1316 -> c
+    53:53:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1614 -> c
+    54:65:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1617:1628 -> c
+    66:68:boolean isLongMul(com.android.tools.r8.ir.code.Instruction):1674:1676 -> c
+    66:68:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1629 -> c
+    69:69:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1632:1632 -> c
+    70:71:boolean isLongAddOrSub(com.android.tools.r8.ir.code.Instruction):1681:1682 -> c
+    70:71:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1633 -> c
+    72:73:boolean isFallthoughTarget(com.android.tools.r8.ir.code.BasicBlock):1686:1687 -> c
+    72:73:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1636 -> c
+    74:75:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1639:1640 -> c
+    76:80:boolean isAliasOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):1660:1664 -> c
+    76:80:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1641 -> c
+    81:86:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1642:1647 -> c
+    87:98:void ensureThrowingInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction):1696:1707 -> c
+    87:98:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1648 -> c
+    1:1:com.android.tools.r8.graph.DexType lambda$updateMainDexListWithSynthesizedClassMap$1(com.android.tools.r8.graph.DexProgramClass):497:497 -> d
+    2:6:com.android.tools.r8.graph.DexApplication optimize():618:622 -> d
+    7:10:void waveStart(java.util.Collection,java.util.concurrent.ExecutorService):813:816 -> d
+    11:11:void lambda$computeReachabilitySensitivity$7(com.android.tools.r8.graph.DexEncodedMethod):844:844 -> d
+    12:12:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1563:1563 -> d
+    13:13:boolean com.android.tools.r8.utils.InternalOptions.canHaveForwardingInitInliningBug():1353:1353 -> d
+    13:13:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1563 -> d
+    14:30:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1567:1583 -> d
+    31:34:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1713:1716 -> d
+    31:34:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1594 -> d
     35:35:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1045:1045 -> d
-    35:35:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1715 -> d
-    35:35:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1593 -> d
-    36:44:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1716:1724 -> d
-    36:44:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1593 -> d
-    1:1:com.android.tools.r8.graph.DexType lambda$updateSynthesizedClassMapping$2(com.android.tools.r8.graph.DexProgramClass):535:535 -> e
-    2:2:void clearDexMethodCompilationState():913:913 -> e
-    1:7:boolean enableTryWithResourcesDesugaring():378:384 -> f
-    1:1:boolean enableTwrCloseResourceDesugaring():374:374 -> g
-    1:2:boolean removeLambdaDeserializationMethods():388:389 -> h
-    1:3:void waveDone():821:823 -> i
+    35:35:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1716 -> d
+    35:35:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1594 -> d
+    36:44:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1717:1725 -> d
+    36:44:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1594 -> d
+    1:1:com.android.tools.r8.graph.DexType lambda$updateSynthesizedClassMapping$2(com.android.tools.r8.graph.DexProgramClass):536:536 -> e
+    2:2:void clearDexMethodCompilationState():914:914 -> e
+    1:7:boolean enableTryWithResourcesDesugaring():379:385 -> f
+    1:1:boolean enableTwrCloseResourceDesugaring():375:375 -> g
+    1:2:boolean removeLambdaDeserializationMethods():389:390 -> h
+    1:3:void waveDone():822:824 -> i
 com.android.tools.r8.ir.conversion.LambdaMethodProcessor -> com.android.tools.r8.ir.conversion.P:
     java.util.Deque waves -> a
     java.util.Collection wave -> b
@@ -28370,12 +28394,12 @@
     131:138:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):167:174 -> a
     139:142:com.android.tools.r8.graph.DexMethod rebindVirtualInvokeToMostSpecific(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):611:614 -> a
     139:142:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):173 -> a
-    143:143:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):184:184 -> a
+    143:143:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):186:186 -> a
     143:143:com.android.tools.r8.graph.DexMethod rebindVirtualInvokeToMostSpecific(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):614 -> a
     143:143:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):173 -> a
     144:162:com.android.tools.r8.graph.DexMethod rebindVirtualInvokeToMostSpecific(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):616:634 -> a
     144:162:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):173 -> a
-    163:163:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    163:163:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     163:163:com.android.tools.r8.graph.DexMethod rebindVirtualInvokeToMostSpecific(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):634 -> a
     163:163:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):173 -> a
     164:170:com.android.tools.r8.graph.DexMethod rebindVirtualInvokeToMostSpecific(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):636:642 -> a
@@ -28404,7 +28428,7 @@
     428:428:boolean com.android.tools.r8.graph.DexMethodHandle.isMethodHandle():297:297 -> a
     428:428:com.android.tools.r8.graph.DexMethodHandle rewriteDexMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):537 -> a
     429:463:com.android.tools.r8.graph.DexMethodHandle rewriteDexMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):538:572 -> a
-    464:464:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    464:464:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     464:464:com.android.tools.r8.graph.DexMethodHandle rewriteDexMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):572 -> a
     465:476:com.android.tools.r8.graph.DexMethodHandle rewriteDexMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):573:584 -> a
     477:477:com.android.tools.r8.ir.code.Instruction lambda$rewrite$1(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):338:338 -> a
@@ -28426,9 +28450,9 @@
     526:531:com.android.tools.r8.graph.DexValue$DexValueMethodType rewriteDexMethodType(com.android.tools.r8.graph.DexValue$DexValueMethodType):591:596 -> a
     532:532:boolean canInvokeTargetWithInvokeVirtual(com.android.tools.r8.graph.DexEncodedMethod):646:646 -> a
     533:539:boolean hasAccessToInvokeTargetFromContext(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):650:656 -> a
-    540:540:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    540:540:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     540:540:boolean hasAccessToInvokeTargetFromContext(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):656 -> a
-    541:541:boolean com.android.tools.r8.graph.DexType.isSamePackage(com.android.tools.r8.graph.DexType):85:85 -> a
+    541:541:boolean com.android.tools.r8.graph.DexType.isSamePackage(com.android.tools.r8.graph.DexType):91:91 -> a
     541:541:boolean hasAccessToInvokeTargetFromContext(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):661 -> a
     542:545:boolean hasAccessToInvokeTargetFromContext(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):664:667 -> a
     1:1:com.android.tools.r8.ir.code.Instruction lambda$rewrite$6(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):365:365 -> b
@@ -28572,58 +28596,11 @@
     com.android.tools.r8.graph.DebugLocalInfo getIncomingLocal(int) -> e
     boolean verifyRegister(int) -> f
     int instructionIndex(int) -> g
-com.android.tools.r8.ir.conversion.SourceDebugExtensionRewriter -> com.android.tools.r8.ir.conversion.d0:
-    com.android.tools.r8.graph.DexItemFactory factory -> b
-    com.android.tools.r8.graph.AppView appView -> a
-    boolean $assertionsDisabled -> c
-    1:1:void <clinit>():32:32 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.graph.AppView):39:41 -> <init>
-    1:20:com.android.tools.r8.ir.conversion.SourceDebugExtensionRewriter analyze(java.util.function.Predicate):45:64 -> a
-    21:28:void processMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result):97:104 -> a
-    29:51:void handleLabel(com.android.tools.r8.ir.conversion.SourceDebugExtensionRewriter$Context,com.android.tools.r8.cf.code.CfLabel):117:139 -> a
-    29:51:void processMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result):104 -> a
-    52:54:void processMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result):105:107 -> a
-    55:71:void handlePosition(com.android.tools.r8.ir.conversion.SourceDebugExtensionRewriter$Context,com.android.tools.r8.cf.code.CfPosition,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result):143:159 -> a
-    55:71:void processMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result):107 -> a
-    72:81:void handlePosition(com.android.tools.r8.ir.conversion.SourceDebugExtensionRewriter$Context,com.android.tools.r8.cf.code.CfPosition,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result):156:165 -> a
-    72:81:void processMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result):107 -> a
-    82:102:void handlePosition(com.android.tools.r8.ir.conversion.SourceDebugExtensionRewriter$Context,com.android.tools.r8.cf.code.CfPosition,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result):160:180 -> a
-    82:102:void processMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result):107 -> a
-    103:113:void handlePosition(com.android.tools.r8.ir.conversion.SourceDebugExtensionRewriter$Context,com.android.tools.r8.cf.code.CfPosition,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result):178:188 -> a
-    103:113:void processMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result):107 -> a
-    114:118:com.android.tools.r8.ir.code.Position appendAsOuterMostCaller(com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.Position):198:202 -> a
-    114:118:void handlePosition(com.android.tools.r8.ir.conversion.SourceDebugExtensionRewriter$Context,com.android.tools.r8.cf.code.CfPosition,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result):188 -> a
-    114:118:void processMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result):107 -> a
-    119:119:void handlePosition(com.android.tools.r8.ir.conversion.SourceDebugExtensionRewriter$Context,com.android.tools.r8.cf.code.CfPosition,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result):188:188 -> a
-    119:119:void processMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result):107 -> a
-    120:125:void handlePosition(com.android.tools.r8.ir.conversion.SourceDebugExtensionRewriter$Context,com.android.tools.r8.cf.code.CfPosition,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result):185:190 -> a
-    120:125:void processMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result):107 -> a
-    126:129:void processMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result):109:112 -> a
-    130:134:com.android.tools.r8.ir.code.Position appendAsOuterMostCaller(com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.Position):198:202 -> a
-com.android.tools.r8.ir.conversion.SourceDebugExtensionRewriter$Context -> com.android.tools.r8.ir.conversion.c0:
-    com.android.tools.r8.graph.CfCode$LocalVariableInfo localVariableInliningInfoEntry -> b
-    java.util.Stack endRangeLabels -> c
-    java.util.List resultingList -> d
-    int lastPosition -> f
-    com.android.tools.r8.ir.code.Position currentPosition -> a
-    com.android.tools.r8.com.google.common.collect.ImmutableListMultimap localVariableInfoStartMap -> e
-    1:1:void <init>(int,com.android.tools.r8.com.google.common.collect.ImmutableListMultimap):82:82 -> <init>
-    2:13:void <init>(int,com.android.tools.r8.com.google.common.collect.ImmutableListMultimap):73:84 -> <init>
-    1:1:com.android.tools.r8.ir.code.Position access$000(com.android.tools.r8.ir.conversion.SourceDebugExtensionRewriter$Context):71:71 -> a
-    2:2:com.android.tools.r8.ir.code.Position access$002(com.android.tools.r8.ir.conversion.SourceDebugExtensionRewriter$Context,com.android.tools.r8.ir.code.Position):71:71 -> a
-    3:3:com.android.tools.r8.graph.CfCode$LocalVariableInfo access$102(com.android.tools.r8.ir.conversion.SourceDebugExtensionRewriter$Context,com.android.tools.r8.graph.CfCode$LocalVariableInfo):71:71 -> a
-    4:4:int access$502(com.android.tools.r8.ir.conversion.SourceDebugExtensionRewriter$Context,int):71:71 -> a
-    5:9:java.lang.String getInlinedFunctionName():88:92 -> a
-    1:1:com.android.tools.r8.graph.CfCode$LocalVariableInfo access$100(com.android.tools.r8.ir.conversion.SourceDebugExtensionRewriter$Context):71:71 -> b
-    1:1:java.util.List access$200(com.android.tools.r8.ir.conversion.SourceDebugExtensionRewriter$Context):71:71 -> c
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap access$300(com.android.tools.r8.ir.conversion.SourceDebugExtensionRewriter$Context):71:71 -> d
-    1:1:java.util.Stack access$400(com.android.tools.r8.ir.conversion.SourceDebugExtensionRewriter$Context):71:71 -> e
-    1:1:int access$500(com.android.tools.r8.ir.conversion.SourceDebugExtensionRewriter$Context):71:71 -> f
-com.android.tools.r8.ir.conversion.StringSwitchConverter -> com.android.tools.r8.ir.conversion.m0:
+com.android.tools.r8.ir.conversion.StringSwitchConverter -> com.android.tools.r8.ir.conversion.k0:
     1:7:boolean isDefinedByStringHashCode(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):184:190 -> a
     1:7:boolean access$700(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):104 -> a
-com.android.tools.r8.ir.conversion.StringSwitchConverter$1 -> com.android.tools.r8.ir.conversion.e0:
-com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping -> com.android.tools.r8.ir.conversion.g0:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$1 -> com.android.tools.r8.ir.conversion.c0:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping -> com.android.tools.r8.ir.conversion.e0:
     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
@@ -28634,7 +28611,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):587:587 -> a
     1:1:com.android.tools.r8.ir.code.Phi access$100(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping):587:587 -> b
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap access$300(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping):587:587 -> c
-com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping$Builder -> com.android.tools.r8.ir.conversion.f0:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping$Builder -> com.android.tools.r8.ir.conversion.d0:
     1:1:void <init>():589:589 -> <init>
     1:1:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping build(com.android.tools.r8.ir.code.BasicBlock):616:616 -> 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):628:628 -> a
@@ -28657,7 +28634,7 @@
     82:82:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping extendWithSwitch(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.IntSwitch):708:708 -> a
     83:83:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping setFallthroughBlock(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.BasicBlock):622:622 -> a
     83:83:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping extendWithSwitch(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.IntSwitch):708 -> a
-com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo -> com.android.tools.r8.ir.conversion.i0:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo -> com.android.tools.r8.ir.conversion.g0:
     java.util.Map mapping -> c
     com.android.tools.r8.ir.code.Value value -> d
     com.android.tools.r8.ir.code.BasicBlock insertionBlock -> b
@@ -28666,7 +28643,7 @@
     1:29:void createAndInsertStringSwitch(com.android.tools.r8.ir.code.IRCode):273:301 -> a
     30:30:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):298:298 -> a
     30:30:void createAndInsertStringSwitch(com.android.tools.r8.ir.code.IRCode):301 -> a
-com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo$Builder -> com.android.tools.r8.ir.conversion.h0:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo$Builder -> com.android.tools.r8.ir.conversion.f0:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> a
     1:1:void <clinit>():195:195 -> <clinit>
@@ -28680,7 +28657,7 @@
     15:16:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo build(com.android.tools.r8.ir.code.BasicBlock):216 -> a
     17:19:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo build(com.android.tools.r8.ir.code.BasicBlock):217:219 -> a
     20:46:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo build(com.android.tools.r8.ir.code.BasicBlock):218:244 -> a
-com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping -> com.android.tools.r8.ir.conversion.k0:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping -> com.android.tools.r8.ir.conversion.i0:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap mapping -> c
     com.android.tools.r8.ir.code.Value stringHashValue -> b
     boolean $assertionsDisabled -> d
@@ -28692,7 +28669,7 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap access$200(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping):305:305 -> a
     2:2:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping$Builder 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):583:583 -> a
     1:1:com.android.tools.r8.ir.code.Value access$500(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping):305:305 -> b
-com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping$Builder -> com.android.tools.r8.ir.conversion.j0:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping$Builder -> com.android.tools.r8.ir.conversion.h0:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.ir.code.Phi idValue -> c
     com.android.tools.r8.ir.code.Value stringValue -> d
@@ -28724,7 +28701,7 @@
     31:31:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping extendWithPredecessor(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping,com.android.tools.r8.ir.code.BasicBlock):400:400 -> b
     32:32:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlock.startOfGotoChain():0:0 -> b
     32:32:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping extendWithPredecessor(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping,com.android.tools.r8.ir.code.BasicBlock):399 -> b
-com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils -> com.android.tools.r8.ir.conversion.l0:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils -> com.android.tools.r8.ir.conversion.j0:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():736:736 -> <clinit>
     1:2:com.android.tools.r8.ir.code.BasicBlock getTrueTarget(com.android.tools.r8.ir.code.If):739:740 -> a
@@ -28735,7 +28712,7 @@
     18:23:com.android.tools.r8.ir.code.Value getStringHashValueFromIf(com.android.tools.r8.ir.code.If,com.android.tools.r8.graph.DexItemFactory):766:771 -> a
     24:25:com.android.tools.r8.ir.code.Value getStringHashValueFromSwitch(com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.graph.DexItemFactory):779:780 -> a
     26:28:boolean isSameStringHashValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):797:799 -> a
-com.android.tools.r8.ir.conversion.StringSwitchRemover -> com.android.tools.r8.ir.conversion.n0:
+com.android.tools.r8.ir.conversion.StringSwitchRemover -> com.android.tools.r8.ir.conversion.l0:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.naming.IdentifierNameStringMarker identifierNameStringMarker -> b
     boolean $assertionsDisabled -> e
@@ -28757,7 +28734,7 @@
     91:91:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):298:298 -> a
     91:91:void removeStringSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.StringSwitch,java.util.Set):141 -> a
     92:104:void removeStringSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.StringSwitch,java.util.Set):142:154 -> a
-com.android.tools.r8.ir.conversion.SwitchPayloadResolver -> com.android.tools.r8.ir.conversion.p0:
+com.android.tools.r8.ir.conversion.SwitchPayloadResolver -> com.android.tools.r8.ir.conversion.n0:
     java.util.Map unresolvedPayload -> a
     java.util.Map payloadToData -> b
     boolean $assertionsDisabled -> c
@@ -28771,13 +28748,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.ir.conversion.o0:
+com.android.tools.r8.ir.conversion.SwitchPayloadResolver$PayloadData -> com.android.tools.r8.ir.conversion.m0:
     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.ir.conversion.q0:
+com.android.tools.r8.ir.conversion.TypeConstraintResolver -> com.android.tools.r8.ir.conversion.o0:
     java.util.Map unificationParents -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.conversion.IRBuilder builder -> b
@@ -28848,7 +28825,7 @@
     196:208:boolean verifyNoConstrainedUses(com.android.tools.r8.ir.code.Value,java.util.Set):222:234 -> a
     209:218:boolean verifyNoConstrainedUses(com.android.tools.r8.ir.code.Value,java.util.Set):232:241 -> a
     219:221:com.android.tools.r8.ir.code.Value canonical(com.android.tools.r8.ir.code.Value):279:281 -> a
-com.android.tools.r8.ir.desugar.AccessorMethodSourceCode -> com.android.tools.r8.s.c.a:
+com.android.tools.r8.ir.desugar.AccessorMethodSourceCode -> com.android.tools.r8.r.c.a:
     boolean $assertionsDisabled -> o
     1:1:void <clinit>():21:21 -> <clinit>
     1:6:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.Position):24:29 -> <init>
@@ -28884,7 +28861,7 @@
     1:1:com.android.tools.r8.ir.desugar.LambdaDescriptor com.android.tools.r8.ir.desugar.SynthesizedLambdaSourceCode.descriptor():33:33 -> m
     1:1:boolean delegatingToConstructor():68 -> m
     2:2:boolean delegatingToConstructor():68:68 -> m
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter -> com.android.tools.r8.s.c.b:
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter -> com.android.tools.r8.r.c.b:
     com.android.tools.r8.graph.DexItemFactory factory -> c
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set holders -> e
@@ -28893,238 +28870,238 @@
     java.util.Map methodProviders -> f
     com.android.tools.r8.ir.conversion.IRConverter converter -> b
     1:1:void <clinit>():63:63 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):75:75 -> <init>
-    2:9:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):72:79 -> <init>
-    1:7:java.util.List generateListOfBackportedMethods(com.android.tools.r8.utils.AndroidApiLevel):83:89 -> a
-    8:8:void desugar(com.android.tools.r8.ir.code.IRCode):94:94 -> a
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):77:77 -> <init>
+    2:9:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):74:81 -> <init>
+    1:7:java.util.List generateListOfBackportedMethods(com.android.tools.r8.utils.AndroidApiLevel):85:91 -> a
+    8:8:void desugar(com.android.tools.r8.ir.code.IRCode):96:96 -> a
     9:9:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():965:965 -> a
-    9:9:void desugar(com.android.tools.r8.ir.code.IRCode):98 -> a
-    10:44:void desugar(com.android.tools.r8.ir.code.IRCode):99:133 -> a
-    45:45:boolean com.android.tools.r8.graph.DexEncodedMethod.isFinal():257:257 -> a
-    45:45:void desugar(com.android.tools.r8.ir.code.IRCode):134 -> a
-    46:53:void desugar(com.android.tools.r8.ir.code.IRCode):135:142 -> a
-    54:66:void desugar(com.android.tools.r8.ir.code.IRCode):141:153 -> a
-    67:67:boolean hasRewrittenMethodPrefix(com.android.tools.r8.graph.DexType):168:168 -> a
-    68:68:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):173:173 -> a
-    69:69:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():324:324 -> a
-    69:69:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):173 -> a
-    70:70:void synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):308:308 -> a
-    70:70:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):174 -> a
-    71:71:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():324:324 -> a
-    71:71:void synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):308 -> a
-    71:71:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):174 -> a
-    72:86:void synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):308:322 -> a
-    72:86:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):174 -> a
-    87:87:com.android.tools.r8.graph.DexType dispatchInterfaceTypeFor(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):432:432 -> a
-    87:87:void synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):322 -> a
-    87:87:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):174 -> a
-    88:94:com.android.tools.r8.graph.DexEncodedMethod generateInterfaceDispatchMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):385:391 -> a
-    88:94:void synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):324 -> a
-    88:94:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):174 -> a
-    95:103:void synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):325:333 -> a
-    95:103:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):174 -> a
-    104:104:com.android.tools.r8.graph.DexType dispatchHolderTypeFor(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):436:436 -> a
-    104:104:void synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):333 -> a
-    104:104:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):174 -> a
-    105:105:void synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):334:334 -> a
-    105:105:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):174 -> a
-    106:121:com.android.tools.r8.graph.DexEncodedMethod generateHolderDispatchMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):405:420 -> a
-    106:121:void synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):335 -> a
-    106:121:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):174 -> a
-    122:122:com.android.tools.r8.graph.DexEncodedMethod generateHolderDispatchMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):415:415 -> a
-    122:122:void synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):335 -> a
-    122:122:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):174 -> a
-    123:123:void synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):336:336 -> a
-    123:123:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):174 -> a
-    124:124:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService):232:232 -> a
-    124:124:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):176 -> a
-    125:125:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():324:324 -> a
-    125:125:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService):232 -> a
-    125:125:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):176 -> a
-    126:126:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService):232:232 -> a
-    126:126:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):176 -> a
+    9:9:void desugar(com.android.tools.r8.ir.code.IRCode):100 -> a
+    10:44:void desugar(com.android.tools.r8.ir.code.IRCode):101:135 -> a
+    45:45:boolean com.android.tools.r8.graph.DexEncodedMethod.isFinal():261:261 -> a
+    45:45:void desugar(com.android.tools.r8.ir.code.IRCode):136 -> a
+    46:53:void desugar(com.android.tools.r8.ir.code.IRCode):137:144 -> a
+    54:66:void desugar(com.android.tools.r8.ir.code.IRCode):143:155 -> a
+    67:67:boolean hasRewrittenMethodPrefix(com.android.tools.r8.graph.DexType):170:170 -> a
+    68:68:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):175:175 -> a
+    69:69:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():316:316 -> a
+    69:69:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):175 -> a
+    70:70:void synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):310:310 -> a
+    70:70:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):176 -> a
+    71:71:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():316:316 -> a
+    71:71:void synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):310 -> a
+    71:71:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):176 -> a
+    72:86:void synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):310:324 -> a
+    72:86:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):176 -> a
+    87:87:com.android.tools.r8.graph.DexType dispatchInterfaceTypeFor(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):434:434 -> a
+    87:87:void synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):324 -> a
+    87:87:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):176 -> a
+    88:94:com.android.tools.r8.graph.DexEncodedMethod generateInterfaceDispatchMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):387:393 -> a
+    88:94:void synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):326 -> a
+    88:94:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):176 -> a
+    95:103:void synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):327:335 -> a
+    95:103:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):176 -> a
+    104:104:com.android.tools.r8.graph.DexType dispatchHolderTypeFor(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):438:438 -> a
+    104:104:void synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):335 -> a
+    104:104:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):176 -> a
+    105:105:void synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):336:336 -> a
+    105:105:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):176 -> a
+    106:121:com.android.tools.r8.graph.DexEncodedMethod generateHolderDispatchMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):407:422 -> a
+    106:121:void synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):337 -> a
+    106:121:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):176 -> a
+    122:122:com.android.tools.r8.graph.DexEncodedMethod generateHolderDispatchMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):417:417 -> a
+    122:122:void synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):337 -> a
+    122:122:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):176 -> a
+    123:123:void synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):338:338 -> a
+    123:123:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):176 -> a
+    124:124:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService):234:234 -> a
+    124:124:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):178 -> a
+    125:125:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():316:316 -> a
+    125:125:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService):234 -> a
+    125:125:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):178 -> a
+    126:126:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService):234:234 -> a
+    126:126:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):178 -> a
     127:127:java.util.IdentityHashMap com.android.tools.r8.com.google.common.collect.Maps.newIdentityHashMap():511:511 -> a
-    127:127:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService):233 -> a
-    127:127:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):176 -> a
-    128:138:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService):234:244 -> a
-    128:138:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):176 -> a
-    139:139:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
-    139:139:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService):244 -> a
-    139:139:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):176 -> a
-    140:143:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService):248:251 -> a
-    140:143:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):176 -> a
-    144:148:boolean inherit(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexType):265:269 -> a
-    144:148:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService):251 -> a
-    144:148:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):176 -> a
-    149:149:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
-    149:149:boolean inherit(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexType):269 -> a
-    149:149:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService):251 -> a
-    149:149:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):176 -> a
-    150:150:boolean inherit(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexType):269:269 -> a
-    150:150:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService):251 -> a
-    150:150:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):176 -> a
-    151:151:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService):252:252 -> a
-    151:151:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):176 -> a
-    152:155:java.util.List addInterfacesAndForwardingMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List):280:283 -> a
-    152:155:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService):252 -> a
-    152:155:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):176 -> a
-    156:156:com.android.tools.r8.graph.DexType dispatchInterfaceTypeFor(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):432:432 -> a
-    156:156:java.util.List addInterfacesAndForwardingMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List):284 -> a
-    156:156:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService):252 -> a
-    156:156:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):176 -> a
-    157:159:java.util.List addInterfacesAndForwardingMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List):284:286 -> a
-    157:159:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService):252 -> a
-    157:159:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):176 -> a
-    160:163:com.android.tools.r8.graph.DexEncodedMethod createForwardingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):300:303 -> a
-    160:163:java.util.List addInterfacesAndForwardingMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List):288 -> a
-    160:163:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService):252 -> a
-    160:163:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):176 -> a
-    164:164:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):184:184 -> a
-    164:164:com.android.tools.r8.graph.DexEncodedMethod createForwardingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):304 -> a
-    164:164:java.util.List addInterfacesAndForwardingMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List):288 -> a
-    164:164:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService):252 -> a
-    164:164:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):176 -> a
-    165:165:com.android.tools.r8.graph.DexEncodedMethod createForwardingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):304:304 -> a
-    165:165:java.util.List addInterfacesAndForwardingMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List):288 -> a
-    165:165:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService):252 -> a
-    165:165:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):176 -> a
-    166:166:com.android.tools.r8.graph.DexEncodedMethod createForwardingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):303:303 -> a
-    166:166:java.util.List addInterfacesAndForwardingMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List):288 -> a
-    166:166:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService):252 -> a
-    166:166:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):176 -> a
-    167:168:java.util.List addInterfacesAndForwardingMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List):289:290 -> a
-    167:168:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService):252 -> a
-    167:168:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):176 -> a
-    169:177:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService):252:260 -> a
-    169:177:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):176 -> a
-    178:184:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService) -> a
-    185:185:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
-    185:185:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):184 -> a
-    186:186:java.util.Collection findSynthesizedFrom(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.graph.DexType):159:159 -> a
-    186:186:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):186 -> a
-    187:187:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():720:720 -> a
-    187:187:java.util.Collection findSynthesizedFrom(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.graph.DexType):160 -> a
-    187:187:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):186 -> a
-    188:188:java.util.Collection findSynthesizedFrom(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.graph.DexType):161:161 -> a
-    188:188:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):186 -> a
-    189:209:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):187:207 -> a
-    210:210:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
-    210:210:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):207 -> a
-    211:227:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):210:226 -> a
-    228:228:boolean lambda$synthesizeUtilityClasses$0(com.android.tools.r8.graph.DexProgramClass):216:216 -> a
-    229:254:com.android.tools.r8.graph.DexProgramClass 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,boolean):353:378 -> a
-    255:258:com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier getChecksumSupplier(com.android.tools.r8.graph.DexEncodedMethod):425:428 -> a
-    259:259:long lambda$getChecksumSupplier$1(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):428:428 -> a
-    260:260:com.android.tools.r8.graph.DexType dispatchHolderTypeFor(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):436:436 -> a
-    261:273:com.android.tools.r8.graph.DexType dispatchTypeFor(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,java.lang.String):441:453 -> a
-    274:292:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getMethodProviderOrNull(com.android.tools.r8.graph.DexMethod):457:475 -> a
-    1:1:com.android.tools.r8.graph.DexType dispatchInterfaceTypeFor(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):432:432 -> b
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$InvokeRewriter -> com.android.tools.r8.s.c.b$a:
+    127:127:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService):235 -> a
+    127:127:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):178 -> a
+    128:138:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService):236:246 -> a
+    128:138:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):178 -> a
+    139:139:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
+    139:139:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService):246 -> a
+    139:139:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):178 -> a
+    140:143:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService):250:253 -> a
+    140:143:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):178 -> a
+    144:148:boolean inherit(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexType):267:271 -> a
+    144:148:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService):253 -> a
+    144:148:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):178 -> a
+    149:149:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
+    149:149:boolean inherit(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexType):271 -> a
+    149:149:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService):253 -> a
+    149:149:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):178 -> a
+    150:150:boolean inherit(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexType):271:271 -> a
+    150:150:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService):253 -> a
+    150:150:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):178 -> a
+    151:151:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService):254:254 -> a
+    151:151:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):178 -> a
+    152:155:java.util.List addInterfacesAndForwardingMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List):282:285 -> a
+    152:155:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService):254 -> a
+    152:155:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):178 -> a
+    156:156:com.android.tools.r8.graph.DexType dispatchInterfaceTypeFor(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):434:434 -> a
+    156:156:java.util.List addInterfacesAndForwardingMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List):286 -> a
+    156:156:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService):254 -> a
+    156:156:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):178 -> a
+    157:159:java.util.List addInterfacesAndForwardingMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List):286:288 -> a
+    157:159:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService):254 -> a
+    157:159:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):178 -> a
+    160:163:com.android.tools.r8.graph.DexEncodedMethod createForwardingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):302:305 -> a
+    160:163:java.util.List addInterfacesAndForwardingMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List):290 -> a
+    160:163:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService):254 -> a
+    160:163:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):178 -> a
+    164:164:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):186:186 -> a
+    164:164:com.android.tools.r8.graph.DexEncodedMethod createForwardingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):306 -> a
+    164:164:java.util.List addInterfacesAndForwardingMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List):290 -> a
+    164:164:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService):254 -> a
+    164:164:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):178 -> a
+    165:165:com.android.tools.r8.graph.DexEncodedMethod createForwardingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):306:306 -> a
+    165:165:java.util.List addInterfacesAndForwardingMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List):290 -> a
+    165:165:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService):254 -> a
+    165:165:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):178 -> a
+    166:166:com.android.tools.r8.graph.DexEncodedMethod createForwardingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):305:305 -> a
+    166:166:java.util.List addInterfacesAndForwardingMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List):290 -> a
+    166:166:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService):254 -> a
+    166:166:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):178 -> a
+    167:168:java.util.List addInterfacesAndForwardingMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List):291:292 -> a
+    167:168:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService):254 -> a
+    167:168:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):178 -> a
+    169:177:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService):254:262 -> a
+    169:177:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):178 -> a
+    178:184:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):180:186 -> a
+    185:185:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
+    185:185:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):186 -> a
+    186:186:java.util.Collection findSynthesizedFrom(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.graph.DexType):161:161 -> a
+    186:186:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):188 -> a
+    187:187:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():770:770 -> a
+    187:187:java.util.Collection findSynthesizedFrom(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.graph.DexType):162 -> a
+    187:187:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):188 -> a
+    188:188:java.util.Collection findSynthesizedFrom(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.graph.DexType):163:163 -> a
+    188:188:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):188 -> a
+    189:209:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService) -> a
+    210:210:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
+    210:210:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):209 -> a
+    211:227:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):212:228 -> a
+    228:228:boolean lambda$synthesizeUtilityClasses$0(com.android.tools.r8.graph.DexProgramClass):218:218 -> a
+    229:254:com.android.tools.r8.graph.DexProgramClass 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,boolean):355:380 -> a
+    255:258:com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier getChecksumSupplier(com.android.tools.r8.graph.DexEncodedMethod):427:430 -> a
+    259:259:long lambda$getChecksumSupplier$1(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):430:430 -> a
+    260:260:com.android.tools.r8.graph.DexType dispatchHolderTypeFor(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):438:438 -> a
+    261:273:com.android.tools.r8.graph.DexType dispatchTypeFor(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,java.lang.String):443:455 -> a
+    274:292:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getMethodProviderOrNull(com.android.tools.r8.graph.DexMethod):459:477 -> a
+    1:1:com.android.tools.r8.graph.DexType dispatchInterfaceTypeFor(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):434:434 -> b
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$InvokeRewriter -> com.android.tools.r8.r.c.b$a:
     com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter rewriter -> b
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():1701:1701 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter):1706:1707 -> <init>
+    1:1:void <clinit>():1746:1746 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter):1751:1752 -> <init>
     boolean requiresGenerationOfCode() -> a
-    1:2:void rewriteInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):1713:1714 -> a
-    3:3:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1724:1724 -> a
-    4:4:com.android.tools.r8.graph.Code generateTemplateMethod(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1729:1729 -> a
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodGenerator -> com.android.tools.r8.s.c.b$b:
+    1:2:void rewriteInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):1758:1759 -> a
+    3:3:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1769:1769 -> a
+    4:4:com.android.tools.r8.graph.Code generateTemplateMethod(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1774:1774 -> a
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodGenerator -> com.android.tools.r8.r.c.b$b:
     com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory factory -> b
     com.android.tools.r8.graph.DexMethod generatedMethod -> d
     java.lang.String methodName -> c
-    1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory):1740:1740 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory,java.lang.String):1744:1746 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory):1785:1785 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory,java.lang.String):1789:1791 -> <init>
     boolean requiresGenerationOfCode() -> a
-    1:2:void rewriteInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):1752:1753 -> a
-    3:3:void rewriteInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):1752:1752 -> a
-    4:27:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1758:1781 -> a
-    28:28:com.android.tools.r8.graph.Code generateTemplateMethod(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1787:1787 -> a
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter -> com.android.tools.r8.s.c.b$c:
+    1:2:void rewriteInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):1797:1798 -> a
+    3:3:void rewriteInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):1797:1797 -> a
+    4:27:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1803:1826 -> a
+    28:28:com.android.tools.r8.graph.Code generateTemplateMethod(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1832:1832 -> a
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter -> com.android.tools.r8.r.c.b$c:
     void rewrite(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory) -> a
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider -> com.android.tools.r8.s.c.b$d:
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider -> com.android.tools.r8.r.c.b$d:
     com.android.tools.r8.graph.DexMethod method -> a
-    1:2:void <init>(com.android.tools.r8.graph.DexMethod):1645:1646 -> <init>
+    1:2:void <init>(com.android.tools.r8.graph.DexMethod):1690:1691 -> <init>
     com.android.tools.r8.graph.Code generateTemplateMethod(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod) -> a
     com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView) -> a
     boolean requiresGenerationOfCode() -> a
     void rewriteInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView) -> a
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$RetargetCoreLibraryMethodProvider -> com.android.tools.r8.s.c.b$e:
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$RetargetCoreLibraryMethodProvider -> com.android.tools.r8.r.c.b$e:
     com.android.tools.r8.graph.DexType newHolder -> b
     com.android.tools.r8.graph.DexMethod targetMethod -> c
     boolean isStatic -> d
-    1:3:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,boolean):1666:1668 -> <init>
+    1:3:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,boolean):1711:1713 -> <init>
     boolean requiresGenerationOfCode() -> a
-    1:2:void rewriteInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):1674:1675 -> a
-    3:3:void rewriteInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):1674:1674 -> a
-    4:10:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1680:1686 -> a
-    11:11:com.android.tools.r8.graph.Code generateTemplateMethod(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1692:1692 -> a
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$RewritableMethods -> com.android.tools.r8.s.c.b$f:
+    1:2:void rewriteInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):1719:1720 -> a
+    3:3:void rewriteInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):1719:1719 -> a
+    4:10:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1725:1731 -> a
+    11:11:com.android.tools.r8.graph.Code generateTemplateMethod(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1737:1737 -> a
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$RewritableMethods -> com.android.tools.r8.r.c.b$f:
     java.util.Map rewritable -> a
     java.util.Map virtualRewrites -> b
     java.util.Set emulatedDispatchMethods -> c
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():478:478 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.AppView):489:489 -> <init>
-    2:44:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.AppView):481:523 -> <init>
-    1:1:java.util.Set getEmulatedDispatchMethods():541:541 -> a
-    2:2:void visit(java.util.function.Consumer):549:549 -> a
-    3:132:void initializeAndroidKMethodProviders(com.android.tools.r8.graph.DexItemFactory):554:683 -> a
-    133:133:com.android.tools.r8.graph.Code lambda$initializeJava9MethodProviders$0(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1316:1316 -> a
-    134:136:void initializeRetargetCoreLibraryMembers(com.android.tools.r8.graph.AppView):1574:1576 -> a
-    137:137:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
-    137:137:void initializeRetargetCoreLibraryMembers(com.android.tools.r8.graph.AppView):1577 -> a
-    138:143:void warnMissingRetargetCoreLibraryMember(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1564:1569 -> a
-    138:143:void initializeRetargetCoreLibraryMembers(com.android.tools.r8.graph.AppView):1579 -> a
-    144:144:void initializeRetargetCoreLibraryMembers(com.android.tools.r8.graph.AppView):1581:1581 -> a
-    145:151:java.util.List findDexEncodedMethodsWithName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):1610:1616 -> a
-    145:151:void initializeRetargetCoreLibraryMembers(com.android.tools.r8.graph.AppView):1582 -> a
-    152:156:void initializeRetargetCoreLibraryMembers(com.android.tools.r8.graph.AppView):1583:1587 -> a
-    157:157:boolean com.android.tools.r8.graph.DexEncodedMethod.isFinal():257:257 -> a
-    157:157:void initializeRetargetCoreLibraryMembers(com.android.tools.r8.graph.AppView):1590 -> a
-    158:158:void initializeRetargetCoreLibraryMembers(com.android.tools.r8.graph.AppView):1593:1593 -> a
-    159:160:void handleEmulateDispatch(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):1621:1622 -> a
-    159:160:void initializeRetargetCoreLibraryMembers(com.android.tools.r8.graph.AppView):1593 -> a
-    161:161:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():324:324 -> a
-    161:161:void handleEmulateDispatch(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):1622 -> a
-    161:161:void initializeRetargetCoreLibraryMembers(com.android.tools.r8.graph.AppView):1593 -> a
-    162:165:void handleEmulateDispatch(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):1624:1627 -> a
-    162:165:void initializeRetargetCoreLibraryMembers(com.android.tools.r8.graph.AppView):1593 -> a
-    166:173:void initializeRetargetCoreLibraryMembers(com.android.tools.r8.graph.AppView):1594:1601 -> a
-    174:174:void initializeRetargetCoreLibraryMembers(com.android.tools.r8.graph.AppView):1599:1599 -> a
-    175:176:void addProvider(com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider):1632:1633 -> a
-    177:177:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getProvider(com.android.tools.r8.graph.DexMethod):1637:1637 -> a
-    1:6:boolean matchesVirtualRewrite(com.android.tools.r8.graph.DexMethod):528:533 -> b
-    7:7:boolean isEmpty():545:545 -> b
-    8:346:void initializeAndroidNMethodProviders(com.android.tools.r8.graph.DexItemFactory):689:1027 -> b
-    347:347:com.android.tools.r8.graph.Code lambda$initializeJava9MethodProviders$1(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1338:1338 -> b
+    1:1:void <clinit>():480:480 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.AppView):491:491 -> <init>
+    2:44:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.AppView):483:525 -> <init>
+    1:1:java.util.Set getEmulatedDispatchMethods():543:543 -> a
+    2:2:void visit(java.util.function.Consumer):551:551 -> a
+    3:132:void initializeAndroidKMethodProviders(com.android.tools.r8.graph.DexItemFactory):556:685 -> a
+    133:133:com.android.tools.r8.graph.Code lambda$initializeJava9MethodProviders$0(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1318:1318 -> a
+    134:136:void initializeRetargetCoreLibraryMembers(com.android.tools.r8.graph.AppView):1619:1621 -> a
+    137:137:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
+    137:137:void initializeRetargetCoreLibraryMembers(com.android.tools.r8.graph.AppView):1622 -> a
+    138:143:void warnMissingRetargetCoreLibraryMember(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1609:1614 -> a
+    138:143:void initializeRetargetCoreLibraryMembers(com.android.tools.r8.graph.AppView):1624 -> a
+    144:144:void initializeRetargetCoreLibraryMembers(com.android.tools.r8.graph.AppView):1626:1626 -> a
+    145:151:java.util.List findDexEncodedMethodsWithName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):1655:1661 -> a
+    145:151:void initializeRetargetCoreLibraryMembers(com.android.tools.r8.graph.AppView):1627 -> a
+    152:156:void initializeRetargetCoreLibraryMembers(com.android.tools.r8.graph.AppView):1628:1632 -> a
+    157:157:boolean com.android.tools.r8.graph.DexEncodedMethod.isFinal():261:261 -> a
+    157:157:void initializeRetargetCoreLibraryMembers(com.android.tools.r8.graph.AppView):1635 -> a
+    158:158:void initializeRetargetCoreLibraryMembers(com.android.tools.r8.graph.AppView):1638:1638 -> a
+    159:160:void handleEmulateDispatch(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):1666:1667 -> a
+    159:160:void initializeRetargetCoreLibraryMembers(com.android.tools.r8.graph.AppView):1638 -> a
+    161:161:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():316:316 -> a
+    161:161:void handleEmulateDispatch(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):1667 -> a
+    161:161:void initializeRetargetCoreLibraryMembers(com.android.tools.r8.graph.AppView):1638 -> a
+    162:165:void handleEmulateDispatch(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):1669:1672 -> a
+    162:165:void initializeRetargetCoreLibraryMembers(com.android.tools.r8.graph.AppView):1638 -> a
+    166:173:void initializeRetargetCoreLibraryMembers(com.android.tools.r8.graph.AppView):1639:1646 -> a
+    174:174:void initializeRetargetCoreLibraryMembers(com.android.tools.r8.graph.AppView):1644:1644 -> a
+    175:176:void addProvider(com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider):1677:1678 -> a
+    177:177:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getProvider(com.android.tools.r8.graph.DexMethod):1682:1682 -> a
+    1:6:boolean matchesVirtualRewrite(com.android.tools.r8.graph.DexMethod):530:535 -> b
+    7:7:boolean isEmpty():547:547 -> b
+    8:346:void initializeAndroidNMethodProviders(com.android.tools.r8.graph.DexItemFactory):691:1029 -> b
+    347:347:com.android.tools.r8.graph.Code lambda$initializeJava9MethodProviders$1(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1340:1340 -> b
     1:6:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.CollectionMethodGenerators.generateMapOf(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int):74:79 -> c
-    1:6:com.android.tools.r8.graph.Code lambda$initializeJava9MethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1359 -> c
+    1:6:com.android.tools.r8.graph.Code lambda$initializeJava9MethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1361 -> c
     7:40:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.CollectionMethodGenerators.generateMapOf(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int):77:110 -> c
-    7:40:com.android.tools.r8.graph.Code lambda$initializeJava9MethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1359 -> c
+    7:40:com.android.tools.r8.graph.Code lambda$initializeJava9MethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1361 -> c
     41:41:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.CollectionMethodGenerators.generateMapOf(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int):105:105 -> c
-    41:41:com.android.tools.r8.graph.Code lambda$initializeJava9MethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1359 -> c
+    41:41:com.android.tools.r8.graph.Code lambda$initializeJava9MethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1361 -> c
     42:60:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.CollectionMethodGenerators.generateMapOf(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int):102:120 -> c
-    42:60:com.android.tools.r8.graph.Code lambda$initializeJava9MethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1359 -> c
-    61:218:void initializeAndroidOMethodProviders(com.android.tools.r8.graph.DexItemFactory):1034:1191 -> c
-    1:29:void initializeJava10MethodProviders(com.android.tools.r8.graph.DexItemFactory):1376:1404 -> d
-    1:26:void initializeJava10OptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1495:1520 -> e
-    1:7:void initializeJava11MethodProviders(com.android.tools.r8.graph.DexItemFactory):1411:1417 -> f
-    1:20:void initializeJava11OptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1526:1545 -> g
-    1:116:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1198:1313 -> h
-    117:142:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1310:1335 -> h
-    143:167:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1332:1356 -> h
-    168:186:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1353:1371 -> h
-    1:65:void initializeJava9OptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1424:1488 -> i
-    1:7:void initializeStreamMethodProviders(com.android.tools.r8.graph.DexItemFactory):1552:1558 -> j
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$StatifyingMethodGenerator -> com.android.tools.r8.s.c.b$g:
+    42:60:com.android.tools.r8.graph.Code lambda$initializeJava9MethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1361 -> c
+    61:218:void initializeAndroidOMethodProviders(com.android.tools.r8.graph.DexItemFactory):1036:1193 -> c
+    1:29:void initializeJava10MethodProviders(com.android.tools.r8.graph.DexItemFactory):1378:1406 -> d
+    1:26:void initializeJava10OptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1540:1565 -> e
+    1:50:void initializeJava11MethodProviders(com.android.tools.r8.graph.DexItemFactory):1413:1462 -> f
+    1:20:void initializeJava11OptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1571:1590 -> g
+    1:116:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1200:1315 -> h
+    117:142:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1312:1337 -> h
+    143:167:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1334:1358 -> h
+    168:186:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1355:1373 -> h
+    1:65:void initializeJava9OptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1469:1533 -> i
+    1:7:void initializeStreamMethodProviders(com.android.tools.r8.graph.DexItemFactory):1597:1603 -> j
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$StatifyingMethodGenerator -> com.android.tools.r8.r.c.b$g:
     boolean $assertionsDisabled -> f
     com.android.tools.r8.graph.DexType receiverType -> e
-    1:1:void <clinit>():1799:1799 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory,java.lang.String,com.android.tools.r8.graph.DexType):1805:1806 -> <init>
-    1:8:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1811:1818 -> a
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory -> com.android.tools.r8.s.c.b$h:
+    1:1:void <clinit>():1844:1844 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory,java.lang.String,com.android.tools.r8.graph.DexType):1850:1851 -> <init>
+    1:8:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1856:1863 -> a
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory -> com.android.tools.r8.r.c.b$h:
     com.android.tools.r8.graph.Code create(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod) -> a
-com.android.tools.r8.ir.desugar.ClassProcessor -> com.android.tools.r8.s.c.g:
+com.android.tools.r8.ir.desugar.ClassProcessor -> com.android.tools.r8.r.c.g:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.AppView appView -> a
     java.util.function.Consumer newSynthesizedMethodConsumer -> d
@@ -29137,101 +29114,98 @@
     java.util.Map classInfo -> g
     java.util.Map libraryClassInfo -> h
     1:1:void <clinit>():46:46 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter,java.util.function.Consumer):204:204 -> <init>
-    2:32:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter,java.util.function.Consumer):185:215 -> <init>
-    1:1:void processClass(com.android.tools.r8.graph.DexProgramClass):227:227 -> a
-    2:6:void addSyntheticMethods():231:235 -> a
-    7:11:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures):271:275 -> a
-    12:20:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):290:298 -> a
-    12:20:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures):273 -> a
-    21:21:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
-    21:21:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):298 -> a
-    21:21:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures):273 -> a
-    22:22:boolean needsLibraryInfo():219:219 -> a
-    22:22:boolean dontRewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):348 -> a
-    22:22:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):300 -> a
-    22:22:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures):273 -> a
-    23:23:boolean dontRewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):348:348 -> a
-    23:23:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):300 -> a
-    23:23:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures):273 -> a
-    24:31:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):305:312 -> a
-    24:31:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures):273 -> a
-    32:32:boolean isRetargetMethod(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexEncodedMethod):337:337 -> a
-    32:32:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):316 -> a
-    32:32:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures):273 -> a
-    33:33:boolean needsLibraryInfo():219:219 -> a
-    33:33:boolean isRetargetMethod(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexEncodedMethod):337 -> a
-    33:33:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):316 -> a
-    33:33:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures):273 -> a
-    34:36:boolean isRetargetMethod(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexEncodedMethod):337:339 -> a
-    34:36:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):316 -> a
-    34:36:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures):273 -> a
-    37:37:boolean com.android.tools.r8.graph.DexEncodedMethod.isFinal():257:257 -> a
-    37:37:boolean isRetargetMethod(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexEncodedMethod):340 -> a
-    37:37:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):316 -> a
-    37:37:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures):273 -> a
-    38:38:boolean isRetargetMethod(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexEncodedMethod):343:343 -> a
-    38:38:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):316 -> a
-    38:38:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures):273 -> a
-    39:52:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):317:330 -> a
-    39:52:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures):273 -> a
-    53:53:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
-    53:53:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):330 -> a
-    53:53:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures):273 -> a
-    54:54:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):331:331 -> a
-    54:54:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures):273 -> a
-    55:55:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures):283:283 -> a
-    56:57:void lambda$computeClassInfo$0(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):277:278 -> a
-    58:73:void addForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):378:393 -> a
-    58:73:void lambda$computeClassInfo$0(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):279 -> a
-    74:74:void addSyntheticMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):354:354 -> a
-    75:89:void addICCEThrowingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):358:372 -> a
-    90:90:com.android.tools.r8.ir.conversion.SourceCode lambda$addICCEThrowingMethod$2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):370:370 -> a
-    91:94:com.android.tools.r8.graph.DexClass definitionOrNull(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):400:403 -> a
-    95:95:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
-    95:95:com.android.tools.r8.graph.DexClass definitionOrNull(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):403 -> a
-    96:96:com.android.tools.r8.graph.DexClass definitionOrNull(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):405:405 -> a
-    97:102:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo visitClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):417:422 -> a
-    103:104:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):428:429 -> a
-    103:104:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo lambda$visitClassInfo$3(com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):422 -> a
-    105:106:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo visitClassInfo(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):412:413 -> a
-    105:106:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):429 -> a
-    105:106:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo lambda$visitClassInfo$3(com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):422 -> a
-    107:108:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):430:431 -> a
-    107:108:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo lambda$visitClassInfo$3(com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):422 -> a
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter,java.util.function.Consumer):200:200 -> <init>
+    2:32:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter,java.util.function.Consumer):181:211 -> <init>
+    1:1:void processClass(com.android.tools.r8.graph.DexProgramClass):223:223 -> a
+    2:6:void addSyntheticMethods():227:231 -> a
+    7:11:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures):267:271 -> a
+    12:21:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):286:295 -> a
+    12:21:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures):269 -> a
+    22:22:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
+    22:22:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):295 -> a
+    22:22:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures):269 -> a
+    23:23:boolean needsLibraryInfo():215:215 -> a
+    23:23:boolean dontRewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):345 -> a
+    23:23:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):297 -> a
+    23:23:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures):269 -> a
+    24:24:boolean dontRewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):345:345 -> a
+    24:24:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):297 -> a
+    24:24:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures):269 -> a
+    25:32:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):302:309 -> a
+    25:32:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures):269 -> a
+    33:33:boolean isRetargetMethod(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexEncodedMethod):334:334 -> a
+    33:33:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):313 -> a
+    33:33:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures):269 -> a
+    34:34:boolean needsLibraryInfo():215:215 -> a
+    34:34:boolean isRetargetMethod(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexEncodedMethod):334 -> a
+    34:34:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):313 -> a
+    34:34:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures):269 -> a
+    35:37:boolean isRetargetMethod(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexEncodedMethod):334:336 -> a
+    35:37:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):313 -> a
+    35:37:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures):269 -> a
+    38:38:boolean com.android.tools.r8.graph.DexEncodedMethod.isFinal():261:261 -> a
+    38:38:boolean isRetargetMethod(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexEncodedMethod):337 -> a
+    38:38:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):313 -> a
+    38:38:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures):269 -> a
+    39:39:boolean isRetargetMethod(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexEncodedMethod):340:340 -> a
+    39:39:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):313 -> a
+    39:39:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures):269 -> a
+    40:53:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):314:327 -> a
+    40:53:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures):269 -> a
+    54:54:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
+    54:54:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):327 -> a
+    54:54:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures):269 -> a
+    55:55:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):328:328 -> a
+    55:55:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures):269 -> a
+    56:56:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo computeClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures):279:279 -> a
+    57:58:void lambda$computeClassInfo$0(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):273:274 -> a
+    59:74:void addForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):375:390 -> a
+    59:74:void lambda$computeClassInfo$0(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):275 -> a
+    75:75:void addSyntheticMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):351:351 -> a
+    76:90:void addICCEThrowingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):355:369 -> a
+    91:91:com.android.tools.r8.ir.conversion.SourceCode lambda$addICCEThrowingMethod$2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):367:367 -> a
+    92:97:com.android.tools.r8.graph.DexClass definitionOrNull(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):397:402 -> a
+    98:102:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo visitClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):414:418 -> a
+    103:104:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):424:425 -> a
+    103:104:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo lambda$visitClassInfo$3(com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):418 -> a
+    105:106:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo visitClassInfo(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):409:410 -> a
+    105:106:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):425 -> a
+    105:106:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo lambda$visitClassInfo$3(com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):418 -> a
+    107:108:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):426:427 -> a
+    107:108:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo lambda$visitClassInfo$3(com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):418 -> a
     109:109:boolean com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo.isEmpty():115:115 -> a
-    109:109:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):431 -> a
-    109:109:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo lambda$visitClassInfo$3(com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):422 -> a
+    109:109:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):427 -> a
+    109:109:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo lambda$visitClassInfo$3(com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):418 -> a
     110:110:boolean com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures.isEmpty():84:84 -> a
-    110:110:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):431 -> a
-    110:110:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo lambda$visitClassInfo$3(com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):422 -> a
-    111:111:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):431:431 -> a
-    111:111:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo lambda$visitClassInfo$3(com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):422 -> a
+    110:110:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):427 -> a
+    110:110:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo lambda$visitClassInfo$3(com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):418 -> a
+    111:111:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):427:427 -> a
+    111:111:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo lambda$visitClassInfo$3(com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):418 -> a
     112:112:boolean com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo.isEmpty():115:115 -> a
-    112:112:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):431 -> a
-    112:112:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo lambda$visitClassInfo$3(com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):422 -> a
-    113:116:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):432:435 -> a
-    113:116:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo lambda$visitClassInfo$3(com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):422 -> a
-    117:121:com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures visitLibraryClassInfo(com.android.tools.r8.graph.DexType):440:444 -> a
-    122:125:com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures visitLibraryClassInfo(com.android.tools.r8.graph.DexClass):448:451 -> a
-    126:129:com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures visitLibraryClassInfoRaw(com.android.tools.r8.graph.DexLibraryClass):455:458 -> a
-    1:1:boolean ignoreLibraryInfo():223:223 -> b
-    2:2:java.util.List lambda$addSyntheticMethod$1(com.android.tools.r8.graph.DexProgramClass):354:354 -> b
-    3:4:com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures visitInterfaceInfo(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):464:465 -> b
-    5:9:com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures visitInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):469:473 -> b
-    10:13:com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures visitInterfaceInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):477:480 -> b
-    10:13:com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures lambda$visitInterfaceInfo$4(com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):473 -> b
-    14:17:com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures computeInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures):242:245 -> b
-    14:17:com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures visitInterfaceInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):482 -> b
-    14:17:com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures lambda$visitInterfaceInfo$4(com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):473 -> b
-    18:18:boolean needsLibraryInfo():219:219 -> b
-    18:18:com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures computeInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures):245 -> b
-    18:18:com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures visitInterfaceInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):482 -> b
-    18:18:com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures lambda$visitInterfaceInfo$4(com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):473 -> b
-    19:28:com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures computeInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures):245:254 -> b
-    19:28:com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures visitInterfaceInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):482 -> b
-    19:28:com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures lambda$visitInterfaceInfo$4(com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):473 -> b
-com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo -> com.android.tools.r8.s.c.c:
+    112:112:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):427 -> a
+    112:112:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo lambda$visitClassInfo$3(com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):418 -> a
+    113:116:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):428:431 -> a
+    113:116:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo lambda$visitClassInfo$3(com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):418 -> a
+    117:121:com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures visitLibraryClassInfo(com.android.tools.r8.graph.DexType):436:440 -> a
+    122:125:com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures visitLibraryClassInfo(com.android.tools.r8.graph.DexClass):444:447 -> a
+    126:129:com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures visitLibraryClassInfoRaw(com.android.tools.r8.graph.DexLibraryClass):451:454 -> a
+    1:1:boolean ignoreLibraryInfo():219:219 -> b
+    2:2:java.util.List lambda$addSyntheticMethod$1(com.android.tools.r8.graph.DexProgramClass):351:351 -> b
+    3:4:com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures visitInterfaceInfo(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):460:461 -> b
+    5:8:com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures visitInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):465:468 -> b
+    9:12:com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures visitInterfaceInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):472:475 -> b
+    9:12:com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures lambda$visitInterfaceInfo$4(com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):468 -> b
+    13:16:com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures computeInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures):238:241 -> b
+    13:16:com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures visitInterfaceInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):477 -> b
+    13:16:com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures lambda$visitInterfaceInfo$4(com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):468 -> b
+    17:17:boolean needsLibraryInfo():215:215 -> b
+    17:17:com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures computeInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures):241 -> b
+    17:17:com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures visitInterfaceInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):477 -> b
+    17:17:com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures lambda$visitInterfaceInfo$4(com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):468 -> b
+    18:27:com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures computeInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures):241:250 -> b
+    18:27:com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures visitInterfaceInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):477 -> b
+    18:27:com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures lambda$visitInterfaceInfo$4(com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):468 -> b
+com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo -> com.android.tools.r8.r.c.c:
     com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo parent -> a
     com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo EMPTY -> c
     com.android.tools.r8.com.google.common.collect.ImmutableList forwardedMethodTargets -> b
@@ -29239,14 +29213,15 @@
     1:3:void <init>(com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo,com.android.tools.r8.com.google.common.collect.ImmutableList):102:104 -> <init>
     1:3:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo create(com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo,com.android.tools.r8.com.google.common.collect.ImmutableList):109:111 -> a
     4:5:boolean isTargetedByForwards(com.android.tools.r8.graph.DexEncodedMethod):119:120 -> a
-com.android.tools.r8.ir.desugar.ClassProcessor$LibraryReportingContext -> com.android.tools.r8.s.c.d:
+com.android.tools.r8.ir.desugar.ClassProcessor$LibraryReportingContext -> com.android.tools.r8.r.c.d:
     com.android.tools.r8.ir.desugar.ClassProcessor$LibraryReportingContext LIBRARY_CONTEXT -> c
-    1:1:void <clinit>():159:159 -> <clinit>
-    1:1:void <init>():162:162 -> <init>
+    1:1:void <clinit>():155:155 -> <clinit>
+    1:1:void <init>():158:158 -> <init>
     com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext forClass(com.android.tools.r8.graph.DexClass) -> a
-    void reportDependency(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView) -> a
     void reportMissingType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter) -> a
-com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures -> com.android.tools.r8.s.c.e:
+    1:1:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
+    1:1:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):168 -> a
+com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures -> com.android.tools.r8.r.c.e:
     java.util.Set signatures -> a
     com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures EMPTY -> b
     1:1:void <clinit>():51:51 -> <clinit>
@@ -29257,15 +29232,14 @@
     3:3:boolean isEmpty():84:84 -> a
     3:3:com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures merge(com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures):67 -> a
     4:6:com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures merge(com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures):70:72 -> a
-com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext -> com.android.tools.r8.s.c.f:
+com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext -> com.android.tools.r8.r.c.f:
     com.android.tools.r8.graph.DexClass directSubClass -> a
     com.android.tools.r8.graph.DexProgramClass closestProgramSubClass -> b
     1:3:void <init>(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass):130:132 -> <init>
     1:5:com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext forClass(com.android.tools.r8.graph.DexClass):136:140 -> a
-    6:8:void reportDependency(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):145:147 -> a
-    9:9:void reportDependency(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):146:146 -> a
-    10:10:void reportMissingType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter):152:152 -> a
-com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer -> com.android.tools.r8.s.c.h:
+    6:6:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):144:144 -> a
+    7:7:void reportMissingType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter):148:148 -> a
+com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer -> com.android.tools.r8.r.c.h:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.ir.conversion.IRConverter converter -> a
     boolean $assertionsDisabled -> c
@@ -29289,7 +29263,7 @@
     25:26:boolean hasVirtualMethodWithSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):257:258 -> a
     25:26:void updateClass(com.android.tools.r8.graph.DexClass,java.util.List,java.util.List):85 -> a
     27:27:void updateClass(com.android.tools.r8.graph.DexClass,java.util.List,java.util.List):86:86 -> a
-    28:28:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():720:720 -> a
+    28:28:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():770:770 -> a
     28:28:void updateClass(com.android.tools.r8.graph.DexClass,java.util.List,java.util.List):90 -> a
     29:29:void updateClass(com.android.tools.r8.graph.DexClass,java.util.List,java.util.List):90:90 -> a
     30:30:void updateClass(com.android.tools.r8.graph.DexClass,java.util.List,java.util.List):87:87 -> a
@@ -29313,7 +29287,7 @@
     129:129:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
     129:129:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):220 -> a
     130:149:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):220:239 -> a
-    150:150:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():720:720 -> a
+    150:150:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():770:770 -> a
     150:150:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):243 -> a
     151:151:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):243:243 -> a
     152:152:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):240:240 -> a
@@ -29325,24 +29299,24 @@
     156:156:boolean isCovariantReturnTypeAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):248 -> a
     157:157:boolean isCovariantReturnTypeAnnotation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):252:252 -> a
     1:1:boolean lambda$updateClass$0(com.android.tools.r8.graph.DexAnnotation):96:96 -> b
-com.android.tools.r8.ir.desugar.D8NestBasedAccessDesugaring -> com.android.tools.r8.s.c.i:
+com.android.tools.r8.ir.desugar.D8NestBasedAccessDesugaring -> com.android.tools.r8.r.c.i:
     boolean $assertionsDisabled -> i
     java.util.Map metNestHosts -> h
     1:1:void <clinit>():40:40 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView):47:47 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.AppView):44:44 -> <init>
     1:1:void rewriteNestBasedAccesses(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):52:52 -> a
-    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     2:2:void rewriteNestBasedAccesses(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):52 -> a
     3:19:void rewriteNestBasedAccesses(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):53:69 -> a
-    20:20:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):184:184 -> a
+    20:20:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):186:186 -> a
     20:20:void rewriteNestBasedAccesses(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):69 -> a
     21:31:void rewriteNestBasedAccesses(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):71:81 -> a
     32:32:void com.android.tools.r8.ir.code.InvokeDirect.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):37:37 -> a
     32:32:void rewriteNestBasedAccesses(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):81 -> a
     33:37:void rewriteNestBasedAccesses(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):80:84 -> a
     38:45:void rewriteNestBasedAccesses(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):83:90 -> a
-    46:46:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexField):179:179 -> a
+    46:46:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexField):181:181 -> a
     46:46:void rewriteNestBasedAccesses(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):90 -> a
     47:56:void rewriteNestBasedAccesses(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):91:100 -> a
     57:57:void rewriteNestBasedAccesses(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):99:99 -> a
@@ -29359,7 +29333,7 @@
     80:80:boolean shouldProcessClassInNest(com.android.tools.r8.graph.DexClass,java.util.List):151:151 -> a
     81:81:void reportMissingNestHost(com.android.tools.r8.graph.DexClass):156:156 -> a
     82:82:void reportIncompleteNest(java.util.List):161:161 -> a
-com.android.tools.r8.ir.desugar.DefaultMethodsHelper -> com.android.tools.r8.s.c.k:
+com.android.tools.r8.ir.desugar.DefaultMethodsHelper -> com.android.tools.r8.r.c.k:
     java.util.Set candidates -> a
     java.util.Set hidden -> b
     1:5:void <init>():17:21 -> <init>
@@ -29372,8 +29346,8 @@
     9:9:void hideMatches(com.android.tools.r8.graph.DexMethod):68 -> a
     10:10:void addDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):76:76 -> a
     11:13:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection wrapInCollection():81:83 -> a
-com.android.tools.r8.ir.desugar.DefaultMethodsHelper$1 -> com.android.tools.r8.s.c.j:
-com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection -> com.android.tools.r8.s.c.k$a:
+com.android.tools.r8.ir.desugar.DefaultMethodsHelper$1 -> com.android.tools.r8.r.c.j:
+com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection -> com.android.tools.r8.r.c.k$a:
     java.util.List hidden -> b
     java.util.List live -> a
     com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection EMPTY -> c
@@ -29383,7 +29357,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.s.c.l:
+com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter -> com.android.tools.r8.r.c.l:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Map callBackMethods -> d
@@ -29397,7 +29371,7 @@
     1:1:void desugar(com.android.tools.r8.ir.code.IRCode):86:86 -> a
     2:15:void generateCallBackIfNeeded(com.android.tools.r8.ir.code.IRCode):129:142 -> a
     2:15:void desugar(com.android.tools.r8.ir.code.IRCode):90 -> a
-    16:16:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    16:16:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     16:16:void generateCallBackIfNeeded(com.android.tools.r8.ir.code.IRCode):142 -> a
     16:16:void desugar(com.android.tools.r8.ir.code.IRCode):90 -> a
     17:18:void generateCallBackIfNeeded(com.android.tools.r8.ir.code.IRCode):146:147 -> a
@@ -29405,7 +29379,7 @@
     19:22:void generateCallBack(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):186:189 -> a
     19:22:void generateCallBackIfNeeded(com.android.tools.r8.ir.code.IRCode):147 -> a
     19:22:void desugar(com.android.tools.r8.ir.code.IRCode):90 -> a
-    23:23:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():324:324 -> a
+    23:23:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():316:316 -> a
     23:23:void generateCallBack(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):189 -> a
     23:23:void generateCallBackIfNeeded(com.android.tools.r8.ir.code.IRCode):147 -> a
     23:23:void desugar(com.android.tools.r8.ir.code.IRCode):90 -> a
@@ -29417,7 +29391,7 @@
     26:28:void generateCallBackIfNeeded(com.android.tools.r8.ir.code.IRCode):147 -> a
     26:28:void desugar(com.android.tools.r8.ir.code.IRCode):90 -> a
     29:45:void desugar(com.android.tools.r8.ir.code.IRCode):92:108 -> a
-    46:46:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    46:46:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     46:46:void desugar(com.android.tools.r8.ir.code.IRCode):108 -> a
     47:52:void desugar(com.android.tools.r8.ir.code.IRCode):109:114 -> a
     53:67:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,java.util.ListIterator):304:318 -> a
@@ -29464,10 +29438,10 @@
     131:151:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,java.util.ListIterator):371:391 -> a
     131:151:void desugar(com.android.tools.r8.ir.code.IRCode):115 -> a
     152:161:boolean overridesLibraryMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):153:162 -> a
-    162:162:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    162:162:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     162:162:boolean overridesLibraryMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):162 -> a
     163:167:boolean overridesLibraryMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):166:170 -> a
-    168:168:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():324:324 -> a
+    168:168:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():316:316 -> a
     168:168:boolean overridesLibraryMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):170 -> a
     169:172:boolean overridesLibraryMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):173:176 -> a
     173:187: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):211:225 -> a
@@ -29482,7 +29456,7 @@
     244:254:com.android.tools.r8.graph.DexMethod createConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):445:455 -> a
     255:255:com.android.tools.r8.graph.DexMethod createConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):454:454 -> a
     256:257:boolean canConvert(com.android.tools.r8.graph.DexType):463:464 -> a
-com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration -> com.android.tools.r8.s.c.m:
+com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration -> com.android.tools.r8.r.c.m:
     java.util.Map rewritePrefix -> d
     java.util.List extraKeepRules -> j
     java.util.List dontRewriteInvocation -> i
@@ -29500,7 +29474,7 @@
     13:13:com.android.tools.r8.ir.desugar.PrefixRewritingMapper createPrefixRewritingMapper(com.android.tools.r8.graph.DexItemFactory):100 -> a
     14:14:com.android.tools.r8.ir.desugar.PrefixRewritingMapper createPrefixRewritingMapper(com.android.tools.r8.graph.DexItemFactory):101:101 -> a
     15:15:java.lang.String getSynthesizedLibraryClassesPackagePrefix(com.android.tools.r8.graph.AppView):113:113 -> a
-    16:16:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():324:324 -> a
+    16:16:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():316:316 -> a
     16:16:java.lang.String getSynthesizedLibraryClassesPackagePrefix(com.android.tools.r8.graph.AppView):113 -> a
     17:17:java.lang.String getSynthesizedLibraryClassesPackagePrefix(com.android.tools.r8.graph.AppView):114:114 -> a
     18:24:com.android.tools.r8.graph.DexMethod retargetMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView):132:138 -> a
@@ -29517,7 +29491,7 @@
     1:1:java.lang.String getSynthesizedLibraryClassesPackagePrefix():119:119 -> i
     1:1:boolean isLibraryCompilation():109:109 -> j
     1:11:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration empty():62:72 -> k
-com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder -> com.android.tools.r8.s.c.m$a:
+com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder -> com.android.tools.r8.r.c.m$a:
     boolean $assertionsDisabled -> l
     java.util.Map customConversions -> i
     java.util.List dontRewriteInvocation -> j
@@ -29569,7 +29543,7 @@
     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):261 -> f
     6:6:int sharpIndex(java.lang.String,java.lang.String):261:261 -> f
-com.android.tools.r8.ir.desugar.DesugaredLibraryConfigurationParser -> com.android.tools.r8.s.c.n:
+com.android.tools.r8.ir.desugar.DesugaredLibraryConfigurationParser -> com.android.tools.r8.r.c.n:
     int minAPILevel -> d
     com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder configurationBuilder -> a
     com.android.tools.r8.utils.Reporter reporter -> b
@@ -29595,7 +29569,7 @@
     112:112:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration parse(com.android.tools.r8.StringResource):50:50 -> a
     113:115:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> a
     113:115:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration parse(com.android.tools.r8.StringResource):50 -> a
-com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer -> com.android.tools.r8.s.c.o:
+com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer -> com.android.tools.r8.r.c.o:
     java.util.Map typeWrappers -> b
     java.util.Map vivifiedTypeWrappers -> c
     com.android.tools.r8.graph.AppView appView -> a
@@ -29608,16 +29582,16 @@
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter):114:114 -> <init>
     2:18:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter):101:117 -> <init>
     1:1:boolean canGenerateWrapper(com.android.tools.r8.graph.DexType):133:133 -> a
-    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     2:2:boolean canGenerateWrapper(com.android.tools.r8.graph.DexType):133 -> a
     3:3:boolean canGenerateWrapper(com.android.tools.r8.graph.DexType):137:137 -> a
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():324:324 -> a
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():316:316 -> a
     4:4:boolean canGenerateWrapper(com.android.tools.r8.graph.DexType):137 -> a
     5:18:com.android.tools.r8.graph.DexType getWrapper(com.android.tools.r8.graph.DexType,java.lang.String,java.util.Map,java.util.function.BiFunction):177:190 -> a
-    19:19:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    19:19:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     19:19:com.android.tools.r8.graph.DexType getWrapper(com.android.tools.r8.graph.DexType,java.lang.String,java.util.Map,java.util.function.BiFunction):190 -> a
     20:21:com.android.tools.r8.graph.DexType getWrapper(com.android.tools.r8.graph.DexType,java.lang.String,java.util.Map,java.util.function.BiFunction):192:193 -> a
-    22:22:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():324:324 -> a
+    22:22:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():316:316 -> a
     22:22:com.android.tools.r8.graph.DexType getWrapper(com.android.tools.r8.graph.DexType,java.lang.String,java.util.Map,java.util.function.BiFunction):193 -> a
     23:35:com.android.tools.r8.graph.DexType getWrapper(com.android.tools.r8.graph.DexType,java.lang.String,java.util.Map,java.util.function.BiFunction):192:204 -> a
     36:37:com.android.tools.r8.graph.DexType getWrapper(com.android.tools.r8.graph.DexType,java.lang.String,java.util.Map,java.util.function.BiFunction):195:196 -> a
@@ -29637,17 +29611,17 @@
     62:62:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):217 -> a
     63:77:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):330:344 -> a
     63:77:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):219 -> a
-    78:78:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    78:78:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     78:78:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):344 -> a
     78:78:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):219 -> a
     79:79:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):345:345 -> a
     79:79:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):219 -> a
-    80:80:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():324:324 -> a
+    80:80:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():316:316 -> a
     80:80:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):345 -> a
     80:80:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):219 -> a
     81:84:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):345:348 -> a
     81:84:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):219 -> a
-    85:85:boolean com.android.tools.r8.graph.DexEncodedMethod.isFinal():257:257 -> a
+    85:85:boolean com.android.tools.r8.graph.DexEncodedMethod.isFinal():261:261 -> a
     85:85:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):351 -> a
     85:85:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):219 -> a
     86:97:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):352:363 -> a
@@ -29673,13 +29647,13 @@
     166:166:void reportFinalMethodsInWrapper(java.util.Set):384:384 -> a
     167:177: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):395:405 -> a
     178:200:java.util.List allImplementedMethods(com.android.tools.r8.graph.DexClass):410:432 -> a
-    201:201:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    201:201:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     201:201:java.util.List allImplementedMethods(com.android.tools.r8.graph.DexClass):432 -> a
     202:202:java.util.List allImplementedMethods(com.android.tools.r8.graph.DexClass):434:434 -> a
-    203:203:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():324:324 -> a
+    203:203:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():316:316 -> a
     203:203:java.util.List allImplementedMethods(com.android.tools.r8.graph.DexClass):434 -> a
     204:210:java.util.List allImplementedMethods(com.android.tools.r8.graph.DexClass):434:440 -> a
-    211:211:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    211:211:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     211:211:java.util.List allImplementedMethods(com.android.tools.r8.graph.DexClass):440 -> a
     212:213:java.util.List allImplementedMethods(com.android.tools.r8.graph.DexClass):441:442 -> a
     214:214:void finalizeWrappers(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):488:488 -> a
@@ -29708,12 +29682,12 @@
     4:8:com.android.tools.r8.graph.DexProgramClass generateVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):227 -> b
     9:22:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):286:299 -> b
     9:22:com.android.tools.r8.graph.DexProgramClass generateVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):231 -> b
-    23:23:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> b
+    23:23:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> b
     23:23:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):299 -> b
     23:23:com.android.tools.r8.graph.DexProgramClass generateVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):231 -> b
     24:26:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):300:302 -> b
     24:26:com.android.tools.r8.graph.DexProgramClass generateVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):231 -> b
-    27:27:boolean com.android.tools.r8.graph.DexEncodedMethod.isFinal():257:257 -> b
+    27:27:boolean com.android.tools.r8.graph.DexEncodedMethod.isFinal():261:261 -> b
     27:27:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):307 -> b
     27:27:com.android.tools.r8.graph.DexProgramClass generateVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):231 -> b
     28:43:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):308:323 -> b
@@ -29731,7 +29705,7 @@
     1:1:com.android.tools.r8.graph.DexType getVivifiedTypeWrapper(com.android.tools.r8.graph.DexType):145:145 -> c
     1:1:boolean hasSynthesized(com.android.tools.r8.graph.DexType):125:125 -> d
     1:1:boolean isSynthesizedWrapper(com.android.tools.r8.graph.DexType):121:121 -> e
-com.android.tools.r8.ir.desugar.InterfaceMethodRewriter -> com.android.tools.r8.s.c.p:
+com.android.tools.r8.ir.desugar.InterfaceMethodRewriter -> com.android.tools.r8.r.c.p:
     java.util.Set synthesizedMethods -> g
     com.android.tools.r8.graph.DexItemFactory factory -> d
     com.android.tools.r8.graph.AppView appView -> a
@@ -29746,7 +29720,7 @@
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):134:134 -> <init>
     2:37:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):105:140 -> <init>
     1:6:void initializeEmulatedInterfaceVariables():144:149 -> a
-    7:7:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    7:7:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     7:7:void initializeEmulatedInterfaceVariables():149 -> a
     8:9:void initializeEmulatedInterfaceVariables():152:153 -> a
     10:10:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):160:160 -> a
@@ -29784,7 +29758,7 @@
     121:121:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):272 -> a
     122:122:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):273:273 -> a
     123:138:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):271:286 -> a
-    139:139:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    139:139:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     139:139:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):286 -> a
     140:151:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):287:298 -> a
     152:152:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):693:693 -> a
@@ -29814,12 +29788,12 @@
     234:268:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):335:369 -> a
     269:269:void 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):420:420 -> a
     269:269:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):371 -> a
-    270:270:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    270:270:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     270:270:void 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):420 -> a
     270:270:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):371 -> a
     271:273:void 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):420:422 -> a
     271:273:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):371 -> a
-    274:274:boolean com.android.tools.r8.graph.DexEncodedMethod.isAbstract():253:253 -> a
+    274:274:boolean com.android.tools.r8.graph.DexEncodedMethod.isAbstract():257:257 -> a
     274:274:void 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):422 -> a
     274:274:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):371 -> a
     275:276:void 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):422:423 -> a
@@ -29836,14 +29810,14 @@
     283:283:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):371 -> a
     284:284:java.util.Set lambda$rewriteMethodReferences$0(com.android.tools.r8.graph.DexLibraryClass):237:237 -> a
     285:285:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):436:436 -> a
-    286:286:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():324:324 -> a
+    286:286:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():316:316 -> a
     286:286:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):436 -> a
     287:291:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):436:440 -> a
     292:297:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Map):495:500 -> a
-    298:298:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    298:298:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     298:298:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Map):500 -> a
     299:308:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Map):502:511 -> a
-    309:309:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    309:309:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     309:309:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Map):511 -> a
     310:310:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Map):513:513 -> a
     311:316:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):544:549 -> a
@@ -29852,12 +29826,12 @@
     324:324:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):556 -> a
     325:325:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):556:556 -> a
     326:344:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):555:573 -> a
-    345:345:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    345:345:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     345:345:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):573 -> a
     346:346:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):574:574 -> a
     347:353:boolean implementsInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):520:526 -> a
     347:353:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):574 -> a
-    354:354:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    354:354:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     354:354:boolean implementsInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):526 -> a
     354:354:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):574 -> a
     355:355:boolean implementsInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):528:528 -> a
@@ -29865,10 +29839,10 @@
     356:361:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):575:580 -> a
     362:362:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):578:578 -> a
     363:377:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):575:589 -> a
-    378:378:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    378:378:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     378:378:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):589 -> a
     379:381:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):590:592 -> a
-    382:382:boolean com.android.tools.r8.graph.DexEncodedMethod.isAbstract():253:253 -> a
+    382:382:boolean com.android.tools.r8.graph.DexEncodedMethod.isAbstract():257:257 -> a
     382:382:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):593 -> a
     383:383:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):594:594 -> a
     384:384:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):693:693 -> a
@@ -29884,7 +29858,7 @@
     405:405:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):606:606 -> a
     406:449:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):605:648 -> a
     450:451:void reportStaticInterfaceMethodHandle(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethodHandle):665:666 -> a
-    452:452:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    452:452:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     452:452:void reportStaticInterfaceMethodHandle(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethodHandle):666 -> a
     453:457:void reportStaticInterfaceMethodHandle(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethodHandle):670:674 -> a
     458:458:java.lang.String getCompanionClassDescriptor(java.lang.String):681:681 -> a
@@ -29898,14 +29872,14 @@
     481:481:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):775 -> a
     482:484:com.android.tools.r8.graph.DexEncodedMethod[] renameHolder(java.util.List,com.android.tools.r8.graph.DexType):836:838 -> a
     485:485:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):915:915 -> a
-    486:486:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():324:324 -> a
+    486:486:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():316:316 -> a
     486:486:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):915 -> a
     487:490:java.util.Map processEmulatedInterfaceHierarchy():483:486 -> a
     487:490:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):464 -> a
     487:490:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):916 -> a
     491:492:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):465:466 -> a
     491:492:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):916 -> a
-    493:493:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    493:493:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     493:493:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):466 -> a
     493:493:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):916 -> a
     494:498:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):468:472 -> a
@@ -29919,12 +29893,12 @@
     501:502:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):916 -> a
     503:513:void duplicateEmulatedInterfaces():846:856 -> a
     503:513:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):918 -> a
-    514:514:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():324:324 -> a
+    514:514:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():316:316 -> a
     514:514:void duplicateEmulatedInterfaces():856 -> a
     514:514:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):918 -> a
     515:516:void duplicateEmulatedInterfaces():857:858 -> a
     515:516:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):918 -> a
-    517:517:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    517:517:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     517:517:void duplicateEmulatedInterfaces():858 -> a
     517:517:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):918 -> a
     518:518:void duplicateEmulatedInterfaces():859:859 -> a
@@ -29932,7 +29906,7 @@
     519:527:java.util.List emulatedInterfacesOf(com.android.tools.r8.graph.DexClass):881:889 -> a
     519:527:void duplicateEmulatedInterfaces():860 -> a
     519:527:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):918 -> a
-    528:528:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    528:528:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     528:528:java.util.List emulatedInterfacesOf(com.android.tools.r8.graph.DexClass):889 -> a
     528:528:void duplicateEmulatedInterfaces():860 -> a
     528:528:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):918 -> a
@@ -29963,7 +29937,7 @@
     586:586:boolean isInMainDexList(com.android.tools.r8.graph.DexType):725:725 -> a
     586:586:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):933 -> a
     587:591:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):933:937 -> a
-    592:592:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():324:324 -> a
+    592:592:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():316:316 -> a
     592:592:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):937 -> a
     593:594:void renameEmulatedInterfaces():791:792 -> a
     593:594:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):938 -> a
@@ -29977,7 +29951,7 @@
     608:608:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):814:814 -> a
     608:608:void renameEmulatedInterfaces():793 -> a
     608:608:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):938 -> a
-    609:609:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    609:609:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     609:609:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):814 -> a
     609:609:void renameEmulatedInterfaces():793 -> a
     609:609:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):938 -> a
@@ -29995,7 +29969,7 @@
     621:635:boolean isDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):990:1004 -> a
     636:636:boolean isDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):997:997 -> a
     637:648:boolean isEmulatedInterfaceDispatch(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):1012:1023 -> a
-    649:649:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    649:649:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     649:649:boolean isEmulatedInterfaceDispatch(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):1024 -> a
     650:659:boolean isEmulatedInterfaceDispatch(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):1025:1034 -> a
     660:660:void warnMissingType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1052:1052 -> a
@@ -30008,7 +29982,7 @@
     677:677: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):1082:1082 -> a
     678:679:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1095:1096 -> a
     678:679: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):1086 -> a
-    680:680:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    680:680:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     680:680:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1096 -> a
     680:680: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):1086 -> a
     681:682:void warnMissingInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1044:1045 -> a
@@ -30019,38 +29993,22 @@
     686:686:boolean isNonDesugaredLibraryClass(com.android.tools.r8.graph.DexClass):432:432 -> a
     686:686:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1107 -> a
     686:686: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):1086 -> a
-    687:693:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1112:1118 -> a
-    687:693: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):1086 -> a
-    694:694:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1143:1143 -> a
-    694:694:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1118 -> a
-    694:694: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):1086 -> a
-    695:695:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():716:716 -> a
-    695:695:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1145 -> a
-    695:695:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1118 -> a
-    695:695: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):1086 -> a
-    696:696:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():716:716 -> a
-    696:696:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1146 -> a
-    696:696:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1118 -> a
-    696:696: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):1086 -> a
-    697:697:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1148:1148 -> a
-    697:697:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1118 -> a
-    697:697: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):1086 -> a
-    698:714:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1122:1138 -> a
-    698:714: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):1086 -> a
-    715:715: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):1087:1087 -> a
-    716:718:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1102:1104 -> a
-    716:718: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):1086 -> a
-    719:719:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    719:719:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1104 -> a
+    687:713:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1112:1138 -> a
+    687:713: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):1086 -> a
+    714:714: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):1087:1087 -> a
+    715:717:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1102:1104 -> a
+    715:717: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):1086 -> a
+    718:718:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    718:718:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1104 -> a
+    718:718: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):1086 -> a
+    719:719:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1104:1104 -> a
     719:719: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):1086 -> a
-    720:720:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1104:1104 -> a
-    720:720: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):1086 -> a
-    721:721:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1143:1143 -> a
-    722:722:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():716:716 -> a
-    722:722:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1145 -> a
-    723:723:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():716:716 -> a
-    723:723:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1146 -> a
-    724:724:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1148:1148 -> a
+    720:721:void reportDependencyEdge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1143:1144 -> a
+    722:722:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():766:766 -> a
+    722:722:void reportDependencyEdge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1146 -> a
+    723:723:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():766:766 -> a
+    723:723:void reportDependencyEdge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1147 -> a
+    724:724:void reportDependencyEdge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1149:1149 -> a
     1:1:boolean isEmulatedInterface(com.android.tools.r8.graph.DexType):172:172 -> b
     2:3:boolean dontRewrite(com.android.tools.r8.graph.DexMethod):445:446 -> b
     4:5:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):658:659 -> b
@@ -30058,110 +30016,114 @@
     6:6:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):660 -> b
     7:7:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):661:661 -> b
     8:9:void warnMissingInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1044:1045 -> b
-    1:1:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):717:717 -> c
-    2:2:boolean isCompanionClassType(com.android.tools.r8.graph.DexType):707:707 -> c
-    2:2:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):717 -> c
-    3:6:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):717:720 -> c
-    7:9:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):719:721 -> c
-    10:10:boolean hasDispatchClassSuffix(com.android.tools.r8.graph.DexType):741:741 -> c
+    1:1:boolean isCompanionClassType(com.android.tools.r8.graph.DexType):707:707 -> c
+    2:2:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):717:717 -> c
+    3:3:boolean isCompanionClassType(com.android.tools.r8.graph.DexType):707:707 -> c
+    3:3:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):717 -> c
+    4:7:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):717:720 -> c
+    8:10:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):719:721 -> c
     11:11:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):785:785 -> c
     12:12:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):781:781 -> c
     12:12:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):785 -> c
-    1:1:boolean isCompanionClassType(com.android.tools.r8.graph.DexType):707:707 -> d
-    2:2:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):731:731 -> d
-    3:3:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):693:693 -> d
-    3:3:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):731 -> d
-    4:4:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):731:731 -> d
-    1:6:void warnMissingEmulatedInterface(com.android.tools.r8.graph.DexType):454:459 -> e
-    7:8:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1070:1071 -> e
-    9:9:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType):712:712 -> e
-    9:9:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1072 -> e
-    10:10:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1074:1074 -> e
-    11:11:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> e
-    11:11:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1074 -> e
-    12:12:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1075:1075 -> e
-    13:13:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():716:716 -> e
-    13:13:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1075 -> e
+    1:6:void warnMissingEmulatedInterface(com.android.tools.r8.graph.DexType):454:459 -> d
+    7:7:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):731:731 -> d
+    8:8:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):693:693 -> d
+    8:8:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):731 -> d
+    9:9:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):731:731 -> d
+    1:2:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1070:1071 -> e
+    3:3:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType):712:712 -> e
+    3:3:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1072 -> e
+    4:4:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1074:1074 -> e
+    5:5:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> e
+    5:5:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1074 -> e
+    6:6:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1075:1075 -> e
+    7:7:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():766:766 -> e
+    7:7:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1075 -> e
     1:4:com.android.tools.r8.graph.DexType maximallySpecificEmulatedInterfaceOrNull(com.android.tools.r8.graph.DexMethod):381:384 -> f
-    5:5:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> f
+    5:5:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> f
     5:5:com.android.tools.r8.graph.DexType maximallySpecificEmulatedInterfaceOrNull(com.android.tools.r8.graph.DexMethod):384 -> f
     6:6:com.android.tools.r8.graph.DexType maximallySpecificEmulatedInterfaceOrNull(com.android.tools.r8.graph.DexMethod):392:392 -> f
-    7:7:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():324:324 -> f
+    7:7:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():316:316 -> f
     7:7:com.android.tools.r8.graph.DexType maximallySpecificEmulatedInterfaceOrNull(com.android.tools.r8.graph.DexMethod):392 -> f
     8:24:com.android.tools.r8.graph.DexType maximallySpecificEmulatedInterfaceOrNull(com.android.tools.r8.graph.DexMethod):392:408 -> f
-    25:25:boolean com.android.tools.r8.graph.DexEncodedMethod.isAbstract():253:253 -> f
+    25:25:boolean com.android.tools.r8.graph.DexEncodedMethod.isAbstract():257:257 -> f
     25:25:com.android.tools.r8.graph.DexType maximallySpecificEmulatedInterfaceOrNull(com.android.tools.r8.graph.DexMethod):409 -> f
     26:26:com.android.tools.r8.graph.DexType maximallySpecificEmulatedInterfaceOrNull(com.android.tools.r8.graph.DexMethod):409:409 -> f
     27:27:boolean isEmulatedInterface(com.android.tools.r8.graph.DexType):172:172 -> f
     27:27:com.android.tools.r8.graph.DexType maximallySpecificEmulatedInterfaceOrNull(com.android.tools.r8.graph.DexMethod):409 -> f
     28:28:com.android.tools.r8.graph.DexType maximallySpecificEmulatedInterfaceOrNull(com.android.tools.r8.graph.DexMethod):410:410 -> f
-com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor -> com.android.tools.r8.s.c.p$a:
+com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor -> com.android.tools.r8.r.c.p$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>():127:131 -> <clinit>
     1:1:void <init>(java.lang.String,int):123:123 -> <init>
-com.android.tools.r8.ir.desugar.InterfaceProcessor -> com.android.tools.r8.s.c.r:
+com.android.tools.r8.ir.desugar.InterfaceProcessor -> com.android.tools.r8.r.c.r:
     java.util.Map syntheticClasses -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.desugar.InterfaceMethodRewriter rewriter -> b
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():54:54 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter):62:62 -> <init>
-    2:6:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter):60:64 -> <init>
+    1:1:void <clinit>():55:55 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter):63:63 -> <init>
+    2:6:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter):61:65 -> <init>
     long lambda$getChecksumSupplier$0(long,com.android.tools.r8.graph.DexProgramClass) -> a
-    1:8:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):68:75 -> a
-    9:20:boolean canMoveToCompanionClass(com.android.tools.r8.graph.DexEncodedMethod):286:297 -> a
-    9:20:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):76 -> a
-    21:33:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):82:94 -> a
-    34:40:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):93:99 -> a
-    41:42:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):86:87 -> a
+    1:8:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):69:76 -> a
+    9:20:boolean canMoveToCompanionClass(com.android.tools.r8.graph.DexEncodedMethod):287:298 -> a
+    9:20:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):77 -> a
+    21:33:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):83:95 -> a
+    34:40:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):94:100 -> a
+    41:42:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):87:88 -> a
     43:43:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):34:34 -> a
     43:43:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
-    43:43:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):87 -> a
-    44:44:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):87:87 -> a
-    45:46:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):77:78 -> a
+    43:43:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):88 -> a
+    44:44:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):88:88 -> a
+    45:46:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):78:79 -> a
     47:47:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):34:34 -> a
     47:47:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
-    47:47:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):78 -> a
-    48:48:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):78:78 -> a
-    49:66:boolean interfaceMethodRemovalChangesApi(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):310:327 -> a
-    49:66:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):103 -> a
-    67:67:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
-    67:67:boolean interfaceMethodRemovalChangesApi(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):327 -> a
-    67:67:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):103 -> a
-    68:74:boolean interfaceMethodRemovalChangesApi(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):329:335 -> a
-    68:74:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):103 -> a
-    75:94:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):104:123 -> a
-    95:98:boolean isStaticMethod(com.android.tools.r8.graph.DexEncodedMethod):343:346 -> a
-    95:98:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):124 -> a
-    99:104:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):125:130 -> a
-    105:123:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):129:147 -> a
-    124:128:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):146:150 -> a
-    129:130:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):143:144 -> a
-    131:131:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):34:34 -> a
-    131:131:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
-    131:131:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):144 -> a
-    132:143:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):144:155 -> a
-    144:144:boolean isStaticMethod(com.android.tools.r8.graph.DexEncodedMethod):344:344 -> a
-    144:144:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):124 -> a
-    145:163:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):159:177 -> a
-    164:164:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.getCompanionClassType(com.android.tools.r8.graph.DexType):693:693 -> a
-    164:164:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):177 -> a
-    165:186:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):178:199 -> a
-    187:191:com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier getChecksumSupplier(com.android.tools.r8.graph.DexProgramClass):203:207 -> a
-    192:216:java.util.List process(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):211:235 -> a
-    217:217:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.staticAsMethodOfDispatchClass(com.android.tools.r8.graph.DexMethod):736:736 -> a
-    217:217:java.util.List process(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):235 -> a
-    218:232:java.util.List process(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):237:251 -> a
-    233:286:java.util.List process(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):228:281 -> a
-com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLense -> com.android.tools.r8.s.c.r$a:
-    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.GraphLense,com.android.tools.r8.graph.DexItemFactory):361:361 -> <init>
-    1:1:com.android.tools.r8.graph.GraphLense$Builder builder():377:377 -> b
-    1:1:com.android.tools.r8.ir.code.Invoke$Type mapInvocationType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):373:373 -> mapInvocationType
-com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLense$Builder -> com.android.tools.r8.s.c.q:
-    1:1:void <init>():380:380 -> <init>
-    1:4:com.android.tools.r8.graph.GraphLense build(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLense):383:386 -> a
-com.android.tools.r8.ir.desugar.LambdaBridgeMethodSourceCode -> com.android.tools.r8.s.c.s:
+    47:47:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):79 -> a
+    48:48:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):79:79 -> a
+    49:60:boolean interfaceMethodRemovalChangesApi(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):317:328 -> a
+    49:60:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):104 -> a
+    61:63:com.android.tools.r8.graph.DexClass definitionForDependency(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):307:309 -> a
+    61:63:boolean interfaceMethodRemovalChangesApi(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):328 -> a
+    61:63:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):104 -> a
+    64:64:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
+    64:64:com.android.tools.r8.graph.DexClass definitionForDependency(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):309 -> a
+    64:64:boolean interfaceMethodRemovalChangesApi(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):328 -> a
+    64:64:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):104 -> a
+    65:71:boolean interfaceMethodRemovalChangesApi(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):329:335 -> a
+    65:71:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):104 -> a
+    72:91:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):105:124 -> a
+    92:95:boolean isStaticMethod(com.android.tools.r8.graph.DexEncodedMethod):351:354 -> a
+    92:95:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):125 -> a
+    96:101:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):126:131 -> a
+    102:120:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):130:148 -> a
+    121:125:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):147:151 -> a
+    126:127:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):144:145 -> a
+    128:128:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):34:34 -> a
+    128:128:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
+    128:128:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):145 -> a
+    129:140:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):145:156 -> a
+    141:141:boolean isStaticMethod(com.android.tools.r8.graph.DexEncodedMethod):352:352 -> a
+    141:141:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):125 -> a
+    142:160:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):160:178 -> a
+    161:161:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.getCompanionClassType(com.android.tools.r8.graph.DexType):693:693 -> a
+    161:161:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):178 -> a
+    162:183:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):179:200 -> a
+    184:188:com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier getChecksumSupplier(com.android.tools.r8.graph.DexProgramClass):204:208 -> a
+    189:213:java.util.List process(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):212:236 -> a
+    214:214:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.staticAsMethodOfDispatchClass(com.android.tools.r8.graph.DexMethod):736:736 -> a
+    214:214:java.util.List process(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):236 -> a
+    215:229:java.util.List process(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):238:252 -> a
+    230:283:java.util.List process(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):229:282 -> a
+    284:288:void addSuperTypes(com.android.tools.r8.graph.DexClass,java.util.Deque):342:346 -> a
+com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLense -> com.android.tools.r8.r.c.r$a:
+    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.GraphLense,com.android.tools.r8.graph.DexItemFactory):369:369 -> <init>
+    1:1:com.android.tools.r8.graph.GraphLense$Builder builder():385:385 -> b
+    1:1:com.android.tools.r8.ir.code.Invoke$Type mapInvocationType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):381:381 -> mapInvocationType
+com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLense$Builder -> com.android.tools.r8.r.c.q:
+    1:1:void <init>():388:388 -> <init>
+    1:4:com.android.tools.r8.graph.GraphLense build(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLense):391:394 -> a
+com.android.tools.r8.ir.desugar.LambdaBridgeMethodSourceCode -> com.android.tools.r8.r.c.s:
     com.android.tools.r8.graph.DexMethod mainMethod -> o
     1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):23:24 -> <init>
     1:1:void lambda$prepareInstructions$0(java.util.List,java.util.List,com.android.tools.r8.ir.conversion.IRBuilder):51:51 -> a
@@ -30173,7 +30135,7 @@
     2:2:void prepareInstructions():30 -> h
     3:18:void prepareInstructions():30:45 -> h
     19:46:void prepareInstructions():44:71 -> h
-com.android.tools.r8.ir.desugar.LambdaBridgeMethodSynthesizedCode -> com.android.tools.r8.s.c.t:
+com.android.tools.r8.ir.desugar.LambdaBridgeMethodSynthesizedCode -> com.android.tools.r8.r.c.t:
     com.android.tools.r8.graph.DexMethod bridgeMethod -> f
     com.android.tools.r8.graph.DexMethod mainMethod -> e
     1:3:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):19:21 -> <init>
@@ -30184,7 +30146,7 @@
     7:8:void lambda$getRegistryCallback$1(com.android.tools.r8.graph.UseRegistry):38:39 -> a
     1:1:java.util.function.Consumer getRegistryCallback():32:32 -> getRegistryCallback
     1:1:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():26:26 -> getSourceCodeProvider
-com.android.tools.r8.ir.desugar.LambdaClass -> com.android.tools.r8.s.c.A:
+com.android.tools.r8.ir.desugar.LambdaClass -> com.android.tools.r8.r.c.A:
     java.util.concurrent.atomic.AtomicBoolean addToMainDexList -> h
     com.android.tools.r8.graph.DexField lambdaField -> f
     com.android.tools.r8.ir.desugar.LambdaClass$Target target -> g
@@ -30196,109 +30158,109 @@
     com.android.tools.r8.graph.DexMethod classConstructor -> e
     com.android.tools.r8.graph.DexMethod constructor -> d
     java.util.Collection synthesizedFrom -> i
-    1:1:void <clinit>():58:58 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):76:76 -> <init>
-    2:34:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):67:99 -> <init>
-    1:21:com.android.tools.r8.graph.DexType createLambdaClassType(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):105:125 -> a
-    22:22:com.android.tools.r8.graph.DexProgramClass getOrCreateLambdaClass():129:129 -> a
-    23:24:com.android.tools.r8.graph.DexField getCaptureField(int):188:189 -> a
-    25:25:com.android.tools.r8.graph.DexField getCaptureField(int):188:188 -> a
-    26:33:void addSynthesizedFrom(com.android.tools.r8.graph.DexProgramClass):197:204 -> a
-    34:34:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):320:320 -> a
-    35:56:com.android.tools.r8.ir.desugar.LambdaClass$Target createLambdaImplMethodTarget(com.android.tools.r8.graph.DexType):343:364 -> a
-    35:56:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):321 -> a
-    57:57:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
-    57:57:com.android.tools.r8.ir.desugar.LambdaClass$Target createLambdaImplMethodTarget(com.android.tools.r8.graph.DexType):365 -> a
-    57:57:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):321 -> a
-    58:77:com.android.tools.r8.ir.desugar.LambdaClass$Target createLambdaImplMethodTarget(com.android.tools.r8.graph.DexType):365:384 -> a
-    58:77:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):321 -> a
-    78:78:com.android.tools.r8.ir.desugar.LambdaClass$Target createLambdaImplMethodTarget(com.android.tools.r8.graph.DexType):383:383 -> a
-    78:78:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):321 -> a
-    79:79:com.android.tools.r8.ir.desugar.LambdaClass$Target createLambdaImplMethodTarget(com.android.tools.r8.graph.DexType):380:380 -> a
-    79:79:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):321 -> a
-    80:93:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):325:338 -> a
-    94:95:com.android.tools.r8.ir.desugar.LambdaClass$Target createInstanceMethodTarget(com.android.tools.r8.graph.DexType):391:392 -> a
-    94:95:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):336 -> a
-    96:117:com.android.tools.r8.ir.desugar.LambdaClass$Target createInstanceMethodTarget(com.android.tools.r8.graph.DexType):391:412 -> a
-    96:117:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):336 -> a
-    118:121:com.android.tools.r8.ir.desugar.LambdaClass$Target createInstanceMethodTarget(com.android.tools.r8.graph.DexType):411:414 -> a
-    118:121:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):336 -> a
-    122:132:com.android.tools.r8.ir.desugar.LambdaClass$Target createStaticMethodTarget(com.android.tools.r8.graph.DexType):420:430 -> a
-    122:132:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):333 -> a
-    133:135:com.android.tools.r8.ir.desugar.LambdaClass$Target createStaticMethodTarget(com.android.tools.r8.graph.DexType):429:431 -> a
-    133:135:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):333 -> a
-    136:153:com.android.tools.r8.ir.desugar.LambdaClass$Target createConstructorTarget(com.android.tools.r8.graph.DexType):437:454 -> a
-    136:153:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):331 -> a
-    154:156:com.android.tools.r8.ir.desugar.LambdaClass$Target createConstructorTarget(com.android.tools.r8.graph.DexType):453:455 -> a
-    154:156:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):331 -> a
-    157:159:com.android.tools.r8.ir.desugar.LambdaClass$Target createInterfaceMethodTarget(com.android.tools.r8.graph.DexType):460:462 -> a
-    157:159:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):329 -> a
-    160:160:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):327:327 -> a
-    1:9:long computeChecksumForSynthesizedClass(com.android.tools.r8.graph.DexProgramClass):176:184 -> b
-    10:10:boolean isStateless():193:193 -> b
+    1:1:void <clinit>():59:59 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):77:77 -> <init>
+    2:34:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):68:100 -> <init>
+    1:21:com.android.tools.r8.graph.DexType createLambdaClassType(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):106:126 -> a
+    22:22:com.android.tools.r8.graph.DexProgramClass getOrCreateLambdaClass():130:130 -> a
+    23:24:com.android.tools.r8.graph.DexField getCaptureField(int):189:190 -> a
+    25:25:com.android.tools.r8.graph.DexField getCaptureField(int):189:189 -> a
+    26:33:void addSynthesizedFrom(com.android.tools.r8.graph.DexProgramClass):198:205 -> a
+    34:34:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):321:321 -> a
+    35:56:com.android.tools.r8.ir.desugar.LambdaClass$Target createLambdaImplMethodTarget(com.android.tools.r8.graph.DexType):344:365 -> a
+    35:56:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):322 -> a
+    57:57:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
+    57:57:com.android.tools.r8.ir.desugar.LambdaClass$Target createLambdaImplMethodTarget(com.android.tools.r8.graph.DexType):366 -> a
+    57:57:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):322 -> a
+    58:77:com.android.tools.r8.ir.desugar.LambdaClass$Target createLambdaImplMethodTarget(com.android.tools.r8.graph.DexType):366:385 -> a
+    58:77:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):322 -> a
+    78:78:com.android.tools.r8.ir.desugar.LambdaClass$Target createLambdaImplMethodTarget(com.android.tools.r8.graph.DexType):384:384 -> a
+    78:78:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):322 -> a
+    79:79:com.android.tools.r8.ir.desugar.LambdaClass$Target createLambdaImplMethodTarget(com.android.tools.r8.graph.DexType):381:381 -> a
+    79:79:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):322 -> a
+    80:93:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):326:339 -> a
+    94:95:com.android.tools.r8.ir.desugar.LambdaClass$Target createInstanceMethodTarget(com.android.tools.r8.graph.DexType):392:393 -> a
+    94:95:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):337 -> a
+    96:117:com.android.tools.r8.ir.desugar.LambdaClass$Target createInstanceMethodTarget(com.android.tools.r8.graph.DexType):392:413 -> a
+    96:117:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):337 -> a
+    118:121:com.android.tools.r8.ir.desugar.LambdaClass$Target createInstanceMethodTarget(com.android.tools.r8.graph.DexType):412:415 -> a
+    118:121:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):337 -> a
+    122:132:com.android.tools.r8.ir.desugar.LambdaClass$Target createStaticMethodTarget(com.android.tools.r8.graph.DexType):421:431 -> a
+    122:132:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):334 -> a
+    133:135:com.android.tools.r8.ir.desugar.LambdaClass$Target createStaticMethodTarget(com.android.tools.r8.graph.DexType):430:432 -> a
+    133:135:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):334 -> a
+    136:153:com.android.tools.r8.ir.desugar.LambdaClass$Target createConstructorTarget(com.android.tools.r8.graph.DexType):438:455 -> a
+    136:153:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):332 -> a
+    154:156:com.android.tools.r8.ir.desugar.LambdaClass$Target createConstructorTarget(com.android.tools.r8.graph.DexType):454:456 -> a
+    154:156:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):332 -> a
+    157:159:com.android.tools.r8.ir.desugar.LambdaClass$Target createInterfaceMethodTarget(com.android.tools.r8.graph.DexType):461:463 -> a
+    157:159:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):330 -> a
+    160:160:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):328:328 -> a
+    1:9:long computeChecksumForSynthesizedClass(com.android.tools.r8.graph.DexProgramClass):177:185 -> b
+    10:10:boolean isStateless():194:194 -> b
     11:11:boolean com.android.tools.r8.ir.desugar.LambdaDescriptor.isStateless():162:162 -> b
-    11:11:boolean isStateless():193 -> b
-    1:1:com.android.tools.r8.graph.DexString generateUniqueLambdaMethodName():466:466 -> c
-    1:11:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():133:143 -> d
-    12:15:com.android.tools.r8.graph.DexTypeList buildInterfaces():311:314 -> d
-    12:15:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():146 -> d
-    16:22:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():146:152 -> d
-    23:38:com.android.tools.r8.graph.DexEncodedField[] synthesizeStaticFields():289:304 -> d
-    23:38:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():153 -> d
-    39:47:com.android.tools.r8.graph.DexEncodedField[] synthesizeInstanceFields():274:282 -> d
-    39:47:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():154 -> d
-    48:71:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeDirectMethods():243:266 -> d
-    48:71:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():155 -> d
-    72:98:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethods(com.android.tools.r8.graph.DexMethod):209:235 -> d
-    72:98:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():156 -> d
-    99:108:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():156:165 -> d
-com.android.tools.r8.ir.desugar.LambdaClass$ClassMethodWithAccessorTarget -> com.android.tools.r8.s.c.u:
+    11:11:boolean isStateless():194 -> b
+    1:1:com.android.tools.r8.graph.DexString generateUniqueLambdaMethodName():467:467 -> c
+    1:11:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():134:144 -> d
+    12:15:com.android.tools.r8.graph.DexTypeList buildInterfaces():312:315 -> d
+    12:15:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():147 -> d
+    16:22:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():147:153 -> d
+    23:38:com.android.tools.r8.graph.DexEncodedField[] synthesizeStaticFields():290:305 -> d
+    23:38:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():154 -> d
+    39:47:com.android.tools.r8.graph.DexEncodedField[] synthesizeInstanceFields():275:283 -> d
+    39:47:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():155 -> d
+    48:71:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeDirectMethods():244:267 -> d
+    48:71:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():156 -> d
+    72:98:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethods(com.android.tools.r8.graph.DexMethod):210:236 -> d
+    72:98:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():157 -> d
+    99:108:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():157:166 -> d
+com.android.tools.r8.ir.desugar.LambdaClass$ClassMethodWithAccessorTarget -> com.android.tools.r8.r.c.u:
     boolean $assertionsDisabled -> f
     com.android.tools.r8.ir.desugar.LambdaClass this$0 -> e
-    1:1:void <clinit>():644:644 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):646:647 -> <init>
-    1:1:void ensureAccessibility():653:653 -> a
-    2:2:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.desugar.LambdaClass$Target.programDefinitionFor(com.android.tools.r8.graph.DexType):493:493 -> a
-    2:2:void ensureAccessibility():653 -> a
-    3:26:void ensureAccessibility():654:677 -> a
-    27:27:void ensureAccessibility():675:675 -> a
-    28:28:com.android.tools.r8.ir.conversion.SourceCode lambda$ensureAccessibility$0(com.android.tools.r8.ir.code.Position):670:670 -> a
-com.android.tools.r8.ir.desugar.LambdaClass$InstanceLambdaImplTarget -> com.android.tools.r8.s.c.v:
+    1:1:void <clinit>():643:643 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):645:646 -> <init>
+    1:1:void ensureAccessibility():652:652 -> a
+    2:2:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.desugar.LambdaClass$Target.programDefinitionFor(com.android.tools.r8.graph.DexType):494:494 -> a
+    2:2:void ensureAccessibility():652 -> a
+    3:26:void ensureAccessibility():653:676 -> a
+    27:27:void ensureAccessibility():674:674 -> a
+    28:28:com.android.tools.r8.ir.conversion.SourceCode lambda$ensureAccessibility$0(com.android.tools.r8.ir.code.Position):669:669 -> a
+com.android.tools.r8.ir.desugar.LambdaClass$InstanceLambdaImplTarget -> com.android.tools.r8.r.c.v:
     com.android.tools.r8.ir.desugar.LambdaClass this$0 -> e
-    1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):604:605 -> <init>
-    1:6:void ensureAccessibility():612:617 -> a
+    1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):603:604 -> <init>
+    1:6:void ensureAccessibility():611:616 -> a
     7:7:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):157:157 -> a
-    7:7:void ensureAccessibility():618 -> a
-    8:22:void ensureAccessibility():621:635 -> a
-com.android.tools.r8.ir.desugar.LambdaClass$InterfaceLambdaImplTarget -> com.android.tools.r8.s.c.w:
+    7:7:void ensureAccessibility():617 -> a
+    8:22:void ensureAccessibility():620:634 -> a
+com.android.tools.r8.ir.desugar.LambdaClass$InterfaceLambdaImplTarget -> com.android.tools.r8.r.c.w:
     boolean $assertionsDisabled -> f
     com.android.tools.r8.ir.desugar.LambdaClass this$0 -> e
-    1:1:void <clinit>():555:555 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):557:558 -> <init>
-    1:6:void ensureAccessibility():565:570 -> a
+    1:1:void <clinit>():554:554 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):556:557 -> <init>
+    1:6:void ensureAccessibility():564:569 -> a
     7:7:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):157:157 -> a
-    7:7:void ensureAccessibility():571 -> a
-    8:25:void ensureAccessibility():574:591 -> a
-    26:33:void ensureAccessibility():590:597 -> a
-com.android.tools.r8.ir.desugar.LambdaClass$NoAccessorMethodTarget -> com.android.tools.r8.s.c.x:
-    1:1:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.Invoke$Type):527:527 -> <init>
+    7:7:void ensureAccessibility():570 -> a
+    8:25:void ensureAccessibility():573:590 -> a
+    26:33:void ensureAccessibility():589:596 -> a
+com.android.tools.r8.ir.desugar.LambdaClass$NoAccessorMethodTarget -> com.android.tools.r8.r.c.x:
+    1:1:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.Invoke$Type):526:526 -> <init>
     void ensureAccessibility() -> a
-com.android.tools.r8.ir.desugar.LambdaClass$StaticLambdaImplTarget -> com.android.tools.r8.s.c.y:
+com.android.tools.r8.ir.desugar.LambdaClass$StaticLambdaImplTarget -> com.android.tools.r8.r.c.y:
     boolean $assertionsDisabled -> f
     com.android.tools.r8.ir.desugar.LambdaClass this$0 -> e
-    1:1:void <clinit>():535:535 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass):537:538 -> <init>
-    1:5:void ensureAccessibility():544:548 -> a
-com.android.tools.r8.ir.desugar.LambdaClass$Target -> com.android.tools.r8.s.c.z:
+    1:1:void <clinit>():534:534 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass):536:537 -> <init>
+    1:5:void ensureAccessibility():543:547 -> a
+com.android.tools.r8.ir.desugar.LambdaClass$Target -> com.android.tools.r8.r.c.z:
     com.android.tools.r8.ir.code.Invoke$Type invokeType -> b
     com.android.tools.r8.ir.desugar.LambdaClass this$0 -> c
     com.android.tools.r8.graph.DexMethod callTarget -> a
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():473:473 -> <clinit>
-    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):478:482 -> <init>
+    1:1:void <clinit>():474:474 -> <clinit>
+    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):479:483 -> <init>
     void ensureAccessibility() -> a
-    1:1:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):489:489 -> a
-com.android.tools.r8.ir.desugar.LambdaClassConstructorSourceCode -> com.android.tools.r8.s.c.B:
+    1:1:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):490:490 -> a
+com.android.tools.r8.ir.desugar.LambdaClassConstructorSourceCode -> com.android.tools.r8.r.c.B:
     boolean $assertionsDisabled -> o
     1:1:void <clinit>():15:15 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.Position):18:19 -> <init>
@@ -30307,13 +30269,13 @@
     7:7:void lambda$prepareInstructions$1(int,com.android.tools.r8.ir.conversion.IRBuilder):29:29 -> c
     1:1:void lambda$prepareInstructions$2(int,com.android.tools.r8.ir.conversion.IRBuilder):38:38 -> d
     1:17:void prepareInstructions():25:41 -> h
-com.android.tools.r8.ir.desugar.LambdaClassConstructorSynthesizedCode -> com.android.tools.r8.s.c.C:
+com.android.tools.r8.ir.desugar.LambdaClassConstructorSynthesizedCode -> com.android.tools.r8.r.c.C:
     1:1:void <init>(com.android.tools.r8.ir.desugar.LambdaClass):13:13 -> <init>
     1:1:com.android.tools.r8.ir.conversion.SourceCode lambda$getSourceCodeProvider$0(com.android.tools.r8.ir.code.Position):18:18 -> a
     2:4:void lambda$getRegistryCallback$1(com.android.tools.r8.graph.UseRegistry):24:26 -> a
     1:1:java.util.function.Consumer getRegistryCallback():23:23 -> getRegistryCallback
     1:1:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():18:18 -> getSourceCodeProvider
-com.android.tools.r8.ir.desugar.LambdaConstructorSourceCode -> com.android.tools.r8.s.c.D:
+com.android.tools.r8.ir.desugar.LambdaConstructorSourceCode -> com.android.tools.r8.r.c.D:
     boolean $assertionsDisabled -> o
     1:1:void <clinit>():16:16 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.Position):19:19 -> <init>
@@ -30323,13 +30285,13 @@
     1:8:boolean equals(java.lang.Object):63:70 -> equals
     1:25:void prepareInstructions():25:49 -> h
     1:2:int hashCode():57:58 -> hashCode
-com.android.tools.r8.ir.desugar.LambdaConstructorSynthesizedCode -> com.android.tools.r8.s.c.E:
+com.android.tools.r8.ir.desugar.LambdaConstructorSynthesizedCode -> com.android.tools.r8.r.c.E:
     1:1:void <init>(com.android.tools.r8.ir.desugar.LambdaClass):14:14 -> <init>
     1:1:com.android.tools.r8.ir.conversion.SourceCode lambda$getSourceCodeProvider$0(com.android.tools.r8.ir.code.Position):19:19 -> a
     2:5:void lambda$getRegistryCallback$1(com.android.tools.r8.graph.UseRegistry):25:28 -> a
     1:1:java.util.function.Consumer getRegistryCallback():24:24 -> getRegistryCallback
     1:1:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():19:19 -> getSourceCodeProvider
-com.android.tools.r8.ir.desugar.LambdaDescriptor -> com.android.tools.r8.s.c.F:
+com.android.tools.r8.ir.desugar.LambdaDescriptor -> com.android.tools.r8.r.c.F:
     java.util.Set bridges -> g
     com.android.tools.r8.graph.DexString name -> b
     com.android.tools.r8.ir.desugar.LambdaDescriptor MATCH_FAILED -> j
@@ -30377,7 +30339,7 @@
     95:96:com.android.tools.r8.ir.desugar.LambdaDescriptor infer(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.AppInfo):267:268 -> b
     1:4:com.android.tools.r8.graph.DexType getImplReceiverType():85:88 -> c
     5:6:com.android.tools.r8.ir.desugar.LambdaDescriptor tryInfer(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.AppInfo):225:226 -> c
-com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode -> com.android.tools.r8.s.c.G:
+com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode -> com.android.tools.r8.r.c.G:
     boolean $assertionsDisabled -> o
     1:1:void <clinit>():25:25 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):28:28 -> <init>
@@ -30386,7 +30348,7 @@
     14:46:boolean isSameOrAdaptableTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):82:114 -> a
     47:47:com.android.tools.r8.graph.DexType getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):57:57 -> a
     47:47:boolean isSameOrAdaptableTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):121 -> a
-    48:48:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):445:445 -> a
+    48:48:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):446:446 -> a
     48:48:com.android.tools.r8.graph.DexType getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):57 -> a
     48:48:boolean isSameOrAdaptableTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):121 -> a
     49:58:boolean isSameOrAdaptableTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):122:131 -> a
@@ -30394,34 +30356,34 @@
     60:60:void lambda$prepareInstructions$0(int,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.IRBuilder):199:199 -> a
     61:61:void lambda$prepareInstructions$1(int,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.conversion.IRBuilder):215:215 -> a
     62:62:void lambda$prepareInstructions$2(com.android.tools.r8.ir.desugar.LambdaClass$Target,com.android.tools.r8.graph.DexMethod,java.util.List,java.util.List,com.android.tools.r8.ir.conversion.IRBuilder):229:229 -> a
-    63:63:boolean com.android.tools.r8.ir.desugar.LambdaClass$Target.holderIsInterface():497:497 -> a
+    63:63:boolean com.android.tools.r8.ir.desugar.LambdaClass$Target.holderIsInterface():498:498 -> a
     63:63:void lambda$prepareInstructions$2(com.android.tools.r8.ir.desugar.LambdaClass$Target,com.android.tools.r8.graph.DexMethod,java.util.List,java.util.List,com.android.tools.r8.ir.conversion.IRBuilder):235 -> a
-    64:64:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():345:345 -> a
-    64:64:boolean com.android.tools.r8.ir.desugar.LambdaClass$Target.holderIsInterface():497 -> a
+    64:64:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():337:337 -> a
+    64:64:boolean com.android.tools.r8.ir.desugar.LambdaClass$Target.holderIsInterface():499 -> a
     64:64:void lambda$prepareInstructions$2(com.android.tools.r8.ir.desugar.LambdaClass$Target,com.android.tools.r8.graph.DexMethod,java.util.List,java.util.List,com.android.tools.r8.ir.conversion.IRBuilder):235 -> a
-    65:65:boolean com.android.tools.r8.ir.desugar.LambdaClass$Target.holderIsInterface():506:506 -> a
+    65:65:boolean com.android.tools.r8.ir.desugar.LambdaClass$Target.holderIsInterface():508:508 -> a
     65:65:void lambda$prepareInstructions$2(com.android.tools.r8.ir.desugar.LambdaClass$Target,com.android.tools.r8.graph.DexMethod,java.util.List,java.util.List,com.android.tools.r8.ir.conversion.IRBuilder):235 -> a
-    66:66:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():324:324 -> a
-    66:66:boolean com.android.tools.r8.ir.desugar.LambdaClass$Target.holderIsInterface():506 -> a
+    66:66:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():316:316 -> a
+    66:66:boolean com.android.tools.r8.ir.desugar.LambdaClass$Target.holderIsInterface():508 -> a
     66:66:void lambda$prepareInstructions$2(com.android.tools.r8.ir.desugar.LambdaClass$Target,com.android.tools.r8.graph.DexMethod,java.util.List,java.util.List,com.android.tools.r8.ir.conversion.IRBuilder):235 -> a
-    67:77:boolean com.android.tools.r8.ir.desugar.LambdaClass$Target.holderIsInterface():506:516 -> a
-    67:77:void lambda$prepareInstructions$2(com.android.tools.r8.ir.desugar.LambdaClass$Target,com.android.tools.r8.graph.DexMethod,java.util.List,java.util.List,com.android.tools.r8.ir.conversion.IRBuilder):235 -> a
-    78:87:boolean com.android.tools.r8.ir.desugar.LambdaClass$Target.holderIsInterface():510:519 -> a
-    78:87:void lambda$prepareInstructions$2(com.android.tools.r8.ir.desugar.LambdaClass$Target,com.android.tools.r8.graph.DexMethod,java.util.List,java.util.List,com.android.tools.r8.ir.conversion.IRBuilder):235 -> a
-    88:88:void lambda$prepareInstructions$2(com.android.tools.r8.ir.desugar.LambdaClass$Target,com.android.tools.r8.graph.DexMethod,java.util.List,java.util.List,com.android.tools.r8.ir.conversion.IRBuilder):229:229 -> a
-    89:94:int prepareReturnValue(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):261:266 -> a
-    95:112:int adjustType(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):289:306 -> a
-    113:113:com.android.tools.r8.graph.DexType getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):57:57 -> a
-    113:113:int adjustType(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):308 -> a
-    114:114:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):445:445 -> a
-    114:114:com.android.tools.r8.graph.DexType getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):57 -> a
-    114:114:int adjustType(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):308 -> a
-    115:156:int adjustType(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):310:351 -> a
-    157:157:void lambda$adjustType$6(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.conversion.IRBuilder):345:345 -> a
-    158:158:void lambda$addPrimitiveWideningConversion$7(com.android.tools.r8.ir.code.NumericType,int,int,com.android.tools.r8.ir.conversion.IRBuilder):372:372 -> a
-    159:159:void lambda$addPrimitiveWideningConversion$10(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int,com.android.tools.r8.ir.conversion.IRBuilder):405:405 -> a
-    160:160:int castToBoxedType(int,com.android.tools.r8.graph.DexType):473:473 -> a
-    161:161:void lambda$addPrimitiveBoxing$14(com.android.tools.r8.graph.DexMethod,java.util.List,java.util.List,com.android.tools.r8.ir.conversion.IRBuilder):488:488 -> a
+    67:74:boolean com.android.tools.r8.ir.desugar.LambdaClass$Target.holderIsInterface():508:515 -> a
+    67:74:void lambda$prepareInstructions$2(com.android.tools.r8.ir.desugar.LambdaClass$Target,com.android.tools.r8.graph.DexMethod,java.util.List,java.util.List,com.android.tools.r8.ir.conversion.IRBuilder):235 -> a
+    75:81:boolean com.android.tools.r8.ir.desugar.LambdaClass$Target.holderIsInterface():512:518 -> a
+    75:81:void lambda$prepareInstructions$2(com.android.tools.r8.ir.desugar.LambdaClass$Target,com.android.tools.r8.graph.DexMethod,java.util.List,java.util.List,com.android.tools.r8.ir.conversion.IRBuilder):235 -> a
+    82:82:void lambda$prepareInstructions$2(com.android.tools.r8.ir.desugar.LambdaClass$Target,com.android.tools.r8.graph.DexMethod,java.util.List,java.util.List,com.android.tools.r8.ir.conversion.IRBuilder):229:229 -> a
+    83:88:int prepareReturnValue(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):261:266 -> a
+    89:106:int adjustType(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):289:306 -> a
+    107:107:com.android.tools.r8.graph.DexType getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):57:57 -> a
+    107:107:int adjustType(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):308 -> a
+    108:108:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):446:446 -> a
+    108:108:com.android.tools.r8.graph.DexType getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):57 -> a
+    108:108:int adjustType(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):308 -> a
+    109:150:int adjustType(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):310:351 -> a
+    151:151:void lambda$adjustType$6(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.conversion.IRBuilder):345:345 -> a
+    152:152:void lambda$addPrimitiveWideningConversion$7(com.android.tools.r8.ir.code.NumericType,int,int,com.android.tools.r8.ir.conversion.IRBuilder):372:372 -> a
+    153:153:void lambda$addPrimitiveWideningConversion$10(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int,com.android.tools.r8.ir.conversion.IRBuilder):405:405 -> a
+    154:154:int castToBoxedType(int,com.android.tools.r8.graph.DexType):473:473 -> a
+    155:155:void lambda$addPrimitiveBoxing$14(com.android.tools.r8.graph.DexMethod,java.util.List,java.util.List,com.android.tools.r8.ir.conversion.IRBuilder):488:488 -> a
     1:1:void lambda$addPrimitiveWideningConversion$8(com.android.tools.r8.ir.code.NumericType,int,int,com.android.tools.r8.ir.conversion.IRBuilder):387:387 -> b
     2:2:void lambda$addPrimitiveWideningConversion$9(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int,com.android.tools.r8.ir.conversion.IRBuilder):397:397 -> b
     3:3:void lambda$addPrimitiveUnboxing$11(com.android.tools.r8.graph.DexMethod,java.util.List,java.util.List,com.android.tools.r8.ir.conversion.IRBuilder):458:458 -> b
@@ -30459,7 +30421,7 @@
     80:81:int prepareParameterValue(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):279:280 -> h
     80:81:void prepareInstructions():222 -> h
     82:112:void prepareInstructions():222:252 -> h
-com.android.tools.r8.ir.desugar.LambdaMainMethodSynthesizedCode -> com.android.tools.r8.s.c.H:
+com.android.tools.r8.ir.desugar.LambdaMainMethodSynthesizedCode -> com.android.tools.r8.r.c.H:
     boolean $assertionsDisabled -> f
     com.android.tools.r8.graph.DexMethod mainMethod -> e
     1:1:void <clinit>():14:14 -> <clinit>
@@ -30471,7 +30433,7 @@
     32:32:void lambda$getRegistryCallback$1(com.android.tools.r8.graph.UseRegistry):46:46 -> a
     1:1:java.util.function.Consumer getRegistryCallback():30:30 -> getRegistryCallback
     1:1:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():25:25 -> getSourceCodeProvider
-com.android.tools.r8.ir.desugar.LambdaRewriter -> com.android.tools.r8.s.c.J:
+com.android.tools.r8.ir.desugar.LambdaRewriter -> com.android.tools.r8.r.c.J:
     com.android.tools.r8.graph.DexItemFactory factory -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.DexString constructorName -> e
@@ -30542,7 +30504,7 @@
     198:204:java.lang.Object putIfAbsent(java.util.Map,java.lang.Object,java.lang.Object):370:376 -> a
     198:204:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):318 -> a
     205:209:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):318:322 -> a
-    210:210:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():324:324 -> a
+    210:210:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():316:316 -> a
     210:210:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):322 -> a
     211:218:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):323:330 -> a
     219:229:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):350:360 -> a
@@ -30556,16 +30518,15 @@
     233:233:java.lang.Object putIfAbsent(java.util.Map,java.lang.Object,java.lang.Object):377:377 -> a
     233:233:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):318 -> a
     234:234:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):337:337 -> a
-    235:235:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    235:235:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     235:235:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):337 -> a
     236:236:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):337:337 -> a
     237:237:boolean isInMainDexList(com.android.tools.r8.graph.DexType):307:307 -> a
     237:237:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):338 -> a
     238:238:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):339:339 -> a
     239:241:java.lang.Object getKnown(java.util.Map,java.lang.Object):364:366 -> a
-    1:1:boolean hasLambdaClassPrefix(com.android.tools.r8.graph.DexType):93:93 -> b
-    2:4:java.util.Set getDesugaredCallSites():285:287 -> b
-com.android.tools.r8.ir.desugar.LambdaRewriter$1 -> com.android.tools.r8.s.c.I:
+    1:3:java.util.Set getDesugaredCallSites():285:287 -> b
+com.android.tools.r8.ir.desugar.LambdaRewriter$1 -> com.android.tools.r8.r.c.I:
     com.android.tools.r8.ir.conversion.LensCodeRewriter val$lensCodeRewriter -> a
     java.util.function.Consumer val$consumer -> c
     com.android.tools.r8.ir.desugar.LambdaRewriter this$0 -> d
@@ -30573,13 +30534,13 @@
     1:1:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.conversion.LensCodeRewriter,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Consumer):163:163 -> <init>
     1:6:void registerCallSite(com.android.tools.r8.graph.DexCallSite):167:172 -> registerCallSite
     7:7:void registerCallSite(com.android.tools.r8.graph.DexCallSite):170:170 -> registerCallSite
-com.android.tools.r8.ir.desugar.LambdaRewriterGraphLense -> com.android.tools.r8.s.c.K:
+com.android.tools.r8.ir.desugar.LambdaRewriterGraphLense -> com.android.tools.r8.r.c.K:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():15:15 -> <clinit>
     1:5:void <init>(com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexItemFactory):20:24 -> <init>
     6:6:void <init>(com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexItemFactory):19:19 -> <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):31:33 -> mapInvocationType
-com.android.tools.r8.ir.desugar.LambdaSynthesizedCode -> com.android.tools.r8.s.c.L:
+com.android.tools.r8.ir.desugar.LambdaSynthesizedCode -> com.android.tools.r8.r.c.L:
     com.android.tools.r8.ir.desugar.LambdaClass lambda -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():14:14 -> <clinit>
@@ -30587,7 +30548,7 @@
     1:1:com.android.tools.r8.ir.desugar.LambdaDescriptor descriptor():28:28 -> a
     1:1:com.android.tools.r8.graph.DexType[] captures():32 -> a
     2:4:com.android.tools.r8.graph.DexType[] captures():32:34 -> a
-com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring -> com.android.tools.r8.s.c.M:
+com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring -> com.android.tools.r8.r.c.M:
     java.util.Map bridges -> b
     java.util.Map getFieldBridges -> c
     com.android.tools.r8.graph.AppView appView -> a
@@ -30603,7 +30564,7 @@
     boolean shouldProcessClassInNest(com.android.tools.r8.graph.DexClass,java.util.List) -> a
     1:1:com.android.tools.r8.graph.DexType getNestConstructorType():71:71 -> a
     2:2:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):79:79 -> a
-    3:3:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    3:3:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     3:3:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):79 -> a
     4:4:java.util.concurrent.Future asyncProcessNest(com.android.tools.r8.graph.DexClass,java.util.concurrent.ExecutorService):112:112 -> a
     5:7:void synthesizeNestConstructor(com.android.tools.r8.graph.DexApplication$Builder):172:174 -> a
@@ -30646,31 +30607,30 @@
     60:65:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):302:307 -> a
     66:67:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):220:221 -> a
     66:67:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):307 -> a
-    68:70:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1308:1310 -> a
+    68:70:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1309:1311 -> a
     68:70:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):221 -> a
     68:70:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):307 -> a
-    71:74:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1309:1312 -> a
+    71:74:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1310:1313 -> a
     71:74:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):221 -> a
     71:74:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):307 -> a
     75:75:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):222:222 -> a
     75:75:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):307 -> a
-    76:76:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1308:1308 -> a
+    76:76:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1309:1309 -> a
     76:76:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):221 -> a
     76:76:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):307 -> a
     77:84:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):309:316 -> a
     85:87:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureInvokeBridge$2(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):319:321 -> a
     1:14:java.util.List extractNest(com.android.tools.r8.graph.DexClass):94:107 -> b
     15:34:com.android.tools.r8.graph.DexProgramClass createNestAccessConstructor():148:167 -> b
-    35:35:boolean isNestConstructor(com.android.tools.r8.graph.DexType):179:179 -> b
-    36:42:com.android.tools.r8.graph.DexMethod computeMethodBridge(com.android.tools.r8.graph.DexEncodedMethod):209:215 -> b
-    43:50:com.android.tools.r8.graph.DexString computeMethodBridgeName(com.android.tools.r8.graph.DexEncodedMethod):183:190 -> b
-    43:50:com.android.tools.r8.graph.DexMethod computeMethodBridge(com.android.tools.r8.graph.DexEncodedMethod):216 -> b
-    51:51:com.android.tools.r8.graph.DexMethod computeMethodBridge(com.android.tools.r8.graph.DexEncodedMethod):216:216 -> b
+    35:41:com.android.tools.r8.graph.DexMethod computeMethodBridge(com.android.tools.r8.graph.DexEncodedMethod):209:215 -> b
+    42:49:com.android.tools.r8.graph.DexString computeMethodBridgeName(com.android.tools.r8.graph.DexEncodedMethod):183:190 -> b
+    42:49:com.android.tools.r8.graph.DexMethod computeMethodBridge(com.android.tools.r8.graph.DexEncodedMethod):216 -> b
+    50:50:com.android.tools.r8.graph.DexMethod computeMethodBridge(com.android.tools.r8.graph.DexEncodedMethod):216:216 -> b
     1:10:boolean holderRequiresBridge(com.android.tools.r8.graph.DexClass):269:278 -> c
     1:1:java.lang.Object lambda$asyncProcessNest$0(com.android.tools.r8.graph.DexClass):114:114 -> d
     2:15:void processNest(java.util.List):125:138 -> d
     2:15:java.lang.Object lambda$asyncProcessNest$0(com.android.tools.r8.graph.DexClass):117 -> d
-com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess -> com.android.tools.r8.s.c.M$a:
+com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess -> com.android.tools.r8.r.c.M$a:
     com.android.tools.r8.graph.DexEncodedField field -> a
     boolean isGet -> b
     1:3:void <init>(com.android.tools.r8.graph.DexEncodedField,boolean):431:433 -> <init>
@@ -30689,7 +30649,7 @@
     2:2:boolean isGet():454:454 -> g
     2:2:boolean isStaticGet():470 -> g
     1:1:int hashCode():438:438 -> hashCode
-com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$NestBasedAccessDesugaringUseRegistry -> com.android.tools.r8.s.c.N:
+com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$NestBasedAccessDesugaringUseRegistry -> com.android.tools.r8.r.c.N:
     com.android.tools.r8.graph.DexClass currentClass -> a
     com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring this$0 -> c
     com.android.tools.r8.graph.DexMethod context -> b
@@ -30699,7 +30659,7 @@
     6:7:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring.definitionFor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):84:85 -> a
     6:7:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring.access$000(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):39 -> a
     6:7:boolean registerInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):345 -> a
-    8:8:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):184:184 -> a
+    8:8:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):186:186 -> a
     8:8:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring.definitionFor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):84 -> a
     8:8:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring.access$000(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):39 -> a
     8:8:boolean registerInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):345 -> a
@@ -30708,7 +30668,7 @@
     12:12:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring.definitionFor(com.android.tools.r8.graph.DexField):89:89 -> a
     12:12:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring.access$100(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring,com.android.tools.r8.graph.DexField):39 -> a
     12:12:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,boolean):354 -> a
-    13:13:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexField):179:179 -> a
+    13:13:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexField):181:181 -> a
     13:13:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring.definitionFor(com.android.tools.r8.graph.DexField):89 -> a
     13:13:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring.access$100(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring,com.android.tools.r8.graph.DexField):39 -> a
     13:13:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,boolean):354 -> a
@@ -30722,7 +30682,7 @@
     1:1:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):366:366 -> registerInvokeVirtual
     1:1:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):411:411 -> registerStaticFieldRead
     1:1:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):416:416 -> registerStaticFieldWrite
-com.android.tools.r8.ir.desugar.NestedPrivateMethodLense -> com.android.tools.r8.s.c.O:
+com.android.tools.r8.ir.desugar.NestedPrivateMethodLense -> com.android.tools.r8.r.c.O:
     java.util.Map getFieldMap -> b
     java.util.Map putFieldMap -> c
     com.android.tools.r8.graph.DexType nestConstructorType -> a
@@ -30738,14 +30698,14 @@
     1:16:com.android.tools.r8.graph.GraphLense$GraphLenseLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):115:130 -> lookupMethod
     1:6:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription lookupPrototypeChanges(com.android.tools.r8.graph.DexMethod):102:107 -> lookupPrototypeChanges
     1:2:com.android.tools.r8.graph.DexMethod lookupPutFieldForMethod(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexMethod):67:68 -> lookupPutFieldForMethod
-com.android.tools.r8.ir.desugar.PrefixRewritingMapper -> com.android.tools.r8.s.c.P:
+com.android.tools.r8.ir.desugar.PrefixRewritingMapper -> com.android.tools.r8.r.c.P:
     1:1:void <init>():19:19 -> <init>
     boolean isRewriting() -> a
     void rewriteType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType) -> a
     1:1:boolean hasRewrittenType(com.android.tools.r8.graph.DexType):30:30 -> a
     2:6:boolean hasRewrittenTypeInSignature(com.android.tools.r8.graph.DexProto):34:38 -> a
     com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType) -> b
-com.android.tools.r8.ir.desugar.PrefixRewritingMapper$DesugarPrefixRewritingMapper -> com.android.tools.r8.s.c.P$a:
+com.android.tools.r8.ir.desugar.PrefixRewritingMapper$DesugarPrefixRewritingMapper -> com.android.tools.r8.r.c.P$a:
     java.util.Map rewritten -> b
     java.util.Map initialPrefixes -> c
     com.android.tools.r8.graph.DexItemFactory factory -> d
@@ -30767,11 +30727,11 @@
     1:5:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType):101:105 -> b
     6:6:com.android.tools.r8.graph.DexType computePrefix(com.android.tools.r8.graph.DexType):126:126 -> b
     6:6:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType):107 -> b
-    7:7:int com.android.tools.r8.graph.DexString.getArrayDim():495:495 -> b
-    7:7:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexString.withoutArray(com.android.tools.r8.graph.DexItemFactory):484 -> b
+    7:7:int com.android.tools.r8.graph.DexString.getArrayDim():511:511 -> b
+    7:7:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexString.withoutArray(com.android.tools.r8.graph.DexItemFactory):500 -> b
     7:7:com.android.tools.r8.graph.DexType computePrefix(com.android.tools.r8.graph.DexType):126 -> b
     7:7:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType):107 -> b
-    8:10:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexString.withoutArray(com.android.tools.r8.graph.DexItemFactory):488:490 -> b
+    8:10:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexString.withoutArray(com.android.tools.r8.graph.DexItemFactory):504:506 -> b
     8:10:com.android.tools.r8.graph.DexType computePrefix(com.android.tools.r8.graph.DexType):126 -> b
     8:10:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType):107 -> b
     11:11:com.android.tools.r8.graph.DexType computePrefix(com.android.tools.r8.graph.DexType):127:127 -> b
@@ -30779,12 +30739,12 @@
     12:15:com.android.tools.r8.graph.DexType lookup(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,java.util.Map):137:140 -> b
     12:15:com.android.tools.r8.graph.DexType computePrefix(com.android.tools.r8.graph.DexType):127 -> b
     12:15:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType):107 -> b
-    16:16:int com.android.tools.r8.graph.DexString.getArrayDim():495:495 -> b
-    16:16:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexString.withNewPrefix(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory):462 -> b
+    16:16:int com.android.tools.r8.graph.DexString.getArrayDim():511:511 -> b
+    16:16:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexString.withNewPrefix(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory):478 -> b
     16:16:com.android.tools.r8.graph.DexType lookup(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,java.util.Map):140 -> b
     16:16:com.android.tools.r8.graph.DexType computePrefix(com.android.tools.r8.graph.DexType):127 -> b
     16:16:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType):107 -> b
-    17:34:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexString.withNewPrefix(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory):463:480 -> b
+    17:34:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexString.withNewPrefix(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory):479:496 -> b
     17:34:com.android.tools.r8.graph.DexType lookup(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,java.util.Map):140 -> b
     17:34:com.android.tools.r8.graph.DexType computePrefix(com.android.tools.r8.graph.DexType):127 -> b
     17:34:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType):107 -> b
@@ -30793,12 +30753,12 @@
     35:36:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType):107 -> b
     37:37:com.android.tools.r8.graph.DexType computePrefix(com.android.tools.r8.graph.DexType):131:131 -> b
     37:37:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType):107 -> b
-com.android.tools.r8.ir.desugar.PrefixRewritingMapper$EmptyPrefixRewritingMapper -> com.android.tools.r8.s.c.Q:
+com.android.tools.r8.ir.desugar.PrefixRewritingMapper$EmptyPrefixRewritingMapper -> com.android.tools.r8.r.c.Q:
     1:1:void <init>():155:155 -> <init>
     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) -> b
-com.android.tools.r8.ir.desugar.R8NestBasedAccessDesugaring -> com.android.tools.r8.s.c.S:
+com.android.tools.r8.ir.desugar.R8NestBasedAccessDesugaring -> com.android.tools.r8.r.c.S:
     boolean $assertionsDisabled -> k
     java.util.Map lensGetFieldBridges -> i
     java.util.Map lensPutFieldBridges -> j
@@ -30808,8 +30768,8 @@
     2:4:void <init>(com.android.tools.r8.graph.AppView):34:36 -> <init>
     boolean shouldProcessClassInNest(com.android.tools.r8.graph.DexClass,java.util.List) -> a
     1:1:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication$Builder):44:44 -> a
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():345:345 -> a
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1113 -> a
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():337:337 -> a
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1105 -> a
     2:2:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication$Builder):44 -> a
     3:4:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication$Builder):44:45 -> a
     5:5:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication$Builder):44:44 -> a
@@ -30825,7 +30785,7 @@
     40:46:void addDeferredBridgesAndMapMethods(java.util.Map,java.util.Map):79:85 -> a
     47:50:void reportMissingNestHost(com.android.tools.r8.graph.DexClass):126:129 -> a
     51:54:void reportIncompleteNest(java.util.List):135:138 -> a
-com.android.tools.r8.ir.desugar.StringConcatRewriter -> com.android.tools.r8.s.c.Y:
+com.android.tools.r8.ir.desugar.StringConcatRewriter -> com.android.tools.r8.r.c.Y:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.DexMethod defaultAppendMethod -> h
@@ -30899,8 +30859,8 @@
     165:165:com.android.tools.r8.errors.CompilationError error(com.android.tools.r8.graph.DexMethod,java.lang.String):458 -> a
     1:1:com.android.tools.r8.graph.DexMethod access$200(com.android.tools.r8.ir.desugar.StringConcatRewriter):39:39 -> b
     1:1:com.android.tools.r8.graph.DexMethod access$300(com.android.tools.r8.ir.desugar.StringConcatRewriter):39:39 -> c
-com.android.tools.r8.ir.desugar.StringConcatRewriter$1 -> com.android.tools.r8.s.c.T:
-com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder -> com.android.tools.r8.s.c.X:
+com.android.tools.r8.ir.desugar.StringConcatRewriter$1 -> com.android.tools.r8.r.c.T:
+com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder -> com.android.tools.r8.r.c.X:
     java.util.ListIterator blocks -> c
     com.android.tools.r8.ir.code.BasicBlock currentBlock -> f
     com.android.tools.r8.graph.AppView appView -> a
@@ -30941,16 +30901,16 @@
     37:38:void desugar():369:370 -> a
     39:69:void desugar():369:399 -> a
     1:1:com.android.tools.r8.ir.code.IRCode access$600(com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder):283:283 -> b
-com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder$ArgumentChunk -> com.android.tools.r8.s.c.U:
+com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder$ArgumentChunk -> com.android.tools.r8.r.c.U:
     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.s.c.V:
+com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder$Chunk -> com.android.tools.r8.r.c.V:
     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.s.c.W:
+com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder$ConstantChunk -> com.android.tools.r8.r.c.W:
     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>
@@ -30959,7 +30919,7 @@
     3:3:com.android.tools.r8.ir.code.Value getOrCreateValue():444 -> a
     4:8:com.android.tools.r8.ir.code.Value getOrCreateValue():445:449 -> a
     9:9:com.android.tools.r8.ir.code.Value getOrCreateValue():445:445 -> a
-com.android.tools.r8.ir.desugar.SynthesizedLambdaSourceCode -> com.android.tools.r8.s.c.Z:
+com.android.tools.r8.ir.desugar.SynthesizedLambdaSourceCode -> com.android.tools.r8.r.c.Z:
     boolean $assertionsDisabled -> n
     com.android.tools.r8.ir.desugar.LambdaClass lambda -> m
     com.android.tools.r8.graph.DexMethod currentMethod -> l
@@ -30974,7 +30934,7 @@
     1:1:com.android.tools.r8.ir.desugar.LambdaDescriptor descriptor():33:33 -> j
     1:1:com.android.tools.r8.graph.DexItemFactory factory():43:43 -> k
     1:1:java.lang.String toString():59:59 -> toString
-com.android.tools.r8.ir.desugar.TwrCloseResourceRewriter -> com.android.tools.r8.s.c.a0:
+com.android.tools.r8.ir.desugar.TwrCloseResourceRewriter -> com.android.tools.r8.r.c.a0:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set referencingClasses -> d
     boolean $assertionsDisabled -> e
@@ -30983,94 +30943,93 @@
     1:1:void <clinit>():50:50 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):62:62 -> <init>
     2:14:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):60:72 -> <init>
-    1:1:boolean isUtilityClassDescriptor(com.android.tools.r8.graph.DexType):77:77 -> a
-    2:14:boolean isSynthesizedCloseResourceMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView):107:119 -> a
-    15:20:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):126:131 -> a
-    21:56: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):237:272 -> a
-    21:56:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):132 -> a
-    57:70: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):269:282 -> a
-    57:70:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):132 -> a
-    71:73: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):281:283 -> a
-    71:73:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):132 -> a
-    74:90: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):279:295 -> a
-    74:90:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):132 -> a
-    91:95: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):292:296 -> a
-    91:95:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):132 -> a
-    96:117: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):290:311 -> a
-    96:117:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):132 -> a
-    118:122: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):308:312 -> a
-    118:122:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):132 -> a
-    123:146: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):306:329 -> a
-    123:146:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):132 -> a
-    147:158: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):326:337 -> a
-    147:158:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):132 -> a
-    159:161: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):336:338 -> a
-    159:161:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):132 -> a
-    162:174: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):334:346 -> a
-    162:174:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):132 -> a
-    175:178: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):344:347 -> a
-    175:178:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):132 -> a
-    179:193: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):342:356 -> a
-    179:193:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):132 -> a
-    194:197: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):354:357 -> a
-    194:197:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):132 -> a
-    198:210: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):352:364 -> a
-    198:210:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):132 -> a
-    211:213: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):363:365 -> a
-    211:213:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):132 -> a
-    214:228: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):361:375 -> a
-    214:228:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):132 -> a
-    229:233:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):372:376 -> a
-    229:233:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):132 -> a
-    234:255: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):370:391 -> a
-    234:255:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):132 -> a
-    256:268: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):388:400 -> a
-    256:268:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):132 -> a
-    269:272: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):398:401 -> a
-    269:272:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):132 -> a
-    273:286: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):396:409 -> a
-    273:286:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):132 -> a
-    287:289: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):408:410 -> a
-    287:289:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):132 -> a
-    290:302: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):406:418 -> a
-    290:302:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):132 -> a
-    303:306: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):416:419 -> a
-    303:306:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):132 -> a
-    307:319: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):414:426 -> a
-    307:319:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):132 -> a
-    320:322: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):425:427 -> a
-    320:322:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):132 -> a
-    323:337:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):423:437 -> a
-    323:337:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):132 -> a
-    338:342: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):434:438 -> a
-    338:342:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):132 -> a
-    343:361: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):432:450 -> a
-    343:361:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):132 -> a
-    362:364:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):449:451 -> a
-    362:364:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):132 -> a
-    365:365:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):447:447 -> a
-    365:365:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):132 -> a
-    366:582: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):259:475 -> a
-    366:582:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):132 -> a
-    583:595: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):474:486 -> a
-    583:595:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):132 -> a
-    596:603: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):485:492 -> a
-    596:603:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):132 -> a
-    604:611: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):491:498 -> a
-    604:611:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):132 -> a
-    612:619: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):497:504 -> a
-    612:619:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):132 -> a
-    620:628: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):503:511 -> a
-    620:628:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):132 -> a
-    629:671: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):470:512 -> a
-    629:671:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):132 -> a
-    672:706:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):134:168 -> a
-    707:707:boolean lambda$synthesizeUtilityClass$0(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.DexProgramClass):165:165 -> a
-    708:708:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():965:965 -> a
-    708:708:void rewriteMethodCode(com.android.tools.r8.ir.code.IRCode):82 -> a
-    709:725:void rewriteMethodCode(com.android.tools.r8.ir.code.IRCode):83:99 -> a
-    726:730:void rewriteMethodCode(com.android.tools.r8.ir.code.IRCode):98:102 -> a
-com.android.tools.r8.ir.desugar.backports.BackportedMethods -> com.android.tools.r8.s.c.b0.a:
+    1:13:boolean isSynthesizedCloseResourceMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView):107:119 -> a
+    14:19:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):126:131 -> a
+    20:55: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):237:272 -> a
+    20:55:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):132 -> a
+    56:69: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):269:282 -> a
+    56:69:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):132 -> a
+    70:72: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):281:283 -> a
+    70:72:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):132 -> a
+    73:89: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):279:295 -> a
+    73:89:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):132 -> a
+    90:94: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):292:296 -> a
+    90:94:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):132 -> a
+    95:116: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):290:311 -> a
+    95:116:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):132 -> a
+    117:121: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):308:312 -> a
+    117:121:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):132 -> a
+    122:145: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):306:329 -> a
+    122:145:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):132 -> a
+    146:157: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):326:337 -> a
+    146:157:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):132 -> a
+    158:160: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):336:338 -> a
+    158:160:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):132 -> a
+    161:173: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):334:346 -> a
+    161:173:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):132 -> a
+    174:177: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):344:347 -> a
+    174:177:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):132 -> a
+    178:192: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):342:356 -> a
+    178:192:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):132 -> a
+    193:196: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):354:357 -> a
+    193:196:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):132 -> a
+    197:209: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):352:364 -> a
+    197:209:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):132 -> a
+    210:212: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):363:365 -> a
+    210:212:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):132 -> a
+    213:227: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):361:375 -> a
+    213:227:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):132 -> a
+    228:232:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):372:376 -> a
+    228:232:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):132 -> a
+    233:254: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):370:391 -> a
+    233:254:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):132 -> a
+    255:267: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):388:400 -> a
+    255:267:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):132 -> a
+    268:271: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):398:401 -> a
+    268:271:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):132 -> a
+    272:285: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):396:409 -> a
+    272:285:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):132 -> a
+    286:288: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):408:410 -> a
+    286:288:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):132 -> a
+    289:301: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):406:418 -> a
+    289:301:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):132 -> a
+    302:305: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):416:419 -> a
+    302:305:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):132 -> a
+    306:318: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):414:426 -> a
+    306:318:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):132 -> a
+    319:321: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):425:427 -> a
+    319:321:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):132 -> a
+    322:336: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):423:437 -> a
+    322:336:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):132 -> a
+    337:341: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):434:438 -> a
+    337:341:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):132 -> a
+    342:360: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):432:450 -> a
+    342:360:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):132 -> a
+    361:363: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):449:451 -> a
+    361:363:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):132 -> a
+    364:364:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):447:447 -> a
+    364:364:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):132 -> a
+    365:581: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):259:475 -> a
+    365:581:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):132 -> a
+    582:594: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):474:486 -> a
+    582:594:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):132 -> a
+    595:602: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):485:492 -> a
+    595:602:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):132 -> a
+    603:610: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):491:498 -> a
+    603:610:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):132 -> a
+    611:618: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):497:504 -> a
+    611:618:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):132 -> a
+    619:627: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):503:511 -> a
+    619:627:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):132 -> a
+    628:670: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):470:512 -> a
+    628:670:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):132 -> a
+    671:705:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):134:168 -> a
+    706:706:boolean lambda$synthesizeUtilityClass$0(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.DexProgramClass):165:165 -> a
+    707:707:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():965:965 -> a
+    707:707:void rewriteMethodCode(com.android.tools.r8.ir.code.IRCode):82 -> a
+    708:724:void rewriteMethodCode(com.android.tools.r8.ir.code.IRCode):83:99 -> a
+    725:729:void rewriteMethodCode(com.android.tools.r8.ir.code.IRCode):98:102 -> a
+com.android.tools.r8.ir.desugar.backports.BackportedMethods -> com.android.tools.r8.r.c.b0.a:
     1:30:com.android.tools.r8.graph.CfCode IntegerMethods_remainderUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1818:1847 -> A
     1:18:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5061:5078 -> A0
     19:33:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5075:5089 -> A0
@@ -31230,54 +31189,120 @@
     42:42:com.android.tools.r8.graph.CfCode StreamMethods_ofNullable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5684:5684 -> P0
     43:71:com.android.tools.r8.graph.CfCode StreamMethods_ofNullable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5667:5695 -> P0
     1:55:com.android.tools.r8.graph.CfCode MathMethods_floorDivInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2948:3002 -> Q
-    1:29:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5699:5727 -> Q0
-    30:33:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5725:5728 -> Q0
-    34:50:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5723:5739 -> Q0
-    51:72:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5736:5757 -> Q0
-    73:76:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5755:5758 -> Q0
-    77:102:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5753:5778 -> Q0
-    103:106:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5776:5779 -> Q0
-    107:126:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5774:5793 -> Q0
-    127:130:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5791:5794 -> Q0
-    131:149:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5789:5807 -> Q0
-    150:152:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5806:5808 -> Q0
-    153:153:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5804:5804 -> Q0
-    154:253:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5714:5813 -> Q0
+    1:26:com.android.tools.r8.graph.CfCode StringMethods_isBlank(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5699:5724 -> Q0
+    27:45:com.android.tools.r8.graph.CfCode StringMethods_isBlank(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5721:5739 -> Q0
+    46:48:com.android.tools.r8.graph.CfCode StringMethods_isBlank(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5738:5740 -> Q0
+    49:63:com.android.tools.r8.graph.CfCode StringMethods_isBlank(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5736:5750 -> Q0
+    64:66:com.android.tools.r8.graph.CfCode StringMethods_isBlank(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5749:5751 -> Q0
+    67:85:com.android.tools.r8.graph.CfCode StringMethods_isBlank(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5747:5765 -> Q0
+    86:88:com.android.tools.r8.graph.CfCode StringMethods_isBlank(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5764:5766 -> Q0
+    89:89:com.android.tools.r8.graph.CfCode StringMethods_isBlank(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5762:5762 -> Q0
+    90:154:com.android.tools.r8.graph.CfCode StringMethods_isBlank(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5713:5777 -> Q0
     1:59:com.android.tools.r8.graph.CfCode MathMethods_floorDivLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3006:3064 -> R
-    1:28:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5817:5844 -> R0
-    29:32:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5842:5845 -> R0
-    33:49:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5840:5856 -> R0
-    50:63:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5853:5866 -> R0
-    64:66:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5865:5867 -> R0
-    67:81:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5863:5877 -> R0
-    82:96:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5874:5888 -> R0
-    97:99:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5887:5889 -> R0
-    100:113:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5885:5898 -> R0
-    114:117:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5896:5899 -> R0
-    118:133:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5894:5909 -> R0
-    134:149:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5906:5921 -> R0
-    150:153:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5919:5922 -> R0
-    154:170:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5917:5933 -> R0
-    171:173:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5932:5934 -> R0
-    174:187:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5930:5943 -> R0
-    188:191:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5941:5944 -> R0
-    192:208:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5939:5955 -> R0
-    209:211:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5954:5956 -> R0
-    212:212:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5952:5952 -> R0
-    213:343:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5831:5961 -> R0
+    1:29:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5781:5809 -> R0
+    30:33:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5807:5810 -> R0
+    34:50:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5805:5821 -> R0
+    51:72:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5818:5839 -> R0
+    73:76:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5837:5840 -> R0
+    77:102:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5835:5860 -> R0
+    103:106:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5858:5861 -> R0
+    107:126:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5856:5875 -> R0
+    127:130:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5873:5876 -> R0
+    131:149:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5871:5889 -> R0
+    150:152:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5888:5890 -> R0
+    153:153:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5886:5886 -> R0
+    154:253:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5796:5895 -> R0
     1:19:com.android.tools.r8.graph.CfCode MathMethods_floorDivLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3068:3086 -> S
     20:24:com.android.tools.r8.graph.CfCode MathMethods_floorDivLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3083:3087 -> S
     25:25:com.android.tools.r8.graph.CfCode MathMethods_floorDivLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3081:3081 -> S
     26:44:com.android.tools.r8.graph.CfCode MathMethods_floorDivLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3074:3092 -> S
+    1:28:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5899:5926 -> S0
+    29:32:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5924:5927 -> S0
+    33:49:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5922:5938 -> S0
+    50:63:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5935:5948 -> S0
+    64:66:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5947:5949 -> S0
+    67:81:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5945:5959 -> S0
+    82:96:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5956:5970 -> S0
+    97:99:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5969:5971 -> S0
+    100:113:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5967:5980 -> S0
+    114:117:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5978:5981 -> S0
+    118:133:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5976:5991 -> S0
+    134:149:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5988:6003 -> S0
+    150:153:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6001:6004 -> S0
+    154:170:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5999:6015 -> S0
+    171:173:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6014:6016 -> S0
+    174:187:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6012:6025 -> S0
+    188:191:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6023:6026 -> S0
+    192:208:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6021:6037 -> S0
+    209:211:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6036:6038 -> S0
+    212:212:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6034:6034 -> S0
+    213:343:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5913:6043 -> S0
     1:47:com.android.tools.r8.graph.CfCode MathMethods_floorModInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3096:3142 -> T
+    1:33:com.android.tools.r8.graph.CfCode StringMethods_repeat(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6047:6079 -> T0
+    34:46:com.android.tools.r8.graph.CfCode StringMethods_repeat(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6076:6088 -> T0
+    47:50:com.android.tools.r8.graph.CfCode StringMethods_repeat(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6086:6089 -> T0
+    51:65:com.android.tools.r8.graph.CfCode StringMethods_repeat(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6084:6098 -> T0
+    66:69:com.android.tools.r8.graph.CfCode StringMethods_repeat(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6096:6099 -> T0
+    70:82:com.android.tools.r8.graph.CfCode StringMethods_repeat(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6094:6106 -> T0
+    83:85:com.android.tools.r8.graph.CfCode StringMethods_repeat(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6105:6107 -> T0
+    86:98:com.android.tools.r8.graph.CfCode StringMethods_repeat(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6103:6115 -> T0
+    99:102:com.android.tools.r8.graph.CfCode StringMethods_repeat(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6113:6116 -> T0
+    103:118:com.android.tools.r8.graph.CfCode StringMethods_repeat(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6111:6126 -> T0
+    119:151:com.android.tools.r8.graph.CfCode StringMethods_repeat(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6123:6155 -> T0
+    152:154:com.android.tools.r8.graph.CfCode StringMethods_repeat(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6154:6156 -> T0
+    155:178:com.android.tools.r8.graph.CfCode StringMethods_repeat(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6152:6175 -> T0
+    179:182:com.android.tools.r8.graph.CfCode StringMethods_repeat(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6173:6176 -> T0
+    183:201:com.android.tools.r8.graph.CfCode StringMethods_repeat(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6171:6189 -> T0
+    202:204:com.android.tools.r8.graph.CfCode StringMethods_repeat(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6188:6190 -> T0
+    205:205:com.android.tools.r8.graph.CfCode StringMethods_repeat(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6186:6186 -> T0
+    206:336:com.android.tools.r8.graph.CfCode StringMethods_repeat(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6065:6195 -> T0
     1:51:com.android.tools.r8.graph.CfCode MathMethods_floorModLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3146:3196 -> U
+    1:32:com.android.tools.r8.graph.CfCode StringMethods_strip(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6199:6230 -> U0
+    33:51:com.android.tools.r8.graph.CfCode StringMethods_strip(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6227:6245 -> U0
+    52:54:com.android.tools.r8.graph.CfCode StringMethods_strip(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6244:6246 -> U0
+    55:69:com.android.tools.r8.graph.CfCode StringMethods_strip(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6242:6256 -> U0
+    70:72:com.android.tools.r8.graph.CfCode StringMethods_strip(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6255:6257 -> U0
+    73:90:com.android.tools.r8.graph.CfCode StringMethods_strip(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6253:6270 -> U0
+    91:93:com.android.tools.r8.graph.CfCode StringMethods_strip(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6269:6271 -> U0
+    94:118:com.android.tools.r8.graph.CfCode StringMethods_strip(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6267:6291 -> U0
+    119:123:com.android.tools.r8.graph.CfCode StringMethods_strip(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6288:6292 -> U0
+    124:140:com.android.tools.r8.graph.CfCode StringMethods_strip(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6286:6302 -> U0
+    141:143:com.android.tools.r8.graph.CfCode StringMethods_strip(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6301:6303 -> U0
+    144:161:com.android.tools.r8.graph.CfCode StringMethods_strip(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6299:6316 -> U0
+    162:164:com.android.tools.r8.graph.CfCode StringMethods_strip(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6315:6317 -> U0
+    165:186:com.android.tools.r8.graph.CfCode StringMethods_strip(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6313:6334 -> U0
+    187:191:com.android.tools.r8.graph.CfCode StringMethods_strip(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6331:6335 -> U0
+    192:192:com.android.tools.r8.graph.CfCode StringMethods_strip(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6329:6329 -> U0
+    193:314:com.android.tools.r8.graph.CfCode StringMethods_strip(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6219:6340 -> U0
     1:19:com.android.tools.r8.graph.CfCode MathMethods_floorModLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3200:3218 -> V
     20:24:com.android.tools.r8.graph.CfCode MathMethods_floorModLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3215:3219 -> V
     25:25:com.android.tools.r8.graph.CfCode MathMethods_floorModLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3213:3213 -> V
     26:45:com.android.tools.r8.graph.CfCode MathMethods_floorModLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3206:3225 -> V
+    1:26:com.android.tools.r8.graph.CfCode StringMethods_stripLeading(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6344:6369 -> V0
+    27:45:com.android.tools.r8.graph.CfCode StringMethods_stripLeading(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6366:6384 -> V0
+    46:48:com.android.tools.r8.graph.CfCode StringMethods_stripLeading(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6383:6385 -> V0
+    49:63:com.android.tools.r8.graph.CfCode StringMethods_stripLeading(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6381:6395 -> V0
+    64:66:com.android.tools.r8.graph.CfCode StringMethods_stripLeading(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6394:6396 -> V0
+    67:84:com.android.tools.r8.graph.CfCode StringMethods_stripLeading(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6392:6409 -> V0
+    85:87:com.android.tools.r8.graph.CfCode StringMethods_stripLeading(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6408:6410 -> V0
+    88:109:com.android.tools.r8.graph.CfCode StringMethods_stripLeading(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6406:6427 -> V0
+    110:114:com.android.tools.r8.graph.CfCode StringMethods_stripLeading(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6424:6428 -> V0
+    115:115:com.android.tools.r8.graph.CfCode StringMethods_stripLeading(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6422:6422 -> V0
+    116:191:com.android.tools.r8.graph.CfCode StringMethods_stripLeading(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6358:6433 -> V0
     1:22:com.android.tools.r8.graph.CfCode MathMethods_incrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3229:3250 -> W
     23:23:com.android.tools.r8.graph.CfCode MathMethods_incrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3247:3247 -> W
     24:47:com.android.tools.r8.graph.CfCode MathMethods_incrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3237:3260 -> W
+    1:22:com.android.tools.r8.graph.CfCode StringMethods_stripTrailing(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6437:6458 -> W0
+    23:42:com.android.tools.r8.graph.CfCode StringMethods_stripTrailing(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6455:6474 -> W0
+    43:47:com.android.tools.r8.graph.CfCode StringMethods_stripTrailing(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6471:6475 -> W0
+    48:64:com.android.tools.r8.graph.CfCode StringMethods_stripTrailing(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6469:6485 -> W0
+    65:67:com.android.tools.r8.graph.CfCode StringMethods_stripTrailing(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6484:6486 -> W0
+    68:85:com.android.tools.r8.graph.CfCode StringMethods_stripTrailing(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6482:6499 -> W0
+    86:88:com.android.tools.r8.graph.CfCode StringMethods_stripTrailing(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6498:6500 -> W0
+    89:110:com.android.tools.r8.graph.CfCode StringMethods_stripTrailing(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6496:6517 -> W0
+    111:115:com.android.tools.r8.graph.CfCode StringMethods_stripTrailing(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6514:6518 -> W0
+    116:116:com.android.tools.r8.graph.CfCode StringMethods_stripTrailing(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6512:6512 -> W0
+    117:190:com.android.tools.r8.graph.CfCode StringMethods_stripTrailing(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6450:6523 -> W0
     1:23:com.android.tools.r8.graph.CfCode MathMethods_incrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3264:3286 -> X
     24:24:com.android.tools.r8.graph.CfCode MathMethods_incrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3283:3283 -> X
     25:49:com.android.tools.r8.graph.CfCode MathMethods_incrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3272:3296 -> X
@@ -31654,7 +31679,7 @@
     48:62:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5036:5050 -> z0
     63:63:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5047:5047 -> z0
     64:107:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5013:5056 -> z0
-com.android.tools.r8.ir.desugar.backports.BooleanMethodRewrites -> com.android.tools.r8.s.c.b0.b:
+com.android.tools.r8.ir.desugar.backports.BooleanMethodRewrites -> com.android.tools.r8.r.c.b0.b:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():17:17 -> <clinit>
     1:5:void rewriteLogicalAnd(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):20:24 -> a
@@ -31663,50 +31688,54 @@
     6:6:void rewriteLogicalOr(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):32:32 -> b
     1:5:void rewriteLogicalXor(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):38:42 -> c
     6:6:void rewriteLogicalXor(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):41:41 -> c
-com.android.tools.r8.ir.desugar.backports.CollectionMethodGenerators -> com.android.tools.r8.s.c.b0.c:
+com.android.tools.r8.ir.desugar.backports.CollectionMethodGenerators -> com.android.tools.r8.r.c.b0.c:
     1:1:com.android.tools.r8.graph.CfCode generateListOf(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int):31:31 -> a
     2:21:com.android.tools.r8.graph.CfCode generateFixedMethods(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int,com.android.tools.r8.graph.DexType):40:59 -> a
     22:22:com.android.tools.r8.graph.CfCode generateFixedMethods(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int,com.android.tools.r8.graph.DexType):56:56 -> a
     23:39:com.android.tools.r8.graph.CfCode generateFixedMethods(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int,com.android.tools.r8.graph.DexType):53:69 -> a
     1:1:com.android.tools.r8.graph.CfCode generateSetOf(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int):35:35 -> b
-com.android.tools.r8.ir.desugar.backports.CollectionMethodRewrites -> com.android.tools.r8.s.c.b0.d:
+com.android.tools.r8.ir.desugar.backports.CollectionMethodRewrites -> com.android.tools.r8.r.c.b0.d:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:void rewriteListOfEmpty(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):20:20 -> a
     2:8:void rewriteToCollectionMethod(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory,java.lang.String):35:41 -> a
     1:1:void rewriteMapOfEmpty(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):30:30 -> b
     1:1:void rewriteSetOfEmpty(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):25:25 -> c
-com.android.tools.r8.ir.desugar.backports.FloatMethodRewrites -> com.android.tools.r8.s.c.b0.e:
+com.android.tools.r8.ir.desugar.backports.FloatMethodRewrites -> com.android.tools.r8.r.c.b0.e:
     boolean com.android.tools.r8.utils.NumberUtils.is16Bit(long) -> a
     1:2:java.lang.Object com.android.tools.r8.utils.PredicateUtils.findFirst(java.lang.Object[],java.util.function.Predicate):12:13 -> a
     3:3:java.lang.Object com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoBufUtilKt.getExtensionOrNull(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):12:12 -> a
     4:7:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.ExtensionUtilsKt.applySingleExtension(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):13:16 -> a
     8:11:java.util.Set com.android.tools.r8.utils.CollectionUtils.mergeSets(java.util.Collection,java.util.Collection):13:16 -> a
     12:13:java.util.Deque com.android.tools.r8.utils.DequeUtils.newArrayDeque(java.lang.Object):13:14 -> a
-    14:18:boolean com.android.tools.r8.ir.optimize.ArgumentRemovalUtils.isPinned(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):16:20 -> a
-    19:20:java.util.Set com.android.tools.r8.utils.SetUtils.newIdentityHashSet(java.lang.Iterable):22:23 -> a
-    21:29:com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmExtension com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.ExtensionUtilsKt.singleOfType(java.util.Collection,com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType):25:33 -> a
-    30:33:void com.android.tools.r8.ir.desugar.backports.OptionalMethodRewrites.rewriteDoubleOrElseGet(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):26:29 -> a
-    34:34:int com.android.tools.r8.jetbrains.kotlinx.metadata.FlagsKt.flagsOf(com.android.tools.r8.jetbrains.kotlinx.metadata.Flag[]):27:27 -> a
-    35:35:int com.android.tools.r8.jetbrains.kotlinx.metadata.FlagsKt.flagsOf(com.android.tools.r8.jetbrains.kotlinx.metadata.Flag[]):24:24 -> a
-    36:36:java.util.Set com.android.tools.r8.utils.SetUtils.newIdentityHashSet(int):28:28 -> a
-    37:39:java.util.Set com.android.tools.r8.utils.SetUtils.mapIdentityHashSet(java.util.Set,java.util.function.Function):38:40 -> a
-    40:41:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.receiverType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):50:51 -> a
-    42:44:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.returnType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):56:58 -> a
-    45:45:void com.android.tools.r8.it.unimi.dsi.fastutil.Arrays.ensureFromTo(int,int,int):57:57 -> a
-    46:46:void com.android.tools.r8.it.unimi.dsi.fastutil.Arrays.ensureFromTo(int,int,int):56:56 -> a
-    47:47:void com.android.tools.r8.it.unimi.dsi.fastutil.Arrays.ensureFromTo(int,int,int):55:55 -> a
-    48:55:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):58:65 -> a
-    56:62:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:67 -> a
-    63:64:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:62 -> a
-    65:74:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:70 -> a
-    75:82:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:68 -> a
-    83:85:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:63 -> a
-    86:89:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:64 -> a
-    90:95:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:66 -> a
-    96:104:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:69 -> a
-    105:107:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.type(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):70:72 -> a
-    108:108:java.lang.Object com.android.tools.r8.jetbrains.kotlinx.metadata.NodesKt.addTo(java.lang.Object,java.util.Collection):971:971 -> a
+    14:22:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmWriteUtilsKt.writeProtoBufData(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext) -> a
+    23:30:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmWriteUtilsKt.writeProtoBufData(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):15:22 -> a
+    31:31:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmWriteUtilsKt.writeProtoBufData(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):21:21 -> a
+    32:32:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmWriteUtilsKt.writeProtoBufData(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):14:14 -> a
+    33:37:boolean com.android.tools.r8.ir.optimize.ArgumentRemovalUtils.isPinned(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):16:20 -> a
+    38:39:java.util.Set com.android.tools.r8.utils.SetUtils.newIdentityHashSet(java.lang.Iterable):22:23 -> a
+    40:48:com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmExtension com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.ExtensionUtilsKt.singleOfType(java.util.Collection,com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType):25:33 -> a
+    49:52:void com.android.tools.r8.ir.desugar.backports.OptionalMethodRewrites.rewriteDoubleOrElseGet(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):26:29 -> a
+    53:53:int com.android.tools.r8.jetbrains.kotlinx.metadata.FlagsKt.flagsOf(com.android.tools.r8.jetbrains.kotlinx.metadata.Flag[]):27:27 -> a
+    54:54:int com.android.tools.r8.jetbrains.kotlinx.metadata.FlagsKt.flagsOf(com.android.tools.r8.jetbrains.kotlinx.metadata.Flag[]):24:24 -> a
+    55:55:java.util.Set com.android.tools.r8.utils.SetUtils.newIdentityHashSet(int):28:28 -> a
+    56:58:java.util.Set com.android.tools.r8.utils.SetUtils.mapIdentityHashSet(java.util.Set,java.util.function.Function):38:40 -> a
+    59:60:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.receiverType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):50:51 -> a
+    61:63:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.returnType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):56:58 -> a
+    64:64:void com.android.tools.r8.it.unimi.dsi.fastutil.Arrays.ensureFromTo(int,int,int):57:57 -> a
+    65:65:void com.android.tools.r8.it.unimi.dsi.fastutil.Arrays.ensureFromTo(int,int,int):56:56 -> a
+    66:66:void com.android.tools.r8.it.unimi.dsi.fastutil.Arrays.ensureFromTo(int,int,int):55:55 -> a
+    67:74:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):58:65 -> a
+    75:81:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:67 -> a
+    82:83:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:62 -> a
+    84:93:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:70 -> a
+    94:101:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:68 -> a
+    102:104:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:63 -> a
+    105:108:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:64 -> a
+    109:114:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:66 -> a
+    115:123:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:69 -> a
+    124:126:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.type(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):70:72 -> a
+    127:127:java.lang.Object com.android.tools.r8.jetbrains.kotlinx.metadata.NodesKt.addTo(java.lang.Object,java.util.Collection):971:971 -> a
     boolean com.android.tools.r8.utils.NumberUtils.is32Bit(long) -> b
     1:2:java.util.Set com.android.tools.r8.utils.SetUtils.newIdentityHashSet(java.lang.Object):16:17 -> b
     3:6:void rewriteHashCode(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):18:21 -> b
@@ -31716,12 +31745,12 @@
     1:4:void com.android.tools.r8.ir.desugar.backports.OptionalMethodRewrites.rewriteOrElseGet(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):18:21 -> e
     1:7:void com.android.tools.r8.ir.desugar.backports.ObjectsMethodRewrites.rewriteRequireNonNull(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):29:35 -> f
     1:6:void com.android.tools.r8.ir.desugar.backports.ObjectsMethodRewrites.rewriteToArraysHashCode(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):19:24 -> g
-com.android.tools.r8.ir.desugar.backports.LongMethodRewrites -> com.android.tools.r8.s.c.b0.f:
+com.android.tools.r8.ir.desugar.backports.LongMethodRewrites -> com.android.tools.r8.r.c.b0.f:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():16:16 -> <clinit>
     1:4:void rewriteCompare(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):22:25 -> a
     5:5:void rewriteCompare(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):24:24 -> a
-com.android.tools.r8.ir.desugar.backports.NumericMethodRewrites -> com.android.tools.r8.s.c.b0.g:
+com.android.tools.r8.ir.desugar.backports.NumericMethodRewrites -> com.android.tools.r8.r.c.b0.g:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():12:12 -> <clinit>
     1:4:void rewriteAsIdentity(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):33:36 -> a
@@ -31741,7 +31770,58 @@
     50:50:void insertAssumeNoneInstructionsInBlock(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):78 -> a
     51:51:boolean lambda$insertAssumeNoneInstructionsInBlock$0(com.android.tools.r8.ir.code.Instruction):80:80 -> a
     52:53:void lambda$insertAssumeNoneInstructionsInBlock$1(com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Assume):83:84 -> a
-com.android.tools.r8.ir.optimize.AssumeDynamicTypeRemover -> com.android.tools.r8.ir.optimize.b:
+com.android.tools.r8.ir.optimize.AssertionsRewriter -> com.android.tools.r8.ir.optimize.d:
+    com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
+    com.android.tools.r8.graph.AppView appView -> a
+    java.util.List configuration -> c
+    boolean $assertionsDisabled -> e
+    boolean enabled -> d
+    1:1:void <clinit>():30:30 -> <clinit>
+    1:15:void <init>(com.android.tools.r8.graph.AppView):81:95 -> <init>
+    1:1:com.android.tools.r8.ir.optimize.AssertionsRewriter$ConfigurationEntryWithDexString lambda$new$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.AssertionsConfiguration$ConfigurationEntry):93:93 -> a
+    2:5:boolean isPassthroughAll(com.android.tools.r8.AssertionsConfiguration):101:104 -> a
+    6:6:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):222:222 -> a
+    7:25:com.android.tools.r8.AssertionsConfiguration$AssertionTransformation getTransformationForMethod(com.android.tools.r8.graph.DexEncodedMethod):109:127 -> a
+    7:25:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):225 -> a
+    26:49:boolean isDescriptorForClassOrInnerClass(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):148:171 -> a
+    26:49:com.android.tools.r8.AssertionsConfiguration$AssertionTransformation getTransformationForMethod(com.android.tools.r8.graph.DexEncodedMethod):127 -> a
+    26:49:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):225 -> a
+    50:54:com.android.tools.r8.AssertionsConfiguration$AssertionTransformation getTransformationForMethod(com.android.tools.r8.graph.DexEncodedMethod):128:132 -> a
+    50:54:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):225 -> a
+    55:56:com.android.tools.r8.AssertionsConfiguration$AssertionTransformation getTransformationForMethod(com.android.tools.r8.graph.DexEncodedMethod):115:116 -> a
+    55:56:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):225 -> a
+    57:62:boolean com.android.tools.r8.graph.DexString.contains(com.android.tools.r8.graph.DexString):448:453 -> a
+    57:62:com.android.tools.r8.AssertionsConfiguration$AssertionTransformation getTransformationForMethod(com.android.tools.r8.graph.DexEncodedMethod):116 -> a
+    57:62:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):225 -> a
+    63:66:com.android.tools.r8.AssertionsConfiguration$AssertionTransformation getTransformationForMethod(com.android.tools.r8.graph.DexEncodedMethod):117:120 -> a
+    63:66:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):225 -> a
+    67:90:com.android.tools.r8.AssertionsConfiguration$AssertionTransformation getTransformationForMethod(com.android.tools.r8.graph.DexEncodedMethod):112:135 -> a
+    67:90:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):225 -> a
+    91:100:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):226:235 -> a
+    101:101:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
+    101:101:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):235 -> a
+    102:104:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):239:241 -> a
+    105:105:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():965:965 -> a
+    105:105:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):246 -> a
+    106:110:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):247:251 -> a
+    111:111:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1059:1059 -> a
+    111:111:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):252 -> a
+    112:123:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):252:263 -> a
+    124:124:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1059:1059 -> a
+    124:124:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):263 -> a
+    125:125:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):262:262 -> a
+com.android.tools.r8.ir.optimize.AssertionsRewriter$1 -> com.android.tools.r8.ir.optimize.b:
+com.android.tools.r8.ir.optimize.AssertionsRewriter$ConfigurationEntryWithDexString -> com.android.tools.r8.ir.optimize.c:
+    com.android.tools.r8.AssertionsConfiguration$ConfigurationEntry entry -> a
+    com.android.tools.r8.graph.DexString value -> b
+    1:1:void <init>(com.android.tools.r8.AssertionsConfiguration$ConfigurationEntry,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.optimize.AssertionsRewriter$1):32:32 -> <init>
+    2:26:void <init>(com.android.tools.r8.AssertionsConfiguration$ConfigurationEntry,com.android.tools.r8.graph.DexItemFactory):38:62 -> <init>
+    27:40:void <init>(com.android.tools.r8.AssertionsConfiguration$ConfigurationEntry,com.android.tools.r8.graph.DexItemFactory):58:71 -> <init>
+    41:49:void <init>(com.android.tools.r8.AssertionsConfiguration$ConfigurationEntry,com.android.tools.r8.graph.DexItemFactory):42:50 -> <init>
+    50:72:void <init>(com.android.tools.r8.AssertionsConfiguration$ConfigurationEntry,com.android.tools.r8.graph.DexItemFactory):46:68 -> <init>
+    1:1:com.android.tools.r8.AssertionsConfiguration$ConfigurationEntry access$000(com.android.tools.r8.ir.optimize.AssertionsRewriter$ConfigurationEntryWithDexString):32:32 -> a
+    1:1:com.android.tools.r8.graph.DexString access$100(com.android.tools.r8.ir.optimize.AssertionsRewriter$ConfigurationEntryWithDexString):32:32 -> b
+com.android.tools.r8.ir.optimize.AssumeDynamicTypeRemover -> com.android.tools.r8.ir.optimize.e:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set affectedValues -> c
     java.util.Set assumeDynamicTypeInstructionsToRemove -> d
@@ -31761,10 +31841,10 @@
     35:35:void finish():106 -> a
     36:36:void finish():106:106 -> a
     1:1:boolean mayHaveIntroducedTrivialPhi():48:48 -> b
-com.android.tools.r8.ir.optimize.Assumer -> com.android.tools.r8.ir.optimize.c:
+com.android.tools.r8.ir.optimize.Assumer -> com.android.tools.r8.ir.optimize.f:
     void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate) -> a
     1:1:void insertAssumeInstructions(com.android.tools.r8.ir.code.IRCode):18:18 -> a
-com.android.tools.r8.ir.optimize.BasicBlockInstructionsEquivalence -> com.android.tools.r8.ir.optimize.d:
+com.android.tools.r8.ir.optimize.BasicBlockInstructionsEquivalence -> com.android.tools.r8.ir.optimize.g:
     com.android.tools.r8.ir.regalloc.RegisterAllocator allocator -> a
     int[] hashes -> b
     boolean $assertionsDisabled -> c
@@ -31783,7 +31863,7 @@
     1:1:int doHash(java.lang.Object):16:16 -> doHash
     2:8:int doHash(com.android.tools.r8.ir.code.BasicBlock):79:85 -> doHash
     2:8:int doHash(java.lang.Object):16 -> doHash
-com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator -> com.android.tools.r8.ir.optimize.f:
+com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator -> com.android.tools.r8.ir.optimize.i:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set revisitedMethods -> b
     boolean $assertionsDisabled -> d
@@ -31821,12 +31901,12 @@
     java.util.Collection codeOptimizationsForPostProcessing() -> b
     1:6:void logResults():63:68 -> c
     7:7:void logResults():67:67 -> c
-com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator$Mode -> com.android.tools.r8.ir.optimize.e:
+com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator$Mode -> com.android.tools.r8.ir.optimize.h:
     com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator$Mode COLLECT -> a
     com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator$Mode REVISIT -> b
     1:3:void <clinit>():44:46 -> <clinit>
     1:1:void <init>(java.lang.String,int):43:43 -> <init>
-com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization -> com.android.tools.r8.ir.optimize.h:
+com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization -> com.android.tools.r8.ir.optimize.k:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$WaveDoneAction waveDoneAction -> d
@@ -31837,7 +31917,7 @@
     2:7:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):98:103 -> <init>
     1:1:com.android.tools.r8.graph.AppView access$000(com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization):61:61 -> a
     2:6:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):107:111 -> a
-    7:7:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    7:7:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     7:7:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):111 -> a
     8:27:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):119:138 -> a
     28:52:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):259:283 -> a
@@ -31845,7 +31925,7 @@
     53:53:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):287:287 -> a
     53:53:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):283 -> a
     53:53:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):138 -> a
-    54:54:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    54:54:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     54:54:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):287 -> a
     54:54:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):283 -> a
     54:54:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):138 -> a
@@ -31888,7 +31968,7 @@
     360:467:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):349:456 -> a
     468:566:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):358:456 -> a
     567:569:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):365:367 -> a
-    570:571:boolean com.android.tools.r8.graph.DexClass.definesStaticField(com.android.tools.r8.graph.DexField):445:446 -> a
+    570:571:boolean com.android.tools.r8.graph.DexClass.definesStaticField(com.android.tools.r8.graph.DexField):495:496 -> a
     570:571:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):368 -> a
     572:572:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):369:369 -> a
     573:577:boolean com.android.tools.r8.ir.code.Value.isDexItemBasedConstStringThatNeedsToComputeClassName():843:847 -> a
@@ -31904,7 +31984,7 @@
     723:723:java.util.Set lambda$findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts$2(com.android.tools.r8.graph.DexField):420:420 -> a
     724:725:java.util.Collection validateFinalFieldPuts(java.util.Map,java.util.Map):483:484 -> a
     726:734:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Instruction):501:509 -> a
-com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$WaveDoneAction -> com.android.tools.r8.ir.optimize.g:
+com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$WaveDoneAction -> com.android.tools.r8.ir.optimize.j:
     java.util.Map fieldsWithStaticValues -> a
     com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization this$0 -> c
     java.util.Set noLongerWrittenFields -> b
@@ -31912,612 +31992,599 @@
     1:2:void join(java.util.Map,java.util.Set):78:79 -> a
     3:5:void execute():85:87 -> a
     6:10:void execute():86:90 -> a
-com.android.tools.r8.ir.optimize.CodeRewriter -> com.android.tools.r8.ir.optimize.i:
+com.android.tools.r8.ir.optimize.CodeRewriter -> com.android.tools.r8.ir.optimize.l:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
     com.android.tools.r8.graph.AppView appView -> b
     boolean $assertionsDisabled -> e
     com.android.tools.r8.utils.InternalOptions options -> d
     com.android.tools.r8.ir.conversion.IRConverter converter -> a
-    1:1:void <clinit>():138:138 -> <clinit>
-    1:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):157:161 -> <init>
+    1:1:void <clinit>():135:135 -> <clinit>
+    1:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):154:158 -> <init>
     boolean lambda$computeConstantArrayValues$9(com.android.tools.r8.ir.code.NewArrayEmpty,com.android.tools.r8.ir.code.Instruction) -> a
-    1:3:void insertAssumeInstructions(com.android.tools.r8.ir.code.IRCode,java.util.Collection):165:167 -> a
-    4:4:boolean lambda$removedTrivialGotos$0(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):242:242 -> a
-    5:28: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):326:349 -> a
-    29:29:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):416:416 -> a
-    30:30:boolean com.android.tools.r8.utils.InternalOptions.canHaveDex2OatInliningIssue():1332:1332 -> a
-    30:30:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):416 -> a
+    1:3:void insertAssumeInstructions(com.android.tools.r8.ir.code.IRCode,java.util.Collection):162:164 -> a
+    4:4:boolean lambda$removedTrivialGotos$0(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):239:239 -> a
+    5:28: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):323:346 -> a
+    29:29:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):413:413 -> a
+    30:30:boolean com.android.tools.r8.utils.InternalOptions.canHaveDex2OatInliningIssue():1324:1324 -> a
+    30:30:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):413 -> a
     31:32:boolean com.android.tools.r8.ir.code.IRCode.hasCatchHandlers():629:630 -> a
-    31:32:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):416 -> a
-    33:44:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):423:434 -> a
+    31:32:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):413 -> a
+    33:44:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):420:431 -> a
     45:45:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():29:29 -> a
-    45:45:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):434 -> a
-    46:53:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):435:442 -> a
-    54:90:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):594:630 -> a
-    91:91:java.lang.Object com.android.tools.r8.ir.optimize.CodeRewriter$InstructionBuilder.setBlockNumber(int):458:458 -> a
-    91:91:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):631 -> a
-    92:106:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):632:646 -> a
-    107:107:java.lang.Object com.android.tools.r8.ir.optimize.CodeRewriter$InstructionBuilder.setBlockNumber(int):458:458 -> a
-    107:107:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):647 -> a
-    108:117:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):648:657 -> a
-    118:131:com.android.tools.r8.ir.optimize.CodeRewriter$Interval combineOrAddInterval(java.util.List,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,com.android.tools.r8.ir.optimize.CodeRewriter$Interval):707:720 -> a
-    132:132:com.android.tools.r8.ir.optimize.CodeRewriter$Interval combineOrAddInterval(java.util.List,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,com.android.tools.r8.ir.optimize.CodeRewriter$Interval):717:717 -> a
-    133:144:void tryAddToBiggestSavings(java.util.Set,java.util.PriorityQueue,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,int):730:741 -> a
-    145:152:int sizeForKeysWrittenAsIfs(com.android.tools.r8.ir.code.ValueType,java.util.Collection):746:753 -> a
-    153:153:int codeUnitMargin():760:760 -> a
-    154:154:int lambda$rewriteSwitch$1(com.android.tools.r8.utils.InternalOutputMode,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,com.android.tools.r8.ir.optimize.CodeRewriter$Interval):922:922 -> a
-    155:155:void lambda$removeSwitchMaps$2(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):1099:1099 -> a
-    156:156:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1163:1163 -> a
-    157:157:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1162:1162 -> a
-    158:164:com.android.tools.r8.graph.DexType getArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1173:1179 -> a
-    158:164:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1166 -> a
-    165:165:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1166:1166 -> a
-    166:170:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1165:1169 -> a
-    171:178:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1323:1330 -> a
-    179:179:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
-    179:179:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1330 -> a
-    180:182:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1334:1336 -> a
-    183:183:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():965:965 -> a
-    183:183:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1341 -> a
-    184:188:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1342:1346 -> a
-    189:189:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1059:1059 -> a
-    189:189:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1347 -> a
-    190:202:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1347:1359 -> a
-    203:203:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1059:1059 -> a
-    203:203:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1358 -> a
-    204:204:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1357:1357 -> a
-    205:236:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1506:1537 -> a
-    237:274:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1536:1573 -> a
-    275:275:boolean lambda$removeInstanceOfInstructionIfTrivial$3(com.android.tools.r8.ir.code.Value):1548:1548 -> a
-    276:278:boolean isNeverInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):1580:1582 -> a
-    279:279:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
-    279:279:boolean isNeverInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):1582 -> a
-    280:282:boolean isNeverInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):1582:1584 -> a
-    283:293:void removeOrReplaceByDebugLocalWrite(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):1589:1599 -> a
-    294:302:boolean isBinopWithLit8OrLit16(com.android.tools.r8.ir.code.Instruction):1720:1728 -> a
-    303:308:com.android.tools.r8.ir.code.Value binopWithLit8OrLit16NonConstant(com.android.tools.r8.ir.code.Binop):1747:1752 -> a
-    309:310:boolean lambda$shortenLiveRanges$5(com.android.tools.r8.ir.code.ConstInstruction):1815:1816 -> a
-    311:317:void lambda$shortenLiveRanges$7(java.util.Map,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):1878:1884 -> a
-    318:410:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,java.util.Map,java.util.function.Predicate):1912:2004 -> a
-    411:458:com.android.tools.r8.ir.code.ConstInstruction[] computeConstantArrayValues(com.android.tools.r8.ir.code.NewArrayEmpty,com.android.tools.r8.ir.code.BasicBlock,int):2040:2087 -> a
-    459:459:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2436:2436 -> a
-    460:466:boolean hasCSECandidate(com.android.tools.r8.ir.code.IRCode,int):2424:2430 -> a
-    460:466:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2437 -> a
-    467:469:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2439:2441 -> a
-    470:470:void com.android.tools.r8.ir.code.DominatorTree.<init>(com.android.tools.r8.ir.code.IRCode):37:37 -> a
-    470:470:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2441 -> a
-    471:484:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2442:2455 -> a
-    485:494:boolean shareCatchHandlers(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2402:2411 -> a
-    485:494:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2456 -> a
-    495:510:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2457:2472 -> a
-    511:512:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock):2623:2624 -> a
-    513:513:int negateBoolean(com.android.tools.r8.ir.code.ConstNumber):2789:2789 -> a
-    514:514:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():935:935 -> a
-    514:514:int negateBoolean(com.android.tools.r8.ir.code.ConstNumber):2789 -> a
-    515:516:int negateBoolean(com.android.tools.r8.ir.code.ConstNumber):2789:2790 -> a
-    517:544:boolean replaceDominatedConstNumbers(long,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.base.Supplier):2800:2827 -> a
-    545:545:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():935:935 -> a
-    545:545:boolean replaceDominatedConstNumbers(long,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.base.Supplier):2831 -> a
-    546:560:boolean replaceDominatedConstNumbers(long,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.base.Supplier):2846:2860 -> a
-    561:586:boolean isBlockSupportedBySimplifyKnownBooleanCondition(com.android.tools.r8.ir.code.BasicBlock):3034:3059 -> a
-    587:589:void rewriteIfToGoto(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):3070:3072 -> a
-    590:592:void com.android.tools.r8.ir.code.BasicBlock.replaceLastInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):98:100 -> a
-    590:592:void rewriteIfToGoto(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):3072 -> a
-    593:594:void rewriteIfToGoto(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):3073:3074 -> a
-    595:615:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3234:3254 -> a
-    616:616:void com.android.tools.r8.ir.code.InvokeDirect.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):37:37 -> a
-    616:616:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3254 -> a
-    617:633:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3254:3270 -> a
-    634:634:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3269:3269 -> a
-    635:635:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1045:1045 -> a
-    635:635:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3268 -> a
-    636:647:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3268:3279 -> a
-    648:670:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3290:3312 -> a
-    671:671:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):167:167 -> a
-    671:671:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3312 -> a
-    672:672:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3313:3313 -> a
-    673:707:java.util.Set computeUnneededMoves(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DebugLocalsChange,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3350:3384 -> a
-    673:707:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3317 -> a
-    708:730:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3318:3340 -> a
-    731:731:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap):168:168 -> a
-    731:731:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3340 -> a
-    732:736:void updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3395:3399 -> a
-    737:737:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):167:167 -> a
-    737:737:void updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3399 -> a
-    738:742:void updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3400:3404 -> a
-    743:743:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3457:3457 -> a
-    744:748:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3463:3467 -> a
-    744:748:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3459 -> a
-    749:749:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
-    749:749:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3467 -> a
-    749:749:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3459 -> a
-    750:750:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3472:3472 -> a
-    750:750:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3459 -> a
-    751:751:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3469:3469 -> a
-    751:751:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3459 -> a
-    752:752:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    752:752:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3469 -> a
-    752:752:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3459 -> a
-    753:753:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3469:3469 -> a
-    753:753:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3459 -> a
-    754:755: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):3478:3479 -> a
-    756:756:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1045:1045 -> a
-    756:756: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):3480 -> a
-    757:757: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):3482:3482 -> a
-    758:758:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():345:345 -> a
-    758:758: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):3482 -> a
-    759:760: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):3482:3483 -> a
-    761:781:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3493:3513 -> a
-    782:782:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1045:1045 -> a
-    782:782:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3512 -> a
-    783:789:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3515:3521 -> a
-    790:828:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3519:3557 -> a
-    829:832:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlock.createIfBlock(int,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.IRMetadata):1392:1395 -> a
-    829:832:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3557 -> a
-    833:855:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3558:3580 -> a
-    856:856:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1045:1045 -> a
-    856:856:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3580 -> a
-    857:858:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3581:3582 -> a
-    859:874:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3581:3596 -> a
-    875:882:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3600:3607 -> a
-    883:893:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3620:3630 -> a
-    883:893:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3607 -> a
-    894:894:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3608:3608 -> a
-    895:920:void replaceTrivialNewInstancePhis(com.android.tools.r8.ir.code.Value):3653:3678 -> a
-    895:920:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3608 -> a
-    921:925:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3609:3613 -> a
-    926:926:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3610:3610 -> a
-    927:927:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    927:927:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3610 -> a
-    928:928:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    928:928:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    928:928:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3610 -> a
-    929:929:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3610:3610 -> a
-    930:930:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3628:3628 -> a
-    930:930:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3607 -> a
-    931:931:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    931:931:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3628 -> a
-    931:931:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3607 -> a
-    932:932:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    932:932:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    932:932:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3628 -> a
-    932:932:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3607 -> a
-    933:933:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3628:3628 -> a
-    933:933:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3607 -> a
-    934:934:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3624:3624 -> a
-    934:934:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3607 -> a
-    935:935:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    935:935:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3624 -> a
-    935:935:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3607 -> a
-    936:936:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    936:936:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    936:936:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3624 -> a
-    936:936:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3607 -> a
-    937:937:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3624:3624 -> a
-    937:937:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3607 -> a
-    938:944:void recursiveAddOperands(com.android.tools.r8.ir.code.Phi,java.util.Set,java.util.Set):3634:3640 -> a
-    1:1:void removeAssumeInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):181:181 -> b
+    45:45:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):431 -> a
+    46:53:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):432:439 -> a
+    54:90:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):591:627 -> a
+    91:91:java.lang.Object com.android.tools.r8.ir.optimize.CodeRewriter$InstructionBuilder.setBlockNumber(int):455:455 -> a
+    91:91:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):628 -> a
+    92:106:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):629:643 -> a
+    107:107:java.lang.Object com.android.tools.r8.ir.optimize.CodeRewriter$InstructionBuilder.setBlockNumber(int):455:455 -> a
+    107:107:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):644 -> a
+    108:117:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):645:654 -> a
+    118:131:com.android.tools.r8.ir.optimize.CodeRewriter$Interval combineOrAddInterval(java.util.List,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,com.android.tools.r8.ir.optimize.CodeRewriter$Interval):704:717 -> a
+    132:132:com.android.tools.r8.ir.optimize.CodeRewriter$Interval combineOrAddInterval(java.util.List,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,com.android.tools.r8.ir.optimize.CodeRewriter$Interval):714:714 -> a
+    133:144:void tryAddToBiggestSavings(java.util.Set,java.util.PriorityQueue,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,int):727:738 -> a
+    145:152:int sizeForKeysWrittenAsIfs(com.android.tools.r8.ir.code.ValueType,java.util.Collection):743:750 -> a
+    153:153:int codeUnitMargin():757:757 -> a
+    154:154:int lambda$rewriteSwitch$1(com.android.tools.r8.utils.InternalOutputMode,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,com.android.tools.r8.ir.optimize.CodeRewriter$Interval):919:919 -> a
+    155:155:void lambda$removeSwitchMaps$2(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):1096:1096 -> a
+    156:156:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1160:1160 -> a
+    157:157:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1159:1159 -> a
+    158:164:com.android.tools.r8.graph.DexType getArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1170:1176 -> a
+    158:164:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1163 -> a
+    165:165:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1163:1163 -> a
+    166:170:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1162:1166 -> a
+    171:202:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1416:1447 -> a
+    203:240:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1446:1483 -> a
+    241:241:boolean lambda$removeInstanceOfInstructionIfTrivial$3(com.android.tools.r8.ir.code.Value):1458:1458 -> a
+    242:244:boolean isNeverInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):1490:1492 -> a
+    245:245:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
+    245:245:boolean isNeverInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):1492 -> a
+    246:248:boolean isNeverInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):1492:1494 -> a
+    249:259:void removeOrReplaceByDebugLocalWrite(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):1499:1509 -> a
+    260:268:boolean isBinopWithLit8OrLit16(com.android.tools.r8.ir.code.Instruction):1630:1638 -> a
+    269:274:com.android.tools.r8.ir.code.Value binopWithLit8OrLit16NonConstant(com.android.tools.r8.ir.code.Binop):1657:1662 -> a
+    275:276:boolean lambda$shortenLiveRanges$5(com.android.tools.r8.ir.code.ConstInstruction):1725:1726 -> a
+    277:283:void lambda$shortenLiveRanges$7(java.util.Map,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):1788:1794 -> a
+    284:376:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,java.util.Map,java.util.function.Predicate):1822:1914 -> a
+    377:424:com.android.tools.r8.ir.code.ConstInstruction[] computeConstantArrayValues(com.android.tools.r8.ir.code.NewArrayEmpty,com.android.tools.r8.ir.code.BasicBlock,int):1950:1997 -> a
+    425:425:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2346:2346 -> a
+    426:432:boolean hasCSECandidate(com.android.tools.r8.ir.code.IRCode,int):2334:2340 -> a
+    426:432:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2347 -> a
+    433:435:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2349:2351 -> a
+    436:436:void com.android.tools.r8.ir.code.DominatorTree.<init>(com.android.tools.r8.ir.code.IRCode):37:37 -> a
+    436:436:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2351 -> a
+    437:450:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2352:2365 -> a
+    451:460:boolean shareCatchHandlers(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2312:2321 -> a
+    451:460:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2366 -> a
+    461:476:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2367:2382 -> a
+    477:478:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock):2533:2534 -> a
+    479:479:int negateBoolean(com.android.tools.r8.ir.code.ConstNumber):2699:2699 -> a
+    480:480:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():935:935 -> a
+    480:480:int negateBoolean(com.android.tools.r8.ir.code.ConstNumber):2699 -> a
+    481:482:int negateBoolean(com.android.tools.r8.ir.code.ConstNumber):2699:2700 -> a
+    483:510:boolean replaceDominatedConstNumbers(long,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.base.Supplier):2710:2737 -> a
+    511:511:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():935:935 -> a
+    511:511:boolean replaceDominatedConstNumbers(long,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.base.Supplier):2741 -> a
+    512:526:boolean replaceDominatedConstNumbers(long,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.base.Supplier):2756:2770 -> a
+    527:552:boolean isBlockSupportedBySimplifyKnownBooleanCondition(com.android.tools.r8.ir.code.BasicBlock):2944:2969 -> a
+    553:555:void rewriteIfToGoto(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):2980:2982 -> a
+    556:558:void com.android.tools.r8.ir.code.BasicBlock.replaceLastInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):98:100 -> a
+    556:558:void rewriteIfToGoto(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):2982 -> a
+    559:560:void rewriteIfToGoto(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):2983:2984 -> a
+    561:581:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3144:3164 -> a
+    582:582:void com.android.tools.r8.ir.code.InvokeDirect.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):37:37 -> a
+    582:582:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3164 -> a
+    583:599:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3164:3180 -> a
+    600:600:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3179:3179 -> a
+    601:601:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1045:1045 -> a
+    601:601:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3178 -> a
+    602:613:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3178:3189 -> a
+    614:636:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3200:3222 -> a
+    637:637:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):167:167 -> a
+    637:637:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3222 -> a
+    638:638:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3223:3223 -> a
+    639:673:java.util.Set computeUnneededMoves(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DebugLocalsChange,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3260:3294 -> a
+    639:673:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3227 -> a
+    674:696:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3228:3250 -> a
+    697:697:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap):168:168 -> a
+    697:697:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3250 -> a
+    698:702:void updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3305:3309 -> a
+    703:703:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):167:167 -> a
+    703:703:void updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3309 -> a
+    704:708:void updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3310:3314 -> a
+    709:709:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3367:3367 -> a
+    710:714:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3373:3377 -> a
+    710:714:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3369 -> a
+    715:715:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
+    715:715:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3377 -> a
+    715:715:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3369 -> a
+    716:716:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3382:3382 -> a
+    716:716:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3369 -> a
+    717:717:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3379:3379 -> a
+    717:717:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3369 -> a
+    718:718:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    718:718:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3379 -> a
+    718:718:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3369 -> a
+    719:719:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3379:3379 -> a
+    719:719:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3369 -> a
+    720:721: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):3388:3389 -> a
+    722:722:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1045:1045 -> a
+    722:722: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):3390 -> a
+    723:723: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):3392:3392 -> a
+    724:724:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():337:337 -> a
+    724:724: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):3392 -> a
+    725:726: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):3392:3393 -> a
+    727:747:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3403:3423 -> a
+    748:748:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1045:1045 -> a
+    748:748:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3422 -> a
+    749:755:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3425:3431 -> a
+    756:794:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3429:3467 -> a
+    795:798:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlock.createIfBlock(int,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.IRMetadata):1392:1395 -> a
+    795:798:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3467 -> a
+    799:821:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3468:3490 -> a
+    822:822:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1045:1045 -> a
+    822:822:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3490 -> a
+    823:824:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3491:3492 -> a
+    825:840:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3491:3506 -> a
+    841:848:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3510:3517 -> a
+    849:859:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3530:3540 -> a
+    849:859:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3517 -> a
+    860:860:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3518:3518 -> a
+    861:886:void replaceTrivialNewInstancePhis(com.android.tools.r8.ir.code.Value):3563:3588 -> a
+    861:886:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3518 -> a
+    887:891:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3519:3523 -> a
+    892:892:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3520:3520 -> a
+    893:893:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    893:893:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3520 -> a
+    894:894:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    894:894:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    894:894:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3520 -> a
+    895:895:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3520:3520 -> a
+    896:896:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3538:3538 -> a
+    896:896:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3517 -> a
+    897:897:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    897:897:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3538 -> a
+    897:897:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3517 -> a
+    898:898:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    898:898:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    898:898:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3538 -> a
+    898:898:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3517 -> a
+    899:899:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3538:3538 -> a
+    899:899:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3517 -> a
+    900:900:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3534:3534 -> a
+    900:900:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3517 -> a
+    901:901:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    901:901:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3534 -> a
+    901:901:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3517 -> a
+    902:902:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    902:902:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    902:902:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3534 -> a
+    902:902:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3517 -> a
+    903:903:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3534:3534 -> a
+    903:903:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3517 -> a
+    904:910:void recursiveAddOperands(com.android.tools.r8.ir.code.Phi,java.util.Set,java.util.Set):3544:3550 -> a
+    1:1:void removeAssumeInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):178:178 -> b
     2:2:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():965:965 -> b
-    2:2:void removeAssumeInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):183 -> b
-    3:25:void removeAssumeInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):185:207 -> b
+    2:2:void removeAssumeInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):180 -> b
+    3:25:void removeAssumeInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):182:204 -> b
     26:26:void com.android.tools.r8.ir.code.IRCode.removeAllTrivialPhis(java.util.Set):1126:1126 -> b
-    26:26:void removeAssumeInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):219 -> b
-    27:28:void removeAssumeInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):222:223 -> b
+    26:26:void removeAssumeInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):216 -> b
+    27:28:void removeAssumeInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):219:220 -> b
     29:29:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> b
-    29:29:void removeAssumeInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):223 -> b
-    30:33:void removeAssumeInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):223:226 -> b
+    29:29:void removeAssumeInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):220 -> b
+    30:33:void removeAssumeInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):220:223 -> b
     34:34:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():965:965 -> b
-    34:34:void removeAssumeInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):183 -> b
-    35:36:boolean isFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):314:315 -> b
-    37:46:void unlinkTrivialGotoBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):354:363 -> b
-    47:47:boolean lambda$shortenLiveRanges$6(com.android.tools.r8.ir.code.ConstInstruction):1824:1824 -> b
-    48:53:boolean isCSEInstructionCandidate(com.android.tools.r8.ir.code.Instruction):2415:2420 -> b
-    54:100:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2871:2917 -> b
+    34:34:void removeAssumeInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):180 -> b
+    35:36:boolean isFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):311:312 -> b
+    37:46:void unlinkTrivialGotoBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):351:360 -> b
+    47:47:boolean lambda$shortenLiveRanges$6(com.android.tools.r8.ir.code.ConstInstruction):1734:1734 -> b
+    48:53:boolean isCSEInstructionCandidate(com.android.tools.r8.ir.code.Instruction):2325:2330 -> b
+    54:100:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2781:2827 -> b
     101:102:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createConstNull(com.android.tools.r8.graph.DebugLocalInfo):1092:1093 -> b
-    101:102:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2917 -> b
-    103:114:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2918:2929 -> b
-    115:117:com.android.tools.r8.graph.DexMethod lambda$workaroundNumberConversionRegisterAllocationBug$13():3741:3743 -> b
-    118:118:com.android.tools.r8.graph.DexMethod lambda$workaroundNumberConversionRegisterAllocationBug$13():3741:3741 -> b
-    1:1:java.util.Map lambda$shortenLiveRangesInsideBlock$8(com.android.tools.r8.ir.code.BasicBlock):1998:1998 -> c
-    2:52:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2649:2699 -> c
+    101:102:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2827 -> b
+    103:114:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2828:2839 -> b
+    115:117:com.android.tools.r8.graph.DexMethod lambda$workaroundNumberConversionRegisterAllocationBug$13():3651:3653 -> b
+    118:118:com.android.tools.r8.graph.DexMethod lambda$workaroundNumberConversionRegisterAllocationBug$13():3651:3651 -> b
+    1:1:java.util.Map lambda$shortenLiveRangesInsideBlock$8(com.android.tools.r8.ir.code.BasicBlock):1908:1908 -> c
+    2:52:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2559:2609 -> c
     53:53:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():935:935 -> c
-    53:53:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2700 -> c
-    54:63:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2702:2711 -> c
-    64:64:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2710:2710 -> c
+    53:53:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2610 -> c
+    54:63:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2612:2621 -> c
+    64:64:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2620:2620 -> c
     65:65:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():935:935 -> c
-    65:65:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2717 -> c
-    66:66:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2720:2720 -> c
-    67:80:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2719:2732 -> c
-    81:81:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2731:2731 -> c
+    65:65:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2627 -> c
+    66:66:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2630:2630 -> c
+    67:80:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2629:2642 -> c
+    81:81:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2641:2641 -> c
     82:82:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():935:935 -> c
-    82:82:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2738 -> c
-    83:83:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2741:2741 -> c
-    84:103:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2740:2759 -> c
-    104:104:boolean lambda$logArgumentTypes$12(com.android.tools.r8.ir.code.Instruction):3502:3502 -> c
-    1:6:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1066:1071 -> d
+    82:82:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2648 -> c
+    83:83:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2651:2651 -> c
+    84:103:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2650:2669 -> c
+    104:104:boolean lambda$logArgumentTypes$12(com.android.tools.r8.ir.code.Instruction):3412:3412 -> c
+    1:6:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1063:1068 -> d
     7:45:com.android.tools.r8.ir.optimize.SwitchUtils$EnumSwitchInfo com.android.tools.r8.ir.optimize.SwitchUtils.analyzeSwitchOverEnum(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.AppView):63:101 -> d
-    7:45:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1071 -> d
-    46:53:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1073:1080 -> d
+    7:45:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1068 -> d
+    46:53:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1070:1077 -> d
     54:54:int[] com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection.toIntArray(int[]):167:167 -> d
     54:54:int[] com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection.toIntArray():155 -> d
-    54:54:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1080 -> d
-    55:66:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1081:1092 -> d
+    54:54:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1077 -> d
+    55:66:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1078:1089 -> d
     67:67:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):298:298 -> d
-    67:67:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1094 -> d
-    68:76:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1097:1105 -> d
-    1:31:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1371:1401 -> e
+    67:67:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1091 -> d
+    68:76:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1094:1102 -> d
+    1:31:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1281:1311 -> e
     32:32:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> e
-    32:32:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1401 -> e
-    33:33:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1402:1402 -> e
+    32:32:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1311 -> e
+    33:33:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1312:1312 -> e
     34:34:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():965:965 -> e
-    34:34:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1403 -> e
-    35:40:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1405:1410 -> e
-    41:57:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult removeCheckCastInstructionIfTrivial(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):1442:1458 -> e
-    41:57:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1410 -> e
-    58:58:boolean com.android.tools.r8.graph.DexType.isFloatType():211:211 -> e
-    58:58:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult removeCheckCastInstructionIfTrivial(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):1458 -> e
-    58:58:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1410 -> e
-    59:98:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult removeCheckCastInstructionIfTrivial(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):1459:1498 -> e
-    59:98:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1410 -> e
-    99:107:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1411:1419 -> e
+    34:34:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1313 -> e
+    35:40:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1315:1320 -> e
+    41:57:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult removeCheckCastInstructionIfTrivial(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):1352:1368 -> e
+    41:57:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1320 -> e
+    58:58:boolean com.android.tools.r8.graph.DexType.isFloatType():217:217 -> e
+    58:58:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult removeCheckCastInstructionIfTrivial(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):1368 -> e
+    58:58:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1320 -> e
+    59:98:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult removeCheckCastInstructionIfTrivial(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):1369:1408 -> e
+    59:98:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1320 -> e
+    99:107:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1321:1329 -> e
     108:108:void com.android.tools.r8.ir.code.IRCode.removeAllTrivialPhis(java.util.Set):1126:1126 -> e
-    108:108:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1431 -> e
-    109:113:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1432:1436 -> e
-    1:1:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):3125:3125 -> f
+    108:108:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1341 -> e
+    109:113:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1342:1346 -> e
+    1:1:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):3035:3035 -> f
     2:2:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():965:965 -> f
-    2:2:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):3129 -> f
-    3:68:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):3130:3195 -> f
+    2:2:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):3039 -> f
+    3:68:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):3040:3105 -> f
     1:1:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():965:965 -> g
-    1:1:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3199 -> g
-    2:26:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3200:3224 -> g
+    1:1:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3109 -> g
+    2:26:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3110:3134 -> g
     27:27:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1059:1059 -> g
-    27:27:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3225 -> g
-    28:32:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3226:3230 -> g
-    1:1:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1184:1184 -> h
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():345:345 -> h
-    2:2:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1184 -> h
-    3:36:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1187:1220 -> h
-    37:84:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1219:1266 -> h
+    27:27:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3135 -> g
+    28:32:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3136:3140 -> g
+    1:1:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1181:1181 -> h
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():337:337 -> h
+    2:2:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1181 -> h
+    3:36:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1184:1217 -> h
+    37:84:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1216:1263 -> h
     85:85:void com.android.tools.r8.ir.code.IRCode.removeAllTrivialPhis(java.util.Set):1126:1126 -> h
-    85:85:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1267 -> h
-    86:87:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1268:1269 -> h
+    85:85:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1264 -> h
+    86:87:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1265:1266 -> h
     88:88:void com.android.tools.r8.ir.code.IRCode.removeAllTrivialPhis(java.util.Set):1126:1126 -> h
-    88:88:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1270 -> h
-    89:90:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1272:1273 -> h
+    88:88:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1267 -> h
+    89:90:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1269:1270 -> h
     91:91:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> h
-    91:91:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1273 -> h
-    92:94:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1273:1275 -> h
-    1:58:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):253:310 -> i
-    1:17:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3414:3430 -> j
+    91:91:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1270 -> h
+    92:94:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1270:1272 -> h
+    1:58:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):250:307 -> i
+    1:17:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3324:3340 -> j
     18:18:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1059:1059 -> j
-    18:18:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3437 -> j
-    19:34:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3438:3453 -> j
-    1:54:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1802:1855 -> k
+    18:18:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3347 -> j
+    19:34:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3348:3363 -> j
+    1:54:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1712:1765 -> k
     55:55:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():29:29 -> k
-    55:55:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1855 -> k
+    55:55:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1765 -> k
     56:56:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):29:29 -> k
-    56:56:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1856 -> k
-    57:71:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1857:1871 -> k
-    72:72:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpIfFloatBug():1293:1293 -> k
-    72:72:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1872 -> k
-    73:76:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1872:1875 -> k
-    77:78:void forEachUse(com.android.tools.r8.ir.code.Instruction,java.util.function.Consumer):1902:1903 -> k
-    77:78:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1875 -> k
-    79:88:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1889:1898 -> k
-    1:1:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2117:2117 -> l
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():345:345 -> l
-    2:2:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2117 -> l
-    3:11:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2120:2128 -> l
-    12:28:boolean allowNewFilledArrayConstruction(com.android.tools.r8.ir.code.Instruction):2093:2109 -> l
-    12:28:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2129 -> l
-    29:45:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2132:2148 -> l
-    46:63:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2147:2164 -> l
-    64:80:short[] computeArrayFilledData(com.android.tools.r8.ir.code.ConstInstruction[],int,int):2013:2029 -> l
-    64:80:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2165 -> l
-    81:127:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2169:2215 -> l
-    1:1:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2476:2476 -> m
-    2:7:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2482:2487 -> m
-    2:7:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2477 -> m
-    8:22:boolean flipIfBranchesIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3104:3118 -> m
-    8:22:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2488 -> m
-    8:22:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2477 -> m
+    56:56:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1766 -> k
+    57:71:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1767:1781 -> k
+    72:72:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpIfFloatBug():1285:1285 -> k
+    72:72:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1782 -> k
+    73:76:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1782:1785 -> k
+    77:78:void forEachUse(com.android.tools.r8.ir.code.Instruction,java.util.function.Consumer):1812:1813 -> k
+    77:78:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1785 -> k
+    79:88:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1799:1808 -> k
+    1:1:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2027:2027 -> l
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():337:337 -> l
+    2:2:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2027 -> l
+    3:11:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2030:2038 -> l
+    12:28:boolean allowNewFilledArrayConstruction(com.android.tools.r8.ir.code.Instruction):2003:2019 -> l
+    12:28:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2039 -> l
+    29:45:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2042:2058 -> l
+    46:63:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2057:2074 -> l
+    64:80:short[] computeArrayFilledData(com.android.tools.r8.ir.code.ConstInstruction[],int,int):1923:1939 -> l
+    64:80:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2075 -> l
+    81:127:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2079:2125 -> l
+    1:1:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2386:2386 -> m
+    2:7:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2392:2397 -> m
+    2:7:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2387 -> m
+    8:22:boolean flipIfBranchesIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3014:3028 -> m
+    8:22:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2398 -> m
+    8:22:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2387 -> m
     23:25:void com.android.tools.r8.ir.code.BasicBlock.replaceLastInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):98:100 -> m
-    23:25:boolean flipIfBranchesIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3119 -> m
-    23:25:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2488 -> m
-    23:25:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2477 -> m
-    26:26:boolean flipIfBranchesIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3120:3120 -> m
-    26:26:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2488 -> m
-    26:26:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2477 -> m
-    27:38:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3078:3089 -> m
-    27:38:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2489 -> m
-    27:38:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2477 -> m
+    23:25:boolean flipIfBranchesIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3029 -> m
+    23:25:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2398 -> m
+    23:25:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2387 -> m
+    26:26:boolean flipIfBranchesIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3030:3030 -> m
+    26:26:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2398 -> m
+    26:26:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2387 -> m
+    27:38:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2988:2999 -> m
+    27:38:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2399 -> m
+    27:38:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2387 -> m
     39:52:com.android.tools.r8.ir.code.If$Type com.android.tools.r8.ir.code.If$Type.forSwappedOperands():27:40 -> m
-    39:52:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3089 -> m
-    39:52:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2489 -> m
-    39:52:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2477 -> m
+    39:52:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2999 -> m
+    39:52:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2399 -> m
+    39:52:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2387 -> m
     53:53:com.android.tools.r8.ir.code.If$Type com.android.tools.r8.ir.code.If$Type.forSwappedOperands():38:38 -> m
-    53:53:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3089 -> m
-    53:53:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2489 -> m
-    53:53:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2477 -> m
+    53:53:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2999 -> m
+    53:53:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2399 -> m
+    53:53:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2387 -> m
     54:54:com.android.tools.r8.ir.code.If$Type com.android.tools.r8.ir.code.If$Type.forSwappedOperands():36:36 -> m
-    54:54:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3089 -> m
-    54:54:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2489 -> m
-    54:54:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2477 -> m
+    54:54:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2999 -> m
+    54:54:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2399 -> m
+    54:54:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2387 -> m
     55:55:com.android.tools.r8.ir.code.If$Type com.android.tools.r8.ir.code.If$Type.forSwappedOperands():34:34 -> m
-    55:55:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3089 -> m
-    55:55:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2489 -> m
-    55:55:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2477 -> m
+    55:55:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2999 -> m
+    55:55:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2399 -> m
+    55:55:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2387 -> m
     56:56:com.android.tools.r8.ir.code.If$Type com.android.tools.r8.ir.code.If$Type.forSwappedOperands():32:32 -> m
-    56:56:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3089 -> m
-    56:56:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2489 -> m
-    56:56:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2477 -> m
-    57:57:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3089:3089 -> m
-    57:57:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2489 -> m
-    57:57:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2477 -> m
+    56:56:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2999 -> m
+    56:56:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2399 -> m
+    56:56:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2387 -> m
+    57:57:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2999:2999 -> m
+    57:57:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2399 -> m
+    57:57:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2387 -> m
     58:60:void com.android.tools.r8.ir.code.BasicBlock.replaceLastInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):98:100 -> m
-    58:60:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3090 -> m
-    58:60:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2489 -> m
-    58:60:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2477 -> m
-    61:65:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3091:3095 -> m
-    61:65:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2489 -> m
-    61:65:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2477 -> m
+    58:60:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3000 -> m
+    58:60:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2399 -> m
+    58:60:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2387 -> m
+    61:65:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3001:3005 -> m
+    61:65:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2399 -> m
+    61:65:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2387 -> m
     66:68:void com.android.tools.r8.ir.code.BasicBlock.replaceLastInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):98:100 -> m
-    66:68:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3096 -> m
-    66:68:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2489 -> m
-    66:68:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2477 -> m
-    69:69:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3097:3097 -> m
-    69:69:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2489 -> m
-    69:69:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2477 -> m
-    70:72:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2963:2965 -> m
-    70:72:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2491 -> m
-    70:72:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2477 -> m
+    66:68:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3006 -> m
+    66:68:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2399 -> m
+    66:68:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2387 -> m
+    69:69:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3007:3007 -> m
+    69:69:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2399 -> m
+    69:69:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2387 -> m
+    70:72:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2873:2875 -> m
+    70:72:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2401 -> m
+    70:72:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2387 -> m
     73:73:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():935:935 -> m
-    73:73:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2965 -> m
-    73:73:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2491 -> m
-    73:73:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2477 -> m
-    74:108:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2966:3000 -> m
-    74:108:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2491 -> m
-    74:108:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2477 -> m
+    73:73:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2875 -> m
+    73:73:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2401 -> m
+    73:73:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2387 -> m
+    74:108:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2876:2910 -> m
+    74:108:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2401 -> m
+    74:108:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2387 -> m
     109:109:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1514:1514 -> m
-    109:109:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3001 -> m
-    109:109:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2491 -> m
-    109:109:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2477 -> m
-    110:131:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3003:3024 -> m
-    110:131:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2491 -> m
-    110:131:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2477 -> m
-    132:155:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2496:2519 -> m
-    132:155:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2477 -> m
-    156:156:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2628:2628 -> m
-    156:156:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2520 -> m
-    156:156:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2477 -> m
-    157:171:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2523:2537 -> m
-    157:171:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2477 -> m
-    172:172:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2628:2628 -> m
-    172:172:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2538 -> m
-    172:172:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2477 -> m
-    173:173:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2529:2529 -> m
-    173:173:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2477 -> m
-    174:174:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2628:2628 -> m
-    174:174:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2530 -> m
-    174:174:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2477 -> m
-    175:185:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2545:2555 -> m
-    175:185:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2477 -> m
-    186:186:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2628:2628 -> m
-    186:186:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2556 -> m
-    186:186:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2477 -> m
-    187:202:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2559:2574 -> m
-    187:202:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2477 -> m
-    203:203:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2628:2628 -> m
-    203:203:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2575 -> m
-    203:203:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2477 -> m
-    204:204:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2565:2565 -> m
-    204:204:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2477 -> m
-    205:205:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2628:2628 -> m
-    205:205:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2566 -> m
-    205:205:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2477 -> m
-    206:210:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2585:2589 -> m
-    206:210:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2477 -> m
-    211:211:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2628:2628 -> m
-    211:211:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2590 -> m
-    211:211:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2477 -> m
-    212:212:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2592:2592 -> m
-    212:212:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2477 -> m
-    213:213:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2628:2628 -> m
-    213:213:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2593 -> m
-    213:213:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2477 -> m
-    214:217:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2598:2601 -> m
-    214:217:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2477 -> m
-    218:218:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2628:2628 -> m
-    218:218:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2603 -> m
-    218:218:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2477 -> m
-    219:219:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2604:2604 -> m
-    219:219:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2477 -> m
-    220:220:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2628:2628 -> m
-    220:220:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2605 -> m
-    220:220:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2477 -> m
-    221:223:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2612:2614 -> m
-    221:223:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2477 -> m
+    109:109:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2911 -> m
+    109:109:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2401 -> m
+    109:109:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2387 -> m
+    110:131:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2913:2934 -> m
+    110:131:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2401 -> m
+    110:131:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2387 -> m
+    132:155:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2406:2429 -> m
+    132:155:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2387 -> m
+    156:156:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2538:2538 -> m
+    156:156:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2430 -> m
+    156:156:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2387 -> m
+    157:171:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2433:2447 -> m
+    157:171:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2387 -> m
+    172:172:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2538:2538 -> m
+    172:172:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2448 -> m
+    172:172:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2387 -> m
+    173:173:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2439:2439 -> m
+    173:173:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2387 -> m
+    174:174:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2538:2538 -> m
+    174:174:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2440 -> m
+    174:174:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2387 -> m
+    175:185:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2455:2465 -> m
+    175:185:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2387 -> m
+    186:186:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2538:2538 -> m
+    186:186:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2466 -> m
+    186:186:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2387 -> m
+    187:202:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2469:2484 -> m
+    187:202:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2387 -> m
+    203:203:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2538:2538 -> m
+    203:203:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2485 -> m
+    203:203:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2387 -> m
+    204:204:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2475:2475 -> m
+    204:204:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2387 -> m
+    205:205:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2538:2538 -> m
+    205:205:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2476 -> m
+    205:205:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2387 -> m
+    206:210:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2495:2499 -> m
+    206:210:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2387 -> m
+    211:211:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2538:2538 -> m
+    211:211:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2500 -> m
+    211:211:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2387 -> m
+    212:212:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2502:2502 -> m
+    212:212:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2387 -> m
+    213:213:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2538:2538 -> m
+    213:213:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2503 -> m
+    213:213:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2387 -> m
+    214:217:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2508:2511 -> m
+    214:217:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2387 -> m
+    218:218:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2538:2538 -> m
+    218:218:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2513 -> m
+    218:218:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2387 -> m
+    219:219:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2514:2514 -> m
+    219:219:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2387 -> m
+    220:220:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2538:2538 -> m
+    220:220:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2515 -> m
+    220:220:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2387 -> m
+    221:223:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2522:2524 -> m
+    221:223:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2387 -> m
     224:224:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> m
-    224:224:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2614 -> m
-    224:224:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2477 -> m
-    225:228:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2614:2617 -> m
-    225:228:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2477 -> m
-    1:6:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2252:2257 -> n
-    7:25:void removeDebugWriteOfPhi(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.DebugLocalWrite):2296:2314 -> n
-    7:25:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2257 -> n
-    26:36:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2262:2272 -> n
-    37:59:boolean hasLocalOrLineChangeBetween(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):2221:2243 -> n
-    37:59:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2274 -> n
-    60:73:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2275:2288 -> n
-    74:74:boolean hasLocalOrLineChangeBetween(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):2248:2248 -> n
-    74:74:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2274 -> n
-    1:30:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):1607:1636 -> o
-    1:31:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1647:1677 -> p
+    224:224:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2524 -> m
+    224:224:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2387 -> m
+    225:228:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2524:2527 -> m
+    225:228:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2387 -> m
+    1:6:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2162:2167 -> n
+    7:25:void removeDebugWriteOfPhi(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.DebugLocalWrite):2206:2224 -> n
+    7:25:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2167 -> n
+    26:36:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2172:2182 -> n
+    37:59:boolean hasLocalOrLineChangeBetween(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):2131:2153 -> n
+    37:59:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2184 -> n
+    60:73:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2185:2198 -> n
+    74:74:boolean hasLocalOrLineChangeBetween(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):2158:2158 -> n
+    74:74:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2184 -> n
+    1:30:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):1517:1546 -> o
+    1:31:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1557:1587 -> p
     32:32:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> p
-    32:32:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1677 -> p
-    33:51:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1677:1695 -> p
-    52:65:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1763:1776 -> p
-    52:65:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1696 -> p
+    32:32:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1587 -> p
+    33:51:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1587:1605 -> p
+    52:65:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1673:1686 -> p
+    52:65:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1606 -> p
     66:66:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable,java.lang.Iterable):449:449 -> p
-    66:66:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1776 -> p
-    66:66:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1696 -> p
-    67:67:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1777:1777 -> p
-    67:67:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1696 -> p
+    66:66:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1686 -> p
+    66:66:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1606 -> p
+    67:67:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1687:1687 -> p
+    67:67:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1606 -> p
     68:68:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> p
-    68:68:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1777 -> p
-    68:68:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1696 -> p
-    69:76:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1778:1785 -> p
-    69:76:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1696 -> p
+    68:68:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1687 -> p
+    68:68:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1606 -> p
+    69:76:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1688:1695 -> p
+    69:76:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1606 -> p
     77:89:boolean com.android.tools.r8.ir.code.BasicBlock.hasPathTo(com.android.tools.r8.ir.code.BasicBlock):1884:1896 -> p
-    77:89:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1788 -> p
-    77:89:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1696 -> p
-    90:90:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1791:1791 -> p
-    90:90:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1696 -> p
+    77:89:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1698 -> p
+    77:89:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1606 -> p
+    90:90:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1701:1701 -> p
+    90:90:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1606 -> p
     91:91:boolean com.android.tools.r8.ir.code.BasicBlock.hasPathTo(com.android.tools.r8.ir.code.BasicBlock):1884:1884 -> p
-    91:91:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1788 -> p
-    91:91:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1696 -> p
-    92:97:com.android.tools.r8.ir.code.Value binopWithLit8OrLit16Constant(com.android.tools.r8.ir.code.Instruction):1734:1739 -> p
-    92:97:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1698 -> p
-    98:108:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1699:1709 -> p
-    109:109:com.android.tools.r8.ir.code.Value binopWithLit8OrLit16Constant(com.android.tools.r8.ir.code.Instruction):1741:1741 -> p
-    109:109:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1698 -> p
-    110:110:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1715:1715 -> p
-    1:46:void workaroundNumberConversionRegisterAllocationBug(com.android.tools.r8.ir.code.IRCode):3740:3785 -> q
-    1:15:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1118:1132 -> r
-    16:34:void collapseIfTrueTarget(com.android.tools.r8.ir.code.BasicBlock):369:387 -> r
-    16:34:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1133 -> r
-    35:35:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1135:1135 -> r
-    36:49:void collapseNonFallthroughSwitchTargets(com.android.tools.r8.ir.code.BasicBlock):393:406 -> r
-    36:49:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1136 -> r
-    50:66:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1140:1156 -> r
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap getConstantsByValue(com.android.tools.r8.ir.code.IRCode):2765:2765 -> s
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap lambda$redundantConstNumberRemoval$10(com.android.tools.r8.ir.code.IRCode):2660 -> s
+    91:91:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1698 -> p
+    91:91:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1606 -> p
+    92:97:com.android.tools.r8.ir.code.Value binopWithLit8OrLit16Constant(com.android.tools.r8.ir.code.Instruction):1644:1649 -> p
+    92:97:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1608 -> p
+    98:108:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1609:1619 -> p
+    109:109:com.android.tools.r8.ir.code.Value binopWithLit8OrLit16Constant(com.android.tools.r8.ir.code.Instruction):1651:1651 -> p
+    109:109:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1608 -> p
+    110:110:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1625:1625 -> p
+    1:46:void workaroundNumberConversionRegisterAllocationBug(com.android.tools.r8.ir.code.IRCode):3650:3695 -> q
+    1:15:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1115:1129 -> r
+    16:34:void collapseIfTrueTarget(com.android.tools.r8.ir.code.BasicBlock):366:384 -> r
+    16:34:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1130 -> r
+    35:35:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1132:1132 -> r
+    36:49:void collapseNonFallthroughSwitchTargets(com.android.tools.r8.ir.code.BasicBlock):390:403 -> r
+    36:49:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1133 -> r
+    50:66:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1137:1153 -> r
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap getConstantsByValue(com.android.tools.r8.ir.code.IRCode):2675:2675 -> s
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap lambda$redundantConstNumberRemoval$10(com.android.tools.r8.ir.code.IRCode):2570 -> s
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap.<init>():119:119 -> s
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap getConstantsByValue(com.android.tools.r8.ir.code.IRCode):2765 -> s
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap lambda$redundantConstNumberRemoval$10(com.android.tools.r8.ir.code.IRCode):2660 -> s
-    3:16:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap getConstantsByValue(com.android.tools.r8.ir.code.IRCode):2768:2781 -> s
-    3:16:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap lambda$redundantConstNumberRemoval$10(com.android.tools.r8.ir.code.IRCode):2660 -> s
-    1:1:com.android.tools.r8.ir.code.DominatorTree lambda$redundantConstNumberRemoval$11(com.android.tools.r8.ir.code.IRCode):2661:2661 -> t
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap getConstantsByValue(com.android.tools.r8.ir.code.IRCode):2675 -> s
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap lambda$redundantConstNumberRemoval$10(com.android.tools.r8.ir.code.IRCode):2570 -> s
+    3:16:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap getConstantsByValue(com.android.tools.r8.ir.code.IRCode):2678:2691 -> s
+    3:16:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap lambda$redundantConstNumberRemoval$10(com.android.tools.r8.ir.code.IRCode):2570 -> s
+    1:1:com.android.tools.r8.ir.code.DominatorTree lambda$redundantConstNumberRemoval$11(com.android.tools.r8.ir.code.IRCode):2571:2571 -> t
     2:2:void com.android.tools.r8.ir.code.DominatorTree.<init>(com.android.tools.r8.ir.code.IRCode):37:37 -> t
-    2:2:com.android.tools.r8.ir.code.DominatorTree lambda$redundantConstNumberRemoval$11(com.android.tools.r8.ir.code.IRCode):2661 -> t
-    1:1:com.android.tools.r8.ir.code.DominatorTree lambda$shortenLiveRanges$4(com.android.tools.r8.ir.code.IRCode):1803:1803 -> u
+    2:2:com.android.tools.r8.ir.code.DominatorTree lambda$redundantConstNumberRemoval$11(com.android.tools.r8.ir.code.IRCode):2571 -> t
+    1:1:com.android.tools.r8.ir.code.DominatorTree lambda$shortenLiveRanges$4(com.android.tools.r8.ir.code.IRCode):1713:1713 -> u
     2:2:void com.android.tools.r8.ir.code.DominatorTree.<init>(com.android.tools.r8.ir.code.IRCode):37:37 -> u
-    2:2:com.android.tools.r8.ir.code.DominatorTree lambda$shortenLiveRanges$4(com.android.tools.r8.ir.code.IRCode):1803 -> u
-    1:13:boolean removedTrivialGotos(com.android.tools.r8.ir.code.IRCode):230:242 -> v
-    14:20:boolean removedTrivialGotos(com.android.tools.r8.ir.code.IRCode):239:245 -> v
-    1:14:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):857:870 -> w
-    15:22:com.android.tools.r8.ir.optimize.SwitchCaseEliminator removeUnnecessarySwitchCases(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.code.InstructionListIterator):1018:1025 -> w
-    15:22:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):872 -> w
-    23:25:boolean switchCaseIsUnreachable(com.android.tools.r8.ir.code.IntSwitch,int):1044:1046 -> w
-    23:25:com.android.tools.r8.ir.optimize.SwitchCaseEliminator removeUnnecessarySwitchCases(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.code.InstructionListIterator):1029 -> w
-    23:25:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):872 -> w
-    26:34:com.android.tools.r8.ir.optimize.SwitchCaseEliminator removeUnnecessarySwitchCases(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.code.InstructionListIterator):1030:1038 -> w
-    26:34:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):872 -> w
-    35:59:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):874:898 -> w
+    2:2:com.android.tools.r8.ir.code.DominatorTree lambda$shortenLiveRanges$4(com.android.tools.r8.ir.code.IRCode):1713 -> u
+    1:13:boolean removedTrivialGotos(com.android.tools.r8.ir.code.IRCode):227:239 -> v
+    14:20:boolean removedTrivialGotos(com.android.tools.r8.ir.code.IRCode):236:242 -> v
+    1:14:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):854:867 -> w
+    15:22:com.android.tools.r8.ir.optimize.SwitchCaseEliminator removeUnnecessarySwitchCases(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.code.InstructionListIterator):1015:1022 -> w
+    15:22:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):869 -> w
+    23:25:boolean switchCaseIsUnreachable(com.android.tools.r8.ir.code.IntSwitch,int):1041:1043 -> w
+    23:25:com.android.tools.r8.ir.optimize.SwitchCaseEliminator removeUnnecessarySwitchCases(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.code.InstructionListIterator):1026 -> w
+    23:25:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):869 -> w
+    26:34:com.android.tools.r8.ir.optimize.SwitchCaseEliminator removeUnnecessarySwitchCases(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.code.InstructionListIterator):1027:1035 -> w
+    26:34:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):869 -> w
+    35:59:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):871:895 -> w
     60:60:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1059:1059 -> w
-    60:60:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):898 -> w
-    61:88:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):899:926 -> w
+    60:60:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):895 -> w
+    61:88:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):896:923 -> w
     89:89:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> w
-    89:89:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):926 -> w
-    90:104:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):927:941 -> w
+    89:89:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):923 -> w
+    90:104:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):924:938 -> w
     105:105:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> w
-    105:105:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):941 -> w
-    106:142:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):943:979 -> w
+    105:105:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):938 -> w
+    106:142:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):940:976 -> w
     143:143:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> w
-    143:143:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):979 -> w
-    144:144:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):981:981 -> w
-    145:176:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):765:796 -> w
-    145:176:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):982 -> w
+    143:143:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):976 -> w
+    144:144:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):978:978 -> w
+    145:176:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):762:793 -> w
+    145:176:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):979 -> w
     177:177:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> w
-    177:177:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):796 -> w
-    177:177:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):982 -> w
-    178:233:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):797:852 -> w
-    178:233:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):982 -> w
-    234:258:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):986:1010 -> w
+    177:177:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):793 -> w
+    177:177:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):979 -> w
+    178:233:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):794:849 -> w
+    178:233:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):979 -> w
+    234:258:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):983:1007 -> w
     259:259:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> w
-    259:259:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):1010 -> w
-    260:263:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):1010:1013 -> w
-com.android.tools.r8.ir.optimize.CodeRewriter$1 -> com.android.tools.r8.ir.optimize.i$a:
-com.android.tools.r8.ir.optimize.CodeRewriter$CSEExpressionEquivalence -> com.android.tools.r8.ir.optimize.i$b:
+    259:259:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):1007 -> w
+    260:263:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):1007:1010 -> w
+com.android.tools.r8.ir.optimize.CodeRewriter$1 -> com.android.tools.r8.ir.optimize.l$a:
+com.android.tools.r8.ir.optimize.CodeRewriter$CSEExpressionEquivalence -> com.android.tools.r8.ir.optimize.l$b:
     com.android.tools.r8.utils.InternalOptions options -> a
     boolean $assertionsDisabled -> b
-    1:1:void <clinit>():2318:2318 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.optimize.CodeRewriter$1):2318:2318 -> <init>
-    2:3:void <init>(com.android.tools.r8.utils.InternalOptions):2322:2323 -> <init>
-    1:6:boolean identicalValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):2382:2387 -> a
-    7:11:int getHashCode(com.android.tools.r8.ir.code.Value):2393:2397 -> a
-    1:1:boolean doEquivalent(java.lang.Object,java.lang.Object):2318:2318 -> doEquivalent
-    2:2:boolean doEquivalent(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2331:2331 -> doEquivalent
-    2:2:boolean doEquivalent(java.lang.Object,java.lang.Object):2318 -> doEquivalent
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():1265:1265 -> doEquivalent
-    3:3:boolean doEquivalent(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2331 -> doEquivalent
-    3:3:boolean doEquivalent(java.lang.Object,java.lang.Object):2318 -> doEquivalent
-    4:19:boolean doEquivalent(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2335:2350 -> doEquivalent
-    4:19:boolean doEquivalent(java.lang.Object,java.lang.Object):2318 -> doEquivalent
-    1:1:int doHash(java.lang.Object):2318:2318 -> doHash
-    2:16:int doHash(com.android.tools.r8.ir.code.Instruction):2361:2375 -> doHash
-    2:16:int doHash(java.lang.Object):2318 -> doHash
-com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder -> com.android.tools.r8.ir.optimize.i$c:
+    1:1:void <clinit>():2228:2228 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.optimize.CodeRewriter$1):2228:2228 -> <init>
+    2:3:void <init>(com.android.tools.r8.utils.InternalOptions):2232:2233 -> <init>
+    1:6:boolean identicalValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):2292:2297 -> a
+    7:11:int getHashCode(com.android.tools.r8.ir.code.Value):2303:2307 -> a
+    1:1:boolean doEquivalent(java.lang.Object,java.lang.Object):2228:2228 -> doEquivalent
+    2:2:boolean doEquivalent(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2241:2241 -> doEquivalent
+    2:2:boolean doEquivalent(java.lang.Object,java.lang.Object):2228 -> doEquivalent
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():1257:1257 -> doEquivalent
+    3:3:boolean doEquivalent(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2241 -> doEquivalent
+    3:3:boolean doEquivalent(java.lang.Object,java.lang.Object):2228 -> doEquivalent
+    4:19:boolean doEquivalent(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2245:2260 -> doEquivalent
+    4:19:boolean doEquivalent(java.lang.Object,java.lang.Object):2228 -> doEquivalent
+    1:1:int doHash(java.lang.Object):2228:2228 -> doHash
+    2:16:int doHash(com.android.tools.r8.ir.code.Instruction):2271:2285 -> doHash
+    2:16:int doHash(java.lang.Object):2228 -> doHash
+com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder -> com.android.tools.r8.ir.optimize.l$c:
     com.android.tools.r8.ir.code.BasicBlock fallthrough -> g
     com.android.tools.r8.ir.code.BasicBlock target -> f
     com.android.tools.r8.ir.code.Value left -> d
     com.android.tools.r8.ir.code.IRCode code -> c
     boolean $assertionsDisabled -> h
     int right -> e
-    1:1:void <clinit>():523:523 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.IRCode):531:532 -> <init>
-    1:1:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setLeft(com.android.tools.r8.ir.code.Value):541:541 -> a
-    2:2:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setRight(int):546:546 -> a
-    3:3:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setFallthrough(com.android.tools.r8.ir.code.BasicBlock):556:556 -> a
-    4:9:com.android.tools.r8.ir.code.BasicBlock build():561:566 -> a
+    1:1:void <clinit>():520:520 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.IRCode):528:529 -> <init>
+    1:1:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setLeft(com.android.tools.r8.ir.code.Value):538:538 -> a
+    2:2:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setRight(int):543:543 -> a
+    3:3:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setFallthrough(com.android.tools.r8.ir.code.BasicBlock):553:553 -> a
+    4:9:com.android.tools.r8.ir.code.BasicBlock build():558:563 -> a
     10:10:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1059:1059 -> a
-    10:10:com.android.tools.r8.ir.code.BasicBlock build():566 -> a
-    11:16:com.android.tools.r8.ir.code.BasicBlock build():567:572 -> a
+    10:10:com.android.tools.r8.ir.code.BasicBlock build():563 -> a
+    11:16:com.android.tools.r8.ir.code.BasicBlock build():564:569 -> a
     17:20:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlock.createIfBlock(int,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.IRMetadata):1392:1395 -> a
-    17:20:com.android.tools.r8.ir.code.BasicBlock build():572 -> a
-    21:23:com.android.tools.r8.ir.code.BasicBlock build():574:576 -> a
-    1:1:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setTarget(com.android.tools.r8.ir.code.BasicBlock):551:551 -> b
-com.android.tools.r8.ir.optimize.CodeRewriter$InstanceOfResult -> com.android.tools.r8.ir.optimize.i$d:
+    17:20:com.android.tools.r8.ir.code.BasicBlock build():569 -> a
+    21:23:com.android.tools.r8.ir.code.BasicBlock build():571:573 -> a
+    1:1:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setTarget(com.android.tools.r8.ir.code.BasicBlock):548:548 -> b
+com.android.tools.r8.ir.optimize.CodeRewriter$InstanceOfResult -> com.android.tools.r8.ir.optimize.l$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>():141:143 -> <clinit>
-    1:1:void <init>(java.lang.String,int):140:140 -> <init>
-com.android.tools.r8.ir.optimize.CodeRewriter$InstructionBuilder -> com.android.tools.r8.ir.optimize.i$e:
+    1:3:void <clinit>():138:140 -> <clinit>
+    1:1:void <init>(java.lang.String,int):137:137 -> <init>
+com.android.tools.r8.ir.optimize.CodeRewriter$InstructionBuilder -> com.android.tools.r8.ir.optimize.l$e:
     com.android.tools.r8.ir.code.Position position -> b
     int blockNumber -> a
-    1:2:void <init>(com.android.tools.r8.ir.code.Position):451:452 -> <init>
-com.android.tools.r8.ir.optimize.CodeRewriter$Interval -> com.android.tools.r8.ir.optimize.i$f:
+    1:2:void <init>(com.android.tools.r8.ir.code.Position):448:449 -> <init>
+com.android.tools.r8.ir.optimize.CodeRewriter$Interval -> com.android.tools.r8.ir.optimize.l$f:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList keys -> a
     boolean $assertionsDisabled -> b
-    1:1:void <clinit>():660:660 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList[]):664:664 -> <init>
-    2:8:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList[]):662:668 -> <init>
-    1:1:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):681:681 -> a
-    2:2:int getMax():677:677 -> a
-    2:2:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):681 -> a
-    3:3:int getMin():673:673 -> a
-    3:3:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):681 -> a
-    4:5:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):681:682 -> a
-    6:6:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode):698:698 -> a
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList access$000(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):660:660 -> b
-    2:2:int getMax():677:677 -> b
-    2:2:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):686 -> b
-    3:3:int getMin():673:673 -> b
-    3:3:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):686 -> b
-    4:4:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):687:687 -> b
+    1:1:void <clinit>():657:657 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList[]):661:661 -> <init>
+    2:8:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList[]):659:665 -> <init>
+    1:1:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):678:678 -> a
+    2:2:int getMax():674:674 -> a
+    2:2:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):678 -> a
+    3:3:int getMin():670:670 -> a
+    3:3:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):678 -> a
+    4:5:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):678:679 -> a
+    6:6:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode):695:695 -> a
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList access$000(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):657:657 -> b
+    2:2:int getMax():674:674 -> b
+    2:2:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):683 -> b
+    3:3:int getMin():670:670 -> b
+    3:3:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):683 -> b
+    4:4:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):684:684 -> b
     5:5:int com.android.tools.r8.ir.code.IntSwitch.baseSparseSize(com.android.tools.r8.utils.InternalOutputMode):114:114 -> b
-    5:5:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):691 -> b
-    6:6:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):691:691 -> b
+    5:5:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):688 -> b
+    6:6:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):688:688 -> b
     7:7:int com.android.tools.r8.ir.code.IntSwitch.basePackedSize(com.android.tools.r8.utils.InternalOutputMode):103:103 -> b
-    7:7:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):693 -> b
-    8:8:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):693:693 -> b
-com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult -> com.android.tools.r8.ir.optimize.i$g:
+    7:7:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):690 -> b
+    8:8:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):690:690 -> b
+com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult -> com.android.tools.r8.ir.optimize.l$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>():1366:1367 -> <clinit>
-    1:1:void <init>(java.lang.String,int):1365:1365 -> <init>
-com.android.tools.r8.ir.optimize.CodeRewriter$SCC -> com.android.tools.r8.ir.optimize.i$h:
+    1:2:void <clinit>():1276:1277 -> <clinit>
+    1:1:void <init>(java.lang.String,int):1275:1275 -> <init>
+com.android.tools.r8.ir.optimize.CodeRewriter$SCC -> com.android.tools.r8.ir.optimize.l$h:
     java.util.Deque unassignedStack -> d
     java.util.Set unassignedSet -> c
     java.util.List components -> f
@@ -32525,27 +32592,27 @@
     java.util.Deque preorderStack -> e
     boolean $assertionsDisabled -> g
     int currentTime -> a
-    1:1:void <clinit>():3685:3685 -> <clinit>
-    1:8:void <init>():3685:3692 -> <init>
-    9:9:void <init>(com.android.tools.r8.ir.optimize.CodeRewriter$1):3685:3685 -> <init>
-    1:3:java.util.List computeSCC(com.android.tools.r8.ir.code.Value):3695:3697 -> a
-    1:33:void dfs(com.android.tools.r8.ir.code.Value):3701:3733 -> b
-com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder -> com.android.tools.r8.ir.optimize.i$i:
+    1:1:void <clinit>():3595:3595 -> <clinit>
+    1:8:void <init>():3595:3602 -> <init>
+    9:9:void <init>(com.android.tools.r8.ir.optimize.CodeRewriter$1):3595:3595 -> <init>
+    1:3:java.util.List computeSCC(com.android.tools.r8.ir.code.Value):3605:3607 -> a
+    1:33:void dfs(com.android.tools.r8.ir.code.Value):3611:3643 -> b
+com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder -> com.android.tools.r8.ir.optimize.l$i:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap keyToTarget -> d
     com.android.tools.r8.ir.code.BasicBlock fallthrough -> e
     com.android.tools.r8.ir.code.Value value -> c
-    1:1:void <init>(com.android.tools.r8.ir.code.Position):469:469 -> <init>
-    2:2:void <init>(com.android.tools.r8.ir.code.Position):465:465 -> <init>
-    1:1:com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder setValue(com.android.tools.r8.ir.code.Value):478:478 -> a
-    2:2:com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder addKeyAndTarget(int,com.android.tools.r8.ir.code.BasicBlock):483:483 -> a
-    3:3:com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder setFallthrough(com.android.tools.r8.ir.code.BasicBlock):488:488 -> a
-    4:25:com.android.tools.r8.ir.code.BasicBlock build(com.android.tools.r8.ir.code.IRMetadata):494:515 -> a
+    1:1:void <init>(com.android.tools.r8.ir.code.Position):466:466 -> <init>
+    2:2:void <init>(com.android.tools.r8.ir.code.Position):462:462 -> <init>
+    1:1:com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder setValue(com.android.tools.r8.ir.code.Value):475:475 -> a
+    2:2:com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder addKeyAndTarget(int,com.android.tools.r8.ir.code.BasicBlock):480:480 -> a
+    3:3:com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder setFallthrough(com.android.tools.r8.ir.code.BasicBlock):485:485 -> a
+    4:25:com.android.tools.r8.ir.code.BasicBlock build(com.android.tools.r8.ir.code.IRMetadata):491:512 -> a
     26:29:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlock.createSwitchBlock(int,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.code.IRMetadata):1422:1425 -> a
-    26:29:com.android.tools.r8.ir.code.BasicBlock build(com.android.tools.r8.ir.code.IRMetadata):515 -> a
-    30:31:com.android.tools.r8.ir.code.BasicBlock build(com.android.tools.r8.ir.code.IRMetadata):516:517 -> 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):506:506 -> 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):512:512 -> b
-com.android.tools.r8.ir.optimize.ConstantCanonicalizer -> com.android.tools.r8.ir.optimize.k:
+    26:29:com.android.tools.r8.ir.code.BasicBlock build(com.android.tools.r8.ir.code.IRMetadata):512 -> a
+    30:31:com.android.tools.r8.ir.code.BasicBlock build(com.android.tools.r8.ir.code.IRMetadata):513:514 -> 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):503:503 -> 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):509:509 -> b
+com.android.tools.r8.ir.optimize.ConstantCanonicalizer -> com.android.tools.r8.ir.optimize.n:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap histogramOfCanonicalizationCandidatesPerMethod -> f
     boolean $assertionsDisabled -> g
     int numberOfConstClassCanonicalization -> d
@@ -32582,7 +32649,7 @@
     246:257:void lambda$canonicalize$5(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):223 -> a
     258:259:void lambda$canonicalize$5(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):224:225 -> a
     1:1:boolean lambda$canonicalize$3(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):178:178 -> b
-com.android.tools.r8.ir.optimize.ConstantCanonicalizer$1 -> com.android.tools.r8.ir.optimize.j:
+com.android.tools.r8.ir.optimize.ConstantCanonicalizer$1 -> com.android.tools.r8.ir.optimize.m:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():82:82 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.optimize.ConstantCanonicalizer):82:82 -> <init>
@@ -32598,7 +32665,7 @@
     29:29:int hashCode(java.lang.Object):82 -> a
     30:30:int hashCode(com.android.tools.r8.ir.code.Instruction):89:89 -> a
     30:30:int hashCode(java.lang.Object):82 -> a
-com.android.tools.r8.ir.optimize.DeadCodeRemover -> com.android.tools.r8.ir.optimize.l:
+com.android.tools.r8.ir.optimize.DeadCodeRemover -> com.android.tools.r8.ir.optimize.o:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.optimize.CodeRewriter codeRewriter -> b
     boolean $assertionsDisabled -> c
@@ -32619,13 +32686,13 @@
     1:4:boolean removeUnneededCatchHandlers(com.android.tools.r8.ir.code.IRCode):121:124 -> b
     5:30:java.util.Collection getDeadCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):153:178 -> b
     5:30:boolean removeUnneededCatchHandlers(com.android.tools.r8.ir.code.IRCode):125 -> b
-    31:31:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> b
+    31:31:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> b
     31:31:java.util.Collection getDeadCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):178 -> b
     31:31:boolean removeUnneededCatchHandlers(com.android.tools.r8.ir.code.IRCode):125 -> b
     32:39:java.util.Collection getDeadCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):178:185 -> b
     32:39:boolean removeUnneededCatchHandlers(com.android.tools.r8.ir.code.IRCode):125 -> b
     40:59:boolean removeUnneededCatchHandlers(com.android.tools.r8.ir.code.IRCode):126:145 -> b
-com.android.tools.r8.ir.optimize.DefaultInliningOracle -> com.android.tools.r8.ir.optimize.m:
+com.android.tools.r8.ir.optimize.DefaultInliningOracle -> com.android.tools.r8.ir.optimize.p:
     com.android.tools.r8.ir.conversion.MethodProcessor methodProcessor -> e
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> j
@@ -32643,7 +32710,7 @@
     1:1:com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy lambda$new$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.inliner.DefaultInliningReasonStrategy,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):87:87 -> a
     2:14:boolean isSingleTargetInvalid(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):105:117 -> a
     2:14:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):339 -> a
-    15:15:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    15:15:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     15:15:boolean isSingleTargetInvalid(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):117 -> a
     15:15:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):339 -> a
     16:31:boolean isSingleTargetInvalid(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):118:133 -> a
@@ -32653,16 +32720,16 @@
     53:55:boolean isSingleTargetInvalid(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):106:108 -> a
     53:55:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):339 -> a
     56:60:boolean canInlineStaticInvoke(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):153:157 -> a
-    61:61:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    61:61:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     61:61:boolean canInlineStaticInvoke(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):157 -> a
     62:72:boolean canInlineStaticInvoke(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):158:168 -> a
     73:93:boolean canInlineStaticInvoke(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):164:184 -> a
-    94:94:boolean com.android.tools.r8.graph.DexClass.classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView):786:786 -> a
+    94:94:boolean com.android.tools.r8.graph.DexClass.classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView):836:836 -> a
     94:94:boolean canInlineStaticInvoke(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):184 -> a
     95:99:boolean canInlineStaticInvoke(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):188:192 -> a
     100:100:java.lang.Boolean lambda$canInlineStaticInvoke$1(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$InitializedClassesInInstanceMethods):166:166 -> a
     101:109:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):202:210 -> a
-    110:110:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():345:345 -> a
+    110:110:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():337:337 -> a
     110:110:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):210 -> a
     111:185:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):210:284 -> a
     186:186:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):283:283 -> a
@@ -32692,7 +32759,7 @@
     404:404:void markInlined(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason):692:692 -> a
     405:439:void updateTypeInformationIfNeeded(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):698:732 -> a
     440:446:void insertAssumeInstructionsToInlinee(com.android.tools.r8.ir.optimize.Assumer,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.ListIterator,java.util.Set):744:750 -> a
-com.android.tools.r8.ir.optimize.Devirtualizer -> com.android.tools.r8.ir.optimize.n:
+com.android.tools.r8.ir.optimize.Devirtualizer -> com.android.tools.r8.ir.optimize.q:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():37:37 -> <clinit>
@@ -32705,7 +32772,7 @@
     32:32:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):75 -> a
     33:59:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):76:102 -> a
     60:76:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):101:117 -> a
-    77:77:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    77:77:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     77:77:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):117 -> a
     78:108:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):119:149 -> a
     109:128:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):148:167 -> a
@@ -32719,7 +32786,7 @@
     182:182:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
     182:182:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):225 -> a
     183:185:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):225:227 -> a
-com.android.tools.r8.ir.optimize.DynamicTypeOptimization -> com.android.tools.r8.ir.optimize.o:
+com.android.tools.r8.ir.optimize.DynamicTypeOptimization -> com.android.tools.r8.ir.optimize.r:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():31:31 -> <clinit>
@@ -32731,7 +32798,7 @@
     83:88:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):45 -> a
     89:104:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement computeDynamicLowerBoundType(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):161:176 -> a
     1:10:com.android.tools.r8.ir.analysis.type.TypeLatticeElement computeDynamicReturnType(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):147:156 -> b
-com.android.tools.r8.ir.optimize.EnumInfoMapCollector -> com.android.tools.r8.ir.optimize.p:
+com.android.tools.r8.ir.optimize.EnumInfoMapCollector -> com.android.tools.r8.ir.optimize.s:
     java.util.Map valueInfoMaps -> b
     com.android.tools.r8.graph.AppView appView -> a
     1:1:void <init>(com.android.tools.r8.graph.AppView):35:35 -> <init>
@@ -32740,7 +32807,7 @@
     2:44:void processClasses(com.android.tools.r8.graph.DexProgramClass):51:93 -> a
     2:44:com.android.tools.r8.shaking.AppInfoWithLiveness run():41 -> a
     45:48:com.android.tools.r8.shaking.AppInfoWithLiveness run():43:46 -> a
-com.android.tools.r8.ir.optimize.ForcedInliningOracle -> com.android.tools.r8.ir.optimize.q:
+com.android.tools.r8.ir.optimize.ForcedInliningOracle -> com.android.tools.r8.ir.optimize.t:
     java.util.Map invokesToInline -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.DexEncodedMethod method -> b
@@ -32760,7 +32827,7 @@
     6:18:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):72:84 -> a
     6:18:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):67 -> a
     19:22:com.android.tools.r8.graph.DexType getReceiverTypeIfKnown(com.android.tools.r8.ir.code.InvokeMethod):134:137 -> a
-com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer -> com.android.tools.r8.ir.optimize.s:
+com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer -> com.android.tools.r8.ir.optimize.v:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap histogramOfCanonicalizationCandidatesPerMethod -> e
@@ -32799,7 +32866,7 @@
     201:219:void insertCanonicalizedInvokeWithInValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Invoke):267:285 -> a
     220:220:boolean lambda$insertCanonicalizedInvokeWithInValues$6(com.android.tools.r8.ir.code.Instruction):280:280 -> a
     1:1:boolean lambda$canonicalize$3(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):195:195 -> b
-com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer$1 -> com.android.tools.r8.ir.optimize.r:
+com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer$1 -> com.android.tools.r8.ir.optimize.u:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():97:97 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer):97:97 -> <init>
@@ -32809,7 +32876,7 @@
     7:7:int hashCode(java.lang.Object):97:97 -> a
     8:8:int hashCode(com.android.tools.r8.ir.code.InvokeMethod):100:100 -> a
     8:8:int hashCode(java.lang.Object):97 -> a
-com.android.tools.r8.ir.optimize.Inliner -> com.android.tools.r8.ir.optimize.t:
+com.android.tools.r8.ir.optimize.Inliner -> com.android.tools.r8.ir.optimize.w:
     java.util.Set doubleInlineCallers -> g
     com.android.tools.r8.shaking.MainDexClasses mainDexClasses -> e
     java.util.Set doubleInlineSelectedTargets -> h
@@ -32827,14 +32894,14 @@
     1:19:boolean isBlacklisted(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):101:119 -> a
     20:20:boolean isBlacklisted(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):114:114 -> a
     21:21:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):141:141 -> a
-    22:22:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():345:345 -> a
-    22:22:boolean com.android.tools.r8.utils.InternalOptions.canHaveDalvikCatchHandlerVerificationBug():1484 -> a
+    22:22:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():337:337 -> a
+    22:22:boolean com.android.tools.r8.utils.InternalOptions.canHaveDalvikCatchHandlerVerificationBug():1476 -> a
     22:22:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):141 -> a
-    23:23:boolean com.android.tools.r8.utils.InternalOptions.canHaveDalvikCatchHandlerVerificationBug():1484:1484 -> a
+    23:23:boolean com.android.tools.r8.utils.InternalOptions.canHaveDalvikCatchHandlerVerificationBug():1476:1476 -> a
     23:23:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):141 -> a
     24:29:boolean useReflectiveOperationExceptionOrUnknownClassInCatch(com.android.tools.r8.ir.code.IRCode):1011:1016 -> a
     24:29:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):142 -> a
-    30:30:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    30:30:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     30:30:boolean useReflectiveOperationExceptionOrUnknownClassInCatch(com.android.tools.r8.ir.code.IRCode):1016 -> a
     30:30:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):142 -> a
     31:43:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):143:155 -> a
@@ -32842,13 +32909,13 @@
     44:46:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):156 -> a
     47:52:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):157:162 -> a
     53:57:boolean hasInliningAccess(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):184:188 -> a
-    58:58:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    58:58:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     58:58:boolean hasInliningAccess(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):188 -> a
     59:59:boolean hasInliningAccess(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):189:189 -> a
     60:67:boolean isVisibleWithFlags(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags):193:200 -> a
-    68:68:boolean com.android.tools.r8.graph.DexType.isSamePackage(com.android.tools.r8.graph.DexType):85:85 -> a
+    68:68:boolean com.android.tools.r8.graph.DexType.isSamePackage(com.android.tools.r8.graph.DexType):91:91 -> a
     68:68:boolean isVisibleWithFlags(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags):200 -> a
-    69:69:boolean com.android.tools.r8.graph.DexType.isSamePackage(com.android.tools.r8.graph.DexType):85:85 -> a
+    69:69:boolean com.android.tools.r8.graph.DexType.isSamePackage(com.android.tools.r8.graph.DexType):91:91 -> a
     69:69:boolean isVisibleWithFlags(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags):203 -> a
     70:70:boolean isDoubleInlineSelectedTarget(com.android.tools.r8.graph.DexEncodedMethod):207:207 -> a
     71:72:java.util.Set methodsToRevisit():241:242 -> a
@@ -32879,7 +32946,7 @@
     9:20:void recordDoubleInliningCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):224:235 -> b
     1:1:boolean isDoubleInliningEnabled():127:127 -> c
     2:8:boolean satisfiesRequirementsForDoubleInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):212:218 -> c
-com.android.tools.r8.ir.optimize.Inliner$Constraint -> com.android.tools.r8.ir.optimize.t$a:
+com.android.tools.r8.ir.optimize.Inliner$Constraint -> com.android.tools.r8.ir.optimize.w$a:
     com.android.tools.r8.ir.optimize.Inliner$Constraint PACKAGE -> e
     com.android.tools.r8.ir.optimize.Inliner$Constraint SAMENEST -> d
     com.android.tools.r8.ir.optimize.Inliner$Constraint[] $VALUES -> h
@@ -32893,7 +32960,7 @@
     18:47:void <clinit>():258:287 -> <clinit>
     1:2:void <init>(java.lang.String,int,int):278:279 -> <init>
     1:1:boolean isSet(int):291:291 -> b
-com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget -> com.android.tools.r8.ir.optimize.t$b:
+com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget -> com.android.tools.r8.ir.optimize.w$b:
     com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget ALWAYS -> d
     com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget NEVER -> c
     com.android.tools.r8.ir.optimize.Inliner$Constraint constraint -> a
@@ -32903,39 +32970,39 @@
     1:4:void <init>(com.android.tools.r8.ir.optimize.Inliner$Constraint):319:322 -> <init>
     5:9:void <init>(com.android.tools.r8.ir.optimize.Inliner$Constraint,com.android.tools.r8.graph.DexType):325:329 -> <init>
     1:3:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget deriveConstraint(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.AppView):352:354 -> a
-    4:4:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    4:4:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget deriveConstraint(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.AppView):355 -> a
     5:13:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget deriveConstraint(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.AppView):356:364 -> a
-    14:14:boolean com.android.tools.r8.graph.DexType.isSamePackage(com.android.tools.r8.graph.DexType):85:85 -> a
+    14:14:boolean com.android.tools.r8.graph.DexType.isSamePackage(com.android.tools.r8.graph.DexType):91:91 -> a
     14:14:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget deriveConstraint(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.AppView):365 -> a
     15:19:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget deriveConstraint(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.AppView):367:371 -> a
-    20:20:boolean com.android.tools.r8.graph.DexType.isSamePackage(com.android.tools.r8.graph.DexType):85:85 -> a
+    20:20:boolean com.android.tools.r8.graph.DexType.isSamePackage(com.android.tools.r8.graph.DexType):91:91 -> a
     20:20:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget deriveConstraint(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.AppView):374 -> a
     21:21:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget deriveConstraint(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.AppView):375:375 -> a
     22:27:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget classIsVisible(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):381:386 -> a
-    28:28:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    28:28:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     28:28:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget classIsVisible(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):389 -> a
     29:30:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget classIsVisible(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):391:392 -> a
     31:81:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):397:447 -> a
     82:82:boolean verifyAllNestInSamePackage(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):524:524 -> a
     82:82:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):447 -> a
-    83:83:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    83:83:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     83:83:boolean verifyAllNestInSamePackage(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):525 -> a
     83:83:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):447 -> a
     84:89:boolean verifyAllNestInSamePackage(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):526:531 -> a
     84:89:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):447 -> a
-    90:90:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    90:90:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     90:90:boolean verifyAllNestInSamePackage(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):531 -> a
     90:90:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):447 -> a
     91:93:boolean verifyAllNestInSamePackage(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):532:534 -> a
     91:93:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):447 -> a
     94:101:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):448:455 -> a
-    102:102:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    102:102:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     102:102:boolean allNestMembersSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):501 -> a
     102:102:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):455 -> a
     103:110:boolean allNestMembersSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):503:510 -> a
     103:110:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):455 -> a
-    111:111:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    111:111:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     111:111:boolean allNestMembersSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):510 -> a
     111:111:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):455 -> a
     112:116:boolean allNestMembersSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):512:516 -> a
@@ -32943,9 +33010,9 @@
     117:154:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):459:496 -> a
     1:5:boolean equals(java.lang.Object):342:346 -> equals
     1:4:int hashCode():334:337 -> hashCode
-    5:5:int com.android.tools.r8.graph.DexType.computeHashCode():45:45 -> hashCode
+    5:5:int com.android.tools.r8.graph.DexType.computeHashCode():51:51 -> hashCode
     5:5:int hashCode():337 -> hashCode
-com.android.tools.r8.ir.optimize.Inliner$InlineAction -> com.android.tools.r8.ir.optimize.t$c:
+com.android.tools.r8.ir.optimize.Inliner$InlineAction -> com.android.tools.r8.ir.optimize.w$c:
     com.android.tools.r8.graph.DexEncodedMethod target -> a
     com.android.tools.r8.ir.optimize.Inliner$Reason reason -> b
     boolean shouldSynthesizeNullCheckForReceiver -> c
@@ -32954,7 +33021,7 @@
     1:4:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.optimize.Inliner$Reason):568:571 -> <init>
     1:1:void setShouldSynthesizeNullCheckForReceiver():575:575 -> a
     2:16: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.DexEncodedMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):585:599 -> a
-    17:17:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():345:345 -> a
+    17:17:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():337:337 -> a
     17:17:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):599 -> a
     18:42: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.DexEncodedMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):600:624 -> a
     43:45:void com.android.tools.r8.ir.code.BasicBlock.replaceLastInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):98:100 -> a
@@ -32980,15 +33047,15 @@
     144:144:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):718 -> a
     145:178: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.DexEncodedMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):721:754 -> a
     179:179:com.android.tools.r8.ir.code.Value lambda$buildInliningIR$0(com.android.tools.r8.ir.code.BasicBlock):686:686 -> a
-com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason -> com.android.tools.r8.ir.optimize.u:
+com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason -> com.android.tools.r8.ir.optimize.x:
     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):763:765 -> <init>
-com.android.tools.r8.ir.optimize.Inliner$InliningInfo -> com.android.tools.r8.ir.optimize.v:
+com.android.tools.r8.ir.optimize.Inliner$InliningInfo -> com.android.tools.r8.ir.optimize.y:
     com.android.tools.r8.graph.DexEncodedMethod target -> a
     com.android.tools.r8.graph.DexType receiverType -> b
     1:3:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):809:811 -> <init>
-com.android.tools.r8.ir.optimize.Inliner$Reason -> com.android.tools.r8.ir.optimize.t$d:
+com.android.tools.r8.ir.optimize.Inliner$Reason -> com.android.tools.r8.ir.optimize.w$d:
     com.android.tools.r8.ir.optimize.Inliner$Reason SIMPLE -> e
     com.android.tools.r8.ir.optimize.Inliner$Reason NEVER -> f
     com.android.tools.r8.ir.optimize.Inliner$Reason SINGLE_CALLER -> c
@@ -32998,7 +33065,7 @@
     1:6:void <clinit>():547:552 -> <clinit>
     1:1:void <init>(java.lang.String,int):546:546 -> <init>
     1:1:boolean mustBeInlined():556:556 -> a
-com.android.tools.r8.ir.optimize.InliningConstraints -> com.android.tools.r8.ir.optimize.w:
+com.android.tools.r8.ir.optimize.InliningConstraints -> com.android.tools.r8.ir.optimize.z:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.GraphLense graphLense -> c
     boolean allowStaticInterfaceMethodCalls -> b
@@ -33033,22 +33100,22 @@
     42:42:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):159:159 -> a
     43:43:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):191:191 -> a
     44:45:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forFieldInstruction(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):285:286 -> a
-    46:46:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    46:46:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     46:46:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forFieldInstruction(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):286 -> a
     47:60:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forFieldInstruction(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):288:301 -> a
     61:74:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forFieldInstruction(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):299:312 -> a
     75:80:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forSingleTargetInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):317:322 -> a
-    81:81:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    81:81:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     81:81:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forSingleTargetInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):322 -> a
     82:98:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forSingleTargetInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):324:340 -> a
     99:118:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forVirtualInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,boolean):347:366 -> a
-    119:119:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    119:119:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     119:119:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forVirtualInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,boolean):366 -> a
     120:141:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forVirtualInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,boolean):367:388 -> a
-    142:142:java.util.Set com.android.tools.r8.graph.ResolutionResult.lookupVirtualDispatchTargets(boolean,com.android.tools.r8.graph.AppInfoWithSubtyping):76:76 -> a
+    142:142:java.util.Set com.android.tools.r8.graph.ResolutionResult.lookupVirtualDispatchTargets(boolean,com.android.tools.r8.graph.AppInfoWithSubtyping):77:77 -> a
     142:142:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forVirtualInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,boolean):388 -> a
     143:145:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forVirtualInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,boolean):389:391 -> a
-    146:146:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    146:146:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     146:146:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forVirtualInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,boolean):391 -> a
     147:152:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forVirtualInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,boolean):391:396 -> a
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forConstClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):88:88 -> b
@@ -33067,12 +33134,12 @@
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeNewArray(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):176:176 -> e
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forNewArrayEmpty(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):223:223 -> f
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):231:231 -> g
-com.android.tools.r8.ir.optimize.InliningOracle -> com.android.tools.r8.ir.optimize.x:
+com.android.tools.r8.ir.optimize.InliningOracle -> com.android.tools.r8.ir.optimize.A:
     com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
     boolean isForcedInliningOracle() -> a
     com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType) -> a
     boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
-com.android.tools.r8.ir.optimize.InliningStrategy -> com.android.tools.r8.ir.optimize.y:
+com.android.tools.r8.ir.optimize.InliningStrategy -> com.android.tools.r8.ir.optimize.B:
     boolean allowInliningOfInvokeInInlinee(com.android.tools.r8.ir.optimize.Inliner$InlineAction,int,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
     boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
     void ensureMethodProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback) -> a
@@ -33081,7 +33148,7 @@
     boolean stillHasBudget(com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
     void updateTypeInformationIfNeeded(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock) -> 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.ir.optimize.z:
+com.android.tools.r8.ir.optimize.InstructionEquivalence -> com.android.tools.r8.ir.optimize.C:
     com.android.tools.r8.ir.regalloc.RegisterAllocator allocator -> a
     1:2:void <init>(com.android.tools.r8.ir.regalloc.RegisterAllocator):14:15 -> <init>
     1:2:boolean doEquivalent(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):20:21 -> a
@@ -33089,7 +33156,7 @@
     1:1:int doHash(java.lang.Object):11:11 -> doHash
     2:11:int doHash(com.android.tools.r8.ir.code.Instruction):27:36 -> doHash
     2:11:int doHash(java.lang.Object):11 -> doHash
-com.android.tools.r8.ir.optimize.MemberPoolCollection -> com.android.tools.r8.ir.optimize.A:
+com.android.tools.r8.ir.optimize.MemberPoolCollection -> com.android.tools.r8.ir.optimize.D:
     java.util.Map memberPools -> c
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.com.google.common.base.Equivalence equivalence -> a
@@ -33118,7 +33185,7 @@
     36:36:void lambda$buildAll$0(java.util.List,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexClass):53 -> a
     37:59:java.util.Set getAllSubTypesExclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):135:157 -> a
     60:60:void lambda$getAllSubTypesExclusive$1(java.util.Deque,com.android.tools.r8.graph.DexType):140:140 -> a
-    61:61:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    61:61:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     61:61:void lambda$getAllSubTypesExclusive$1(java.util.Deque,com.android.tools.r8.graph.DexType):140 -> a
     62:62:void addNonNull(java.util.Collection,java.lang.Object):236:236 -> a
     62:62:void lambda$getAllSubTypesExclusive$1(java.util.Deque,com.android.tools.r8.graph.DexType):140 -> a
@@ -33127,31 +33194,31 @@
     2:2:com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool get(com.android.tools.r8.graph.DexClass):80 -> b
     3:4:com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool get(com.android.tools.r8.graph.DexClass):80:81 -> b
     5:15:java.util.Set getAllSuperTypesInclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):112:122 -> b
-    16:16:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> b
+    16:16:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> b
     16:16:java.util.Set getAllSuperTypesInclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):122 -> b
     17:17:void addNonNull(java.util.Collection,java.lang.Object):236:236 -> b
     17:17:java.util.Set getAllSuperTypesInclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):122 -> b
     18:19:java.util.Set getAllSuperTypesInclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):124:125 -> b
-    20:20:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> b
+    20:20:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> b
     20:20:java.util.Set getAllSuperTypesInclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):125 -> b
     21:21:void addNonNull(java.util.Collection,java.lang.Object):236:236 -> b
     21:21:java.util.Set getAllSuperTypesInclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):125 -> b
     22:22:void lambda$getAllSubTypesExclusive$2(java.util.Deque,com.android.tools.r8.graph.DexType):144:144 -> b
-    23:23:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> b
+    23:23:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> b
     23:23:void lambda$getAllSubTypesExclusive$2(java.util.Deque,com.android.tools.r8.graph.DexType):144 -> b
     24:24:void addNonNull(java.util.Collection,java.lang.Object):236:236 -> b
     24:24:void lambda$getAllSubTypesExclusive$2(java.util.Deque,com.android.tools.r8.graph.DexType):144 -> b
     1:1:void lambda$getAllSubTypesExclusive$3(java.util.Deque,com.android.tools.r8.graph.DexType):154:154 -> c
-    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> c
+    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> c
     2:2:void lambda$getAllSubTypesExclusive$3(java.util.Deque,com.android.tools.r8.graph.DexType):154 -> c
     3:3:void addNonNull(java.util.Collection,java.lang.Object):236:236 -> c
     3:3:void lambda$getAllSubTypesExclusive$3(java.util.Deque,com.android.tools.r8.graph.DexType):154 -> c
     1:1:void lambda$getAllSubTypesExclusive$4(java.util.Deque,com.android.tools.r8.graph.DexType):158:158 -> d
-    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> d
+    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> d
     2:2:void lambda$getAllSubTypesExclusive$4(java.util.Deque,com.android.tools.r8.graph.DexType):158 -> d
     3:3:void addNonNull(java.util.Collection,java.lang.Object):236:236 -> d
     3:3:void lambda$getAllSubTypesExclusive$4(java.util.Deque,com.android.tools.r8.graph.DexType):158 -> d
-com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool -> com.android.tools.r8.ir.optimize.A$a:
+com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool -> com.android.tools.r8.ir.optimize.D$a:
     java.util.Set interfaces -> c
     java.util.Set subTypes -> d
     java.util.Set memberPool -> e
@@ -33181,7 +33248,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):230:230 -> c
     1:1:boolean hasSeenStrictlyBelow(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):221:221 -> d
     1:2:void seen(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):196:197 -> e
-com.android.tools.r8.ir.optimize.MemberValuePropagation -> com.android.tools.r8.ir.optimize.D:
+com.android.tools.r8.ir.optimize.MemberValuePropagation -> com.android.tools.r8.ir.optimize.G:
     com.android.tools.r8.ir.optimize.info.OptimizationFeedback feedback -> d
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set warnedFields -> c
@@ -33224,19 +33291,19 @@
     275:275:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
     275:275:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):424 -> a
     276:278:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):424:426 -> a
-com.android.tools.r8.ir.optimize.MemberValuePropagation$ProguardMemberRuleLookup -> com.android.tools.r8.ir.optimize.B:
+com.android.tools.r8.ir.optimize.MemberValuePropagation$ProguardMemberRuleLookup -> com.android.tools.r8.ir.optimize.E:
     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):60:62 -> <init>
     1:5:boolean equals(java.lang.Object):67:71 -> equals
     1:1:int hashCode():76:76 -> hashCode
-com.android.tools.r8.ir.optimize.MemberValuePropagation$RuleType -> com.android.tools.r8.ir.optimize.C:
+com.android.tools.r8.ir.optimize.MemberValuePropagation$RuleType -> com.android.tools.r8.ir.optimize.F:
     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>():50:52 -> <clinit>
     1:1:void <init>(java.lang.String,int):49:49 -> <init>
-com.android.tools.r8.ir.optimize.MethodPoolCollection -> com.android.tools.r8.ir.optimize.E:
+com.android.tools.r8.ir.optimize.MethodPoolCollection -> com.android.tools.r8.ir.optimize.H:
     java.util.function.Predicate methodTester -> e
     1:2:void <init>(com.android.tools.r8.graph.AppView):37:38 -> <init>
     3:4:void <init>(com.android.tools.r8.graph.AppView,java.util.function.Predicate):43:44 -> <init>
@@ -33247,13 +33314,13 @@
     1:1:com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool lambda$computeMemberPoolForClass$2(com.android.tools.r8.graph.DexClass):66:66 -> d
     1:1:com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool lambda$computeMemberPoolForClass$3(com.android.tools.r8.graph.DexClass):76:76 -> e
     1:10:void lambda$computeMemberPoolForClass$4(com.android.tools.r8.graph.DexClass):54:63 -> f
-    11:11:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> f
+    11:11:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> f
     11:11:void lambda$computeMemberPoolForClass$4(com.android.tools.r8.graph.DexClass):63 -> f
     12:20:void lambda$computeMemberPoolForClass$4(com.android.tools.r8.graph.DexClass):65:73 -> f
-    21:21:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> f
+    21:21:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> f
     21:21:void lambda$computeMemberPoolForClass$4(com.android.tools.r8.graph.DexClass):73 -> f
     22:25:void lambda$computeMemberPoolForClass$4(com.android.tools.r8.graph.DexClass):75:78 -> f
-com.android.tools.r8.ir.optimize.MoveEliminator -> com.android.tools.r8.ir.optimize.F:
+com.android.tools.r8.ir.optimize.MoveEliminator -> com.android.tools.r8.ir.optimize.I:
     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>
@@ -33261,13 +33328,13 @@
     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.ir.optimize.G:
+com.android.tools.r8.ir.optimize.NestReducer -> com.android.tools.r8.ir.optimize.J:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():29:29 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.AppView):33:34 -> <init>
     1:2:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):38:39 -> a
-    3:3:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    3:3:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     3:3:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):39 -> a
     4:15:void run(java.util.concurrent.ExecutorService):43:54 -> a
     16:24:void run(java.util.concurrent.ExecutorService):53:61 -> a
@@ -33291,7 +33358,7 @@
     51:54:void clearNestAttributes(com.android.tools.r8.graph.DexClass):114:117 -> a
     51:54:void processNestFrom(com.android.tools.r8.graph.DexClass):88 -> a
     51:54:java.lang.Object lambda$run$0(com.android.tools.r8.graph.DexProgramClass):56 -> a
-    55:55:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    55:55:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     55:55:void clearNestAttributes(com.android.tools.r8.graph.DexClass):117 -> a
     55:55:void 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
@@ -33299,25 +33366,25 @@
     56:56:void processNestFrom(com.android.tools.r8.graph.DexClass):88 -> a
     56:56:java.lang.Object lambda$run$0(com.android.tools.r8.graph.DexProgramClass):56 -> a
     57:63:boolean hasPrivateMembers(com.android.tools.r8.graph.DexClass):123:129 -> a
-com.android.tools.r8.ir.optimize.NestUtils -> com.android.tools.r8.ir.optimize.H:
+com.android.tools.r8.ir.optimize.NestUtils -> com.android.tools.r8.ir.optimize.K:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():21:21 -> <clinit>
     1:14:boolean sameNest(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier):27:40 -> a
     15:15:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():965:965 -> a
     15:15:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):46 -> a
-    16:16:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    16:16:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     16:16:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):47 -> a
     17:23:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):48:54 -> a
-    24:24:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):184:184 -> a
+    24:24:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):186:186 -> a
     24:24:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):55 -> a
     25:31:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):56:62 -> a
     32:36:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):61:65 -> a
     37:44:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):64:71 -> a
-    45:45:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):184:184 -> a
+    45:45:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):186:186 -> a
     45:45:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):72 -> a
     46:52:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):73:79 -> a
     53:53:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):77:77 -> a
-com.android.tools.r8.ir.optimize.NonNullTracker -> com.android.tools.r8.ir.optimize.I:
+com.android.tools.r8.ir.optimize.NonNullTracker -> com.android.tools.r8.ir.optimize.L:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.AppView appView -> a
     java.util.function.Consumer splitBlockConsumer -> c
@@ -33339,7 +33406,7 @@
     271:271:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList findDominatedPredecessorIndexesInPhi(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Value,java.util.Set):353 -> a
     272:280:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList findDominatedPredecessorIndexesInPhi(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Value,java.util.Set):355:363 -> a
     281:284:boolean isNullableReferenceTypeWithUsers(com.android.tools.r8.ir.code.Value):372:375 -> a
-com.android.tools.r8.ir.optimize.Outliner -> com.android.tools.r8.ir.optimize.N:
+com.android.tools.r8.ir.optimize.Outliner -> com.android.tools.r8.ir.optimize.Q:
     java.util.List candidateMethodLists -> a
     java.util.Map outlineSites -> c
     java.util.Map generatedOutlines -> d
@@ -33359,7 +33426,7 @@
     20:20: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):580:580 -> a
     20:20:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1337 -> a
     21:30:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1338:1347 -> a
-    31:31:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():345:345 -> a
+    31:31:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():337:337 -> a
     31:31:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1347 -> a
     32:64:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1348:1380 -> a
     65:71:void applyOutliningCandidate(com.android.tools.r8.ir.code.IRCode):1397:1403 -> a
@@ -33374,7 +33441,7 @@
     1:1:java.util.Map access$400(com.android.tools.r8.ir.optimize.Outliner):105:105 -> e
     2:8:boolean selectMethodsForOutlining():1305:1311 -> e
     9:15:boolean selectMethodsForOutlining():1310:1316 -> e
-com.android.tools.r8.ir.optimize.Outliner$BinOpOutlineInstruction -> com.android.tools.r8.ir.optimize.J:
+com.android.tools.r8.ir.optimize.Outliner$BinOpOutlineInstruction -> com.android.tools.r8.ir.optimize.M:
     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):208:209 -> <init>
     java.lang.String getDetailsString() -> a
@@ -33408,7 +33475,7 @@
     1:1:int com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction.hashCode():180:180 -> hashCode
     1:1:int hashCode():220 -> hashCode
     2:2:int hashCode():220:220 -> hashCode
-com.android.tools.r8.ir.optimize.Outliner$InvokeOutlineInstruction -> com.android.tools.r8.ir.optimize.K:
+com.android.tools.r8.ir.optimize.Outliner$InvokeOutlineInstruction -> com.android.tools.r8.ir.optimize.N:
     com.android.tools.r8.ir.code.Invoke$Type invokeType -> d
     com.android.tools.r8.graph.DexProto proto -> f
     boolean hasOutValue -> e
@@ -33442,7 +33509,7 @@
     1:1:int com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction.hashCode():180:180 -> hashCode
     1:1:int hashCode():408 -> hashCode
     2:6:int hashCode():408:412 -> hashCode
-com.android.tools.r8.ir.optimize.Outliner$NewInstanceOutlineInstruction -> com.android.tools.r8.ir.optimize.L:
+com.android.tools.r8.ir.optimize.Outliner$NewInstanceOutlineInstruction -> com.android.tools.r8.ir.optimize.O:
     com.android.tools.r8.graph.DexType clazz -> c
     1:2:void <init>(com.android.tools.r8.graph.DexType):310:311 -> <init>
     1:1:int compareTo(com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction):331:331 -> a
@@ -33461,7 +33528,7 @@
     1:1:int com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction.hashCode():180:180 -> hashCode
     1:1:int hashCode():326 -> hashCode
     2:2:int hashCode():326:326 -> hashCode
-com.android.tools.r8.ir.optimize.Outliner$Outline -> com.android.tools.r8.ir.optimize.M:
+com.android.tools.r8.ir.optimize.Outliner$Outline -> com.android.tools.r8.ir.optimize.P:
     java.util.List argumentMap -> b
     java.util.List argumentTypes -> a
     com.android.tools.r8.graph.DexProto proto -> e
@@ -33485,7 +33552,7 @@
     1:18:boolean equals(java.lang.Object):585:602 -> equals
     1:6:int hashCode():610:615 -> hashCode
     1:37:java.lang.String toString():671:707 -> toString
-com.android.tools.r8.ir.optimize.Outliner$OutlineCode -> com.android.tools.r8.ir.optimize.N$a:
+com.android.tools.r8.ir.optimize.Outliner$OutlineCode -> com.android.tools.r8.ir.optimize.Q$a:
     com.android.tools.r8.ir.optimize.Outliner this$0 -> b
     com.android.tools.r8.ir.optimize.Outliner$Outline outline -> a
     1:2:void <init>(com.android.tools.r8.ir.optimize.Outliner,com.android.tools.r8.ir.optimize.Outliner$Outline):1567:1568 -> <init>
@@ -33497,7 +33564,7 @@
     1:1:int computeHashCode():1610:1610 -> computeHashCode
     1:1:void registerCodeReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry):1605:1605 -> registerCodeReferences
     1:1:java.lang.String toString():1600:1600 -> toString
-com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction -> com.android.tools.r8.ir.optimize.P:
+com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction -> com.android.tools.r8.ir.optimize.T:
     com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType type -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():121:121 -> <clinit>
@@ -33509,7 +33576,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.ir.optimize.O:
+com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType -> com.android.tools.r8.ir.optimize.S:
     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
@@ -33521,13 +33588,13 @@
     1:7:void <clinit>():127:133 -> <clinit>
     8:8:void <clinit>():126:126 -> <clinit>
     1:1:void <init>(java.lang.String,int):126:126 -> <init>
-com.android.tools.r8.ir.optimize.Outliner$OutlineMethodIdentifier -> com.android.tools.r8.ir.optimize.Q:
+com.android.tools.r8.ir.optimize.Outliner$OutlineMethodIdentifier -> com.android.tools.r8.ir.optimize.U:
     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.DexEncodedMethod,com.android.tools.r8.ir.code.BasicBlock,java.util.Map):1141:1143 -> <init>
     1:3:void handle(int,int,com.android.tools.r8.ir.optimize.Outliner$Outline):1148:1150 -> a
     4:5:java.util.List addOutlineMethodList(com.android.tools.r8.ir.optimize.Outliner$Outline):1154:1155 -> a
-com.android.tools.r8.ir.optimize.Outliner$OutlineRewriter -> com.android.tools.r8.ir.optimize.S:
+com.android.tools.r8.ir.optimize.Outliner$OutlineRewriter -> com.android.tools.r8.ir.optimize.V:
     java.util.ListIterator blocksIterator -> r
     java.util.List toRemove -> s
     com.android.tools.r8.ir.code.IRCode code -> q
@@ -33540,12 +33607,12 @@
     4:6:boolean removeMethodFromOutlineList(com.android.tools.r8.ir.optimize.Outliner$Outline):1261:1263 -> a
     4:6:void handle(int,int,com.android.tools.r8.ir.optimize.Outliner$Outline):1197 -> a
     7:63:void handle(int,int,com.android.tools.r8.ir.optimize.Outliner$Outline):1198:1254 -> a
-com.android.tools.r8.ir.optimize.Outliner$OutlineSiteIdentifier -> com.android.tools.r8.ir.optimize.T:
+com.android.tools.r8.ir.optimize.Outliner$OutlineSiteIdentifier -> com.android.tools.r8.ir.optimize.W:
     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.DexEncodedMethod,com.android.tools.r8.ir.code.BasicBlock):1162:1163 -> <init>
     1:3:void handle(int,int,com.android.tools.r8.ir.optimize.Outliner$Outline):1168:1170 -> a
     4:4:java.util.List lambda$handle$0(com.android.tools.r8.ir.optimize.Outliner$Outline):1169:1169 -> a
-com.android.tools.r8.ir.optimize.Outliner$OutlineSourceCode -> com.android.tools.r8.ir.optimize.U:
+com.android.tools.r8.ir.optimize.Outliner$OutlineSourceCode -> com.android.tools.r8.ir.optimize.X:
     com.android.tools.r8.ir.optimize.Outliner this$0 -> d
     com.android.tools.r8.ir.code.Position position -> b
     com.android.tools.r8.ir.optimize.Outliner$Outline outline -> a
@@ -33576,7 +33643,7 @@
     com.android.tools.r8.graph.DebugLocalInfo getIncomingLocal(int) -> e
     boolean verifyRegister(int) -> f
     int instructionIndex(int) -> g
-com.android.tools.r8.ir.optimize.Outliner$OutlineSpotter -> com.android.tools.r8.ir.optimize.V:
+com.android.tools.r8.ir.optimize.Outliner$OutlineSpotter -> com.android.tools.r8.ir.optimize.Y:
     int pendingNewInstanceIndex -> n
     com.android.tools.r8.graph.DexType returnType -> k
     boolean $assertionsDisabled -> p
@@ -33601,7 +33668,7 @@
     5:10:java.util.List orderedInValues(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):766:771 -> a
     11:23:com.android.tools.r8.graph.DexType argumentTypeFromInvoke(com.android.tools.r8.ir.code.InvokeMethod,int):917:929 -> a
     24:30:boolean supportedArgumentType(com.android.tools.r8.ir.code.Value):934:940 -> a
-    31:31:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():345:345 -> a
+    31:31:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():337:337 -> a
     31:31:boolean supportedArgumentType(com.android.tools.r8.ir.code.Value):940 -> a
     32:38:boolean supportedArgumentType(com.android.tools.r8.ir.code.Value):944:950 -> a
     39:71:com.android.tools.r8.graph.DexType argumentTypeFromValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.InvokeMethod,int):956:988 -> a
@@ -33637,7 +33704,7 @@
     201:201:void process():759 -> c
     202:212:void processInstruction(com.android.tools.r8.ir.code.Instruction):808:818 -> c
     202:212:void process():759 -> c
-com.android.tools.r8.ir.optimize.PeepholeOptimizer -> com.android.tools.r8.ir.optimize.W:
+com.android.tools.r8.ir.optimize.PeepholeOptimizer -> com.android.tools.r8.ir.optimize.Z:
     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
@@ -33693,7 +33760,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):272:272 -> b
-com.android.tools.r8.ir.optimize.PhiOptimizations -> com.android.tools.r8.ir.optimize.X:
+com.android.tools.r8.ir.optimize.PhiOptimizations -> com.android.tools.r8.ir.optimize.a0:
     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
@@ -33715,7 +33782,7 @@
     39:50:boolean tryMovePhisToStack(com.android.tools.r8.ir.code.IRCode):118 -> b
     51:64:boolean tryMovePhiToStack(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Phi,java.util.Set):160:173 -> b
     51:64:boolean tryMovePhisToStack(com.android.tools.r8.ir.code.IRCode):118 -> b
-com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination -> com.android.tools.r8.ir.optimize.a0:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination -> com.android.tools.r8.ir.optimize.d0:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.code.DominatorTree dominatorTree -> d
     boolean $assertionsDisabled -> j
@@ -33731,7 +33798,7 @@
     2:19:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):50:67 -> <init>
     1:2:boolean shouldRun(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):71:72 -> a
     3:7:boolean couldBeVolatile(com.android.tools.r8.graph.DexField):101:105 -> a
-    8:8:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexField):179:179 -> a
+    8:8:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexField):181:181 -> a
     8:8:boolean couldBeVolatile(com.android.tools.r8.graph.DexField):105 -> a
     9:12:boolean couldBeVolatile(com.android.tools.r8.graph.DexField):106:109 -> a
     13:125:void run():113:225 -> a
@@ -33752,8 +33819,8 @@
     180:206:void killActiveFields(com.android.tools.r8.ir.code.FieldInstruction):262:288 -> a
     207:210:void eliminateRedundantRead(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.FieldInstruction):309:312 -> a
     1:2:void killAllActiveFields():257:258 -> b
-com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$1 -> com.android.tools.r8.ir.optimize.Y:
-com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldAndObject -> com.android.tools.r8.ir.optimize.Z:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$1 -> com.android.tools.r8.ir.optimize.b0:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldAndObject -> com.android.tools.r8.ir.optimize.c0:
     com.android.tools.r8.graph.DexField field -> a
     com.android.tools.r8.ir.code.Value object -> b
     boolean $assertionsDisabled -> c
@@ -33763,13 +33830,13 @@
     1:1:com.android.tools.r8.graph.DexField access$100(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldAndObject):75:75 -> a
     1:5:boolean equals(java.lang.Object):92:96 -> equals
     1:1:int hashCode():87:87 -> hashCode
-com.android.tools.r8.ir.optimize.ReflectionOptimizer -> com.android.tools.r8.ir.optimize.b0:
+com.android.tools.r8.ir.optimize.ReflectionOptimizer -> com.android.tools.r8.ir.optimize.e0:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():32:32 -> <clinit>
     1:19:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):38:56 -> a
     20:43:com.android.tools.r8.graph.DexType getTypeForGetClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InvokeVirtual):83:106 -> a
     20:43:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):56 -> a
-    44:44:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    44:44:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     44:44:com.android.tools.r8.graph.DexType getTypeForGetClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InvokeVirtual):111 -> a
     44:44:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):56 -> a
     45:58:com.android.tools.r8.graph.DexType getTypeForGetClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InvokeVirtual):111:124 -> a
@@ -33777,7 +33844,7 @@
     59:61:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):57:59 -> a
     62:112:com.android.tools.r8.graph.DexType getTypeForClassForName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InvokeStatic):135:185 -> a
     62:112:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):58 -> a
-    113:113:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    113:113:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     113:113:com.android.tools.r8.graph.DexType getTypeForClassForName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InvokeStatic):186 -> a
     113:113:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):58 -> a
     114:127:com.android.tools.r8.graph.DexType getTypeForClassForName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InvokeStatic):187:200 -> a
@@ -33789,7 +33856,7 @@
     143:143:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
     143:143:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):74 -> a
     144:146:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):74:76 -> a
-com.android.tools.r8.ir.optimize.ServiceLoaderRewriter -> com.android.tools.r8.ir.optimize.d0:
+com.android.tools.r8.ir.optimize.ServiceLoaderRewriter -> com.android.tools.r8.ir.optimize.g0:
     com.android.tools.r8.graph.AppView appView -> c
     java.util.concurrent.ConcurrentHashMap synthesizedServiceLoaders -> b
     com.android.tools.r8.graph.DexProgramClass synthesizedClass -> a
@@ -33802,12 +33869,12 @@
     3:3:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():965:965 -> a
     3:3:void rewrite(com.android.tools.r8.ir.code.IRCode):87 -> a
     4:71:void rewrite(com.android.tools.r8.ir.code.IRCode):88:155 -> a
-    72:72:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    72:72:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     72:72:void rewrite(com.android.tools.r8.ir.code.IRCode):155 -> a
     73:83:void rewrite(com.android.tools.r8.ir.code.IRCode):159:169 -> a
     84:95:void rewrite(com.android.tools.r8.ir.code.IRCode):168:179 -> a
     96:97:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):171:172 -> a
-    98:98:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():345:345 -> a
+    98:98:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():337:337 -> a
     98:98:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):172 -> a
     99:99:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):173:173 -> a
     100:135:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):184:219 -> a
@@ -33829,7 +33896,7 @@
     227:252:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.ServiceLoaderSourceCode.generate(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.DexItemFactory):86:111 -> a
     227:252:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):228 -> a
     253:254:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):228:229 -> a
-com.android.tools.r8.ir.optimize.ServiceLoaderRewriter$Rewriter -> com.android.tools.r8.ir.optimize.c0:
+com.android.tools.r8.ir.optimize.ServiceLoaderRewriter$Rewriter -> com.android.tools.r8.ir.optimize.f0:
     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
@@ -33839,7 +33906,7 @@
     2:5:void clearGetClassLoader(com.android.tools.r8.ir.code.InvokeVirtual):289:292 -> a
     2:5:void perform(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexMethod):272 -> a
     6:18:void perform(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexMethod):273:285 -> a
-com.android.tools.r8.ir.optimize.SwitchCaseEliminator -> com.android.tools.r8.ir.optimize.e0:
+com.android.tools.r8.ir.optimize.SwitchCaseEliminator -> com.android.tools.r8.ir.optimize.h0:
     com.android.tools.r8.ir.code.IntSwitch theSwitch -> d
     com.android.tools.r8.ir.code.InstructionListIterator iterator -> c
     boolean mayHaveIntroducedUnreachableBlocks -> e
@@ -33877,7 +33944,7 @@
     61:61:void replaceSwitchByOptimizedSwitch(int):140:140 -> b
     61:61:boolean optimize():66 -> b
     1:12:java.util.function.IntPredicate computeSuccessorHasBecomeDeadPredicate():91:102 -> c
-com.android.tools.r8.ir.optimize.SwitchMapCollector -> com.android.tools.r8.ir.optimize.f0:
+com.android.tools.r8.ir.optimize.SwitchMapCollector -> com.android.tools.r8.ir.optimize.i0:
     com.android.tools.r8.graph.DexString switchMapPrefix -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.DexString kotlinSwitchMapPrefix -> c
@@ -33889,16 +33956,16 @@
     8:15:void processClasses(com.android.tools.r8.graph.DexProgramClass):91:98 -> a
     16:16:void lambda$processClasses$0(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedField):98:98 -> a
     17:52:void extractSwitchMap(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.IRCode):103:138 -> a
-    53:53:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    53:53:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     53:53:void extractSwitchMap(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.IRCode):138 -> a
     54:64:void extractSwitchMap(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.IRCode):139:149 -> a
-    65:65:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    65:65:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     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:78:boolean lambda$extractSwitchMap$1(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Instruction):122:122 -> a
     79:81:boolean maybeIsSwitchMap(com.android.tools.r8.graph.DexEncodedField):165:167 -> a
-com.android.tools.r8.ir.optimize.SwitchUtils$1 -> com.android.tools.r8.ir.optimize.g0:
-com.android.tools.r8.ir.optimize.SwitchUtils$EnumSwitchInfo -> com.android.tools.r8.ir.optimize.h0:
+com.android.tools.r8.ir.optimize.SwitchUtils$1 -> com.android.tools.r8.ir.optimize.j0:
+com.android.tools.r8.ir.optimize.SwitchUtils$EnumSwitchInfo -> com.android.tools.r8.ir.optimize.k0:
     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
@@ -33906,7 +33973,7 @@
     java.util.Map 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,java.util.Map,com.android.tools.r8.ir.optimize.SwitchUtils$1):23:23 -> <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,java.util.Map):35:41 -> <init>
-com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization -> com.android.tools.r8.ir.optimize.k0:
+com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization -> com.android.tools.r8.ir.optimize.n0:
     com.android.tools.r8.utils.MethodSignatureEquivalence equivalence -> h
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> i
@@ -33967,19 +34034,19 @@
     13:13:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo getRemovedArgumentsInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy):321 -> b
     14:17:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo getRemovedArgumentsInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy):322:325 -> b
     18:28:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo getRemovedArgumentsInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy):320:330 -> b
-com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy -> com.android.tools.r8.ir.optimize.i0:
+com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy -> com.android.tools.r8.ir.optimize.l0:
     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>():61:62 -> <clinit>
     1:1:void <init>(java.lang.String,int):60:60 -> <init>
-com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$UninstantiatedTypeOptimizationGraphLense -> com.android.tools.r8.ir.optimize.j0:
+com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$UninstantiatedTypeOptimizationGraphLense -> com.android.tools.r8.ir.optimize.m0:
     java.util.Map removedArgumentsInfoPerMethod -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():65:65 -> <clinit>
     1:7:void <init>(com.android.tools.r8.com.google.common.collect.BiMap,java.util.Map,com.android.tools.r8.graph.AppView):74:80 -> <init>
     8:16:void <init>(com.android.tools.r8.com.google.common.collect.BiMap,java.util.Map,com.android.tools.r8.graph.AppView):73:81 -> <init>
     1:12:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription lookupPrototypeChanges(com.android.tools.r8.graph.DexMethod):86:97 -> lookupPrototypeChanges
-com.android.tools.r8.ir.optimize.UnusedArgumentsCollector -> com.android.tools.r8.ir.optimize.q0:
+com.android.tools.r8.ir.optimize.UnusedArgumentsCollector -> com.android.tools.r8.ir.optimize.t0:
     com.android.tools.r8.ir.optimize.MethodPoolCollection methodPoolCollection -> b
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Map removedArguments -> d
@@ -33993,41 +34060,41 @@
     2:2:com.android.tools.r8.utils.MethodSignatureEquivalence access$100():45:45 -> a
     3:9:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):98:104 -> a
     10:36:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):98:124 -> a
-    37:48:void processDirectMethods(com.android.tools.r8.graph.DexProgramClass):221:232 -> a
-    37:48:void lambda$runnableForClass$0(com.android.tools.r8.graph.DexProgramClass):217 -> a
-    49:49:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod):282:282 -> a
-    49:49:void processDirectMethods(com.android.tools.r8.graph.DexProgramClass):236 -> a
-    49:49:void lambda$runnableForClass$0(com.android.tools.r8.graph.DexProgramClass):217 -> a
-    50:62:void processDirectMethods(com.android.tools.r8.graph.DexProgramClass):237:249 -> a
-    50:62:void lambda$runnableForClass$0(com.android.tools.r8.graph.DexProgramClass):217 -> a
-    63:94:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):287:318 -> a
-    95:95:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo$Builder com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo.builder():119:119 -> a
-    95:95:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):320 -> a
-    96:98:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):321:323 -> a
-    99:106:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):319:326 -> a
-    107:125:com.android.tools.r8.graph.DexProto createProtoWithRemovedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo):333:351 -> a
-    1:18:void processVirtualMethods(com.android.tools.r8.graph.DexProgramClass):255:272 -> b
-    19:24:void processVirtualMethods(com.android.tools.r8.graph.DexProgramClass):271:276 -> b
+    37:47:void processDirectMethods(com.android.tools.r8.graph.DexProgramClass):221:231 -> a
+    37:47:void lambda$runnableForClass$0(com.android.tools.r8.graph.DexProgramClass):217 -> a
+    48:48:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod):281:281 -> a
+    48:48:void processDirectMethods(com.android.tools.r8.graph.DexProgramClass):235 -> a
+    48:48:void lambda$runnableForClass$0(com.android.tools.r8.graph.DexProgramClass):217 -> a
+    49:61:void processDirectMethods(com.android.tools.r8.graph.DexProgramClass):236:248 -> a
+    49:61:void lambda$runnableForClass$0(com.android.tools.r8.graph.DexProgramClass):217 -> a
+    62:93:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):286:317 -> a
+    94:94:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo$Builder com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo.builder():119:119 -> a
+    94:94:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):319 -> a
+    95:97:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):320:322 -> a
+    98:105:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):318:325 -> a
+    106:124:com.android.tools.r8.graph.DexProto createProtoWithRemovedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo):332:350 -> a
+    1:18:void processVirtualMethods(com.android.tools.r8.graph.DexProgramClass):254:271 -> b
+    19:24:void processVirtualMethods(com.android.tools.r8.graph.DexProgramClass):270:275 -> b
     1:1:java.lang.Runnable runnableForClass(com.android.tools.r8.graph.DexProgramClass):217:217 -> c
-com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$1 -> com.android.tools.r8.ir.optimize.l0:
-com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$CollectUsedArguments -> com.android.tools.r8.ir.optimize.m0:
+com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$1 -> com.android.tools.r8.ir.optimize.o0:
+com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$CollectUsedArguments -> com.android.tools.r8.ir.optimize.p0:
     java.util.BitSet used -> a
-    1:3:void <init>():354:356 -> <init>
-    4:4:void <init>(com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$1):354:354 -> <init>
-    1:1:java.util.BitSet getUsedArguments():359:359 -> a
-    2:2:boolean register(int):364:364 -> a
-com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$GloballyUsedSignatures -> com.android.tools.r8.ir.optimize.n0:
+    1:3:void <init>():353:355 -> <init>
+    4:4:void <init>(com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$1):353:353 -> <init>
+    1:1:java.util.BitSet getUsedArguments():358:358 -> a
+    2:2:boolean register(int):363:363 -> a
+com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$GloballyUsedSignatures -> com.android.tools.r8.ir.optimize.q0:
     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):183:184 -> <init>
     1:12:com.android.tools.r8.graph.DexMethod getNewSignature(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProto):193:204 -> a
     13: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.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo):210:212 -> a
     16:16:com.android.tools.r8.graph.DexEncodedMethod removeArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo):211:211 -> a
-com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$UnusedArgumentsGraphLense -> com.android.tools.r8.ir.optimize.o0:
+com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$UnusedArgumentsGraphLense -> com.android.tools.r8.ir.optimize.r0:
     java.util.Map removedArguments -> a
     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.GraphLense,com.android.tools.r8.graph.DexItemFactory,java.util.Map):68:76 -> <init>
     1:6:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription lookupPrototypeChanges(com.android.tools.r8.graph.DexMethod):82:87 -> lookupPrototypeChanges
-com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$UsedSignatures -> com.android.tools.r8.ir.optimize.p0:
+com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$UsedSignatures -> com.android.tools.r8.ir.optimize.s0:
     com.android.tools.r8.ir.optimize.UnusedArgumentsCollector this$0 -> c
     com.android.tools.r8.utils.MethodSignatureEquivalence equivalence -> a
     java.util.Set usedSignatures -> b
@@ -34048,7 +34115,7 @@
     27:27:com.android.tools.r8.graph.DexEncodedMethod removeArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo):172 -> a
     28:28:com.android.tools.r8.graph.DexEncodedMethod removeArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo):175:175 -> a
     29:29:com.android.tools.r8.graph.DexEncodedMethod removeArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo):174:174 -> a
-com.android.tools.r8.ir.optimize.classinliner.ClassInliner -> com.android.tools.r8.ir.optimize.r0.b:
+com.android.tools.r8.ir.optimize.classinliner.ClassInliner -> com.android.tools.r8.ir.optimize.u0.b:
     java.util.concurrent.ConcurrentHashMap knownClasses -> b
     com.android.tools.r8.ir.desugar.LambdaRewriter lambdaRewriter -> a
     boolean $assertionsDisabled -> c
@@ -34073,14 +34140,14 @@
     123:126:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus computeClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):308:311 -> a
     123:126:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):293 -> a
     123:126:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus lambda$processMethodCode$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):197 -> a
-    127:127:boolean com.android.tools.r8.graph.DexClass.isAbstract():626:626 -> a
+    127:127:boolean com.android.tools.r8.graph.DexClass.isAbstract():676:676 -> a
     127:127:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus computeClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):313 -> a
     127:127:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):293 -> a
     127:127:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus lambda$processMethodCode$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):197 -> a
     128:143:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus computeClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):313:328 -> a
     128:143:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):293 -> a
     128:143:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus lambda$processMethodCode$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):197 -> a
-    144:144:boolean com.android.tools.r8.graph.DexClass.initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppView):833:833 -> a
+    144:144:boolean com.android.tools.r8.graph.DexClass.initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppView):883:883 -> a
     144:144:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus computeClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):333 -> a
     144:144:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):293 -> a
     144:144:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus lambda$processMethodCode$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):197 -> a
@@ -34092,7 +34159,7 @@
     148:148:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus lambda$processMethodCode$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):197 -> a
     149:150:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):294:295 -> a
     149:150:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus lambda$processMethodCode$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):197 -> a
-com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus -> com.android.tools.r8.ir.optimize.r0.a:
+com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus -> com.android.tools.r8.ir.optimize.u0.a:
     com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus RETRIEVAL_MAY_HAVE_SIDE_EFFECTS -> c
     com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus UNKNOWN_TYPE -> d
     com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus NON_CLASS_TYPE -> a
@@ -34112,7 +34179,7 @@
     com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus ELIGIBLE -> q
     1:22:void <clinit>():39:60 -> <clinit>
     1:1:void <init>(java.lang.String,int):37:37 -> <init>
-com.android.tools.r8.ir.optimize.classinliner.ClassInlinerCostAnalysis -> com.android.tools.r8.ir.optimize.r0.c:
+com.android.tools.r8.ir.optimize.classinliner.ClassInlinerCostAnalysis -> com.android.tools.r8.ir.optimize.u0.c:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set definiteReceiverAliases -> c
     boolean $assertionsDisabled -> e
@@ -34131,11 +34198,11 @@
     53:53:boolean willExceedInstructionBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List):78 -> a
     54:64:boolean willExceedInstructionBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List):79:89 -> a
     65:66:boolean exceedsInstructionBudgetAfterIncrement(int):95:96 -> a
-com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo -> com.android.tools.r8.ir.optimize.r0.d:
+com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo -> com.android.tools.r8.ir.optimize.u0.d:
     java.util.List callsReceiver -> a
     com.android.tools.r8.utils.OptionalBool returnsReceiver -> b
     1:3:void <init>(java.util.List,com.android.tools.r8.utils.OptionalBool):25:27 -> <init>
-com.android.tools.r8.ir.optimize.classinliner.ClassInlinerReceiverAnalysis -> com.android.tools.r8.ir.optimize.r0.e:
+com.android.tools.r8.ir.optimize.classinliner.ClassInlinerReceiverAnalysis -> com.android.tools.r8.ir.optimize.u0.e:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.code.Value receiver -> d
     boolean $assertionsDisabled -> f
@@ -34153,7 +34220,7 @@
     74:74:com.android.tools.r8.utils.OptionalBool computeIsReceiverAlias(com.android.tools.r8.ir.code.Value):115:115 -> a
     75:75:com.android.tools.r8.utils.OptionalBool computeIsReceiverAlias(com.android.tools.r8.ir.code.Value):110:110 -> a
     1:2:com.android.tools.r8.utils.OptionalBool getOrComputeIsReceiverAlias(com.android.tools.r8.ir.code.Value):78:79 -> b
-com.android.tools.r8.ir.optimize.classinliner.ClassInlinerReceiverSet -> com.android.tools.r8.ir.optimize.r0.f:
+com.android.tools.r8.ir.optimize.classinliner.ClassInlinerReceiverSet -> com.android.tools.r8.ir.optimize.u0.f:
     java.util.Set maybeReceiverAliases -> c
     java.util.Set illegalReceiverAliases -> d
     boolean $assertionsDisabled -> f
@@ -34182,7 +34249,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.ir.optimize.r0.g:
+com.android.tools.r8.ir.optimize.classinliner.FieldValueHelper -> com.android.tools.r8.ir.optimize.u0.g:
     com.android.tools.r8.ir.code.Instruction root -> c
     com.android.tools.r8.graph.AppView appView -> d
     com.android.tools.r8.ir.code.Value defaultValue -> e
@@ -34205,7 +34272,7 @@
     50:50:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):29:29 -> b
     50:50:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):160 -> b
     51:54:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):162:165 -> b
-com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor -> com.android.tools.r8.ir.optimize.r0.j:
+com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor -> com.android.tools.r8.ir.optimize.u0.j:
     com.android.tools.r8.ir.optimize.classinliner.ClassInlinerReceiverSet receivers -> q
     java.util.List indirectInlinees -> p
     com.android.tools.r8.graph.AppView appView -> a
@@ -34238,7 +34305,7 @@
     80:80:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):337 -> a
     81:94:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleConstructorCall(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.DexEncodedMethod):710:723 -> a
     81:94:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):337 -> a
-    95:95:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):184:184 -> a
+    95:95:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):186:186 -> a
     95:95:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleConstructorCall(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.DexEncodedMethod):723 -> a
     95:95:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):337 -> a
     96:100:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleConstructorCall(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.DexEncodedMethod):727:731 -> a
@@ -34276,7 +34343,7 @@
     309:309:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):432:432 -> a
     310:316:boolean forceInlineDirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):464:470 -> a
     317:346:boolean forceInlineDirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):468:497 -> a
-    347:347:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):184:184 -> a
+    347:347:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):186:186 -> a
     347:347:boolean forceInlineDirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):497 -> a
     348:353:boolean forceInlineDirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):498:503 -> a
     354:363:boolean forceInlineDirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):499:508 -> a
@@ -34307,7 +34374,7 @@
     581:611:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):1008:1038 -> a
     612:615:boolean isInstanceInitializerEligibleForClassInlining(com.android.tools.r8.graph.DexMethod):1069:1072 -> a
     612:615:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):1039 -> a
-    616:616:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):184:184 -> a
+    616:616:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):186:186 -> a
     616:616:boolean isInstanceInitializerEligibleForClassInlining(com.android.tools.r8.graph.DexMethod):1072 -> a
     616:616:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):1039 -> a
     617:618:boolean isInstanceInitializerEligibleForClassInlining(com.android.tools.r8.graph.DexMethod):1077:1078 -> a
@@ -34317,7 +34384,7 @@
     647:647:void markSizeForInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):1099:1099 -> a
     648:655:boolean exemptFromInstructionLimit(com.android.tools.r8.graph.DexEncodedMethod):1082:1089 -> a
     648:655:void markSizeForInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):1100 -> a
-    656:656:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    656:656:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     656:656:boolean exemptFromInstructionLimit(com.android.tools.r8.graph.DexEncodedMethod):1089 -> a
     656:656:void markSizeForInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):1100 -> a
     657:662:boolean exemptFromInstructionLimit(com.android.tools.r8.graph.DexEncodedMethod):1090:1095 -> a
@@ -34339,17 +34406,17 @@
     11:11:boolean com.android.tools.r8.ir.code.StaticGet.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):139:139 -> f
     11:11:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isInstanceEligible():153 -> f
     12:32:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isInstanceEligible():154:174 -> f
-    33:33:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> f
+    33:33:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> f
     33:33:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isInstanceEligible():174 -> f
     34:39:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isInstanceEligible():174:179 -> f
     40:40:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isInstanceEligible():161:161 -> f
     1:14:void removeAssumeInstructionsLinkedToEligibleInstance():522:535 -> g
-com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor$AliasKind -> com.android.tools.r8.ir.optimize.r0.h:
+com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor$AliasKind -> com.android.tools.r8.ir.optimize.u0.h:
     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>():73:74 -> <clinit>
     1:1:void <init>(java.lang.String,int):72:72 -> <init>
-com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor$IllegalClassInlinerStateException -> com.android.tools.r8.ir.optimize.r0.i:
+com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor$IllegalClassInlinerStateException -> com.android.tools.r8.ir.optimize.u0.i:
     1:1:void <init>():1147:1147 -> <init>
 com.android.tools.r8.ir.optimize.info.BottomCallSiteOptimizationInfo -> com.android.tools.r8.ir.optimize.info.a:
     com.android.tools.r8.ir.optimize.info.BottomCallSiteOptimizationInfo INSTANCE -> d
@@ -34550,7 +34617,7 @@
     118:118:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass):376:376 -> a
     118:118:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):352 -> a
     118:118:void collectMethodOptimizationInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization):127 -> a
-    119:119:boolean com.android.tools.r8.graph.DexClass.definesFinalizer(com.android.tools.r8.graph.DexItemFactory):850:850 -> a
+    119:119:boolean com.android.tools.r8.graph.DexClass.definesFinalizer(com.android.tools.r8.graph.DexItemFactory):900:900 -> a
     119:119:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass):376 -> a
     119:119:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):352 -> a
     119:119:void collectMethodOptimizationInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization):127 -> a
@@ -34566,7 +34633,7 @@
     341:343:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass):476:478 -> a
     341:343:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):352 -> a
     341:343:void collectMethodOptimizationInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization):127 -> a
-    344:344:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):184:184 -> a
+    344:344:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):186:186 -> a
     344:344:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass):478 -> a
     344:344:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):352 -> a
     344:344:void collectMethodOptimizationInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization):127 -> a
@@ -34602,7 +34669,7 @@
     731:736:void computeNonNullParamOnNormalExits(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode):1048:1053 -> a
     731:736:void collectMethodOptimizationInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization):131 -> a
     737:750:void identifyClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):149:162 -> a
-    751:751:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    751:751:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     751:751:void identifyClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):162 -> a
     752:790:void identifyClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):167:205 -> a
     791:823:void identifyClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):204:236 -> a
@@ -34647,13 +34714,13 @@
     1236:1236:boolean com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect.canBePostponed():28:28 -> a
     1236:1236:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):911 -> a
     1237:1239:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):912:914 -> a
-    1240:1241:boolean com.android.tools.r8.graph.DexType.isD8R8SynthesizedLambdaClassType():250:251 -> a
+    1240:1241:boolean com.android.tools.r8.graph.DexType.isD8R8SynthesizedLambdaClassType():256:257 -> a
     1240:1241:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):914 -> a
     1242:1244:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):914:916 -> a
     1245:1256:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):914:925 -> a
     1257:1257:boolean hasNonTrivialFinalizeMethod(com.android.tools.r8.graph.DexType):944:944 -> a
     1257:1257:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):925 -> a
-    1258:1258:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    1258:1258:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     1258:1258:boolean hasNonTrivialFinalizeMethod(com.android.tools.r8.graph.DexType):944 -> a
     1258:1258:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):925 -> a
     1259:1267:boolean hasNonTrivialFinalizeMethod(com.android.tools.r8.graph.DexType):946:954 -> a
@@ -35038,7 +35105,7 @@
     1:1:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder setInstanceFieldInitializationMayDependOnEnvironment():130:130 -> e
     1:1:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder setMayHaveOtherSideEffectsThanInstanceFieldAssignments():139:139 -> f
     1:1:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder setReceiverMayEscapeOutsideConstructorChain():144:144 -> g
-com.android.tools.r8.ir.optimize.inliner.DefaultInliningReasonStrategy -> com.android.tools.r8.ir.optimize.s0.a:
+com.android.tools.r8.ir.optimize.inliner.DefaultInliningReasonStrategy -> com.android.tools.r8.ir.optimize.v0.a:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.conversion.CallSiteInformation callSiteInformation -> b
     com.android.tools.r8.ir.optimize.Inliner inliner -> c
@@ -35050,13 +35117,13 @@
     20:22:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):52 -> a
     23:25:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):53:55 -> a
     26:27:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):35:36 -> a
-com.android.tools.r8.ir.optimize.inliner.InlinerUtils -> com.android.tools.r8.ir.optimize.s0.b:
+com.android.tools.r8.ir.optimize.inliner.InlinerUtils -> com.android.tools.r8.ir.optimize.v0.b:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():14:14 -> <clinit>
     1:4:void collectAllMonitorEnterValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Set):20:23 -> a
     5:9:void addMonitorEnterValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):32:36 -> a
     10:10: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.ir.optimize.s0.c:
+com.android.tools.r8.ir.optimize.inliner.InliningIRProvider -> com.android.tools.r8.ir.optimize.v0.c:
     com.android.tools.r8.ir.code.ValueNumberGenerator valueNumberGenerator -> c
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Map cache -> d
@@ -35070,9 +35137,9 @@
     2:3:com.android.tools.r8.ir.code.IRCode getAndCacheInliningIR(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):43 -> a
     4:4:boolean verifyIRCacheIsEmpty():53:53 -> a
     1:7:com.android.tools.r8.ir.code.IRCode getInliningIR(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):32:38 -> b
-com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy -> com.android.tools.r8.ir.optimize.s0.d:
+com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy -> com.android.tools.r8.ir.optimize.v0.d:
     com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod) -> a
-com.android.tools.r8.ir.optimize.inliner.NopWhyAreYouNotInliningReporter -> com.android.tools.r8.ir.optimize.s0.e:
+com.android.tools.r8.ir.optimize.inliner.NopWhyAreYouNotInliningReporter -> com.android.tools.r8.ir.optimize.v0.e:
     com.android.tools.r8.ir.optimize.inliner.NopWhyAreYouNotInliningReporter INSTANCE -> a
     1:1:void <clinit>():15:15 -> <clinit>
     1:1:void <init>():18:18 -> <init>
@@ -35112,7 +35179,7 @@
     void reportRecursiveMethod() -> x
     void reportUnknownTarget() -> y
     boolean unsetReasonHasBeenReportedFlag() -> z
-com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter -> com.android.tools.r8.ir.optimize.s0.f:
+com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter -> com.android.tools.r8.ir.optimize.v0.f:
     1:1:void <init>():18:18 -> <init>
     void reportBlacklisted() -> a
     void reportIncorrectArity(int,int) -> a
@@ -35151,7 +35218,7 @@
     void reportRecursiveMethod() -> x
     void reportUnknownTarget() -> y
     boolean unsetReasonHasBeenReportedFlag() -> z
-com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporterImpl -> com.android.tools.r8.ir.optimize.s0.g:
+com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporterImpl -> com.android.tools.r8.ir.optimize.v0.g:
     com.android.tools.r8.graph.DexEncodedMethod callee -> a
     boolean $assertionsDisabled -> e
     com.android.tools.r8.graph.DexEncodedMethod context -> b
@@ -35200,7 +35267,7 @@
     1:1:void reportRecursiveMethod():209:209 -> x
     1:1:void reportUnknownTarget():214:214 -> y
     1:2:boolean unsetReasonHasBeenReportedFlag():270:271 -> z
-com.android.tools.r8.ir.optimize.lambda.CaptureSignature -> com.android.tools.r8.ir.optimize.t0.a:
+com.android.tools.r8.ir.optimize.lambda.CaptureSignature -> com.android.tools.r8.ir.optimize.w0.a:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList SINGLE_LIST -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList EMPTY_LIST -> a
     boolean $assertionsDisabled -> c
@@ -35221,7 +35288,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.ir.optimize.t0.d:
+com.android.tools.r8.ir.optimize.lambda.CodeProcessor -> com.android.tools.r8.ir.optimize.w0.d:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.DexEncodedMethod context -> j
@@ -35293,7 +35360,7 @@
     84:88:java.lang.Void visit(com.android.tools.r8.ir.code.StaticPut):347:351 -> a
     84:88:java.lang.Object visit(com.android.tools.r8.ir.code.StaticPut):47 -> a
     1:5:void processCode():187:191 -> b
-com.android.tools.r8.ir.optimize.lambda.CodeProcessor$1 -> com.android.tools.r8.ir.optimize.t0.b:
+com.android.tools.r8.ir.optimize.lambda.CodeProcessor$1 -> com.android.tools.r8.ir.optimize.w0.b:
     1:1:void <init>():76:76 -> <init>
     boolean isValidInvoke(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod) -> a
     boolean isValidNewInstance(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.NewInstance) -> a
@@ -35305,7 +35372,7 @@
     boolean isValidInstanceFieldWrite(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField) -> b
     boolean isValidStaticFieldRead(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField) -> c
     boolean isValidInstanceFieldRead(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.ir.optimize.t0.c:
+com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy -> com.android.tools.r8.ir.optimize.w0.c:
     boolean isValidInvoke(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod) -> a
     boolean isValidNewInstance(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.NewInstance) -> a
     boolean isValidStaticFieldWrite(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField) -> a
@@ -35316,7 +35383,7 @@
     boolean isValidInstanceFieldWrite(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField) -> b
     boolean isValidStaticFieldRead(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField) -> c
     boolean isValidInstanceFieldRead(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.ir.optimize.t0.g:
+com.android.tools.r8.ir.optimize.lambda.LambdaGroup -> com.android.tools.r8.ir.optimize.w0.g:
     java.util.Map lambdas -> c
     com.android.tools.r8.ir.optimize.lambda.LambdaGroupId id -> a
     com.android.tools.r8.graph.DexType classType -> b
@@ -35350,14 +35417,14 @@
     1:2:void remove(com.android.tools.r8.graph.DexType):136:137 -> e
     1:1:boolean isTrivial():127:127 -> f
     1:1:int size():73:73 -> g
-com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo -> com.android.tools.r8.ir.optimize.t0.e:
+com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo -> com.android.tools.r8.ir.optimize.w0.e:
     com.android.tools.r8.graph.DexProgramClass clazz -> b
     int id -> a
     1:3:void <init>(int,com.android.tools.r8.graph.DexProgramClass):57:59 -> <init>
-com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaStructureError -> com.android.tools.r8.ir.optimize.t0.f:
+com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaStructureError -> com.android.tools.r8.ir.optimize.w0.f:
     boolean reportable -> a
     1:2:void <init>(java.lang.String,boolean):225:226 -> <init>
-com.android.tools.r8.ir.optimize.lambda.LambdaGroupClassBuilder -> com.android.tools.r8.ir.optimize.t0.h:
+com.android.tools.r8.ir.optimize.lambda.LambdaGroupClassBuilder -> com.android.tools.r8.ir.optimize.w0.h:
     java.lang.String origin -> n
     com.android.tools.r8.graph.DexItemFactory factory -> m
     com.android.tools.r8.ir.optimize.lambda.LambdaGroup group -> l
@@ -35373,9 +35440,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.ir.optimize.t0.i:
+com.android.tools.r8.ir.optimize.lambda.LambdaGroupId -> com.android.tools.r8.ir.optimize.w0.i:
     com.android.tools.r8.ir.optimize.lambda.LambdaGroup createGroup() -> a
-com.android.tools.r8.ir.optimize.lambda.LambdaMerger -> com.android.tools.r8.ir.optimize.t0.q:
+com.android.tools.r8.ir.optimize.lambda.LambdaMerger -> com.android.tools.r8.ir.optimize.w0.q:
     java.util.Map lambdas -> a
     com.android.tools.r8.kotlin.Kotlin kotlin -> f
     com.android.tools.r8.ir.optimize.lambda.LambdaMerger$Mode mode -> h
@@ -35443,8 +35510,8 @@
     1:1:java.util.Map access$900(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):90:90 -> d
     2:14:void lambda$collectGroupCandidates$4(com.android.tools.r8.graph.DexProgramClass):242:254 -> d
     15:15:void lambda$collectGroupCandidates$4(com.android.tools.r8.graph.DexProgramClass):249:249 -> d
-com.android.tools.r8.ir.optimize.lambda.LambdaMerger$1 -> com.android.tools.r8.ir.optimize.t0.j:
-com.android.tools.r8.ir.optimize.lambda.LambdaMerger$AnalysisStrategy -> com.android.tools.r8.ir.optimize.t0.k:
+com.android.tools.r8.ir.optimize.lambda.LambdaMerger$1 -> com.android.tools.r8.ir.optimize.w0.j:
+com.android.tools.r8.ir.optimize.lambda.LambdaMerger$AnalysisStrategy -> com.android.tools.r8.ir.optimize.w0.k:
     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.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$1):474:474 -> <init>
     2:6:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):475:479 -> <init>
@@ -35456,12 +35523,12 @@
     5:5:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InstanceGet):501:501 -> a
     6:6:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.StaticPut):506:506 -> a
     7:7:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.StaticGet):511:511 -> a
-com.android.tools.r8.ir.optimize.lambda.LambdaMerger$AnalyzeMode -> com.android.tools.r8.ir.optimize.t0.l:
+com.android.tools.r8.ir.optimize.lambda.LambdaMerger$AnalyzeMode -> com.android.tools.r8.ir.optimize.w0.l:
     com.android.tools.r8.ir.optimize.lambda.LambdaMerger this$0 -> a
     1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):100:100 -> <init>
     2:2:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$1):100:100 -> <init>
     1:1:void analyzeCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):104:104 -> a
-com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyMode -> com.android.tools.r8.ir.optimize.t0.m:
+com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyMode -> com.android.tools.r8.ir.optimize.w0.m:
     java.util.Map lambdaGroups -> a
     com.android.tools.r8.ir.optimize.lambda.LambdaMerger this$0 -> c
     com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer optimizationInfoFixer -> b
@@ -35469,10 +35536,10 @@
     1:1:void <clinit>():108:108 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,java.util.Map,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer):115:117 -> <init>
     1:1:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.Inliner,com.android.tools.r8.graph.DexEncodedMethod):123:123 -> a
-    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     2:2:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.Inliner,com.android.tools.r8.graph.DexEncodedMethod):123 -> a
     3:33:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.Inliner,com.android.tools.r8.graph.DexEncodedMethod):123:153 -> a
-com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy -> com.android.tools.r8.ir.optimize.t0.n:
+com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy -> com.android.tools.r8.ir.optimize.w0.n:
     boolean $assertionsDisabled -> o
     com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer optimizationInfoFixer -> m
     java.util.Set typeAffectedValues -> n
@@ -35492,7 +35559,7 @@
     1:28:void processCode():546:573 -> b
     29:45:void processCode():572:588 -> b
     46:46:boolean typeMayHaveChanged(com.android.tools.r8.ir.code.Value):592:592 -> b
-com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer -> com.android.tools.r8.ir.optimize.t0.o:
+com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer -> com.android.tools.r8.ir.optimize.w0.o:
     java.util.Map lambdaGroupsClasses -> a
     com.android.tools.r8.ir.optimize.lambda.LambdaMerger this$0 -> b
     boolean $assertionsDisabled -> c
@@ -35503,12 +35570,12 @@
     1:1:java.lang.Object apply(java.lang.Object):630:630 -> apply
     2:6:com.android.tools.r8.graph.DexType apply(com.android.tools.r8.graph.DexType):641:645 -> apply
     2:6:java.lang.Object apply(java.lang.Object):630 -> apply
-com.android.tools.r8.ir.optimize.lambda.LambdaMerger$Mode -> com.android.tools.r8.ir.optimize.t0.p:
+com.android.tools.r8.ir.optimize.lambda.LambdaMerger$Mode -> com.android.tools.r8.ir.optimize.w0.p:
     1:1:void <init>():92:92 -> <init>
     2:2:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$1):92:92 -> <init>
     void analyzeCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode) -> a
     void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.Inliner,com.android.tools.r8.graph.DexEncodedMethod) -> a
-com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor -> com.android.tools.r8.ir.optimize.t0.r:
+com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor -> com.android.tools.r8.ir.optimize.w0.r:
     java.util.function.Consumer onLambdaType -> c
     java.util.function.Predicate isLambdaType -> b
     boolean $assertionsDisabled -> d
@@ -35546,7 +35613,7 @@
     63:63:boolean com.android.tools.r8.graph.DexMethodHandle.isMethodHandle():297:297 -> a
     63:63:void accept(com.android.tools.r8.graph.DexMethodHandle):83 -> a
     64:65:void accept(com.android.tools.r8.graph.DexMethodHandle):83:84 -> a
-com.android.tools.r8.ir.optimize.lambda.kotlin.ClassInitializerSourceCode -> com.android.tools.r8.ir.optimize.t0.s.a:
+com.android.tools.r8.ir.optimize.lambda.kotlin.ClassInitializerSourceCode -> com.android.tools.r8.ir.optimize.w0.s.a:
     boolean $assertionsDisabled -> n
     com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroup group -> m
     com.android.tools.r8.graph.DexItemFactory factory -> l
@@ -35559,36 +35626,36 @@
     1:1:void lambda$prepareInstructions$3(int,int,com.android.tools.r8.ir.conversion.IRBuilder):62:62 -> c
     1:3:void prepareInstructions():35:37 -> h
     4:35:void prepareInstructions():36:67 -> h
-com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup -> com.android.tools.r8.ir.optimize.t0.s.g:
+com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup -> com.android.tools.r8.ir.optimize.w0.s.g:
     1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$GroupId,com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$1):103:103 -> <init>
     2:2:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$GroupId):105:105 -> <init>
     1:1:com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$ClassBuilder getBuilder(com.android.tools.r8.graph.DexItemFactory):110:110 -> a
     1:1:com.android.tools.r8.ir.optimize.lambda.LambdaGroupClassBuilder getBuilder(com.android.tools.r8.graph.DexItemFactory):103 -> a
     2:2:com.android.tools.r8.utils.ThrowingConsumer lambdaClassValidator(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.AppInfoWithSubtyping):116:116 -> a
     java.lang.String getGroupSuffix() -> d
-com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$1 -> com.android.tools.r8.ir.optimize.t0.s.b:
-com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$ClassBuilder -> com.android.tools.r8.ir.optimize.t0.s.c:
+com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$1 -> com.android.tools.r8.ir.optimize.w0.s.b:
+com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$ClassBuilder -> com.android.tools.r8.ir.optimize.w0.s.c:
     1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup,com.android.tools.r8.graph.DexItemFactory,java.lang.String):179:179 -> <init>
     1:4:com.android.tools.r8.ir.synthetic.SyntheticSourceCode createInstanceInitializerSourceCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):190:193 -> a
     5:5:com.android.tools.r8.graph.DexField lambda$createInstanceInitializerSourceCode$0(int):194:194 -> a
     1:1:com.android.tools.r8.graph.DexType getSuperClassType():184:184 -> i
-com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$ClassValidator -> com.android.tools.r8.ir.optimize.t0.s.d:
+com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$ClassValidator -> com.android.tools.r8.ir.optimize.w0.s.d:
     1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup,com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.AppInfoWithSubtyping):151:151 -> <init>
     1:1:int getInstanceInitializerSize(java.util.List):156:156 -> a
     2:9:int validateInstanceInitializerEpilogue(com.android.tools.r8.code.Instruction[],int):163:170 -> a
     10:10:int validateInstanceInitializerEpilogue(com.android.tools.r8.code.Instruction[],int):166:166 -> a
-com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$GroupId -> com.android.tools.r8.ir.optimize.t0.s.e:
+com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$GroupId -> com.android.tools.r8.ir.optimize.w0.s.e:
     1:1:void <init>(java.lang.String,com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.graph.EnclosingMethodAttribute):129:129 -> <init>
     1:1:com.android.tools.r8.ir.optimize.lambda.LambdaGroup createGroup():144:144 -> a
     java.lang.String getLambdaKindDescriptor() -> b
     1:1:boolean equals(java.lang.Object):134:134 -> equals
-com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$InstanceInitializerSourceCode -> com.android.tools.r8.ir.optimize.t0.s.f:
+com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$InstanceInitializerSourceCode -> com.android.tools.r8.ir.optimize.w0.s.f:
     com.android.tools.r8.graph.DexMethod objectInitializer -> n
     1:2:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField,java.util.function.IntFunction,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):212:213 -> <init>
     1:6:void lambda$prepareSuperConstructorCall$0(int,com.android.tools.r8.ir.conversion.IRBuilder):220:225 -> b
     7:7:void lambda$prepareSuperConstructorCall$0(int,com.android.tools.r8.ir.conversion.IRBuilder):220:220 -> b
     1:1:void prepareSuperConstructorCall(int):218:218 -> i
-com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroupIdFactory -> com.android.tools.r8.ir.optimize.t0.s.h:
+com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroupIdFactory -> com.android.tools.r8.ir.optimize.w0.s.h:
     boolean $assertionsDisabled -> n
     com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroupIdFactory INSTANCE -> m
     1:2:void <clinit>():16:17 -> <clinit>
@@ -35622,30 +35689,30 @@
     39:39:com.android.tools.r8.ir.optimize.lambda.LambdaGroupId validateAndCreate(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):31 -> a
     40:40:void validateSuperclass(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass):49:49 -> a
     40:40:com.android.tools.r8.ir.optimize.lambda.LambdaGroupId validateAndCreate(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):31 -> a
-com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup -> com.android.tools.r8.ir.optimize.t0.s.n:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup -> com.android.tools.r8.ir.optimize.w0.s.n:
     1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$GroupId,com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$1):109:109 -> <init>
     2:2:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$GroupId):111:111 -> <init>
     1:1:com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$ClassBuilder getBuilder(com.android.tools.r8.graph.DexItemFactory):116:116 -> a
     1:1:com.android.tools.r8.ir.optimize.lambda.LambdaGroupClassBuilder getBuilder(com.android.tools.r8.graph.DexItemFactory):109 -> a
     2:2:com.android.tools.r8.utils.ThrowingConsumer lambdaClassValidator(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.AppInfoWithSubtyping):122:122 -> a
     java.lang.String getGroupSuffix() -> d
-com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$1 -> com.android.tools.r8.ir.optimize.t0.s.i:
-com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$ClassBuilder -> com.android.tools.r8.ir.optimize.t0.s.j:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$1 -> com.android.tools.r8.ir.optimize.w0.s.i:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$ClassBuilder -> com.android.tools.r8.ir.optimize.w0.s.j:
     1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup,com.android.tools.r8.graph.DexItemFactory,java.lang.String):190:190 -> <init>
     1:7:com.android.tools.r8.ir.synthetic.SyntheticSourceCode createInstanceInitializerSourceCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):201:207 -> a
     8:8:com.android.tools.r8.graph.DexField lambda$createInstanceInitializerSourceCode$0(int):205:205 -> a
     1:1:com.android.tools.r8.graph.DexType getSuperClassType():195:195 -> i
-com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$ClassValidator -> com.android.tools.r8.ir.optimize.t0.s.k:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$ClassValidator -> com.android.tools.r8.ir.optimize.w0.s.k:
     1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup,com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.AppInfoWithSubtyping):157:157 -> <init>
     1:1:int getInstanceInitializerSize(java.util.List):162:162 -> a
     2:14:int validateInstanceInitializerEpilogue(com.android.tools.r8.code.Instruction[],int):169:181 -> a
     15:15:int validateInstanceInitializerEpilogue(com.android.tools.r8.code.Instruction[],int):177:177 -> a
-com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$GroupId -> com.android.tools.r8.ir.optimize.t0.s.l:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$GroupId -> com.android.tools.r8.ir.optimize.w0.s.l:
     1:1:void <init>(java.lang.String,com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.graph.EnclosingMethodAttribute):135:135 -> <init>
     1:1:com.android.tools.r8.ir.optimize.lambda.LambdaGroup createGroup():150:150 -> a
     java.lang.String getLambdaKindDescriptor() -> b
     1:1:boolean equals(java.lang.Object):140:140 -> equals
-com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$InstanceInitializerSourceCode -> com.android.tools.r8.ir.optimize.t0.s.m:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$InstanceInitializerSourceCode -> com.android.tools.r8.ir.optimize.w0.s.m:
     int arity -> n
     com.android.tools.r8.graph.DexMethod lambdaInitializer -> o
     1:4:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField,java.util.function.IntFunction,com.android.tools.r8.graph.DexMethod,int,com.android.tools.r8.ir.code.Position):226:229 -> <init>
@@ -35654,7 +35721,7 @@
     2:7:void lambda$prepareSuperConstructorCall$1(int,int,com.android.tools.r8.ir.conversion.IRBuilder):238:243 -> b
     8:8:void lambda$prepareSuperConstructorCall$1(int,int,com.android.tools.r8.ir.conversion.IRBuilder):238:238 -> b
     1:3:void prepareSuperConstructorCall(int):234:236 -> i
-com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroupIdFactory -> com.android.tools.r8.ir.optimize.t0.s.o:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroupIdFactory -> com.android.tools.r8.ir.optimize.w0.s.o:
     boolean $assertionsDisabled -> n
     com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupIdFactory INSTANCE -> m
     1:2:void <clinit>():16:17 -> <clinit>
@@ -35695,7 +35762,7 @@
     39:39:com.android.tools.r8.ir.optimize.lambda.LambdaGroupId validateAndCreate(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):31 -> a
     40:40:void validateSuperclass(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass):49:49 -> a
     40:40:com.android.tools.r8.ir.optimize.lambda.LambdaGroupId validateAndCreate(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):31 -> a
-com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinInstanceInitializerSourceCode -> com.android.tools.r8.ir.optimize.t0.s.p:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinInstanceInitializerSourceCode -> com.android.tools.r8.ir.optimize.w0.s.p:
     com.android.tools.r8.graph.DexField idField -> l
     java.util.function.IntFunction fieldGenerator -> m
     1:3:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField,java.util.function.IntFunction,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):25:27 -> <init>
@@ -35704,7 +35771,7 @@
     3:3:void lambda$prepareInstructions$1(int,int,com.android.tools.r8.ir.conversion.IRBuilder):41:41 -> b
     1:17:void prepareInstructions():32:48 -> h
     void prepareSuperConstructorCall(int) -> i
-com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaClassValidator -> com.android.tools.r8.ir.optimize.t0.s.q:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaClassValidator -> com.android.tools.r8.ir.optimize.w0.s.q:
     com.android.tools.r8.graph.AppInfoWithSubtyping appInfo -> c
     com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroup group -> b
     com.android.tools.r8.kotlin.Kotlin kotlin -> a
@@ -35790,7 +35857,7 @@
     229:236:void accept(java.lang.Object):47 -> accept
     237:237:void accept(com.android.tools.r8.graph.DexClass):73:73 -> accept
     237:237:void accept(java.lang.Object):47 -> accept
-com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaConstants -> com.android.tools.r8.ir.optimize.t0.s.r:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaConstants -> com.android.tools.r8.ir.optimize.w0.s.r:
     com.android.tools.r8.graph.FieldAccessFlags CAPTURE_FIELD_FLAGS -> j
     com.android.tools.r8.graph.FieldAccessFlags SINGLETON_FIELD_FLAGS -> i
     com.android.tools.r8.graph.MethodAccessFlags CLASS_INITIALIZER_FLAGS -> c
@@ -35803,7 +35870,7 @@
     com.android.tools.r8.graph.MethodAccessFlags BRIDGE_METHOD_FLAGS -> g
     com.android.tools.r8.graph.MethodAccessFlags BRIDGE_METHOD_FLAGS_FIXED -> h
     1:38:void <clinit>():15:52 -> <clinit>
-com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroup -> com.android.tools.r8.ir.optimize.t0.s.s:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroup -> com.android.tools.r8.ir.optimize.w0.s.s:
     com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy strategy -> e
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():19:19 -> <clinit>
@@ -35838,7 +35905,7 @@
     1:1:com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupId id():27:27 -> j
     1:1:boolean isStateless():31 -> j
     2:2:boolean isStateless():31:31 -> j
-com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupClassBuilder -> com.android.tools.r8.ir.optimize.t0.s.t:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupClassBuilder -> com.android.tools.r8.ir.optimize.w0.s.t:
     boolean $assertionsDisabled -> p
     com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupId id -> o
     1:1:void <clinit>():43:43 -> <clinit>
@@ -35867,7 +35934,7 @@
     1:25:com.android.tools.r8.graph.DexEncodedMethod[] buildVirtualMethods():97:121 -> h
     26:44:com.android.tools.r8.graph.DexEncodedMethod[] buildVirtualMethods():116:134 -> h
     1:3:java.util.Map collectVirtualMethods():142:144 -> j
-com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupCodeStrategy -> com.android.tools.r8.ir.optimize.t0.s.u:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupCodeStrategy -> com.android.tools.r8.ir.optimize.w0.s.u:
     com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroup group -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():35:35 -> <clinit>
@@ -35938,7 +36005,7 @@
     17:17:boolean isValidInitializerCall(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod):105:105 -> b
     1:4:boolean isValidStaticFieldRead(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField):61:64 -> c
     1:1:boolean isValidInstanceFieldRead(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField):79:79 -> d
-com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupId -> com.android.tools.r8.ir.optimize.t0.s.v:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupId -> com.android.tools.r8.ir.optimize.w0.s.v:
     com.android.tools.r8.graph.DexProto mainMethodProto -> g
     com.android.tools.r8.graph.ParameterAnnotationsList mainMethodParamAnnotations -> i
     int innerClassAccess -> k
@@ -35958,7 +36025,7 @@
     1:10:int computeHashCode():80:89 -> c
     1:1:int hashCode():76:76 -> hashCode
     1:21:java.lang.String toString():113:133 -> toString
-com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupIdFactory -> com.android.tools.r8.ir.optimize.t0.s.w:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupIdFactory -> com.android.tools.r8.ir.optimize.w0.s.w:
     boolean $assertionsDisabled -> l
     1:1:void <clinit>():21:21 -> <clinit>
     1:1:void <init>():22:22 -> <init>
@@ -36039,7 +36106,7 @@
     11:11:com.android.tools.r8.graph.DexEncodedMethod validateVirtualMethods(com.android.tools.r8.graph.DexClass):61 -> c
     12:18:com.android.tools.r8.graph.DexEncodedMethod validateVirtualMethods(com.android.tools.r8.graph.DexClass):63:69 -> c
     19:24:boolean hasValidAnnotations(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass):90:95 -> c
-com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaVirtualMethodSourceCode -> com.android.tools.r8.ir.optimize.t0.s.x:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaVirtualMethodSourceCode -> com.android.tools.r8.ir.optimize.w0.s.x:
     com.android.tools.r8.graph.DexItemFactory factory -> l
     java.util.List implMethods -> n
     com.android.tools.r8.graph.DexField idField -> m
@@ -36055,7 +36122,7 @@
     1:1:void lambda$prepareInstructions$6(int,com.android.tools.r8.ir.conversion.IRBuilder):102:102 -> e
     1:1:void lambda$prepareInstructions$7(int,com.android.tools.r8.ir.conversion.IRBuilder):103:103 -> f
     1:65:void prepareInstructions():41:105 -> h
-com.android.tools.r8.ir.optimize.library.BooleanMethodOptimizer -> com.android.tools.r8.ir.optimize.u0.a:
+com.android.tools.r8.ir.optimize.library.BooleanMethodOptimizer -> com.android.tools.r8.ir.optimize.x0.a:
     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):27:29 -> <init>
@@ -36068,9 +36135,9 @@
     14:22: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.DexEncodedMethod,java.util.Set):47 -> a
     23:23:void 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):76:76 -> a
     23:23: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.DexEncodedMethod,java.util.Set):47 -> a
-com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection -> com.android.tools.r8.ir.optimize.u0.b:
+com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection -> com.android.tools.r8.ir.optimize.x0.b:
     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.DexEncodedMethod,java.util.Set) -> a
-com.android.tools.r8.ir.optimize.library.LibraryMethodOptimizer -> com.android.tools.r8.ir.optimize.u0.c:
+com.android.tools.r8.ir.optimize.library.LibraryMethodOptimizer -> com.android.tools.r8.ir.optimize.x0.c:
     java.util.Map libraryMethodModelCollections -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():25:25 -> <clinit>
@@ -36089,13 +36156,13 @@
     20:20:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
     20:20:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):60 -> a
     21:21:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):60:60 -> a
-com.android.tools.r8.ir.optimize.library.NopLibraryMethodModelCollection -> com.android.tools.r8.ir.optimize.u0.d:
+com.android.tools.r8.ir.optimize.library.NopLibraryMethodModelCollection -> com.android.tools.r8.ir.optimize.x0.d:
     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.DexEncodedMethod,java.util.Set) -> a
     1:1:com.android.tools.r8.ir.optimize.library.NopLibraryMethodModelCollection getInstance():24:24 -> a
-com.android.tools.r8.ir.optimize.peepholes.BasicBlockMuncher -> com.android.tools.r8.ir.optimize.v0.a:
+com.android.tools.r8.ir.optimize.peepholes.BasicBlockMuncher -> com.android.tools.r8.ir.optimize.y0.a:
     1:1:java.util.List nonDestructivePeepholes():22:22 -> a
     1:1:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):37 -> a
     2:2:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):37:37 -> a
@@ -36109,10 +36176,10 @@
     35:35:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
     35:35:void runPeepholes(com.android.tools.r8.ir.code.IRCode,java.util.List,com.android.tools.r8.utils.InternalOptions):71 -> a
     36:40:void runPeepholes(com.android.tools.r8.ir.code.IRCode,java.util.List,com.android.tools.r8.utils.InternalOptions):71:75 -> a
-com.android.tools.r8.ir.optimize.peepholes.BasicBlockPeephole -> com.android.tools.r8.ir.optimize.v0.b:
+com.android.tools.r8.ir.optimize.peepholes.BasicBlockPeephole -> com.android.tools.r8.ir.optimize.y0.b:
     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.ir.optimize.v0.c:
+com.android.tools.r8.ir.optimize.peepholes.DupDupDupPeephole -> com.android.tools.r8.ir.optimize.y0.c:
     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
@@ -36123,7 +36190,7 @@
     2:39:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):41:78 -> a
     1:1:boolean lambda$new$1(com.android.tools.r8.ir.code.Instruction):33:33 -> b
     1:1: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.ir.optimize.v0.d:
+com.android.tools.r8.ir.optimize.peepholes.LoadLoadDupPeephole -> com.android.tools.r8.ir.optimize.y0.d:
     com.android.tools.r8.ir.optimize.peepholes.Point firstLoadExp -> b
     com.android.tools.r8.ir.optimize.peepholes.Point lastLoadExp -> a
     com.android.tools.r8.ir.optimize.peepholes.PeepholeLayout layout -> c
@@ -36132,10 +36199,10 @@
     1:8:void <init>():30:37 -> <init>
     boolean resetAfterMatch() -> a
     1:24:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):41:64 -> a
-com.android.tools.r8.ir.optimize.peepholes.Match -> com.android.tools.r8.ir.optimize.v0.e:
+com.android.tools.r8.ir.optimize.peepholes.Match -> com.android.tools.r8.ir.optimize.y0.e:
     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.ir.optimize.v0.f:
+com.android.tools.r8.ir.optimize.peepholes.MoveLoadUpPeephole -> com.android.tools.r8.ir.optimize.y0.f:
     com.android.tools.r8.ir.optimize.peepholes.Point firstLoad -> d
     com.android.tools.r8.ir.code.Instruction insertPosition -> c
     com.android.tools.r8.ir.optimize.peepholes.PeepholeLayout layout -> f
@@ -36156,12 +36223,12 @@
     32:32:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):73 -> a
     33:59:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):76:102 -> a
     1:10:boolean lambda$new$1(com.android.tools.r8.ir.code.Instruction):51:60 -> b
-com.android.tools.r8.ir.optimize.peepholes.PeepholeExpression -> com.android.tools.r8.ir.optimize.v0.g:
+com.android.tools.r8.ir.optimize.peepholes.PeepholeExpression -> com.android.tools.r8.ir.optimize.y0.g:
     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.ir.optimize.v0.h:
+com.android.tools.r8.ir.optimize.peepholes.PeepholeHelper -> com.android.tools.r8.ir.optimize.y0.h:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:java.util.function.Predicate withoutLocalInfo(java.util.function.Predicate):17:17 -> a
@@ -36173,7 +36240,7 @@
     1:1:void resetPrevious(com.android.tools.r8.ir.code.InstructionListIterator,int):31:31 -> b
     2:5:int numberOfValuesPutOnStack(com.android.tools.r8.ir.code.Instruction):36:39 -> b
     6:6:boolean lambda$moveInstructionsUpToCurrentPosition$2(java.util.List,com.android.tools.r8.ir.code.Instruction):70:70 -> b
-com.android.tools.r8.ir.optimize.peepholes.PeepholeLayout -> com.android.tools.r8.ir.optimize.v0.i:
+com.android.tools.r8.ir.optimize.peepholes.PeepholeLayout -> com.android.tools.r8.ir.optimize.y0.i:
     com.android.tools.r8.ir.optimize.peepholes.PeepholeExpression[] expressions -> b
     java.util.List instructions -> a
     boolean backwards -> c
@@ -36188,7 +36255,7 @@
     1:1:java.lang.Boolean lambda$test$3(com.android.tools.r8.ir.code.InstructionListIterator):40:40 -> e
     1:1:com.android.tools.r8.ir.code.Instruction lambda$test$4(com.android.tools.r8.ir.code.InstructionListIterator):40:40 -> f
     1:1:void lambda$test$5(com.android.tools.r8.ir.code.InstructionListIterator):40:40 -> g
-com.android.tools.r8.ir.optimize.peepholes.Point -> com.android.tools.r8.ir.optimize.v0.j:
+com.android.tools.r8.ir.optimize.peepholes.Point -> com.android.tools.r8.ir.optimize.y0.j:
     java.util.function.Predicate predicate -> a
     int index -> b
     boolean $assertionsDisabled -> c
@@ -36200,14 +36267,14 @@
     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.StoreLoadPeephole -> com.android.tools.r8.ir.optimize.v0.k:
+com.android.tools.r8.ir.optimize.peepholes.StoreLoadPeephole -> com.android.tools.r8.ir.optimize.y0.k:
     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.ir.optimize.v0.l:
+com.android.tools.r8.ir.optimize.peepholes.StoreLoadToDupStorePeephole -> com.android.tools.r8.ir.optimize.y0.l:
     com.android.tools.r8.ir.optimize.peepholes.Point loadExp -> b
     com.android.tools.r8.ir.optimize.peepholes.Point storeExp -> a
     com.android.tools.r8.ir.optimize.peepholes.PeepholeLayout layout -> d
@@ -36219,7 +36286,7 @@
     boolean resetAfterMatch() -> a
     1:1:boolean lambda$new$0(com.android.tools.r8.ir.code.Instruction):37:37 -> a
     2:39:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):43:80 -> a
-com.android.tools.r8.ir.optimize.peepholes.StoreSequenceLoadPeephole -> com.android.tools.r8.ir.optimize.v0.m:
+com.android.tools.r8.ir.optimize.peepholes.StoreSequenceLoadPeephole -> com.android.tools.r8.ir.optimize.y0.m:
     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
@@ -36233,7 +36300,7 @@
     9:50:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):85:126 -> a
     1:10:boolean lambda$new$1(com.android.tools.r8.ir.code.Instruction):56:65 -> b
     1:4:boolean lambda$new$2(com.android.tools.r8.ir.code.Instruction):72:75 -> c
-com.android.tools.r8.ir.optimize.peepholes.Wildcard -> com.android.tools.r8.ir.optimize.v0.n:
+com.android.tools.r8.ir.optimize.peepholes.Wildcard -> com.android.tools.r8.ir.optimize.y0.n:
     java.util.function.Predicate predicate -> a
     int index -> b
     boolean $assertionsDisabled -> c
@@ -36245,7 +36312,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.ir.optimize.w0.d:
+com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer -> com.android.tools.r8.ir.optimize.z0.d:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.AppView appView -> a
     java.util.concurrent.ConcurrentHashMap candidates -> d
@@ -36310,8 +36377,8 @@
     433:433:boolean lambda$analyzeAllValueUsers$3(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):588:588 -> a
     434:434:void staticizeCandidates(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):637:637 -> a
     1:1:boolean lambda$isValidInitCall$2(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):464:464 -> b
-com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$1 -> com.android.tools.r8.ir.optimize.w0.a:
-com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CallSiteReferencesInvalidator -> com.android.tools.r8.ir.optimize.w0.b:
+com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$1 -> com.android.tools.r8.ir.optimize.z0.a:
+com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CallSiteReferencesInvalidator -> com.android.tools.r8.ir.optimize.z0.b:
     com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer this$0 -> a
     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):640:640 -> <init>
     2:3:void <init>(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer,com.android.tools.r8.graph.DexItemFactory):642:643 -> <init>
@@ -36328,7 +36395,7 @@
     1:1:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):700:700 -> registerStaticFieldRead
     1:1:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):705:705 -> registerStaticFieldWrite
     1:3:boolean registerTypeReference(com.android.tools.r8.graph.DexType):710:712 -> registerTypeReference
-com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo -> com.android.tools.r8.ir.optimize.w0.c:
+com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo -> com.android.tools.r8.ir.optimize.z0.c:
     java.util.concurrent.atomic.AtomicInteger instancesCreated -> e
     com.android.tools.r8.graph.DexEncodedField singletonField -> b
     java.util.concurrent.atomic.AtomicInteger fieldWrites -> d
@@ -36344,13 +36411,13 @@
     2:18:void <init>(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):61:77 -> <init>
     1:1:com.android.tools.r8.graph.DexType hostType():85:85 -> a
     1:1:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo invalidate():95:95 -> b
-com.android.tools.r8.ir.optimize.staticizer.ClassStaticizerGraphLense -> com.android.tools.r8.ir.optimize.w0.e:
+com.android.tools.r8.ir.optimize.staticizer.ClassStaticizerGraphLense -> com.android.tools.r8.ir.optimize.z0.e:
     boolean $assertionsDisabled -> a
     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 -> mapInvocationType
-com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor -> com.android.tools.r8.ir.optimize.w0.f:
+com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor -> com.android.tools.r8.ir.optimize.z0.f:
     java.util.Set methodsToBeStaticized -> g
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer classStaticizer -> b
@@ -36370,7 +36437,7 @@
     6:6:com.android.tools.r8.graph.DexClass com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.hostClass():89:89 -> a
     6:6:void prepareCandidates():242 -> a
     6:6:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):85 -> a
-    7:7:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    7:7:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     7:7:com.android.tools.r8.graph.DexClass com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.hostClass():89 -> a
     7:7:void prepareCandidates():242 -> a
     7:7:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):85 -> a
@@ -36393,7 +36460,7 @@
     59:59:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):107 -> a
     60:73:java.util.Set staticizeMethodSymbols():615:628 -> a
     60:73:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):107 -> a
-    74:74:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    74:74:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     74:74:java.util.Set staticizeMethodSymbols():628 -> a
     74:74:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):107 -> a
     75:76:java.util.Set staticizeMethodSymbols():629:630 -> a
@@ -36596,7 +36663,7 @@
     2:5:void <init>(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer,com.android.tools.r8.ir.code.Value):863:866 -> <init>
     1:1:void logEscapingRoute(boolean):871:871 -> a
     1:10: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.DexMethod):881:890 -> isLegitimateEscapeRoute
-    11:11:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> isLegitimateEscapeRoute
+    11:11:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> isLegitimateEscapeRoute
     11:11: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.DexMethod):890 -> isLegitimateEscapeRoute
     12:73: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.DexMethod):891:952 -> isLegitimateEscapeRoute
     74:74: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.DexMethod):882:882 -> isLegitimateEscapeRoute
@@ -36717,7 +36784,7 @@
     222:222:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():965:965 -> a
     222:222:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):309 -> a
     223:264:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):310:351 -> a
-    265:265:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    265:265:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     265:265:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):354 -> a
     266:323:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):359:416 -> a
     324:375:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):397:448 -> a
@@ -37073,16 +37140,16 @@
     1365:1365: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):2330 -> a
     1366:1373: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):2331:2338 -> a
     1374:1409: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):2446:2481 -> a
-    1410:1410:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():345:345 -> a
+    1410:1410:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():337:337 -> a
     1410:1410:boolean unconstrainedForCf(int,com.android.tools.r8.utils.InternalOptions):2653 -> a
     1410:1410: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):2481 -> a
     1411:1417: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):2481:2487 -> a
     1418:1469:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2520:2571 -> a
     1470:1476:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2568:2574 -> a
-    1477:1477:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():345:345 -> a
+    1477:1477:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():337:337 -> a
     1477:1477:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2574 -> a
     1478:1485:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2574:2581 -> a
-    1486:1486:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():345:345 -> a
+    1486:1486:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():337:337 -> a
     1486:1486:boolean unconstrainedForCf(int,com.android.tools.r8.utils.InternalOptions):2653 -> a
     1486:1486:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2581 -> a
     1487:1524:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2581:2618 -> a
@@ -37138,14 +37205,14 @@
     98:103:void computeLiveRanges():2492:2497 -> b
     98:103:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():633 -> b
     98:103:void allocateRegisters():215 -> b
-    104:104:boolean com.android.tools.r8.utils.InternalOptions.canHaveThisTypeVerifierBug():1217:1217 -> b
+    104:104:boolean com.android.tools.r8.utils.InternalOptions.canHaveThisTypeVerifierBug():1209:1209 -> b
     104:104:void computeLiveRanges():2497 -> b
     104:104:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():633 -> b
     104:104:void allocateRegisters():215 -> b
     105:105:void computeLiveRanges():2497:2497 -> b
     105:105:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():633 -> b
     105:105:void allocateRegisters():215 -> b
-    106:106:boolean com.android.tools.r8.utils.InternalOptions.canHaveThisJitCodeDebuggingBug():1226:1226 -> b
+    106:106:boolean com.android.tools.r8.utils.InternalOptions.canHaveThisJitCodeDebuggingBug():1218:1218 -> b
     106:106:void computeLiveRanges():2497 -> b
     106:106:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():633 -> b
     106:106:void allocateRegisters():215 -> b
@@ -37192,7 +37259,7 @@
     309:313:void increaseCapacity(int,boolean):2964:2968 -> b
     1:3:int registersUsed():591:593 -> c
     4:4:boolean needsLongResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1502:1502 -> c
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.canHaveOverlappingLongRegisterBug():1232:1232 -> c
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.canHaveOverlappingLongRegisterBug():1224:1224 -> c
     5:5:boolean needsLongResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1502 -> c
     6:26:boolean needsLongResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1505:1525 -> c
     27:39:boolean isLongResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1538:1550 -> c
@@ -37200,10 +37267,10 @@
     42:42:boolean registersAreFree(int,boolean):3112:3112 -> c
     1:1:int highestUsedRegister():586:586 -> d
     2:2:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1441:1441 -> d
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():1265:1265 -> d
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():1257:1257 -> d
     3:3:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1441 -> d
     4:4:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1441:1441 -> d
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.canHaveLongToIntBug():1439:1439 -> d
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.canHaveLongToIntBug():1431:1431 -> d
     5:5:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1441 -> d
     6:24:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1444:1462 -> d
     25:25:boolean com.android.tools.r8.ir.code.NumberConversion.isLongToIntConversion():52:52 -> d
@@ -37211,12 +37278,12 @@
     26:26:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1472:1472 -> d
     27:27:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1441:1441 -> d
     27:27:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1472 -> d
-    28:28:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():1265:1265 -> d
+    28:28:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():1257:1257 -> d
     28:28:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1441 -> d
     28:28:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1472 -> d
     29:29:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1441:1441 -> d
     29:29:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1472 -> d
-    30:30:boolean com.android.tools.r8.utils.InternalOptions.canHaveLongToIntBug():1439:1439 -> d
+    30:30:boolean com.android.tools.r8.utils.InternalOptions.canHaveLongToIntBug():1431:1431 -> d
     30:30:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1441 -> d
     30:30:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1472 -> d
     31:49:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1444:1462 -> d
@@ -37637,7 +37704,7 @@
     91:95:void scheduleMovesBeforeInstruction(int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):316:320 -> a
     96:104:void removeArgumentRestores(java.util.Set):332:340 -> a
     105:129:void scheduleMoves(int,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Position):347:371 -> a
-    130:130:boolean com.android.tools.r8.utils.InternalOptions.canHaveBoundsCheckEliminationBug():1201:1201 -> a
+    130:130:boolean com.android.tools.r8.utils.InternalOptions.canHaveBoundsCheckEliminationBug():1193:1193 -> a
     130:130:void scheduleMoves(int,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Position):371 -> a
     131:136:void scheduleMoves(int,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Position):371:376 -> a
     137:141:void scheduleMoves(int,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Position):375:379 -> a
@@ -37658,7 +37725,7 @@
     1:3:void addOutMove(int,com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LiveIntervals):152:154 -> f
     4:4:void addOutMove(int,com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LiveIntervals):153:153 -> f
     5:5:java.util.Set lambda$scheduleMovesBeforeInstruction$5(java.lang.Integer):310:310 -> f
-com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode -> com.android.tools.r8.s.d.a:
+com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode -> com.android.tools.r8.r.d.a:
     1:1:void <init>():21:21 -> <init>
     1:8:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):38:45 -> buildIR
     1:8:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):56:63 -> buildInliningIR
@@ -37666,27 +37733,27 @@
     1:1:int computeHashCode():78:78 -> computeHashCode
     1:1:void registerCodeReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry):73:73 -> registerCodeReferences
     1:1:java.lang.String toString():68:68 -> toString
-com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider -> com.android.tools.r8.s.d.a$a:
+com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider -> com.android.tools.r8.r.d.a$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.s.d.g:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider -> com.android.tools.r8.r.d.g:
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):41:41 -> <init>
     1:1:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter,com.android.tools.r8.graph.DexString):46:46 -> a
     2:2:boolean com.android.tools.r8.ir.desugar.PrefixRewritingMapper.hasRewrittenType(com.android.tools.r8.graph.DexType):30:30 -> a
     2:2:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter,com.android.tools.r8.graph.DexString):46 -> a
     3:9:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter,com.android.tools.r8.graph.DexString):49:55 -> a
-com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterConstructorCfCodeProvider -> com.android.tools.r8.s.d.b:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterConstructorCfCodeProvider -> com.android.tools.r8.r.d.b:
     com.android.tools.r8.graph.DexField wrapperField -> c
     1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexField):293:294 -> <init>
     1:9:com.android.tools.r8.graph.CfCode generateCfCode():299:307 -> a
     10:10:com.android.tools.r8.graph.CfCode generateCfCode():305:305 -> a
     11:23:com.android.tools.r8.graph.CfCode generateCfCode():302:314 -> a
-com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterThrowRuntimeExceptionCfCodeProvider -> com.android.tools.r8.s.d.c:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterThrowRuntimeExceptionCfCodeProvider -> com.android.tools.r8.r.d.c:
     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):324:325 -> <init>
     1:11:com.android.tools.r8.graph.CfCode generateCfCode():330:340 -> a
     12:12:com.android.tools.r8.graph.CfCode generateCfCode():338:338 -> a
     13:22:com.android.tools.r8.graph.CfCode generateCfCode():335:344 -> a
-com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterVivifiedWrapperCfCodeProvider -> com.android.tools.r8.s.d.d:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterVivifiedWrapperCfCodeProvider -> com.android.tools.r8.r.d.d:
     com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter converter -> e
     boolean itfCall -> f
     com.android.tools.r8.graph.DexField wrapperField -> c
@@ -37707,7 +37774,7 @@
     44:44:com.android.tools.r8.graph.CfCode generateCfCode():140 -> a
     45:45:com.android.tools.r8.graph.CfCode generateCfCode():139:139 -> a
     46:58:com.android.tools.r8.graph.CfCode generateCfCode():136:148 -> a
-com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterWrapperCfCodeProvider -> com.android.tools.r8.s.d.e:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterWrapperCfCodeProvider -> com.android.tools.r8.r.d.e:
     com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter converter -> e
     boolean itfCall -> f
     com.android.tools.r8.graph.DexField wrapperField -> c
@@ -37725,7 +37792,7 @@
     44:44:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider.vivifiedTypeFor(com.android.tools.r8.graph.DexType):66:66 -> a
     44:44:com.android.tools.r8.graph.CfCode generateCfCode():218 -> a
     45:50:com.android.tools.r8.graph.CfCode generateCfCode():220:225 -> a
-com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterWrapperConversionCfCodeProvider -> com.android.tools.r8.s.d.f:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterWrapperConversionCfCodeProvider -> com.android.tools.r8.r.d.f:
     com.android.tools.r8.graph.DexField wrapperField -> e
     com.android.tools.r8.graph.DexType argType -> c
     com.android.tools.r8.graph.DexField reverseWrapperField -> d
@@ -37733,7 +37800,7 @@
     1:36:com.android.tools.r8.graph.CfCode generateCfCode():245:280 -> a
     37:37:com.android.tools.r8.graph.CfCode generateCfCode():278:278 -> a
     38:47:com.android.tools.r8.graph.CfCode generateCfCode():275:284 -> a
-com.android.tools.r8.ir.synthetic.EmulateInterfaceSyntheticCfCodeProvider -> com.android.tools.r8.s.d.h:
+com.android.tools.r8.ir.synthetic.EmulateInterfaceSyntheticCfCodeProvider -> com.android.tools.r8.r.d.h:
     java.util.List extraDispatchCases -> f
     com.android.tools.r8.graph.DexType interfaceType -> c
     com.android.tools.r8.graph.DexMethod libraryMethod -> e
@@ -37742,13 +37809,13 @@
     1:41:com.android.tools.r8.graph.CfCode generateCfCode():49:89 -> a
     1:4:void addReturn(java.util.List):100:103 -> b
     1:2:void loadExtraParameters(java.util.List):94:95 -> c
-com.android.tools.r8.ir.synthetic.ExceptionThrowingSourceCode -> com.android.tools.r8.s.d.i:
+com.android.tools.r8.ir.synthetic.ExceptionThrowingSourceCode -> com.android.tools.r8.r.d.i:
     com.android.tools.r8.graph.DexType exceptionType -> l
     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):24:25 -> <init>
     1:11:void lambda$prepareInstructions$0(com.android.tools.r8.ir.conversion.IRBuilder):32:42 -> d
     12:19:void lambda$prepareInstructions$0(com.android.tools.r8.ir.conversion.IRBuilder):37:44 -> d
     1:1:void prepareInstructions():30:30 -> h
-com.android.tools.r8.ir.synthetic.FieldAccessorSourceCode -> com.android.tools.r8.s.d.j:
+com.android.tools.r8.ir.synthetic.FieldAccessorSourceCode -> com.android.tools.r8.r.d.j:
     boolean $assertionsDisabled -> m
     com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess fieldWithAccess -> l
     1:1:void <clinit>():15:15 -> <clinit>
@@ -37769,7 +37836,7 @@
     21:21:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isStaticPut():474:474 -> h
     21:21:void prepareInstructions():49 -> h
     22:25:void prepareInstructions():49:52 -> h
-com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode -> com.android.tools.r8.s.d.k:
+com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode -> com.android.tools.r8.r.d.k:
     com.android.tools.r8.graph.DexType targetReceiver -> l
     com.android.tools.r8.graph.DexMethod target -> m
     boolean castResult -> o
@@ -37786,7 +37853,7 @@
     1:1:void lambda$prepareInstructions$3(int,com.android.tools.r8.ir.conversion.IRBuilder):214:214 -> d
     1:36:void prepareInstructions():179:214 -> h
     1:27:boolean checkSignatures():146:172 -> i
-com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder -> com.android.tools.r8.s.d.k$a:
+com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder -> com.android.tools.r8.r.d.k$a:
     com.android.tools.r8.ir.code.Invoke$Type invokeType -> f
     boolean extraNullParameter -> i
     com.android.tools.r8.graph.DexType targetReceiver -> d
@@ -37806,7 +37873,7 @@
     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
     3:3:com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder setExtraNullParameter():85:85 -> b
-com.android.tools.r8.ir.synthetic.SynthesizedCode -> com.android.tools.r8.s.d.l:
+com.android.tools.r8.ir.synthetic.SynthesizedCode -> com.android.tools.r8.r.d.l:
     java.util.function.Consumer registryCallback -> b
     com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider sourceCodeProvider -> a
     1:1:void <init>(com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider):17:17 -> <init>
@@ -37814,7 +37881,7 @@
     1:1:void registerReachableDefinitionsDefault(com.android.tools.r8.graph.UseRegistry):36:36 -> a
     1:1:java.util.function.Consumer getRegistryCallback():32:32 -> getRegistryCallback
     1:1:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():27:27 -> getSourceCodeProvider
-com.android.tools.r8.ir.synthetic.SyntheticCfCodeProvider -> com.android.tools.r8.s.d.m:
+com.android.tools.r8.ir.synthetic.SyntheticCfCodeProvider -> com.android.tools.r8.r.d.m:
     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>
@@ -37822,7 +37889,7 @@
     2:2:java.util.List 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.s.d.n:
+com.android.tools.r8.ir.synthetic.SyntheticSourceCode -> com.android.tools.r8.r.d.n:
     java.util.function.Predicate endsBlock -> j
     com.android.tools.r8.ir.code.Position position -> h
     java.util.List constructors -> f
@@ -37873,19 +37940,19 @@
     1:1:int nextInstructionIndex():109:109 -> g
     void prepareInstructions() -> h
     1:3:int getParamRegister(int):92:94 -> h
-com.android.tools.r8.it.unimi.dsi.fastutil.Function -> com.android.tools.r8.t.a.a.a.a:
-com.android.tools.r8.it.unimi.dsi.fastutil.Hash$Strategy -> com.android.tools.r8.t.a.a.a.b:
+com.android.tools.r8.it.unimi.dsi.fastutil.Function -> com.android.tools.r8.s.a.a.a.a:
+com.android.tools.r8.it.unimi.dsi.fastutil.Hash$Strategy -> com.android.tools.r8.s.a.a.a.b:
     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.t.a.a.a.c:
+com.android.tools.r8.it.unimi.dsi.fastutil.HashCommon -> com.android.tools.r8.s.a.a.a.c:
     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.t.a.a.a.d:
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.AbstractBooleanCollection -> com.android.tools.r8.t.a.a.a.e.a:
+com.android.tools.r8.it.unimi.dsi.fastutil.Stack -> com.android.tools.r8.s.a.a.a.d:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.AbstractBooleanCollection -> com.android.tools.r8.s.a.a.a.e.a:
     1:1:void <init>():37:37 -> <init>
     1:1:boolean add(boolean):68:68 -> a
     1:1:boolean add(java.lang.Object):36:36 -> add
@@ -37896,12 +37963,12 @@
     1:1:boolean contains(java.lang.Object):129:129 -> contains
     1:1:boolean remove(java.lang.Object):143:143 -> remove
     1:14:java.lang.String toString():206:219 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.AbstractBooleanIterator -> com.android.tools.r8.t.a.a.a.e.b:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.AbstractBooleanIterator -> com.android.tools.r8.s.a.a.a.e.b:
     1:1:void <init>():34:34 -> <init>
     1:1:java.lang.Boolean next():57:57 -> next
     1:1:java.lang.Object next():33 -> next
     1:1:void remove():68:68 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.AbstractBooleanSet -> com.android.tools.r8.t.a.a.a.e.c:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.AbstractBooleanSet -> com.android.tools.r8.s.a.a.a.e.c:
     1:1:void <init>():32:32 -> <init>
     1:1:boolean rem(boolean):87:87 -> c
     boolean remove(boolean) -> d
@@ -37910,7 +37977,7 @@
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArraySet.iterator():119:119 -> hashCode
     3:3:int hashCode():58 -> hashCode
     4:4:int hashCode():61:61 -> hashCode
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArraySet -> com.android.tools.r8.t.a.a.a.e.e:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArraySet -> com.android.tools.r8.s.a.a.a.e.e:
     int size -> b
     1:4:void <init>(boolean[],int):104:107 -> <init>
     1:1:int access$000(com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArraySet):29:29 -> a
@@ -37930,7 +37997,7 @@
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator iterator():119:119 -> iterator
     2:2:java.util.Iterator iterator():29 -> iterator
     1:1:int size():148:148 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArraySet$1 -> com.android.tools.r8.t.a.a.a.e.d:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArraySet$1 -> com.android.tools.r8.s.a.a.a.e.d:
     com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArraySet this$0 -> b
     int next -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArraySet):119:120 -> <init>
@@ -37938,13 +38005,13 @@
     1:2:boolean nextBoolean():129:130 -> nextBoolean
     3:3:boolean nextBoolean():129:129 -> nextBoolean
     1:2:void remove():135:136 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArrays -> com.android.tools.r8.t.a.a.a.e.f:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArrays -> com.android.tools.r8.s.a.a.a.e.f:
     boolean[] EMPTY_ARRAY -> a
     1:1:void <clinit>():95:95 -> <clinit>
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection -> com.android.tools.r8.t.a.a.a.e.g:
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollections -> com.android.tools.r8.t.a.a.a.e.i:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection -> com.android.tools.r8.s.a.a.a.e.g:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollections -> com.android.tools.r8.s.a.a.a.e.i:
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection unmodifiable(com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection):536:536 -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollections$UnmodifiableCollection -> com.android.tools.r8.t.a.a.a.e.h:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollections$UnmodifiableCollection -> com.android.tools.r8.s.a.a.a.e.h:
     com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection collection -> a
     1:3:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection):369:371 -> <init>
     4:4:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection):370:370 -> <init>
@@ -37973,13 +38040,13 @@
     1:1:java.lang.Object[] toArray(java.lang.Object[]):422:422 -> toArray
     2:2:java.lang.Object[] toArray():427:427 -> toArray
     1:1:java.lang.String toString():512:512 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator -> com.android.tools.r8.t.a.a.a.e.j:
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterators$UnmodifiableIterator -> com.android.tools.r8.t.a.a.a.e.k:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator -> com.android.tools.r8.s.a.a.a.e.j:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterators$UnmodifiableIterator -> com.android.tools.r8.s.a.a.a.e.k:
     com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator i -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator):724:725 -> <init>
     1:1:boolean hasNext():730:730 -> hasNext
     1:1:boolean nextBoolean():735:735 -> nextBoolean
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2IntMap -> com.android.tools.r8.t.a.a.a.f.b:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2IntMap -> com.android.tools.r8.s.a.a.a.f.b:
     int com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2IntFunction.defRetValue -> a
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2IntFunction.<init>():44:44 -> <init>
     1:1:void <init>():46 -> <init>
@@ -38023,7 +38090,7 @@
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():311:311 -> toString
     2:2:java.lang.String toString():343 -> toString
     3:17:java.lang.String toString():343:357 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2IntMap$BasicEntry -> com.android.tools.r8.t.a.a.a.f.a:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2IntMap$BasicEntry -> com.android.tools.r8.s.a.a.a.f.a:
     int value -> b
     int key -> a
     1:3:void <init>(int,int):122:124 -> <init>
@@ -38042,7 +38109,7 @@
     3:3:java.lang.Integer setValue(java.lang.Integer):175 -> setValue
     3:3:java.lang.Object setValue(java.lang.Object):113 -> setValue
     1:1:java.lang.String toString():194:194 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ReferenceFunction -> com.android.tools.r8.t.a.a.a.f.c:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ReferenceFunction -> com.android.tools.r8.s.a.a.a.f.c:
     java.lang.Object defRetValue -> a
     1:1:void <init>():44:44 -> <init>
     1:1:java.lang.Object put(int,java.lang.Object):71:71 -> a
@@ -38053,7 +38120,7 @@
     2:4:java.lang.Object put(java.lang.Object,java.lang.Object):41 -> put
     1:1:java.lang.Object remove(int):82:82 -> remove
     2:4:java.lang.Object remove(java.lang.Object):153:155 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ReferenceMap -> com.android.tools.r8.t.a.a.a.f.e:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ReferenceMap -> com.android.tools.r8.s.a.a.a.f.e:
     1:1:void <init>():45:45 -> <init>
     boolean containsKey(int) -> a
     1:1:java.util.Set entrySet():42:42 -> entrySet
@@ -38064,7 +38131,7 @@
     14:16:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ReferenceFunction.put(java.lang.Integer,java.lang.Object):135:137 -> putAll
     14:16:void putAll(java.util.Map):82 -> putAll
     1:17:java.lang.String toString():304:320 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ReferenceMap$BasicEntry -> com.android.tools.r8.t.a.a.a.f.d:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ReferenceMap$BasicEntry -> com.android.tools.r8.s.a.a.a.f.d:
     java.lang.Object value -> b
     int key -> a
     1:3:void <init>(int,java.lang.Object):109:111 -> <init>
@@ -38076,7 +38143,7 @@
     1:1:int hashCode():151:151 -> hashCode
     1:1:java.lang.Object setValue(java.lang.Object):138:138 -> setValue
     1:1:java.lang.String toString():156:156 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ReferenceSortedMap -> com.android.tools.r8.t.a.a.a.f.f:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ReferenceSortedMap -> com.android.tools.r8.s.a.a.a.f.f:
     1:1:void <init>():33:33 -> <init>
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entrySet():293:293 -> entrySet
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():30 -> entrySet
@@ -38095,7 +38162,7 @@
     1:1:java.util.SortedMap tailMap(java.lang.Object):30:30 -> tailMap
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap tailMap(java.lang.Integer):59:59 -> tailMap
     2:2:java.util.SortedMap tailMap(java.lang.Object):30 -> tailMap
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ReferenceSortedMap$KeySet -> com.android.tools.r8.t.a.a.a.f.f$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ReferenceSortedMap$KeySet -> com.android.tools.r8.s.a.a.a.f.f$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ReferenceSortedMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ReferenceSortedMap):122:122 -> <init>
     1:1:boolean contains(int):125:125 -> b
@@ -38103,7 +38170,7 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntComparator comparator():140:140 -> comparator
     1:1:java.util.Comparator comparator():122 -> comparator
     1:1:int size():130:130 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection -> com.android.tools.r8.t.a.a.a.f.g:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection -> com.android.tools.r8.s.a.a.a.f.g:
     1:1:void <init>():37:37 -> <init>
     1:1:boolean add(int):68:68 -> a
     2:2:boolean add(java.lang.Integer):114:114 -> a
@@ -38128,12 +38195,12 @@
     1:1:boolean contains(java.lang.Object):129:129 -> contains
     1:1:boolean remove(java.lang.Object):143:143 -> remove
     1:14:java.lang.String toString():206:219 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntIterator -> com.android.tools.r8.t.a.a.a.f.h:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntIterator -> com.android.tools.r8.s.a.a.a.f.h:
     1:1:void <init>():34:34 -> <init>
     1:1:java.lang.Integer next():57:57 -> next
     1:1:java.lang.Object next():33 -> next
     1:1:void remove():68:68 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList -> com.android.tools.r8.t.a.a.a.f.k:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList -> com.android.tools.r8.s.a.a.a.f.k:
     1:1:void <init>():33:33 -> <init>
     boolean addAll(int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList) -> a
     1:1:boolean add(int):86:86 -> a
@@ -38188,7 +38255,7 @@
     2:5:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList subList(int,int):310:313 -> subList
     6:6:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList subList(int,int):312:312 -> subList
     1:14:java.lang.String toString():709:722 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList$IntSubList -> com.android.tools.r8.t.a.a.a.f.j:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList$IntSubList -> com.android.tools.r8.s.a.a.a.f.j:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList l -> a
     int from -> b
     int to -> c
@@ -38243,7 +38310,7 @@
     1:1:java.util.List subList(int,int):726:726 -> subList
     2:5:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList subList(int,int):880:883 -> subList
     6:6:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList subList(int,int):882:882 -> subList
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList$IntSubList$1 -> com.android.tools.r8.t.a.a.a.f.i:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList$IntSubList$1 -> com.android.tools.r8.s.a.a.a.f.i:
     boolean $assertionsDisabled -> e
     int last -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList$IntSubList this$0 -> d
@@ -38265,7 +38332,7 @@
     1:1:int previousIndex():848:848 -> previousIndex
     1:10:void remove():864:873 -> remove
     11:11:void remove():864:864 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntListIterator -> com.android.tools.r8.t.a.a.a.f.l:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntListIterator -> com.android.tools.r8.s.a.a.a.f.l:
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntBidirectionalIterator.<init>():34:34 -> <init>
     1:1:void <init>():35 -> <init>
     1:1:void add(int):57:57 -> a
@@ -38281,13 +38348,13 @@
     1:1:void set(java.lang.Object):34:34 -> set
     2:2:void set(java.lang.Integer):70:70 -> set
     2:2:void set(java.lang.Object):34 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntSet -> com.android.tools.r8.t.a.a.a.f.m:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntSet -> com.android.tools.r8.s.a.a.a.f.m:
     1:1:void <init>():32:32 -> <init>
     1:1:boolean rem(int):87:87 -> c
     1:4:boolean equals(java.lang.Object):41:44 -> equals
     1:5:int hashCode():57:61 -> hashCode
     1:1:boolean remove(int):75:75 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntSortedSet -> com.android.tools.r8.t.a.a.a.f.n:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntSortedSet -> com.android.tools.r8.s.a.a.a.f.n:
     1:1:void <init>():23:23 -> <init>
     1:1:java.lang.Integer first():94:94 -> first
     1:1:java.lang.Object first():22 -> first
@@ -38321,7 +38388,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 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.t.a.a.a.f.r:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap -> com.android.tools.r8.s.a.a.a.f.r:
     int[] key -> b
     int[] value -> c
     int size -> d
@@ -38355,8 +38422,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 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.t.a.a.a.f.o:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap$EntrySet -> com.android.tools.r8.t.a.a.a.f.q:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap$1 -> com.android.tools.r8.s.a.a.a.f.o:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap$EntrySet -> com.android.tools.r8.s.a.a.a.f.q:
     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>
@@ -38366,7 +38433,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.t.a.a.a.f.p:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap$EntrySet$1 -> com.android.tools.r8.s.a.a.a.f.p:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap$EntrySet this$1 -> c
     int next -> b
     int curr -> a
@@ -38378,16 +38445,16 @@
     3:3:java.lang.Object next():136 -> next
     1:5:void remove():153:157 -> remove
     6:6:void remove():153:153 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntFunction -> com.android.tools.r8.t.a.a.a.f.s:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntFunction -> com.android.tools.r8.s.a.a.a.f.s:
     boolean containsKey(int) -> a
     int put(int,int) -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap -> com.android.tools.r8.t.a.a.a.f.v:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap -> com.android.tools.r8.s.a.a.a.f.v:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2IntEntrySet() -> b
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$Entry -> com.android.tools.r8.t.a.a.a.f.t:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$Entry -> com.android.tools.r8.s.a.a.a.f.t:
     int getIntValue() -> a
     int getIntKey() -> b
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$FastEntrySet -> com.android.tools.r8.t.a.a.a.f.u:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap -> com.android.tools.r8.t.a.a.a.f.E:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$FastEntrySet -> com.android.tools.r8.s.a.a.a.f.u:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap -> com.android.tools.r8.s.a.a.a.f.E:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values -> l
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$FastEntrySet entries -> j
     float f -> i
@@ -38451,7 +38518,7 @@
     1:1:int size():428:428 -> size
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection 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.t.a.a.a.f.w:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$1 -> com.android.tools.r8.s.a.a.a.f.w:
     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
@@ -38459,7 +38526,7 @@
     1:1:java.util.Iterator iterator():866:866 -> iterator
     2:2: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.t.a.a.a.f.x:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$EntryIterator -> com.android.tools.r8.s.a.a.a.f.x:
     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>
@@ -38467,13 +38534,13 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$MapEntry 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.t.a.a.a.f.y:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$KeyIterator -> com.android.tools.r8.s.a.a.a.f.y:
     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:java.lang.Integer next():799:799 -> next
     1:1:java.lang.Object next():786 -> next
     1:1:int nextInt():793:793 -> nextInt
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$KeySet -> com.android.tools.r8.t.a.a.a.f.z:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$KeySet -> com.android.tools.r8.s.a.a.a.f.z:
     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>
@@ -38483,7 +38550,7 @@
     2:2: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.t.a.a.a.f.A:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$MapEntry -> com.android.tools.r8.s.a.a.a.f.A:
     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>
@@ -38504,7 +38571,7 @@
     5:5:java.lang.Integer 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.t.a.a.a.f.B:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$MapEntrySet -> com.android.tools.r8.s.a.a.a.f.B:
     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>
@@ -38514,7 +38581,7 @@
     2:2: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.t.a.a.a.f.C:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$MapIterator -> com.android.tools.r8.s.a.a.a.f.C:
     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
@@ -38535,13 +38602,13 @@
     23:23:void remove():644 -> remove
     24:25:void remove():647:648 -> remove
     26:26:void remove():641:641 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$ValueIterator -> com.android.tools.r8.t.a.a.a.f.D:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$ValueIterator -> com.android.tools.r8.s.a.a.a.f.D:
     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:java.lang.Integer next():860:860 -> next
     1:1:java.lang.Object next():847 -> next
     1:1:int nextInt():854:854 -> nextInt
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap -> com.android.tools.r8.t.a.a.a.f.K:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap -> com.android.tools.r8.s.a.a.a.f.K:
     boolean[] dirPath -> j
     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
@@ -38742,8 +38809,8 @@
     1:1:int size():985:985 -> size
     1:1:java.util.Collection values():41:41 -> values
     2:19: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.t.a.a.a.f.F:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$2 -> com.android.tools.r8.t.a.a.a.f.H:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$1 -> com.android.tools.r8.s.a.a.a.f.F:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$2 -> com.android.tools.r8.s.a.a.a.f.H:
     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>
@@ -38768,13 +38835,13 @@
     1:1:java.util.SortedSet tailSet(java.lang.Object):1161:1161 -> tailSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet 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.t.a.a.a.f.G:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$2$1 -> com.android.tools.r8.s.a.a.a.f.G:
     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 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.t.a.a.a.f.I:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$3 -> com.android.tools.r8.s.a.a.a.f.I:
     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
@@ -38782,7 +38849,7 @@
     1:1:java.util.Iterator iterator():1384:1384 -> iterator
     2:2: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.t.a.a.a.f.J:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry -> com.android.tools.r8.s.a.a.a.f.J:
     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
@@ -38809,7 +38876,7 @@
     1:1:boolean succ():795:795 -> k
     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.t.a.a.a.f.K$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$EntryIterator -> com.android.tools.r8.s.a.a.a.f.K$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 add(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1155:1155 -> add
@@ -38821,7 +38888,7 @@
     1:1:void set(java.lang.Object):1130:1130 -> set
     2:2:void 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.t.a.a.a.f.K$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$KeyIterator -> com.android.tools.r8.s.a.a.a.f.K$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 add(java.lang.Integer):1301:1301 -> add
@@ -38835,14 +38902,14 @@
     1:1:void set(java.lang.Object):1252:1252 -> set
     2:2:void 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.t.a.a.a.f.K$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$KeySet -> com.android.tools.r8.s.a.a.a.f.K$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.IntIterator iterator():1308:1308 -> iterator
     2:2:java.util.Iterator iterator():1308:1308 -> iterator
     3:3: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.t.a.a.a.f.K$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap -> com.android.tools.r8.s.a.a.a.f.K$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
@@ -38926,7 +38993,7 @@
     1:5:int size():1665:1669 -> size
     1:1:java.util.Collection values():1435:1435 -> values
     2:22: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.t.a.a.a.f.L:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$1 -> com.android.tools.r8.s.a.a.a.f.L:
     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
@@ -38961,7 +39028,7 @@
     1:1:java.util.SortedSet tailSet(java.lang.Object):1497:1497 -> tailSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet 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.t.a.a.a.f.M:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$2 -> com.android.tools.r8.s.a.a.a.f.M:
     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
@@ -38969,14 +39036,14 @@
     1:1:java.util.Iterator iterator():1598:1598 -> iterator
     2:2: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.t.a.a.a.f.K$d$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$KeySet -> com.android.tools.r8.s.a.a.a.f.K$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.IntIterator iterator():1580:1580 -> iterator
     2:2:java.util.Iterator iterator():1580:1580 -> iterator
     3:3: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.t.a.a.a.f.K$d$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapEntryIterator -> com.android.tools.r8.s.a.a.a.f.K$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 add(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1832:1832 -> add
@@ -38988,7 +39055,7 @@
     1:1:void set(java.lang.Object):1807:1807 -> set
     2:2:void 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.t.a.a.a.f.K$d$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapIterator -> com.android.tools.r8.s.a.a.a.f.K$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 -> i
@@ -39003,7 +39070,7 @@
     4:4:void updatePrevious():1798:1798 -> j
     5:5:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.compare(int,int):232:232 -> j
     5:5:void updatePrevious():1798 -> j
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapKeyIterator -> com.android.tools.r8.t.a.a.a.f.K$d$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapKeyIterator -> com.android.tools.r8.s.a.a.a.f.K$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 add(java.lang.Integer):1896:1896 -> add
@@ -39017,14 +39084,14 @@
     1:1:void set(java.lang.Object):1846:1846 -> set
     2:2:void 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.t.a.a.a.f.K$d$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapValueIterator -> com.android.tools.r8.s.a.a.a.f.K$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.t.a.a.a.f.K$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$TreeIterator -> com.android.tools.r8.s.a.a.a.f.K$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
@@ -39044,14 +39111,14 @@
     1:1:int previousIndex():1092:1092 -> previousIndex
     1:11:void remove():1096:1106 -> remove
     12:12:void remove():1096:1096 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$ValueIterator -> com.android.tools.r8.t.a.a.a.f.K$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$ValueIterator -> com.android.tools.r8.s.a.a.a.f.K$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.t.a.a.a.f.P:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap -> com.android.tools.r8.s.a.a.a.f.P:
     java.lang.Object[] value -> c
     int[] key -> b
     int size -> d
@@ -39081,8 +39148,8 @@
     1:1:int size():252:252 -> size
     1:1:java.util.Collection values():37:37 -> values
     2:2: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.t.a.a.a.f.N:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap$EntrySet -> com.android.tools.r8.t.a.a.a.f.P$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap$1 -> com.android.tools.r8.s.a.a.a.f.N:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap$EntrySet -> com.android.tools.r8.s.a.a.a.f.P$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>
@@ -39092,7 +39159,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.t.a.a.a.f.O:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap$EntrySet$1 -> com.android.tools.r8.s.a.a.a.f.O:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap$EntrySet this$1 -> c
     int next -> b
     int curr -> a
@@ -39104,18 +39171,18 @@
     3:3:java.lang.Object next():136 -> next
     1:6:void remove():153:158 -> remove
     7:7:void remove():153:153 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceFunction -> com.android.tools.r8.t.a.a.a.f.Q:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceFunction -> com.android.tools.r8.s.a.a.a.f.Q:
     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.t.a.a.a.f.S:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap -> com.android.tools.r8.s.a.a.a.f.S:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2ReferenceEntrySet() -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry -> com.android.tools.r8.t.a.a.a.f.S$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry -> com.android.tools.r8.s.a.a.a.f.S$a:
     int getIntKey() -> b
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$FastEntrySet -> com.android.tools.r8.t.a.a.a.f.T:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMaps -> com.android.tools.r8.t.a.a.a.f.V:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$FastEntrySet -> com.android.tools.r8.s.a.a.a.f.T:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMaps -> com.android.tools.r8.s.a.a.a.f.V:
     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.t.a.a.a.f.U:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMaps$EmptyMap -> com.android.tools.r8.s.a.a.a.f.U:
     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
@@ -39133,7 +39200,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 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.t.a.a.a.f.X:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap -> com.android.tools.r8.s.a.a.a.f.X:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$FastEntrySet entries -> j
     java.lang.Object[] value -> c
     float f -> i
@@ -39197,7 +39264,7 @@
     1:1:int size():386:386 -> size
     1:1:java.util.Collection values():49:49 -> values
     2:23: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.t.a.a.a.f.W:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$1 -> com.android.tools.r8.s.a.a.a.f.W:
     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
@@ -39205,7 +39272,7 @@
     1:1:java.util.Iterator iterator():794:794 -> iterator
     2:2: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.t.a.a.a.f.X$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$EntryIterator -> com.android.tools.r8.s.a.a.a.f.X$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>
@@ -39213,13 +39280,13 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapEntry 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.t.a.a.a.f.X$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$KeyIterator -> com.android.tools.r8.s.a.a.a.f.X$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:java.lang.Integer next():733:733 -> next
     1:1:java.lang.Object next():720 -> next
     1:1:int nextInt():727:727 -> nextInt
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$KeySet -> com.android.tools.r8.t.a.a.a.f.X$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$KeySet -> com.android.tools.r8.s.a.a.a.f.X$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>
@@ -39229,7 +39296,7 @@
     2:2: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.t.a.a.a.f.X$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapEntry -> com.android.tools.r8.s.a.a.a.f.X$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>
@@ -39241,7 +39308,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.t.a.a.a.f.X$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapEntrySet -> com.android.tools.r8.s.a.a.a.f.X$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>
@@ -39251,7 +39318,7 @@
     2:2: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.t.a.a.a.f.X$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapIterator -> com.android.tools.r8.s.a.a.a.f.X$f:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList wrapped -> e
     int last -> b
     int pos -> a
@@ -39272,21 +39339,21 @@
     25:25:void remove():580 -> remove
     26:27:void remove():583:584 -> remove
     28:28:void remove():576:576 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$ValueIterator -> com.android.tools.r8.t.a.a.a.f.X$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$ValueIterator -> com.android.tools.r8.s.a.a.a.f.X$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.Int2ReferenceSortedMap -> com.android.tools.r8.t.a.a.a.f.Y:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap -> com.android.tools.r8.s.a.a.a.f.Y:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet int2ReferenceEntrySet() -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap subMap(int,int) -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap tailMap(int) -> c
     int firstIntKey() -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap headMap(int) -> d
     int lastIntKey() -> i
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMaps -> com.android.tools.r8.t.a.a.a.f.a0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMaps -> com.android.tools.r8.s.a.a.a.f.a0:
     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.t.a.a.a.f.Z:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMaps$EmptySortedMap -> com.android.tools.r8.s.a.a.a.f.Z:
     1:1:void <init>():60:60 -> <init>
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet int2ReferenceEntrySet():71:71 -> a
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2ReferenceEntrySet():57 -> a
@@ -39329,7 +39396,7 @@
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap tailMap(int):107:107 -> tailMap
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap tailMap(java.lang.Integer):141 -> tailMap
     3:3:java.util.SortedMap tailMap(java.lang.Object):57 -> tailMap
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList -> com.android.tools.r8.t.a.a.a.f.c0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList -> com.android.tools.r8.s.a.a.a.f.c0:
     int size -> b
     1:3:void <init>(int):81:83 -> <init>
     4:4:void <init>(int):82:82 -> <init>
@@ -39375,7 +39442,7 @@
     1:3:int set(int,int):313:315 -> set
     4:4:int set(int,int):313:313 -> set
     1:1:int size():327:327 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList$1 -> com.android.tools.r8.t.a.a.a.f.b0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList$1 -> com.android.tools.r8.s.a.a.a.f.b0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList this$0 -> d
     int last -> b
     int val$index -> c
@@ -39394,7 +39461,7 @@
     1:1:int previousIndex():520:520 -> previousIndex
     1:9:void remove():534:542 -> remove
     10:10:void remove():534:534 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet -> com.android.tools.r8.t.a.a.a.f.e0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet -> com.android.tools.r8.s.a.a.a.f.e0:
     int size -> b
     1:2:void <init>():55:56 -> <init>
     3:4:void <init>(int):65:66 -> <init>
@@ -39416,7 +39483,7 @@
     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.t.a.a.a.f.d0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet$1 -> com.android.tools.r8.s.a.a.a.f.d0:
     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>
@@ -39424,18 +39491,18 @@
     1:2:int nextInt():129:130 -> nextInt
     3:3:int nextInt():129:129 -> nextInt
     1:2:void remove():135:136 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrays -> com.android.tools.r8.t.a.a.a.f.f0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrays -> com.android.tools.r8.s.a.a.a.f.f0:
     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.t.a.a.a.f.g0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator -> com.android.tools.r8.s.a.a.a.f.g0:
     int previousInt() -> d
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection -> com.android.tools.r8.t.a.a.a.f.h0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection -> com.android.tools.r8.s.a.a.a.f.h0:
     boolean add(int) -> a
     boolean contains(int) -> b
     int[] toIntArray() -> c
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollections -> com.android.tools.r8.t.a.a.a.f.k0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollections -> com.android.tools.r8.s.a.a.a.f.k0:
     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.t.a.a.a.f.i0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollections$EmptyCollection -> com.android.tools.r8.s.a.a.a.f.i0:
     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
@@ -39446,7 +39513,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.t.a.a.a.f.j0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollections$UnmodifiableCollection -> com.android.tools.r8.s.a.a.a.f.j0:
     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>
     4:4:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):370:370 -> <init>
@@ -39474,17 +39541,17 @@
     1:1:java.lang.Object[] toArray(java.lang.Object[]):422:422 -> toArray
     2:2:java.lang.Object[] toArray():427:427 -> toArray
     1:1:java.lang.String toString():512:512 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntComparator -> com.android.tools.r8.t.a.a.a.f.l0:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator -> com.android.tools.r8.t.a.a.a.f.m0:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators -> com.android.tools.r8.t.a.a.a.f.q0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntComparator -> com.android.tools.r8.s.a.a.a.f.l0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator -> com.android.tools.r8.s.a.a.a.f.m0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators -> com.android.tools.r8.s.a.a.a.f.q0:
     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.t.a.a.a.f.n0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators$EmptyIterator -> com.android.tools.r8.s.a.a.a.f.n0:
     1:1:void <init>():42:42 -> <init>
     1:1:java.lang.Object clone():87:87 -> clone
     1:1:int previousInt():62:62 -> d
     1:1:int nextInt():57:57 -> nextInt
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators$SingletonIterator -> com.android.tools.r8.t.a.a.a.f.o0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators$SingletonIterator -> com.android.tools.r8.s.a.a.a.f.o0:
     int curr -> b
     int element -> a
     1:2:void <init>(int):110:111 -> <init>
@@ -39496,24 +39563,24 @@
     1:3:int nextInt():126:128 -> nextInt
     4:4:int nextInt():126:126 -> nextInt
     1:1:int previousIndex():145:145 -> previousIndex
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators$UnmodifiableIterator -> com.android.tools.r8.t.a.a.a.f.p0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators$UnmodifiableIterator -> com.android.tools.r8.s.a.a.a.f.p0:
     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 -> nextInt
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList -> com.android.tools.r8.t.a.a.a.f.r0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList -> com.android.tools.r8.s.a.a.a.f.r0:
     boolean add(int) -> a
     boolean addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList) -> a
     void getElements(int,int[],int,int) -> a
     void removeElements(int,int) -> a
     int removeInt(int) -> e
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator -> com.android.tools.r8.t.a.a.a.f.s0:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists -> com.android.tools.r8.t.a.a.a.f.u0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator -> com.android.tools.r8.s.a.a.a.f.s0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists -> com.android.tools.r8.s.a.a.a.f.u0:
     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.t.a.a.a.f.t0:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists$EmptyList -> com.android.tools.r8.t.a.a.a.f.u0$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists$1 -> com.android.tools.r8.s.a.a.a.f.t0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists$EmptyList -> com.android.tools.r8.s.a.a.a.f.u0$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
@@ -39557,7 +39624,7 @@
     3:3:int set(int,int):90:90 -> set
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList 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.t.a.a.a.f.v0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists$Singleton -> com.android.tools.r8.s.a.a.a.f.v0:
     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>
@@ -39590,7 +39657,7 @@
     1:1:java.util.List subList(int,int):332:332 -> subList
     2:5:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList subList(int,int):390:393 -> subList
     6:6:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList subList(int,int):392:392 -> subList
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet -> com.android.tools.r8.t.a.a.a.f.y0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet -> com.android.tools.r8.s.a.a.a.f.y0:
     float f -> g
     int size -> f
     int n -> d
@@ -39645,8 +39712,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.t.a.a.a.f.w0:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet$SetIterator -> com.android.tools.r8.t.a.a.a.f.x0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet$1 -> com.android.tools.r8.s.a.a.a.f.w0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet$SetIterator -> com.android.tools.r8.s.a.a.a.f.x0:
     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
@@ -39667,21 +39734,21 @@
     23:23:void remove():532 -> remove
     24:25:void remove():535:536 -> remove
     26:26:void remove():528:528 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet -> com.android.tools.r8.t.a.a.a.f.z0:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSets -> com.android.tools.r8.t.a.a.a.f.B0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet -> com.android.tools.r8.s.a.a.a.f.z0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSets -> com.android.tools.r8.s.a.a.a.f.B0:
     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.t.a.a.a.f.A0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSets$EmptySet -> com.android.tools.r8.s.a.a.a.f.A0:
     1:1:void <init>():42:42 -> <init>
     1:1:boolean rem(int):64:64 -> c
     1:1:java.lang.Object clone():52:52 -> clone
     1:1:boolean equals(java.lang.Object):58:58 -> equals
     1:1:boolean remove(int):47:47 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet -> com.android.tools.r8.t.a.a.a.f.C0:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSets -> com.android.tools.r8.t.a.a.a.f.E0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet -> com.android.tools.r8.s.a.a.a.f.C0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSets -> com.android.tools.r8.s.a.a.a.f.E0:
     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.t.a.a.a.f.D0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSets$EmptySet -> com.android.tools.r8.s.a.a.a.f.D0:
     1:1:void <init>():42:42 -> <init>
     1:1:java.lang.Object clone():155:155 -> clone
     1:1:java.lang.Integer first():139:139 -> first
@@ -39697,8 +39764,8 @@
     1:1:java.util.SortedSet tailSet(java.lang.Object):39:39 -> tailSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet 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.t.a.a.a.f.F0:
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLong2ReferenceMap -> com.android.tools.r8.t.a.a.a.g.a:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntStack -> com.android.tools.r8.s.a.a.a.f.F0:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLong2ReferenceMap -> com.android.tools.r8.s.a.a.a.g.a:
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLong2ReferenceFunction.<init>():44:44 -> <init>
     1:1:void <init>():45 -> <init>
     java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLong2ReferenceFunction.put(long,java.lang.Object) -> a
@@ -39738,7 +39805,7 @@
     11:11:long com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapEntry.getLongKey():439:439 -> toString
     11:11:java.lang.String toString():314 -> toString
     12:18:java.lang.String toString():314:320 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLongBidirectionalIterator -> com.android.tools.r8.t.a.a.a.g.b:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLongBidirectionalIterator -> com.android.tools.r8.s.a.a.a.g.b:
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLongIterator.<init>():34:34 -> <init>
     1:1:void <init>():34 -> <init>
     long previousLong() -> a
@@ -39749,7 +39816,7 @@
     long com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLongIterator.nextLong() -> nextLong
     1:1:java.lang.Long previous():56:56 -> previous
     1:1:java.lang.Object previous():33 -> previous
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLongCollection -> com.android.tools.r8.t.a.a.a.g.c:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLongCollection -> com.android.tools.r8.s.a.a.a.g.c:
     1:1:void <init>():37:37 -> <init>
     1:1:boolean add(long):68:68 -> a
     1:1:boolean add(java.lang.Object):36:36 -> add
@@ -39760,7 +39827,7 @@
     1:1:boolean contains(java.lang.Object):129:129 -> contains
     1:1:boolean remove(java.lang.Object):143:143 -> remove
     1:14:java.lang.String toString():206:219 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLongList -> com.android.tools.r8.t.a.a.a.g.f:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLongList -> com.android.tools.r8.s.a.a.a.g.f:
     1:1:void <init>():33:33 -> <init>
     void add(int,long) -> a
     void removeElements(int,int) -> a
@@ -39835,7 +39902,7 @@
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongListIterator iterator():180 -> toString
     2:2:java.lang.String toString():709 -> toString
     3:14:java.lang.String toString():710:721 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLongList$LongSubList -> com.android.tools.r8.t.a.a.a.g.e:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLongList$LongSubList -> com.android.tools.r8.s.a.a.a.g.e:
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongList l -> a
     int from -> b
     int to -> c
@@ -39886,7 +39953,7 @@
     1:1:java.util.List subList(int,int):725:725 -> subList
     2:5:com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongList subList(int,int):879:882 -> subList
     6:6:com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongList subList(int,int):881:881 -> subList
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLongList$LongSubList$1 -> com.android.tools.r8.t.a.a.a.g.d:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLongList$LongSubList$1 -> com.android.tools.r8.s.a.a.a.g.d:
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLongList$LongSubList this$0 -> d
     boolean $assertionsDisabled -> e
     int last -> b
@@ -39908,7 +39975,7 @@
     1:1:int previousIndex():847:847 -> previousIndex
     1:10:void remove():863:872 -> remove
     11:11:void remove():863:863 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLongListIterator -> com.android.tools.r8.t.a.a.a.g.g:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLongListIterator -> com.android.tools.r8.s.a.a.a.g.g:
     1:1:void <init>():35:35 -> <init>
     void add(long) -> a
     1:1:void add(java.lang.Object):34:34 -> add
@@ -39918,17 +39985,17 @@
     1:1:void set(java.lang.Object):34:34 -> set
     2:2:void set(java.lang.Long):70:70 -> set
     2:2:void set(java.lang.Object):34 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLongSet -> com.android.tools.r8.t.a.a.a.g.h:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLongSet -> com.android.tools.r8.s.a.a.a.g.h:
     1:1:void <init>():32:32 -> <init>
     1:1:boolean rem(long):87:87 -> c
     2:4:boolean com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$KeySet.remove(long):755:757 -> c
     2:4:boolean rem(long):87 -> c
     1:4:boolean equals(java.lang.Object):41:44 -> equals
     1:7:int hashCode():57:63 -> hashCode
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap -> com.android.tools.r8.t.a.a.a.g.k:
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap$Entry -> com.android.tools.r8.t.a.a.a.g.i:
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap$FastEntrySet -> com.android.tools.r8.t.a.a.a.g.j:
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap -> com.android.tools.r8.t.a.a.a.g.m:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap -> com.android.tools.r8.s.a.a.a.g.k:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap$Entry -> com.android.tools.r8.s.a.a.a.g.i:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap$FastEntrySet -> com.android.tools.r8.s.a.a.a.g.j:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap -> com.android.tools.r8.s.a.a.a.g.m:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values -> k
     java.lang.Object[] value -> b
     float f -> h
@@ -39988,7 +40055,7 @@
     1:1:int size():386:386 -> size
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection 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.t.a.a.a.g.l:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$1 -> com.android.tools.r8.s.a.a.a.g.l:
     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
@@ -39996,7 +40063,7 @@
     1:1:java.util.Iterator iterator():794:794 -> iterator
     2:2: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.t.a.a.a.g.m$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$EntryIterator -> com.android.tools.r8.s.a.a.a.g.m$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>
@@ -40004,13 +40071,13 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapEntry 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.t.a.a.a.g.m$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$KeyIterator -> com.android.tools.r8.s.a.a.a.g.m$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:java.lang.Long next():733:733 -> next
     1:1:java.lang.Object next():720 -> next
     1:1:long nextLong():727:727 -> nextLong
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$KeySet -> com.android.tools.r8.t.a.a.a.g.m$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$KeySet -> com.android.tools.r8.s.a.a.a.g.m$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>
@@ -40019,7 +40086,7 @@
     1:1:java.util.Iterator iterator():737:737 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongIterator iterator():740:740 -> iterator
     1:1:int size():745:745 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapEntry -> com.android.tools.r8.t.a.a.a.g.m$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapEntry -> com.android.tools.r8.s.a.a.a.g.m$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>
@@ -40030,7 +40097,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.t.a.a.a.g.m$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapEntrySet -> com.android.tools.r8.s.a.a.a.g.m$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>
@@ -40040,7 +40107,7 @@
     2:2: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.t.a.a.a.g.m$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapIterator -> com.android.tools.r8.s.a.a.a.g.m$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
@@ -40061,11 +40128,11 @@
     25:25:void remove():580 -> remove
     26:27:void remove():583:584 -> remove
     28:28:void remove():576:576 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$ValueIterator -> com.android.tools.r8.t.a.a.a.g.m$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$ValueIterator -> com.android.tools.r8.s.a.a.a.g.m$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.t.a.a.a.g.o:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongArrayList -> com.android.tools.r8.s.a.a.a.g.o:
     int size -> b
     1:3:void <init>(int):81:83 -> <init>
     4:4:void <init>(int):82:82 -> <init>
@@ -40094,7 +40161,7 @@
     3:4: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.t.a.a.a.g.n:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongArrayList$1 -> com.android.tools.r8.s.a.a.a.g.n:
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongArrayList this$0 -> d
     int last -> b
     int val$index -> c
@@ -40113,17 +40180,17 @@
     1:1:int previousIndex():520:520 -> previousIndex
     1:9:void remove():534:542 -> remove
     10:10:void remove():534:534 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongBidirectionalIterator -> com.android.tools.r8.t.a.a.a.g.p:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongBidirectionalIterator -> com.android.tools.r8.s.a.a.a.g.p:
     long previousLong() -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongCollection -> com.android.tools.r8.t.a.a.a.g.q:
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongIterator -> com.android.tools.r8.t.a.a.a.g.r:
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongList -> com.android.tools.r8.t.a.a.a.g.s:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongCollection -> com.android.tools.r8.s.a.a.a.g.q:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongIterator -> com.android.tools.r8.s.a.a.a.g.r:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongList -> com.android.tools.r8.s.a.a.a.g.s:
     void add(int,long) -> a
     void removeElements(int,int) -> a
     long set(int,long) -> b
     long removeLong(int) -> f
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongSet -> com.android.tools.r8.t.a.a.a.g.t:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanMap -> com.android.tools.r8.t.a.a.a.h.b:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongSet -> com.android.tools.r8.s.a.a.a.g.t:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanMap -> com.android.tools.r8.s.a.a.a.h.b:
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanFunction.<init>():44:44 -> <init>
     1:1:void <init>():45 -> <init>
     boolean containsValue(boolean) -> a
@@ -40174,7 +40241,7 @@
     17:17:boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanMap$BasicEntry.getBooleanValue():145:145 -> toString
     17:17:java.lang.String toString():341 -> toString
     18:21:java.lang.String toString():341:344 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanMap$BasicEntry -> com.android.tools.r8.t.a.a.a.h.a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanMap$BasicEntry -> com.android.tools.r8.s.a.a.a.h.a:
     java.lang.Object key -> a
     boolean value -> b
     1:3:void <init>(java.lang.Object,boolean):121:123 -> <init>
@@ -40191,7 +40258,7 @@
     3:3:java.lang.Boolean setValue(java.lang.Boolean):162 -> setValue
     3:3:java.lang.Object setValue(java.lang.Object):112 -> setValue
     1:1:java.lang.String toString():180:180 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2IntMap -> com.android.tools.r8.t.a.a.a.h.d:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2IntMap -> com.android.tools.r8.s.a.a.a.h.d:
     int com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2IntFunction.defRetValue -> a
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2IntFunction.<init>():44:44 -> <init>
     1:1:void <init>():45 -> <init>
@@ -40224,7 +40291,7 @@
     1:3:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2IntFunction.remove(java.lang.Object):41 -> remove
     1:3:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2IntFunction.remove(java.lang.Object):0 -> remove
     1:17:java.lang.String toString():328:344 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2IntMap$BasicEntry -> com.android.tools.r8.t.a.a.a.h.c:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2IntMap$BasicEntry -> com.android.tools.r8.s.a.a.a.h.c:
     java.lang.Object key -> a
     int value -> b
     1:3:void <init>(java.lang.Object,int):121:123 -> <init>
@@ -40241,7 +40308,7 @@
     3:3:java.lang.Integer setValue(java.lang.Integer):162 -> setValue
     3:3:java.lang.Object setValue(java.lang.Object):112 -> setValue
     1:1:java.lang.String toString():180:180 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2IntSortedMap -> com.android.tools.r8.t.a.a.a.h.e:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2IntSortedMap -> com.android.tools.r8.s.a.a.a.h.e:
     1:1:void <init>():34:34 -> <init>
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entrySet():229:229 -> entrySet
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():31 -> entrySet
@@ -40255,7 +40322,7 @@
     5:6:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap.object2IntEntrySet():87 -> entrySet
     5:6:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entrySet():229 -> entrySet
     5:6:java.util.Set entrySet():31 -> entrySet
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2LongMap -> com.android.tools.r8.t.a.a.a.h.f:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2LongMap -> com.android.tools.r8.s.a.a.a.h.f:
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2LongFunction.<init>():44:44 -> <init>
     1:1:void <init>():45 -> <init>
     boolean containsValue(long) -> a
@@ -40293,7 +40360,7 @@
     4:4:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap.size():429:429 -> toString
     4:4:java.lang.String toString():330 -> toString
     5:16:java.lang.String toString():333:344 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2ObjectMap -> com.android.tools.r8.t.a.a.a.h.g:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2ObjectMap -> com.android.tools.r8.s.a.a.a.h.g:
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2ObjectFunction.<init>():44:44 -> <init>
     1:1:void <init>():45 -> <init>
     1:3:boolean equals(java.lang.Object):272:274 -> equals
@@ -40325,20 +40392,20 @@
     8:8:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap.size():761:761 -> toString
     8:8:java.lang.String toString():282 -> toString
     9:21:java.lang.String toString():285:297 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2ObjectSortedMap -> com.android.tools.r8.t.a.a.a.h.h:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2ObjectSortedMap -> com.android.tools.r8.s.a.a.a.h.h:
     1:1:void <init>():34:34 -> <init>
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entrySet():226:226 -> entrySet
     1:1:java.util.Set entrySet():31 -> entrySet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap.object2ObjectEntrySet():85:85 -> entrySet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entrySet():226 -> entrySet
     2:2:java.util.Set entrySet():31 -> entrySet
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObjectCollection -> com.android.tools.r8.t.a.a.a.h.i:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObjectCollection -> com.android.tools.r8.s.a.a.a.h.i:
     1:1:void <init>():37:37 -> <init>
     1:15:java.lang.String toString():61:75 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObjectIterator -> com.android.tools.r8.t.a.a.a.h.j:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObjectIterator -> com.android.tools.r8.s.a.a.a.h.j:
     1:1:void <init>():34:34 -> <init>
     1:1:void remove():45:45 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObjectList -> com.android.tools.r8.t.a.a.a.h.m:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObjectList -> com.android.tools.r8.s.a.a.a.h.m:
     1:1:void <init>():34:34 -> <init>
     void removeElements(int,int) -> a
     1:5:boolean addAll(int,java.util.Collection):121:125 -> addAll
@@ -40390,7 +40457,7 @@
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator iterator():181 -> toString
     2:2:java.lang.String toString():503 -> toString
     3:15:java.lang.String toString():504:516 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObjectList$ObjectSubList -> com.android.tools.r8.t.a.a.a.h.l:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObjectList$ObjectSubList -> com.android.tools.r8.s.a.a.a.h.l:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectList l -> a
     int from -> b
     int to -> c
@@ -40422,7 +40489,7 @@
     1:1:java.util.List subList(int,int):520:520 -> subList
     2:5:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectList subList(int,int):674:677 -> subList
     6:6:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectList subList(int,int):676:676 -> subList
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObjectList$ObjectSubList$1 -> com.android.tools.r8.t.a.a.a.h.k:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObjectList$ObjectSubList$1 -> com.android.tools.r8.s.a.a.a.h.k:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObjectList$ObjectSubList this$0 -> d
     boolean $assertionsDisabled -> e
     int last -> b
@@ -40444,18 +40511,18 @@
     11:11:void remove():658:658 -> remove
     1:2:void set(java.lang.Object):653:654 -> set
     3:3:void set(java.lang.Object):653:653 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObjectListIterator -> com.android.tools.r8.t.a.a.a.h.n:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObjectListIterator -> com.android.tools.r8.s.a.a.a.h.n:
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObjectBidirectionalIterator.<init>():34:34 -> <init>
     1:1:void <init>():35 -> <init>
     1:1:void add(java.lang.Object):57:57 -> add
     1:1:void set(java.lang.Object):46:46 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObjectSet -> com.android.tools.r8.t.a.a.a.h.o:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObjectSet -> com.android.tools.r8.s.a.a.a.h.o:
     1:1:void <init>():32:32 -> <init>
     1:4:boolean equals(java.lang.Object):41:44 -> equals
     1:7:int hashCode():57:63 -> hashCode
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObjectSortedSet -> com.android.tools.r8.t.a.a.a.h.p:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObjectSortedSet -> com.android.tools.r8.s.a.a.a.h.p:
     1:1:void <init>():23:23 -> <init>
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2BooleanMap -> com.android.tools.r8.t.a.a.a.h.q:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2BooleanMap -> com.android.tools.r8.s.a.a.a.h.q:
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2BooleanFunction.<init>():44:44 -> <init>
     1:1:void <init>():45 -> <init>
     boolean containsValue(boolean) -> a
@@ -40499,7 +40566,7 @@
     14:14:boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapEntry.getBooleanValue():442:442 -> toString
     14:14:java.lang.String toString():341 -> toString
     15:18:java.lang.String toString():341:344 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntMap -> com.android.tools.r8.t.a.a.a.h.s:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntMap -> com.android.tools.r8.s.a.a.a.h.s:
     int com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntFunction.defRetValue -> a
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntFunction.<init>():44:44 -> <init>
     1:1:void <init>():45 -> <init>
@@ -40532,7 +40599,7 @@
     1:3:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntFunction.remove(java.lang.Object):41 -> remove
     1:3:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntFunction.remove(java.lang.Object):0 -> remove
     1:17:java.lang.String toString():328:344 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntMap$BasicEntry -> com.android.tools.r8.t.a.a.a.h.r:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntMap$BasicEntry -> com.android.tools.r8.s.a.a.a.h.r:
     java.lang.Object key -> a
     int value -> b
     1:3:void <init>(java.lang.Object,int):121:123 -> <init>
@@ -40549,7 +40616,7 @@
     3:3:java.lang.Integer setValue(java.lang.Integer):162 -> setValue
     3:3:java.lang.Object setValue(java.lang.Object):112 -> setValue
     1:1:java.lang.String toString():180:180 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntSortedMap -> com.android.tools.r8.t.a.a.a.h.t:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntSortedMap -> com.android.tools.r8.s.a.a.a.h.t:
     1:1:void <init>():34:34 -> <init>
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entrySet():229:229 -> entrySet
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():31 -> entrySet
@@ -40563,10 +40630,10 @@
     5:6:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap.reference2IntEntrySet():87 -> entrySet
     5:6:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entrySet():229 -> entrySet
     5:6:java.util.Set entrySet():31 -> entrySet
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReferenceCollection -> com.android.tools.r8.t.a.a.a.h.u:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReferenceCollection -> com.android.tools.r8.s.a.a.a.h.u:
     1:1:void <init>():37:37 -> <init>
     1:15:java.lang.String toString():61:75 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReferenceList -> com.android.tools.r8.t.a.a.a.h.x:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReferenceList -> com.android.tools.r8.s.a.a.a.h.x:
     1:1:void <init>():34:34 -> <init>
     void removeElements(int,int) -> a
     1:5:boolean addAll(int,java.util.Collection):121:125 -> addAll
@@ -40605,7 +40672,7 @@
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator iterator():181 -> toString
     2:2:java.lang.String toString():462 -> toString
     3:15:java.lang.String toString():463:475 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReferenceList$ReferenceSubList -> com.android.tools.r8.t.a.a.a.h.w:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReferenceList$ReferenceSubList -> com.android.tools.r8.s.a.a.a.h.w:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceList l -> a
     int from -> b
     int to -> c
@@ -40636,7 +40703,7 @@
     1:1:java.util.List subList(int,int):479:479 -> subList
     2:5:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceList subList(int,int):633:636 -> subList
     6:6:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceList subList(int,int):635:635 -> subList
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReferenceList$ReferenceSubList$1 -> com.android.tools.r8.t.a.a.a.h.v:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReferenceList$ReferenceSubList$1 -> com.android.tools.r8.s.a.a.a.h.v:
     boolean $assertionsDisabled -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReferenceList$ReferenceSubList this$0 -> d
     int last -> b
@@ -40658,13 +40725,13 @@
     11:11:void remove():617:617 -> remove
     1:2:void set(java.lang.Object):612:613 -> set
     3:3:void set(java.lang.Object):612:612 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReferenceSet -> com.android.tools.r8.t.a.a.a.h.y:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReferenceSet -> com.android.tools.r8.s.a.a.a.h.y:
     1:1:void <init>():32:32 -> <init>
     1:4:boolean equals(java.lang.Object):41:44 -> equals
     1:7:int hashCode():57:63 -> hashCode
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReferenceSortedSet -> com.android.tools.r8.t.a.a.a.h.z:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReferenceSortedSet -> com.android.tools.r8.s.a.a.a.h.z:
     1:1:void <init>():23:23 -> <init>
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap -> com.android.tools.r8.t.a.a.a.h.C:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap -> com.android.tools.r8.s.a.a.a.h.C:
     java.lang.Object[] key -> a
     boolean[] value -> b
     int size -> c
@@ -40693,8 +40760,8 @@
     1:1:int size():252:252 -> size
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection 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.t.a.a.a.h.A:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$EntrySet -> com.android.tools.r8.t.a.a.a.h.C$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$1 -> com.android.tools.r8.s.a.a.a.h.A:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$EntrySet -> com.android.tools.r8.s.a.a.a.h.C$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>
@@ -40704,7 +40771,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.t.a.a.a.h.B:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$EntrySet$1 -> com.android.tools.r8.s.a.a.a.h.B:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$EntrySet this$1 -> c
     int next -> b
     int curr -> a
@@ -40716,9 +40783,9 @@
     3:3:java.lang.Object next():136 -> next
     1:6:void remove():153:158 -> remove
     7:7:void remove():153:153 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap -> com.android.tools.r8.t.a.a.a.h.D:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap$Entry -> com.android.tools.r8.t.a.a.a.h.D$a:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap -> com.android.tools.r8.t.a.a.a.h.G:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap -> com.android.tools.r8.s.a.a.a.h.D:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap$Entry -> com.android.tools.r8.s.a.a.a.h.D$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap -> com.android.tools.r8.s.a.a.a.h.G:
     java.lang.Object[] key -> b
     int[] value -> c
     int size -> d
@@ -40749,8 +40816,8 @@
     1:1:int size():252:252 -> size
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection 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.t.a.a.a.h.E:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$EntrySet -> com.android.tools.r8.t.a.a.a.h.G$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$1 -> com.android.tools.r8.s.a.a.a.h.E:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$EntrySet -> com.android.tools.r8.s.a.a.a.h.G$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>
@@ -40760,7 +40827,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.t.a.a.a.h.F:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$EntrySet$1 -> com.android.tools.r8.s.a.a.a.h.F:
     int next -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$EntrySet this$1 -> c
     int curr -> a
@@ -40772,10 +40839,10 @@
     3:3:java.lang.Object next():136 -> next
     1:6:void remove():153:158 -> remove
     7:7:void remove():153:153 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntFunction -> com.android.tools.r8.t.a.a.a.h.H:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntFunction -> com.android.tools.r8.s.a.a.a.h.H:
     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.t.a.a.a.h.J:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap -> com.android.tools.r8.s.a.a.a.h.J:
     float f -> l
     java.lang.Object[] key -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values -> o
@@ -40853,7 +40920,7 @@
     1:1:java.util.SortedMap tailMap(java.lang.Object):87 -> tailMap
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection 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.t.a.a.a.h.I:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$1 -> com.android.tools.r8.s.a.a.a.h.I:
     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
@@ -40861,7 +40928,7 @@
     1:1:java.util.Iterator iterator():1596:1596 -> iterator
     2:2: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.t.a.a.a.h.J$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$EntryIterator -> com.android.tools.r8.s.a.a.a.h.J$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>
@@ -40876,14 +40943,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.t.a.a.a.h.J$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$KeyIterator -> com.android.tools.r8.s.a.a.a.h.J$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.t.a.a.a.h.J$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$KeySet -> com.android.tools.r8.s.a.a.a.h.J$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>
@@ -40905,7 +40972,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 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.t.a.a.a.h.J$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$MapEntry -> com.android.tools.r8.s.a.a.a.h.J$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>
@@ -40924,7 +40991,7 @@
     5:5:java.lang.Integer 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.t.a.a.a.h.J$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$MapEntrySet -> com.android.tools.r8.s.a.a.a.h.J$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>
@@ -40952,7 +41019,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 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.t.a.a.a.h.J$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$MapIterator -> com.android.tools.r8.s.a.a.a.h.J$f:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap this$0 -> e
     int index -> d
     int next -> b
@@ -40973,7 +41040,7 @@
     1:47:void remove():1145:1191 -> remove
     48:48:void remove():1185:1185 -> remove
     49:49:void remove():1146:1146 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$ValueIterator -> com.android.tools.r8.t.a.a.a.h.J$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$ValueIterator -> com.android.tools.r8.s.a.a.a.h.J$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
@@ -40988,12 +41055,12 @@
     1:1:void set(java.lang.Object):1544:1544 -> set
     2:2:void 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.t.a.a.a.h.M:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap -> com.android.tools.r8.s.a.a.a.h.M:
     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.t.a.a.a.h.K:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$Entry -> com.android.tools.r8.s.a.a.a.h.K:
     int getIntValue() -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$FastEntrySet -> com.android.tools.r8.t.a.a.a.h.L:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap -> com.android.tools.r8.t.a.a.a.h.O:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$FastEntrySet -> com.android.tools.r8.s.a.a.a.h.L:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap -> com.android.tools.r8.s.a.a.a.h.O:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet keys -> k
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values -> l
     java.lang.Object[] key -> b
@@ -41055,7 +41122,7 @@
     1:1:int size():429:429 -> size
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection 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.t.a.a.a.h.N:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$1 -> com.android.tools.r8.s.a.a.a.h.N:
     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
@@ -41063,7 +41130,7 @@
     1:1:java.util.Iterator iterator():848:848 -> iterator
     2:2: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.t.a.a.a.h.O$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$EntryIterator -> com.android.tools.r8.s.a.a.a.h.O$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>
@@ -41071,11 +41138,11 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$MapEntry 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.t.a.a.a.h.O$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$KeyIterator -> com.android.tools.r8.s.a.a.a.h.O$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.t.a.a.a.h.O$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$KeySet -> com.android.tools.r8.s.a.a.a.h.O$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>
@@ -41085,7 +41152,7 @@
     2:2: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.t.a.a.a.h.O$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$MapEntry -> com.android.tools.r8.s.a.a.a.h.O$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>
@@ -41104,7 +41171,7 @@
     5:5:java.lang.Integer 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.t.a.a.a.h.O$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$MapEntrySet -> com.android.tools.r8.s.a.a.a.h.O$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>
@@ -41114,7 +41181,7 @@
     2:2: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.t.a.a.a.h.O$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$MapIterator -> com.android.tools.r8.s.a.a.a.h.O$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
@@ -41135,18 +41202,18 @@
     24:24:void remove():634 -> remove
     25:26:void remove():637:638 -> remove
     27:27:void remove():630:630 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$ValueIterator -> com.android.tools.r8.t.a.a.a.h.O$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$ValueIterator -> com.android.tools.r8.s.a.a.a.h.O$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:java.lang.Integer next():842:842 -> next
     1:1:java.lang.Object next():829 -> next
     1:1:int nextInt():836:836 -> nextInt
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntSortedMap$FastSortedEntrySet -> com.android.tools.r8.t.a.a.a.h.P:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap -> com.android.tools.r8.t.a.a.a.h.Q:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap$Entry -> com.android.tools.r8.t.a.a.a.h.Q$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntSortedMap$FastSortedEntrySet -> com.android.tools.r8.s.a.a.a.h.P:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap -> com.android.tools.r8.s.a.a.a.h.Q:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap$Entry -> com.android.tools.r8.s.a.a.a.h.Q$a:
     long getLongValue() -> c
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap$FastEntrySet -> com.android.tools.r8.t.a.a.a.h.S:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap -> com.android.tools.r8.t.a.a.a.h.U:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap$FastEntrySet -> com.android.tools.r8.s.a.a.a.h.S:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap -> com.android.tools.r8.s.a.a.a.h.U:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet keys -> j
     float f -> h
     java.lang.Object[] key -> a
@@ -41209,7 +41276,7 @@
     1:1:int size():429:429 -> size
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongCollection 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.t.a.a.a.h.T:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$1 -> com.android.tools.r8.s.a.a.a.h.T:
     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:boolean contains(long):861:861 -> b
@@ -41217,7 +41284,7 @@
     1:1:java.util.Iterator iterator():848:848 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongIterator iterator():851:851 -> iterator
     1:1:int size():856:856 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$EntryIterator -> com.android.tools.r8.t.a.a.a.h.U$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$EntryIterator -> com.android.tools.r8.s.a.a.a.h.U$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>
@@ -41225,11 +41292,11 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$MapEntry 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.t.a.a.a.h.U$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$KeyIterator -> com.android.tools.r8.s.a.a.a.h.U$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.t.a.a.a.h.U$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$KeySet -> com.android.tools.r8.s.a.a.a.h.U$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>
@@ -41239,7 +41306,7 @@
     2:2: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.t.a.a.a.h.U$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$MapEntry -> com.android.tools.r8.s.a.a.a.h.U$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>
@@ -41258,7 +41325,7 @@
     5:5:java.lang.Long 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.t.a.a.a.h.U$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$MapEntrySet -> com.android.tools.r8.s.a.a.a.h.U$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>
@@ -41268,7 +41335,7 @@
     2:2: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.t.a.a.a.h.U$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$MapIterator -> com.android.tools.r8.s.a.a.a.h.U$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
@@ -41289,13 +41356,13 @@
     24:24:void remove():634 -> remove
     25:26:void remove():637:638 -> remove
     27:27:void remove():630:630 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$ValueIterator -> com.android.tools.r8.t.a.a.a.h.U$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$ValueIterator -> com.android.tools.r8.s.a.a.a.h.U$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:java.lang.Long next():842:842 -> next
     1:1:java.lang.Object next():829 -> next
     1:1:long nextLong():836:836 -> nextLong
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap -> com.android.tools.r8.t.a.a.a.h.W:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap -> com.android.tools.r8.s.a.a.a.h.W:
     float f -> l
     java.lang.Object[] value -> b
     int maxFill -> j
@@ -41370,7 +41437,7 @@
     1:1:java.util.SortedMap tailMap(java.lang.Object):85 -> tailMap
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection 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.t.a.a.a.h.V:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$1 -> com.android.tools.r8.s.a.a.a.h.V:
     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
@@ -41378,7 +41445,7 @@
     1:1:java.util.Iterator iterator():1529:1529 -> iterator
     2:2: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.t.a.a.a.h.W$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$EntryIterator -> com.android.tools.r8.s.a.a.a.h.W$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>
@@ -41393,14 +41460,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.t.a.a.a.h.W$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$KeyIterator -> com.android.tools.r8.s.a.a.a.h.W$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.t.a.a.a.h.W$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$KeySet -> com.android.tools.r8.s.a.a.a.h.W$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>
@@ -41422,7 +41489,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 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.t.a.a.a.h.W$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$MapEntry -> com.android.tools.r8.s.a.a.a.h.W$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>
@@ -41432,7 +41499,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.t.a.a.a.h.W$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$MapEntrySet -> com.android.tools.r8.s.a.a.a.h.W$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>
@@ -41460,7 +41527,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 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.t.a.a.a.h.W$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$MapIterator -> com.android.tools.r8.s.a.a.a.h.W$f:
     int index -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap this$0 -> e
     int next -> b
@@ -41481,17 +41548,17 @@
     1:49:void remove():1102:1150 -> remove
     50:50:void remove():1144:1144 -> remove
     51:51:void remove():1103:1103 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$ValueIterator -> com.android.tools.r8.t.a.a.a.h.W$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$ValueIterator -> com.android.tools.r8.s.a.a.a.h.W$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.t.a.a.a.h.Y:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry -> com.android.tools.r8.t.a.a.a.h.X:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectSortedMap$FastSortedEntrySet -> com.android.tools.r8.t.a.a.a.h.Z:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList -> com.android.tools.r8.t.a.a.a.h.b0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap -> com.android.tools.r8.s.a.a.a.h.Y:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry -> com.android.tools.r8.s.a.a.a.h.X:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectSortedMap$FastSortedEntrySet -> com.android.tools.r8.s.a.a.a.h.Z:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList -> com.android.tools.r8.s.a.a.a.h.b0:
     java.lang.Object[] a -> b
     boolean wrapped -> a
     int size -> c
@@ -41519,7 +41586,7 @@
     1:3:java.lang.Object set(int,java.lang.Object):357:359 -> set
     4: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.t.a.a.a.h.a0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList$1 -> com.android.tools.r8.s.a.a.a.h.a0:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList this$0 -> d
     int last -> b
     int val$index -> c
@@ -41538,7 +41605,7 @@
     10:10:void remove():538:538 -> remove
     1:2:void set(java.lang.Object):533:534 -> set
     3:3:void set(java.lang.Object):533:533 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArraySet -> com.android.tools.r8.t.a.a.a.h.d0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArraySet -> com.android.tools.r8.s.a.a.a.h.d0:
     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
@@ -41558,7 +41625,7 @@
     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.t.a.a.a.h.c0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArraySet$1 -> com.android.tools.r8.s.a.a.a.h.c0:
     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>
@@ -41566,16 +41633,16 @@
     1:2:java.lang.Object next():129:130 -> next
     3: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.t.a.a.a.h.e0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrays -> com.android.tools.r8.s.a.a.a.h.e0:
     java.lang.Object[] EMPTY_ARRAY -> a
     1:1:void <clinit>():88:88 -> <clinit>
     1:2:java.lang.Object[] grow(java.lang.Object[],int,int):213:214 -> a
     3:5:java.lang.Object[] newArray(java.lang.Object[],int):106:108 -> a
     3:5:java.lang.Object[] grow(java.lang.Object[],int,int):215 -> a
     6:6:java.lang.Object[] grow(java.lang.Object[],int,int):216:216 -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator -> com.android.tools.r8.t.a.a.a.h.f0:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection -> com.android.tools.r8.t.a.a.a.h.g0:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollections$EmptyCollection -> com.android.tools.r8.t.a.a.a.h.h0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator -> com.android.tools.r8.s.a.a.a.h.f0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection -> com.android.tools.r8.s.a.a.a.h.g0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollections$EmptyCollection -> com.android.tools.r8.s.a.a.a.h.h0:
     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.ObjectBidirectionalIterator iterator():55:55 -> iterator
@@ -41586,37 +41653,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.t.a.a.a.h.i0:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators -> com.android.tools.r8.t.a.a.a.h.l0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator -> com.android.tools.r8.s.a.a.a.h.i0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators -> com.android.tools.r8.s.a.a.a.h.l0:
     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.t.a.a.a.h.j0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators$EmptyIterator -> com.android.tools.r8.s.a.a.a.h.j0:
     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.t.a.a.a.h.k0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators$UnmodifiableIterator -> com.android.tools.r8.s.a.a.a.h.k0:
     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.t.a.a.a.h.m0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectList -> com.android.tools.r8.s.a.a.a.h.m0:
     void removeElements(int,int) -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator -> com.android.tools.r8.t.a.a.a.h.n0:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet -> com.android.tools.r8.t.a.a.a.h.o0:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSets -> com.android.tools.r8.t.a.a.a.h.q0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator -> com.android.tools.r8.s.a.a.a.h.n0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet -> com.android.tools.r8.s.a.a.a.h.o0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSets -> com.android.tools.r8.s.a.a.a.h.q0:
     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.t.a.a.a.h.p0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSets$EmptySet -> com.android.tools.r8.s.a.a.a.h.p0:
     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.t.a.a.a.h.r0:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSets -> com.android.tools.r8.t.a.a.a.h.t0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet -> com.android.tools.r8.s.a.a.a.h.r0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSets -> com.android.tools.r8.s.a.a.a.h.t0:
     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.t.a.a.a.h.s0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSets$EmptySet -> com.android.tools.r8.s.a.a.a.h.s0:
     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
@@ -41627,10 +41694,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 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.t.a.a.a.h.w0:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap$Entry -> com.android.tools.r8.t.a.a.a.h.u0:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap$FastEntrySet -> com.android.tools.r8.t.a.a.a.h.v0:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap -> com.android.tools.r8.t.a.a.a.h.y0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap -> com.android.tools.r8.s.a.a.a.h.w0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap$Entry -> com.android.tools.r8.s.a.a.a.h.u0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap$FastEntrySet -> com.android.tools.r8.s.a.a.a.h.v0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap -> com.android.tools.r8.s.a.a.a.h.y0:
     com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection values -> k
     float f -> h
     java.lang.Object[] key -> a
@@ -41691,7 +41758,7 @@
     1:1:int size():384:384 -> size
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection 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.t.a.a.a.h.x0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$1 -> com.android.tools.r8.s.a.a.a.h.x0:
     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
@@ -41699,7 +41766,7 @@
     1:1:java.util.Iterator iterator():803:803 -> iterator
     2:2: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.t.a.a.a.h.y0$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$EntryIterator -> com.android.tools.r8.s.a.a.a.h.y0$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>
@@ -41707,11 +41774,11 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapEntry 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.t.a.a.a.h.y0$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$KeyIterator -> com.android.tools.r8.s.a.a.a.h.y0$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.t.a.a.a.h.y0$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$KeySet -> com.android.tools.r8.s.a.a.a.h.y0$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>
@@ -41721,7 +41788,7 @@
     2:2: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.t.a.a.a.h.y0$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapEntry -> com.android.tools.r8.s.a.a.a.h.y0$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>
@@ -41739,7 +41806,7 @@
     5:5:java.lang.Boolean 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.t.a.a.a.h.y0$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapEntrySet -> com.android.tools.r8.s.a.a.a.h.y0$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>
@@ -41749,7 +41816,7 @@
     2:2: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.t.a.a.a.h.y0$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapIterator -> com.android.tools.r8.s.a.a.a.h.y0$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
@@ -41770,13 +41837,13 @@
     24:24:void remove():589 -> remove
     25:26:void remove():592:593 -> remove
     27:27:void remove():585:585 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$ValueIterator -> com.android.tools.r8.t.a.a.a.h.y0$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$ValueIterator -> com.android.tools.r8.s.a.a.a.h.y0$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:java.lang.Boolean next():797:797 -> next
     1:1:java.lang.Object next():784 -> next
     1:1:boolean nextBoolean():791:791 -> nextBoolean
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap -> com.android.tools.r8.t.a.a.a.h.B0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap -> com.android.tools.r8.s.a.a.a.h.B0:
     java.lang.Object[] key -> b
     int[] value -> c
     int size -> d
@@ -41805,8 +41872,8 @@
     1:1:int size():252:252 -> size
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection 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.t.a.a.a.h.z0:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$EntrySet -> com.android.tools.r8.t.a.a.a.h.B0$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$1 -> com.android.tools.r8.s.a.a.a.h.z0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$EntrySet -> com.android.tools.r8.s.a.a.a.h.B0$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>
@@ -41816,7 +41883,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.t.a.a.a.h.A0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$EntrySet$1 -> com.android.tools.r8.s.a.a.a.h.A0:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$EntrySet this$1 -> c
     int next -> b
     int curr -> a
@@ -41828,10 +41895,10 @@
     3:3:java.lang.Object next():136 -> next
     1:6:void remove():153:158 -> remove
     7:7:void remove():153:153 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntFunction -> com.android.tools.r8.t.a.a.a.h.C0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntFunction -> com.android.tools.r8.s.a.a.a.h.C0:
     int getInt(java.lang.Object) -> a
     int put(java.lang.Object,int) -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap -> com.android.tools.r8.t.a.a.a.h.E0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap -> com.android.tools.r8.s.a.a.a.h.E0:
     float f -> l
     java.lang.Object[] key -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values -> o
@@ -41908,7 +41975,7 @@
     1:1:java.util.SortedMap tailMap(java.lang.Object):87 -> tailMap
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection 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.t.a.a.a.h.D0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$1 -> com.android.tools.r8.s.a.a.a.h.D0:
     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
@@ -41916,7 +41983,7 @@
     1:1:java.util.Iterator iterator():1596:1596 -> iterator
     2:2: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.t.a.a.a.h.E0$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$EntryIterator -> com.android.tools.r8.s.a.a.a.h.E0$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>
@@ -41931,14 +41998,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.t.a.a.a.h.E0$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$KeyIterator -> com.android.tools.r8.s.a.a.a.h.E0$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.t.a.a.a.h.E0$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$KeySet -> com.android.tools.r8.s.a.a.a.h.E0$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>
@@ -41960,7 +42027,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 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.t.a.a.a.h.E0$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$MapEntry -> com.android.tools.r8.s.a.a.a.h.E0$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>
@@ -41979,7 +42046,7 @@
     5:5:java.lang.Integer 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.t.a.a.a.h.E0$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$MapEntrySet -> com.android.tools.r8.s.a.a.a.h.E0$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>
@@ -42007,7 +42074,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 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.t.a.a.a.h.E0$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$MapIterator -> com.android.tools.r8.s.a.a.a.h.E0$f:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap this$0 -> e
     int index -> d
     int next -> b
@@ -42028,7 +42095,7 @@
     1:47:void remove():1145:1191 -> remove
     48:48:void remove():1185:1185 -> remove
     49:49:void remove():1146:1146 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$ValueIterator -> com.android.tools.r8.t.a.a.a.h.E0$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$ValueIterator -> com.android.tools.r8.s.a.a.a.h.E0$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
@@ -42043,12 +42110,12 @@
     1:1:void set(java.lang.Object):1544:1544 -> set
     2:2:void 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.t.a.a.a.h.F0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap -> com.android.tools.r8.s.a.a.a.h.F0:
     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.t.a.a.a.h.F0$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$Entry -> com.android.tools.r8.s.a.a.a.h.F0$a:
     int getIntValue() -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$FastEntrySet -> com.android.tools.r8.t.a.a.a.h.G0:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap -> com.android.tools.r8.t.a.a.a.h.I0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$FastEntrySet -> com.android.tools.r8.s.a.a.a.h.G0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap -> com.android.tools.r8.s.a.a.a.h.I0:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$FastEntrySet entries -> j
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values -> l
     java.lang.Object[] key -> b
@@ -42112,7 +42179,7 @@
     1:1:int size():429:429 -> size
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection 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.t.a.a.a.h.H0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$1 -> com.android.tools.r8.s.a.a.a.h.H0:
     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
@@ -42120,7 +42187,7 @@
     1:1:java.util.Iterator iterator():848:848 -> iterator
     2:2: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.t.a.a.a.h.I0$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$EntryIterator -> com.android.tools.r8.s.a.a.a.h.I0$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>
@@ -42128,11 +42195,11 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapEntry 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.t.a.a.a.h.I0$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$KeyIterator -> com.android.tools.r8.s.a.a.a.h.I0$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.t.a.a.a.h.I0$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$KeySet -> com.android.tools.r8.s.a.a.a.h.I0$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>
@@ -42142,7 +42209,7 @@
     2:2: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.t.a.a.a.h.I0$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapEntry -> com.android.tools.r8.s.a.a.a.h.I0$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>
@@ -42161,7 +42228,7 @@
     5:5:java.lang.Integer 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.t.a.a.a.h.I0$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapEntrySet -> com.android.tools.r8.s.a.a.a.h.I0$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>
@@ -42171,7 +42238,7 @@
     2:2: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.t.a.a.a.h.I0$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapIterator -> com.android.tools.r8.s.a.a.a.h.I0$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
@@ -42192,14 +42259,14 @@
     24:24:void remove():634 -> remove
     25:26:void remove():637:638 -> remove
     27:27:void remove():630:630 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$ValueIterator -> com.android.tools.r8.t.a.a.a.h.I0$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$ValueIterator -> com.android.tools.r8.s.a.a.a.h.I0$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:java.lang.Integer next():842:842 -> next
     1:1:java.lang.Object next():829 -> next
     1:1:int nextInt():836:836 -> nextInt
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntSortedMap$FastSortedEntrySet -> com.android.tools.r8.t.a.a.a.h.J0:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList -> com.android.tools.r8.t.a.a.a.h.L0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntSortedMap$FastSortedEntrySet -> com.android.tools.r8.s.a.a.a.h.J0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList -> com.android.tools.r8.s.a.a.a.h.L0:
     java.lang.Object[] a -> b
     boolean wrapped -> a
     int size -> c
@@ -42227,7 +42294,7 @@
     1:3:java.lang.Object set(int,java.lang.Object):357:359 -> set
     4: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.t.a.a.a.h.K0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList$1 -> com.android.tools.r8.s.a.a.a.h.K0:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList this$0 -> d
     int last -> b
     int val$index -> c
@@ -42246,7 +42313,7 @@
     10:10:void remove():538:538 -> remove
     1:2:void set(java.lang.Object):533:534 -> set
     3:3:void set(java.lang.Object):533:533 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet -> com.android.tools.r8.t.a.a.a.h.N0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet -> com.android.tools.r8.s.a.a.a.h.N0:
     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
@@ -42266,7 +42333,7 @@
     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.t.a.a.a.h.M0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet$1 -> com.android.tools.r8.s.a.a.a.h.M0:
     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>
@@ -42274,10 +42341,10 @@
     1:2:java.lang.Object next():129:130 -> next
     3: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.t.a.a.a.h.O0:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollections -> com.android.tools.r8.t.a.a.a.h.R0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection -> com.android.tools.r8.s.a.a.a.h.O0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollections -> com.android.tools.r8.s.a.a.a.h.R0:
     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.t.a.a.a.h.P0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollections$EmptyCollection -> com.android.tools.r8.s.a.a.a.h.P0:
     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.ObjectBidirectionalIterator iterator():55:55 -> iterator
@@ -42287,7 +42354,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.t.a.a.a.h.Q0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollections$UnmodifiableCollection -> com.android.tools.r8.s.a.a.a.h.Q0:
     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>
     4:4:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection):277:277 -> <init>
@@ -42310,9 +42377,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.t.a.a.a.h.S0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceList -> com.android.tools.r8.s.a.a.a.h.S0:
     void removeElements(int,int) -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet -> com.android.tools.r8.t.a.a.a.h.U0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet -> com.android.tools.r8.s.a.a.a.h.U0:
     java.lang.Object[] key -> a
     float f -> g
     int size -> f
@@ -42362,8 +42429,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.t.a.a.a.h.T0:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet$SetIterator -> com.android.tools.r8.t.a.a.a.h.U0$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet$1 -> com.android.tools.r8.s.a.a.a.h.T0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet$SetIterator -> com.android.tools.r8.s.a.a.a.h.U0$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
@@ -42384,17 +42451,17 @@
     23:23:void remove():500 -> remove
     24:25:void remove():503:504 -> remove
     26:26:void remove():496:496 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet -> com.android.tools.r8.t.a.a.a.h.V0:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSets -> com.android.tools.r8.t.a.a.a.h.X0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet -> com.android.tools.r8.s.a.a.a.h.V0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSets -> com.android.tools.r8.s.a.a.a.h.X0:
     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.t.a.a.a.h.W0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSets$EmptySet -> com.android.tools.r8.s.a.a.a.h.W0:
     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.t.a.a.a.h.Y0:
-com.android.tools.r8.jar.CfApplicationWriter -> com.android.tools.r8.u.b:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSortedSet -> com.android.tools.r8.s.a.a.a.h.Y0:
+com.android.tools.r8.jar.CfApplicationWriter -> com.android.tools.r8.t.b:
     com.android.tools.r8.graph.DexApplication application -> a
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.graph.GraphLense graphLense -> c
@@ -42406,86 +42473,87 @@
     1:1:void <clinit>():62:62 -> <clinit>
     1:9:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.dex.Marker,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.naming.ProguardMapSupplier):86:94 -> <init>
     1:1:int com.android.tools.r8.graph.ParameterAnnotationsList.getAnnotableParameterCount():66:66 -> a
-    1:1:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):349 -> a
-    2:2:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):348:348 -> a
+    1:1:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):354 -> a
+    2:2:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):353:353 -> a
     3:3:int com.android.tools.r8.graph.ParameterAnnotationsList.getAnnotableParameterCount():66:66 -> a
-    3:3:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):351 -> a
-    4:11:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):350:357 -> a
-    12:12:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):355:355 -> a
+    3:3:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):356 -> a
+    4:11:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):355:362 -> a
+    12:12:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):360:360 -> a
     13:17:void write(com.android.tools.r8.ClassFileConsumer,java.util.concurrent.ExecutorService):98:102 -> a
-    18:18:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,java.lang.String):132:132 -> a
+    18:18:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,java.lang.String):134:134 -> a
     19:19:void com.android.tools.r8.org.objectweb.asm.ClassWriter.<init>(int):209:209 -> a
-    19:19:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,java.lang.String):132 -> a
-    20:22:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,java.lang.String):133:135 -> a
-    23:28:int getClassFileVersion(com.android.tools.r8.graph.DexProgramClass):211:216 -> a
-    23:28:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,java.lang.String):136 -> a
-    29:43:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,java.lang.String):137:151 -> a
-    44:55:com.android.tools.r8.com.google.common.collect.ImmutableMap getAnnotationDefaults(com.android.tools.r8.graph.DexAnnotationSet):249:260 -> a
-    44:55:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,java.lang.String):151 -> a
-    56:98:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,java.lang.String):153:195 -> a
+    19:19:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,java.lang.String):134 -> a
+    20:22:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,java.lang.String):135:137 -> a
+    23:28:int getClassFileVersion(com.android.tools.r8.graph.DexProgramClass):216:221 -> a
+    23:28:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,java.lang.String):138 -> a
+    29:43:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,java.lang.String):139:153 -> a
+    44:55:com.android.tools.r8.com.google.common.collect.ImmutableMap getAnnotationDefaults(com.android.tools.r8.graph.DexAnnotationSet):254:265 -> a
+    44:55:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,java.lang.String):153 -> a
+    56:98:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,java.lang.String):155:197 -> a
     99:103:void com.android.tools.r8.utils.ExceptionUtils.withConsumeResourceHandler(com.android.tools.r8.utils.Reporter,java.util.function.Consumer):37:41 -> a
-    99:103:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,java.lang.String):195 -> a
-    104:104:void lambda$writeClass$0(com.android.tools.r8.ClassFileConsumer,byte[],java.lang.String,com.android.tools.r8.DiagnosticsHandler):196:196 -> a
-    105:108:int getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):200:203 -> a
-    109:109:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():324:324 -> a
-    109:109:int getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):204 -> a
-    110:114:int getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):203:207 -> a
-    115:122:com.android.tools.r8.graph.DexValue getSystemAnnotationValue(com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexType):222:229 -> a
-    123:135:java.lang.String getSignature(com.android.tools.r8.graph.DexAnnotationSet):233:245 -> a
-    136:139:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):286:289 -> a
-    140:143:java.lang.Object getStaticValue(com.android.tools.r8.graph.DexEncodedField):279:282 -> a
-    140:143:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):290 -> a
-    144:146:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):291:293 -> a
-    147:151:void writeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap,int):301:305 -> a
-    152:161:java.lang.String[] getExceptions(com.android.tools.r8.graph.DexAnnotationSet):264:273 -> a
-    152:161:void writeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap,int):305 -> a
-    162:170:void writeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap,int):306:314 -> a
-    171:184:void writeMethodParametersAnnotation(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.DexAnnotation[]):324:337 -> a
-    171:184:void writeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap,int):314 -> a
-    185:187:void writeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap,int):315:317 -> a
-    188:188:void writeCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,int):435:435 -> a
-    188:188:void writeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap,int):318 -> a
-    189:189:void writeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap,int):320:320 -> a
-    190:190:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor lambda$writeParameterAnnotations$1(com.android.tools.r8.org.objectweb.asm.MethodVisitor,int,java.lang.String,boolean):356:356 -> a
-    191:200:void writeAnnotations(com.android.tools.r8.jar.CfApplicationWriter$AnnotationConsumer,com.android.tools.r8.graph.DexAnnotation[]):366:375 -> a
-    201:206:void writeAnnotations(com.android.tools.r8.jar.CfApplicationWriter$AnnotationConsumer,com.android.tools.r8.graph.DexAnnotation[]):374:379 -> a
-    207:208:void writeAnnotation(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,com.android.tools.r8.graph.DexEncodedAnnotation):385:386 -> a
-    209:213:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):391:395 -> a
-    214:232:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):394:412 -> a
-    233:252:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):411:430 -> a
-    253:253:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):428:428 -> a
-    254:254:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):420:420 -> a
-    255:255:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):418:418 -> a
-    256:256:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):416:416 -> a
-    257:257:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):414:414 -> a
+    99:103:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,java.lang.String):197 -> a
+    104:104:void lambda$writeClass$0(com.android.tools.r8.ClassFileConsumer,byte[],java.lang.String,com.android.tools.r8.DiagnosticsHandler):198:198 -> a
+    105:108:int getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):202:205 -> a
+    109:109:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():316:316 -> a
+    109:109:int getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):206 -> a
+    110:110:int getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):206:206 -> a
+    111:118:int getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):205:212 -> a
+    119:126:com.android.tools.r8.graph.DexValue getSystemAnnotationValue(com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexType):227:234 -> a
+    127:139:java.lang.String getSignature(com.android.tools.r8.graph.DexAnnotationSet):238:250 -> a
+    140:143:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):291:294 -> a
+    144:147:java.lang.Object getStaticValue(com.android.tools.r8.graph.DexEncodedField):284:287 -> a
+    144:147:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):295 -> a
+    148:150:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):296:298 -> a
+    151:155:void writeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap,int):306:310 -> a
+    156:165:java.lang.String[] getExceptions(com.android.tools.r8.graph.DexAnnotationSet):269:278 -> a
+    156:165:void writeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap,int):310 -> a
+    166:174:void writeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap,int):311:319 -> a
+    175:188:void writeMethodParametersAnnotation(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.DexAnnotation[]):329:342 -> a
+    175:188:void writeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap,int):319 -> a
+    189:191:void writeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap,int):320:322 -> a
+    192:192:void writeCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,int):440:440 -> a
+    192:192:void writeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap,int):323 -> a
+    193:193:void writeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap,int):325:325 -> a
+    194:194:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor lambda$writeParameterAnnotations$1(com.android.tools.r8.org.objectweb.asm.MethodVisitor,int,java.lang.String,boolean):361:361 -> a
+    195:204:void writeAnnotations(com.android.tools.r8.jar.CfApplicationWriter$AnnotationConsumer,com.android.tools.r8.graph.DexAnnotation[]):371:380 -> a
+    205:210:void writeAnnotations(com.android.tools.r8.jar.CfApplicationWriter$AnnotationConsumer,com.android.tools.r8.graph.DexAnnotation[]):379:384 -> a
+    211:212:void writeAnnotation(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,com.android.tools.r8.graph.DexEncodedAnnotation):390:391 -> a
+    213:217:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):396:400 -> a
+    218:236:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):399:417 -> a
+    237:256:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):416:435 -> a
+    257:257:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):433:433 -> a
+    258:258:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):425:425 -> a
+    259:259:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):423:423 -> a
+    260:260:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):421:421 -> a
+    261:261:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):419:419 -> a
     1:9:void writeApplication(com.android.tools.r8.ClassFileConsumer,java.util.concurrent.ExecutorService):108:116 -> b
-    10:10:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():324:324 -> b
-    10:10:void writeApplication(com.android.tools.r8.ClassFileConsumer,java.util.concurrent.ExecutorService):116 -> b
-    11:11:void writeApplication(com.android.tools.r8.ClassFileConsumer,java.util.concurrent.ExecutorService):119:119 -> b
-    12:23:void writeApplication(com.android.tools.r8.ClassFileConsumer,java.util.concurrent.ExecutorService):117:128 -> b
-    24:24:void writeApplication(com.android.tools.r8.ClassFileConsumer,java.util.concurrent.ExecutorService):122:122 -> b
-com.android.tools.r8.jar.CfApplicationWriter$AnnotationConsumer -> com.android.tools.r8.u.a:
+    10:10:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():316:316 -> b
+    10:10:void writeApplication(com.android.tools.r8.ClassFileConsumer,java.util.concurrent.ExecutorService):117 -> b
+    11:15:void writeApplication(com.android.tools.r8.ClassFileConsumer,java.util.concurrent.ExecutorService):117:121 -> b
+    16:27:void writeApplication(com.android.tools.r8.ClassFileConsumer,java.util.concurrent.ExecutorService):119:130 -> b
+    28:28:void writeApplication(com.android.tools.r8.ClassFileConsumer,java.util.concurrent.ExecutorService):124:124 -> b
+com.android.tools.r8.jar.CfApplicationWriter$AnnotationConsumer -> com.android.tools.r8.t.a:
     com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visit(java.lang.String,boolean) -> a
-com.android.tools.r8.jar.InliningConstraintVisitor -> com.android.tools.r8.u.c:
+com.android.tools.r8.jar.InliningConstraintVisitor -> com.android.tools.r8.t.c:
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():37:37 -> <clinit>
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget getConstraintForInvoke(int,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):213:213 -> a
     2:31:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget getConstraintForInvoke(int,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):161:190 -> a
     32:64:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget getConstraintForInvoke(int,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):166:198 -> a
-    65:65:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    65:65:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     65:65:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget getConstraintForInvoke(int,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):199 -> a
     66:82:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget getConstraintForInvoke(int,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):200:216 -> a
     83:83:boolean noNeedToUseGraphLense(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.GraphLense):221:221 -> a
-com.android.tools.r8.jetbrains.kotlin.DeprecationLevel -> com.android.tools.r8.v.a.a:
+com.android.tools.r8.jetbrains.kotlin.DeprecationLevel -> com.android.tools.r8.u.a.a:
     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.v.a.b:
+com.android.tools.r8.jetbrains.kotlin.KotlinNullPointerException -> com.android.tools.r8.u.a.b:
     1:1:void <init>():9:9 -> <init>
-com.android.tools.r8.jetbrains.kotlin.Lazy -> com.android.tools.r8.v.a.c:
-com.android.tools.r8.jetbrains.kotlin.LazyKt -> com.android.tools.r8.v.a.d:
+com.android.tools.r8.jetbrains.kotlin.Lazy -> com.android.tools.r8.u.a.c:
+com.android.tools.r8.jetbrains.kotlin.LazyKt -> com.android.tools.r8.u.a.d:
     1:38:com.android.tools.r8.jetbrains.kotlin.Lazy com.android.tools.r8.jetbrains.kotlin.LazyKt__LazyJVMKt.lazy(com.android.tools.r8.jetbrains.kotlin.LazyThreadSafetyMode,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0):0:37 -> a
     1:38: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
     39:39: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):36:36 -> a
@@ -42500,16 +42568,16 @@
     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.jvm.functions.Function0):21 -> a
     64:64:com.android.tools.r8.jetbrains.kotlin.Lazy lazy(com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0):0 -> a
-com.android.tools.r8.jetbrains.kotlin.LazyKt__LazyKt -> com.android.tools.r8.v.a.e:
-com.android.tools.r8.jetbrains.kotlin.LazyThreadSafetyMode -> com.android.tools.r8.v.a.f:
+com.android.tools.r8.jetbrains.kotlin.LazyKt__LazyKt -> com.android.tools.r8.u.a.e:
+com.android.tools.r8.jetbrains.kotlin.LazyThreadSafetyMode -> com.android.tools.r8.u.a.f:
     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.v.a.g:
+com.android.tools.r8.jetbrains.kotlin.NoWhenBranchMatchedException -> com.android.tools.r8.u.a.g:
     1:1:void <init>():9:9 -> <init>
-com.android.tools.r8.jetbrains.kotlin.Pair -> com.android.tools.r8.v.a.h:
+com.android.tools.r8.jetbrains.kotlin.Pair -> com.android.tools.r8.u.a.h:
     java.lang.Object second -> b
     java.lang.Object first -> a
     1:1:void <init>(java.lang.Object,java.lang.Object):26:26 -> <init>
@@ -42518,7 +42586,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.v.a.i:
+com.android.tools.r8.jetbrains.kotlin.SafePublicationLazyImpl -> com.android.tools.r8.u.a.i:
     java.util.concurrent.atomic.AtomicReferenceFieldUpdater valueUpdater -> c
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0 initializer -> a
     java.lang.Object _value -> b
@@ -42528,7 +42596,7 @@
     1:1:boolean 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.v.a.j:
+com.android.tools.r8.jetbrains.kotlin.SynchronizedLazyImpl -> com.android.tools.r8.u.a.j:
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0 initializer -> a
     java.lang.Object _value -> b
     java.lang.Object lock -> c
@@ -42539,19 +42607,19 @@
     1:1:boolean isInitialized():82:82 -> toString
     1:1:java.lang.String toString():84 -> toString
     2:2:java.lang.String toString():84:84 -> toString
-com.android.tools.r8.jetbrains.kotlin.TypeCastException -> com.android.tools.r8.v.a.k:
+com.android.tools.r8.jetbrains.kotlin.TypeCastException -> com.android.tools.r8.u.a.k:
     1:1:void <init>(java.lang.String):11:11 -> <init>
-com.android.tools.r8.jetbrains.kotlin.UNINITIALIZED_VALUE -> com.android.tools.r8.v.a.l:
+com.android.tools.r8.jetbrains.kotlin.UNINITIALIZED_VALUE -> com.android.tools.r8.u.a.l:
     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.v.a.m:
+com.android.tools.r8.jetbrains.kotlin.UninitializedPropertyAccessException -> com.android.tools.r8.u.a.m:
     1:1:void <init>(java.lang.String):11:11 -> <init>
-com.android.tools.r8.jetbrains.kotlin.Unit -> com.android.tools.r8.v.a.n:
+com.android.tools.r8.jetbrains.kotlin.Unit -> com.android.tools.r8.u.a.n:
     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.v.a.o:
+com.android.tools.r8.jetbrains.kotlin.UnsafeLazyImpl -> com.android.tools.r8.u.a.o:
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0 initializer -> a
     java.lang.Object _value -> b
     1:3:void <init>(com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0):74:76 -> <init>
@@ -42560,10 +42628,10 @@
     1:1:boolean 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.v.a.p:
+com.android.tools.r8.jetbrains.kotlin._Assertions -> com.android.tools.r8.u.a.p:
     boolean ENABLED -> a
     1:1:void <clinit>():14:14 -> <clinit>
-com.android.tools.r8.jetbrains.kotlin.collections.AbstractCollection -> com.android.tools.r8.v.a.q.b:
+com.android.tools.r8.jetbrains.kotlin.collections.AbstractCollection -> com.android.tools.r8.u.a.q.b:
     1:1:void <init>():13:13 -> <init>
     int getSize() -> a
     1:2:boolean contains(java.lang.Object):40:41 -> contains
@@ -42576,11 +42644,11 @@
     1:1:java.lang.Object[] toArray():31:31 -> toArray
     2:2:java.lang.Object[] toArray(java.lang.Object[]):37:37 -> toArray
     1:1:java.lang.String toString():24:24 -> toString
-com.android.tools.r8.jetbrains.kotlin.collections.AbstractCollection$toString$1 -> com.android.tools.r8.v.a.q.a:
+com.android.tools.r8.jetbrains.kotlin.collections.AbstractCollection$toString$1 -> com.android.tools.r8.u.a.q.a:
     com.android.tools.r8.jetbrains.kotlin.collections.AbstractCollection this$0 -> a
     1:1:java.lang.CharSequence invoke(java.lang.Object):25:25 -> a
     1:1:java.lang.Object invoke(java.lang.Object):13 -> a
-com.android.tools.r8.jetbrains.kotlin.collections.AbstractList -> com.android.tools.r8.v.a.q.d:
+com.android.tools.r8.jetbrains.kotlin.collections.AbstractList -> com.android.tools.r8.u.a.q.d:
     com.android.tools.r8.jetbrains.kotlin.collections.AbstractList$Companion Companion -> a
     1:1:void <init>():20:20 -> <init>
     1:3:boolean equals(java.lang.Object):60:62 -> equals
@@ -42596,10 +42664,10 @@
     1:1:java.util.ListIterator listIterator():30:30 -> listIterator
     2:2:java.util.ListIterator listIterator(int):32:32 -> listIterator
     1:1:java.util.List subList(int,int):34:34 -> subList
-com.android.tools.r8.jetbrains.kotlin.collections.AbstractList$Companion -> com.android.tools.r8.v.a.q.c:
+com.android.tools.r8.jetbrains.kotlin.collections.AbstractList$Companion -> com.android.tools.r8.u.a.q.c:
     1:1:void <init>():104:104 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):104:104 -> <init>
-com.android.tools.r8.jetbrains.kotlin.collections.AbstractList$IteratorImpl -> com.android.tools.r8.v.a.q.d$a:
+com.android.tools.r8.jetbrains.kotlin.collections.AbstractList$IteratorImpl -> com.android.tools.r8.u.a.q.d$a:
     com.android.tools.r8.jetbrains.kotlin.collections.AbstractList this$0 -> b
     int index -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.collections.AbstractList):70:70 -> <init>
@@ -42610,7 +42678,7 @@
     2:2:boolean hasNext():74 -> hasNext
     1:2:java.lang.Object next():77:78 -> next
     3:3:java.lang.Object next():77:77 -> next
-com.android.tools.r8.jetbrains.kotlin.collections.AbstractList$ListIteratorImpl -> com.android.tools.r8.v.a.q.d$b:
+com.android.tools.r8.jetbrains.kotlin.collections.AbstractList$ListIteratorImpl -> com.android.tools.r8.u.a.q.d$b:
     com.android.tools.r8.jetbrains.kotlin.collections.AbstractList this$0 -> c
     1:5:void <init>(com.android.tools.r8.jetbrains.kotlin.collections.AbstractList,int):85:89 -> <init>
     6:6:void com.android.tools.r8.jetbrains.kotlin.collections.AbstractList$Companion.checkPositionIndex$kotlin_stdlib(int,int):113:113 -> <init>
@@ -42620,7 +42688,7 @@
     1:2:java.lang.Object previous():97:98 -> previous
     3:3:java.lang.Object previous():97:97 -> previous
     1:1:int previousIndex():101:101 -> previousIndex
-com.android.tools.r8.jetbrains.kotlin.collections.AbstractList$SubList -> com.android.tools.r8.v.a.q.e:
+com.android.tools.r8.jetbrains.kotlin.collections.AbstractList$SubList -> com.android.tools.r8.u.a.q.e:
     com.android.tools.r8.jetbrains.kotlin.collections.AbstractList list -> c
     int fromIndex -> d
     int _size -> b
@@ -42633,7 +42701,7 @@
     1:3:java.lang.Object get(int):45:47 -> get
     4:4:void com.android.tools.r8.jetbrains.kotlin.collections.AbstractList$Companion.checkElementIndex$kotlin_stdlib(int,int):107:107 -> get
     4:4:java.lang.Object get(int):45 -> get
-com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt -> com.android.tools.r8.v.a.q.f:
+com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt -> com.android.tools.r8.u.a.q.f:
     1:150:boolean com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__MutableCollectionsKt.addAll(java.util.Collection,java.lang.Object[]):0:149 -> a
     1:150:boolean com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt.addAll(java.util.Collection,java.lang.Object[]):0 -> a
     151:313:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysJvmKt.asList(int[]):0:162 -> a
@@ -42731,8 +42799,8 @@
     1210:1210:java.util.Set com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt.toSet(java.lang.Iterable):0 -> d
     1:1388:java.lang.Iterable com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.withIndex(java.lang.Iterable):0:1387 -> e
     1:1388:java.lang.Iterable com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt.withIndex(java.lang.Iterable):0 -> e
-com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt__ArraysKt -> com.android.tools.r8.v.a.q.g:
-com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysJvmKt$asList$3 -> com.android.tools.r8.v.a.q.h:
+com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt__ArraysKt -> com.android.tools.r8.u.a.q.g:
+com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysJvmKt$asList$3 -> com.android.tools.r8.u.a.q.h:
     int[] $this_asList -> b
     1:1:void <init>(int[]):162:162 -> <init>
     1:1:int getSize():163:163 -> a
@@ -42777,12 +42845,12 @@
     13831:13832:int com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysKt.lastIndexOf(int[],int):1847:1848 -> lastIndexOf
     13831:13832:int lastIndexOf(int):168 -> lastIndexOf
     13831:13832:int lastIndexOf(java.lang.Object):162 -> lastIndexOf
-com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysKt -> com.android.tools.r8.v.a.q.i:
-com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt$withIndex$1 -> com.android.tools.r8.v.a.q.j:
+com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysKt -> com.android.tools.r8.u.a.q.i:
+com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt$withIndex$1 -> com.android.tools.r8.u.a.q.j:
     java.lang.Iterable $this_withIndex -> a
     1:1:java.util.Iterator invoke():1387:1387 -> a
     1:1:java.lang.Object invoke():0 -> a
-com.android.tools.r8.jetbrains.kotlin.collections.EmptyIterator -> com.android.tools.r8.v.a.q.k:
+com.android.tools.r8.jetbrains.kotlin.collections.EmptyIterator -> com.android.tools.r8.u.a.q.k:
     com.android.tools.r8.jetbrains.kotlin.collections.EmptyIterator INSTANCE -> a
     1:1:void <clinit>():13:13 -> <clinit>
     1:1:void <init>():13:13 -> <init>
@@ -42790,7 +42858,7 @@
     1:1:java.lang.Object next():13 -> next
     1:1:java.lang.Void previous():19:19 -> previous
     1:1:java.lang.Object previous():13 -> previous
-com.android.tools.r8.jetbrains.kotlin.collections.EmptyList -> com.android.tools.r8.v.a.q.l:
+com.android.tools.r8.jetbrains.kotlin.collections.EmptyList -> com.android.tools.r8.u.a.q.l:
     com.android.tools.r8.jetbrains.kotlin.collections.EmptyList INSTANCE -> a
     1:1:void <clinit>():22:22 -> <clinit>
     1:1:void <init>():22:22 -> <init>
@@ -42812,7 +42880,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.v.a.q.m:
+com.android.tools.r8.jetbrains.kotlin.collections.EmptyMap -> com.android.tools.r8.u.a.q.m:
     com.android.tools.r8.jetbrains.kotlin.collections.EmptyMap INSTANCE -> a
     1:1:void <clinit>():13:13 -> <clinit>
     1:1:void <init>():13:13 -> <init>
@@ -42826,7 +42894,7 @@
     1:1:java.util.Set keySet():13 -> keySet
     1:1:java.util.Collection getValues():28:28 -> values
     1:1:java.util.Collection values():13 -> values
-com.android.tools.r8.jetbrains.kotlin.collections.EmptySet -> com.android.tools.r8.v.a.q.n:
+com.android.tools.r8.jetbrains.kotlin.collections.EmptySet -> com.android.tools.r8.u.a.q.n:
     com.android.tools.r8.jetbrains.kotlin.collections.EmptySet INSTANCE -> a
     1:1:void <clinit>():12:12 -> <clinit>
     1:1:void <init>():12:12 -> <init>
@@ -42836,17 +42904,17 @@
     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.v.a.q.o:
+com.android.tools.r8.jetbrains.kotlin.collections.IndexedValue -> com.android.tools.r8.u.a.q.o:
     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.v.a.q.p:
+com.android.tools.r8.jetbrains.kotlin.collections.IndexingIterable -> com.android.tools.r8.u.a.q.p:
     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.v.a.q.q:
+com.android.tools.r8.jetbrains.kotlin.collections.IndexingIterator -> com.android.tools.r8.u.a.q.q:
     java.util.Iterator iterator -> b
     int index -> a
     1:1:void <init>(java.util.Iterator):37:37 -> <init>
@@ -42857,27 +42925,27 @@
     2:2:void com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt.throwIndexOverflow():0 -> next
     2:2:com.android.tools.r8.jetbrains.kotlin.collections.IndexedValue next():40 -> next
     2:2:java.lang.Object next():37 -> next
-com.android.tools.r8.jetbrains.kotlin.internal.ProgressionUtilKt -> com.android.tools.r8.v.a.r.a:
+com.android.tools.r8.jetbrains.kotlin.internal.ProgressionUtilKt -> com.android.tools.r8.u.a.r.a:
     1:1:int mod(int,int):10:10 -> a
     2:2:int differenceModulo(int,int,int):21:21 -> a
     2:2:int getProgressionLastElement(int,int,int):46 -> a
     3:3:int 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.v.a.s.a:
+com.android.tools.r8.jetbrains.kotlin.jvm.KotlinReflectionNotSupportedError -> com.android.tools.r8.u.a.s.a:
     1:1:void <init>():11:11 -> <init>
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0 -> com.android.tools.r8.v.a.s.b.a:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0 -> com.android.tools.r8.u.a.s.b.a:
     java.lang.Object invoke() -> a
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1 -> com.android.tools.r8.v.a.s.b.b:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1 -> com.android.tools.r8.u.a.s.b.b:
     java.lang.Object invoke(java.lang.Object) -> a
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function2 -> com.android.tools.r8.v.a.s.b.c:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function2 -> com.android.tools.r8.u.a.s.b.c:
     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.v.a.s.c.a:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference$NoReceiver -> com.android.tools.r8.u.a.s.c.a:
     com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference$NoReceiver INSTANCE -> a
     1:1:void <clinit>():40:40 -> <clinit>
     1:1:void <init>():39:39 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference$NoReceiver access$000():39:39 -> a
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.ClassReference -> com.android.tools.r8.v.a.s.c.b:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.ClassReference -> com.android.tools.r8.u.a.s.c.b:
     java.lang.Class jClass -> a
     1:1:void <init>(java.lang.Class):10:10 -> <init>
     1:1:java.lang.Class getJClass():10:10 -> a
@@ -42887,7 +42955,7 @@
     2:2:java.lang.Class 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.v.a.s.c.c:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.CollectionToArray -> com.android.tools.r8.u.a.s.c.c:
     java.lang.Object[] EMPTY -> a
     1:1:void <clinit>():130:130 -> <clinit>
     1:4:java.lang.Object[] toArray(java.util.Collection):83:86 -> a
@@ -42899,8 +42967,8 @@
     261:264:java.lang.Object[] toArray(java.util.Collection,java.lang.Object[]):43:46 -> a
     265:265:java.lang.Object[] toArray(java.util.Collection,java.lang.Object[]):39:39 -> a
     266:266:java.lang.Object[] toArray(java.util.Collection,java.lang.Object[]):30:30 -> a
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker -> com.android.tools.r8.v.a.s.c.d:
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.Intrinsics -> com.android.tools.r8.v.a.s.c.e:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker -> com.android.tools.r8.u.a.s.c.d:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.Intrinsics -> com.android.tools.r8.u.a.s.c.e:
     int compare(int,int) -> a
     1:1:void throwNpe():37:37 -> a
     2:2:void throwUninitializedPropertyAccessException(java.lang.String):49:49 -> a
@@ -42913,10 +42981,10 @@
     7:18:java.lang.Throwable sanitizeStackTrace(java.lang.Throwable):237 -> a
     1:15:void 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.v.a.s.c.f:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.Lambda -> com.android.tools.r8.u.a.s.c.f:
     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.v.a.s.c.h:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference -> com.android.tools.r8.u.a.s.c.h:
     com.android.tools.r8.jetbrains.kotlin.reflect.KCallable com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference.reflected -> a
     java.lang.Object com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference.receiver -> b
     java.lang.Object com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference.NO_RECEIVER -> c
@@ -42944,7 +43012,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.v.a.s.c.g:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1Impl -> com.android.tools.r8.u.a.s.c.g:
     com.android.tools.r8.jetbrains.kotlin.reflect.KDeclarationContainer owner -> d
     java.lang.String signature -> f
     java.lang.String name -> e
@@ -42970,7 +43038,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.v.a.s.c.i:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.Reflection -> com.android.tools.r8.u.a.s.c.i:
     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
@@ -42986,9 +43054,9 @@
     7:7:com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1 property1(com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1):94:94 -> a
     8:8: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
     8:8: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.v.a.s.c.j:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.ReflectionFactory -> com.android.tools.r8.u.a.s.c.j:
     1:1:void <init>():11:11 -> <init>
-com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression -> com.android.tools.r8.v.a.t.b:
+com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression -> com.android.tools.r8.u.a.t.b:
     com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression$Companion Companion -> d
     int last -> b
     int step -> c
@@ -43005,10 +43073,10 @@
     1:1:com.android.tools.r8.jetbrains.kotlin.collections.IntIterator 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.v.a.t.a:
+com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression$Companion -> com.android.tools.r8.u.a.t.a:
     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.v.a.t.c:
+com.android.tools.r8.jetbrains.kotlin.ranges.IntProgressionIterator -> com.android.tools.r8.u.a.t.c:
     int step -> d
     boolean hasNext -> b
     int next -> c
@@ -43033,7 +43101,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.v.a.t.e:
+com.android.tools.r8.jetbrains.kotlin.ranges.IntRange -> com.android.tools.r8.u.a.t.e:
     com.android.tools.r8.jetbrains.kotlin.ranges.IntRange EMPTY -> e
     com.android.tools.r8.jetbrains.kotlin.ranges.IntRange$Companion Companion -> f
     1:1:void <clinit>():58:58 -> <clinit>
@@ -43043,33 +43111,33 @@
     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.v.a.t.d:
+com.android.tools.r8.jetbrains.kotlin.ranges.IntRange$Companion -> com.android.tools.r8.u.a.t.d:
     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.v.a.t.f:
+com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt -> com.android.tools.r8.u.a.t.f:
     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.v.a.t.g:
-com.android.tools.r8.jetbrains.kotlin.reflect.KCallable -> com.android.tools.r8.v.a.u.a:
-com.android.tools.r8.jetbrains.kotlin.reflect.KDeclarationContainer -> com.android.tools.r8.v.a.u.b:
-com.android.tools.r8.jetbrains.kotlin.reflect.KProperty -> com.android.tools.r8.v.a.u.e:
-com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1 -> com.android.tools.r8.v.a.u.d:
-com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1$Getter -> com.android.tools.r8.v.a.u.c:
-com.android.tools.r8.jetbrains.kotlin.sequences.Sequence -> com.android.tools.r8.v.a.v.a:
-com.android.tools.r8.jetbrains.kotlin.sequences.TransformingSequence -> com.android.tools.r8.v.a.v.c:
+com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt__RangesKt -> com.android.tools.r8.u.a.t.g:
+com.android.tools.r8.jetbrains.kotlin.reflect.KCallable -> com.android.tools.r8.u.a.u.a:
+com.android.tools.r8.jetbrains.kotlin.reflect.KDeclarationContainer -> com.android.tools.r8.u.a.u.b:
+com.android.tools.r8.jetbrains.kotlin.reflect.KProperty -> com.android.tools.r8.u.a.u.e:
+com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1 -> com.android.tools.r8.u.a.u.d:
+com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1$Getter -> com.android.tools.r8.u.a.u.c:
+com.android.tools.r8.jetbrains.kotlin.sequences.Sequence -> com.android.tools.r8.u.a.v.a:
+com.android.tools.r8.jetbrains.kotlin.sequences.TransformingSequence -> com.android.tools.r8.u.a.v.c:
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1 transformer -> b
     com.android.tools.r8.jetbrains.kotlin.sequences.Sequence sequence -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.sequences.Sequence,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):168:168 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence access$getSequence$p(com.android.tools.r8.jetbrains.kotlin.sequences.TransformingSequence):167:167 -> a
     1:1:com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1 access$getTransformer$p(com.android.tools.r8.jetbrains.kotlin.sequences.TransformingSequence):167:167 -> b
     1:1:java.util.Iterator iterator():169:169 -> iterator
-com.android.tools.r8.jetbrains.kotlin.sequences.TransformingSequence$iterator$1 -> com.android.tools.r8.v.a.v.b:
+com.android.tools.r8.jetbrains.kotlin.sequences.TransformingSequence$iterator$1 -> com.android.tools.r8.u.a.v.b:
     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.v.a.w.b:
+com.android.tools.r8.jetbrains.kotlin.text.DelimitedRangesSequence -> com.android.tools.r8.u.a.w.b:
     java.lang.CharSequence input -> a
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function2 getNextMatch -> d
     int startIndex -> b
@@ -43080,7 +43148,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.v.a.w.a:
+com.android.tools.r8.jetbrains.kotlin.text.DelimitedRangesSequence$iterator$1 -> com.android.tools.r8.u.a.w.a:
     com.android.tools.r8.jetbrains.kotlin.ranges.IntRange nextItem -> d
     com.android.tools.r8.jetbrains.kotlin.text.DelimitedRangesSequence this$0 -> f
     int counter -> e
@@ -43107,7 +43175,7 @@
     9:9:java.lang.Object next():1079 -> next
     10:10:com.android.tools.r8.jetbrains.kotlin.ranges.IntRange next():1114:1114 -> next
     10:10:java.lang.Object next():1079 -> next
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt -> com.android.tools.r8.v.a.w.c:
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt -> com.android.tools.r8.u.a.w.c:
     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
@@ -43187,11 +43255,11 @@
     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.v.a.w.d:
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringBuilderJVMKt -> com.android.tools.r8.v.a.w.e:
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringNumberConversionsJVMKt -> com.android.tools.r8.v.a.w.f:
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt -> com.android.tools.r8.v.a.w.g:
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt$rangesDelimitedBy$2 -> com.android.tools.r8.v.a.w.h:
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt__RegexExtensionsJVMKt -> com.android.tools.r8.u.a.w.d:
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringBuilderJVMKt -> com.android.tools.r8.u.a.w.e:
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringNumberConversionsJVMKt -> com.android.tools.r8.u.a.w.f:
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt -> com.android.tools.r8.u.a.w.g:
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt$rangesDelimitedBy$2 -> com.android.tools.r8.u.a.w.h:
     char[] $delimiters -> a
     boolean $ignoreCase -> b
     1:1145:com.android.tools.r8.jetbrains.kotlin.Pair invoke(java.lang.CharSequence,int):0:1144 -> a
@@ -43199,7 +43267,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 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.v.a.w.i:
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt$splitToSequence$2 -> com.android.tools.r8.u.a.w.i:
     java.lang.CharSequence $this_splitToSequence -> a
     1:1219:java.lang.String invoke(com.android.tools.r8.jetbrains.kotlin.ranges.IntRange):0:1218 -> a
     1:1219:java.lang.Object invoke(java.lang.Object):0 -> a
@@ -43220,8 +43288,14 @@
     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 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.v.a.w.j:
-com.android.tools.r8.jetbrains.kotlinx.metadata.Flag -> com.android.tools.r8.v.b.a.c:
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt___StringsJvmKt -> com.android.tools.r8.u.a.w.j:
+com.android.tools.r8.jetbrains.kotlinx.metadata.Flag -> com.android.tools.r8.u.b.a.c:
+    com.android.tools.r8.jetbrains.kotlinx.metadata.Flag IS_OPEN -> h
+    com.android.tools.r8.jetbrains.kotlinx.metadata.Flag IS_ABSTRACT -> i
+    com.android.tools.r8.jetbrains.kotlinx.metadata.Flag IS_PRIVATE -> d
+    com.android.tools.r8.jetbrains.kotlinx.metadata.Flag IS_PROTECTED -> e
+    com.android.tools.r8.jetbrains.kotlinx.metadata.Flag IS_PUBLIC -> f
+    com.android.tools.r8.jetbrains.kotlinx.metadata.Flag IS_FINAL -> g
     int bitWidth -> b
     int value -> c
     int offset -> a
@@ -43234,55 +43308,38 @@
     45:45:void <clinit>():70:70 -> <clinit>
     46:87:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField,int):0:41 -> <clinit>
     46:87:void <clinit>():70 -> <clinit>
-    88:88:void <clinit>():76:76 -> <clinit>
-    89:130:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField,int):0:41 -> <clinit>
-    89:130:void <clinit>():76 -> <clinit>
-    131:131:void <clinit>():82:82 -> <clinit>
-    132:173:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField,int):0:41 -> <clinit>
-    132:173:void <clinit>():82 -> <clinit>
-    174:174:void <clinit>():88:88 -> <clinit>
-    175:216:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField,int):0:41 -> <clinit>
-    175:216:void <clinit>():88 -> <clinit>
-    217:217:void <clinit>():95:95 -> <clinit>
-    218:259:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField,int):0:41 -> <clinit>
-    218:259:void <clinit>():95 -> <clinit>
-    260:260:void <clinit>():102:102 -> <clinit>
-    261:302:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField,int):0:41 -> <clinit>
-    261:302:void <clinit>():102 -> <clinit>
-    303:303:void <clinit>():109:109 -> <clinit>
-    304:345:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField,int):0:41 -> <clinit>
-    304:345:void <clinit>():109 -> <clinit>
-    346:346:void <clinit>():115:115 -> <clinit>
-    347:388:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField,int):0:41 -> <clinit>
-    347:388:void <clinit>():115 -> <clinit>
-    389:389:void <clinit>():121:121 -> <clinit>
-    390:431:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField,int):0:41 -> <clinit>
-    390:431:void <clinit>():121 -> <clinit>
-    432:432:void <clinit>():127:127 -> <clinit>
-    433:474:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField,int):0:41 -> <clinit>
-    433:474:void <clinit>():127 -> <clinit>
+    88:107:void <clinit>():76:95 -> <clinit>
+    108:149:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField,int):0:41 -> <clinit>
+    108:149:void <clinit>():95 -> <clinit>
+    150:150:void <clinit>():102:102 -> <clinit>
+    151:192:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField,int):0:41 -> <clinit>
+    151:192:void <clinit>():102 -> <clinit>
+    193:211:void <clinit>():109:127 -> <clinit>
+    212:253:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField,int):0:41 -> <clinit>
+    212:253:void <clinit>():127 -> <clinit>
     1:1:void <init>(int,int,int):40:40 -> <init>
+    2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField,int):41:41 -> <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.v.b.a.a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.Flag$Type -> com.android.tools.r8.u.b.a.a:
     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.v.b.a.b:
+com.android.tools.r8.jetbrains.kotlinx.metadata.Flag$TypeParameter -> com.android.tools.r8.u.b.a.b:
     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.InconsistentKotlinMetadataException -> com.android.tools.r8.v.b.a.d:
+com.android.tools.r8.jetbrains.kotlinx.metadata.InconsistentKotlinMetadataException -> com.android.tools.r8.u.b.a.d:
     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.v.b.a.e:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation -> com.android.tools.r8.u.b.a.e:
     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.v.b.a.w:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument -> com.android.tools.r8.u.b.a.w:
     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.v.b.a.f:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$AnnotationValue -> com.android.tools.r8.u.b.a.f:
     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>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation getValue():51:51 -> a
@@ -43297,7 +43354,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation 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.v.b.a.g:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ArrayValue -> com.android.tools.r8.u.b.a.g:
     java.util.List value -> a
     1:1:void <init>(java.util.List):52:52 -> <init>
     1:1:java.util.List getValue():52:52 -> a
@@ -43312,7 +43369,7 @@
     1:1:java.util.List getValue():52:52 -> 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$BooleanValue -> com.android.tools.r8.v.b.a.h:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$BooleanValue -> com.android.tools.r8.u.b.a.h:
     boolean value -> a
     1:1:void <init>(boolean):38:38 -> <init>
     1:1:java.lang.Boolean getValue():38:38 -> a
@@ -43328,7 +43385,7 @@
     1:1:java.lang.Boolean 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.v.b.a.i:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ByteValue -> com.android.tools.r8.u.b.a.i:
     byte value -> a
     1:1:void <init>(byte):31:31 -> <init>
     1:1:java.lang.Byte getValue():31:31 -> a
@@ -43344,7 +43401,7 @@
     1:1:java.lang.Byte 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.v.b.a.j:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$CharValue -> com.android.tools.r8.u.b.a.j:
     char value -> a
     1:1:void <init>(char):32:32 -> <init>
     1:1:java.lang.Character getValue():32:32 -> a
@@ -43360,7 +43417,7 @@
     1:1:java.lang.Character 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.v.b.a.k:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$DoubleValue -> com.android.tools.r8.u.b.a.k:
     double value -> a
     1:1:void <init>(double):37:37 -> <init>
     1:1:java.lang.Double getValue():37:37 -> a
@@ -43376,13 +43433,13 @@
     1:1:java.lang.Double 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.v.b.a.l:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$EnumValue -> com.android.tools.r8.u.b.a.l:
     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.v.b.a.m:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$FloatValue -> com.android.tools.r8.u.b.a.m:
     float value -> a
     1:1:void <init>(float):36:36 -> <init>
     1:1:java.lang.Float getValue():36:36 -> a
@@ -43398,7 +43455,7 @@
     1:1:java.lang.Float 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.v.b.a.n:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$IntValue -> com.android.tools.r8.u.b.a.n:
     int value -> a
     1:1:void <init>(int):34:34 -> <init>
     1:1:java.lang.Integer getValue():34:34 -> a
@@ -43414,7 +43471,7 @@
     1:1:java.lang.Integer 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.v.b.a.o:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$KClassValue -> com.android.tools.r8.u.b.a.o:
     java.lang.String value -> a
     1:1:void <init>(java.lang.String):46:46 -> <init>
     1:1:java.lang.String getValue():46:46 -> a
@@ -43429,7 +43486,7 @@
     1:1:java.lang.String 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.v.b.a.p:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$LongValue -> com.android.tools.r8.u.b.a.p:
     long value -> a
     1:1:void <init>(long):35:35 -> <init>
     1:1:java.lang.Long getValue():35:35 -> a
@@ -43445,7 +43502,7 @@
     1:1:java.lang.Long 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.v.b.a.q:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ShortValue -> com.android.tools.r8.u.b.a.q:
     short value -> a
     1:1:void <init>(short):33:33 -> <init>
     1:1:java.lang.Short getValue():33:33 -> a
@@ -43461,7 +43518,7 @@
     1:1:java.lang.Short 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.v.b.a.r:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$StringValue -> com.android.tools.r8.u.b.a.r:
     java.lang.String value -> a
     1:1:void <init>(java.lang.String):45:45 -> <init>
     1:1:java.lang.String getValue():45:45 -> a
@@ -43476,7 +43533,7 @@
     1:1:java.lang.String 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.v.b.a.s:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$UByteValue -> com.android.tools.r8.u.b.a.s:
     byte value -> a
     1:1:void <init>(byte):40:40 -> <init>
     1:1:java.lang.Byte getValue():40:40 -> a
@@ -43492,7 +43549,7 @@
     1:1:java.lang.Byte 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.v.b.a.t:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$UIntValue -> com.android.tools.r8.u.b.a.t:
     int value -> a
     1:1:void <init>(int):42:42 -> <init>
     1:1:java.lang.Integer getValue():42:42 -> a
@@ -43508,7 +43565,7 @@
     1:1:java.lang.Integer 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.v.b.a.u:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ULongValue -> com.android.tools.r8.u.b.a.u:
     long value -> a
     1:1:void <init>(long):43:43 -> <init>
     1:1:java.lang.Long getValue():43:43 -> a
@@ -43524,7 +43581,7 @@
     1:1:java.lang.Long 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.v.b.a.v:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$UShortValue -> com.android.tools.r8.u.b.a.v:
     short value -> a
     1:1:void <init>(short):41:41 -> <init>
     1:1:java.lang.Short getValue():41:41 -> a
@@ -43540,7 +43597,7 @@
     1:1:java.lang.Short 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.v.b.a.x:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass -> com.android.tools.r8.u.b.a.x:
     java.util.List extensions -> o
     java.lang.String companionObject -> j
     int flags -> b
@@ -43606,10 +43663,13 @@
     1:2:void visit(int,java.lang.String):105:106 -> c
     3:3:void visitNestedClass(java.lang.String):132:132 -> c
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():144:144 -> c
-    1:1:java.util.List getSupertypes():54:54 -> d
+    1:1:java.util.List getConstructors():74:74 -> d
     2:2:void visitSealedSubclass(java.lang.String):140:140 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassExtensionVisitor -> com.android.tools.r8.v.b.a.y:
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor -> com.android.tools.r8.v.b.a.z:
+    1:1:java.util.List getFunctions():59:59 -> e
+    1:1:java.util.List getProperties():64:64 -> f
+    1:1:java.util.List getSupertypes():54:54 -> g
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassExtensionVisitor -> com.android.tools.r8.u.b.a.y:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor -> com.android.tools.r8.u.b.a.z:
     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>
     void visitCompanionObject(java.lang.String) -> a
@@ -43625,26 +43685,26 @@
     void visitNestedClass(java.lang.String) -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement() -> c
     void visitSealedSubclass(java.lang.String) -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier -> com.android.tools.r8.v.b.a.D:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier -> com.android.tools.r8.u.b.a.D:
     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.v.b.a.A:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier$Class -> com.android.tools.r8.u.b.a.A:
     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.v.b.a.B:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier$TypeAlias -> com.android.tools.r8.u.b.a.B:
     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.v.b.a.C:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier$TypeParameter -> com.android.tools.r8.u.b.a.C:
     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.v.b.a.E:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstantValue -> com.android.tools.r8.u.b.a.E:
     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.v.b.a.F:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor -> com.android.tools.r8.u.b.a.F:
     java.util.List valueParameters -> b
     java.util.List extensions -> d
     java.util.List versionRequirements -> c
@@ -43665,8 +43725,9 @@
     2109:2109:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor):280:280 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():266:266 -> b
     1:1:int getFlags():248:248 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorExtensionVisitor -> com.android.tools.r8.v.b.a.G:
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor -> com.android.tools.r8.v.b.a.H:
+    1:1:java.util.List getValueParameters():252:252 -> d
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorExtensionVisitor -> com.android.tools.r8.u.b.a.G:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor -> com.android.tools.r8.u.b.a.H:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor delegate -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor):210:210 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):210:210 -> <init>
@@ -43674,26 +43735,26 @@
     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.v.b.a.I:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmContract -> com.android.tools.r8.u.b.a.I:
     java.util.List effects -> b
     1:5:void <init>():758:762 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectVisitor visitEffect(com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind):765:765 -> a
     2:204:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor):773:975 -> a
     205:206:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor):773:774 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor -> com.android.tools.r8.v.b.a.J:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor -> com.android.tools.r8.u.b.a.J:
     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>
     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) -> a
     1:1:void visitEnd():678:678 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor -> com.android.tools.r8.v.b.a.K:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor -> com.android.tools.r8.u.b.a.K:
     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>
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor visitFunction(int,java.lang.String) -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor visitProperty(int,java.lang.String,int,int) -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor getDelegate():11:11 -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor visitTypeAlias(int,java.lang.String) -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffect -> com.android.tools.r8.v.b.a.L:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffect -> com.android.tools.r8.u.b.a.L:
     java.util.List constructorArguments -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression conclusion -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType type -> d
@@ -43705,7 +43766,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor visitConstructorArgument():804:804 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind getInvocationKind():790:790 -> d
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType getType():789:789 -> e
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression -> com.android.tools.r8.v.b.a.M:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression -> com.android.tools.r8.u.b.a.M:
     java.lang.Integer parameterIndex -> c
     java.util.List andArguments -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstantValue constantValue -> d
@@ -43721,7 +43782,7 @@
     97:186:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor):888:977 -> a
     187:188:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor):889:890 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor visitOrArgument():877:877 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor -> com.android.tools.r8.v.b.a.N:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor -> com.android.tools.r8.u.b.a.N:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor delegate -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor):722:722 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):722:722 -> <init>
@@ -43731,26 +43792,26 @@
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitIsInstanceType(int) -> 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.v.b.a.O:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind -> com.android.tools.r8.u.b.a.O:
     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.v.b.a.P:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType -> com.android.tools.r8.u.b.a.P:
     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.v.b.a.Q:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectVisitor -> com.android.tools.r8.u.b.a.Q:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectVisitor delegate -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectVisitor):691:691 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):691:691 -> <init>
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor visitConclusionOfConditionalEffect() -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor visitConstructorArgument() -> b
     1:1:void visitEnd():710:710 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType -> com.android.tools.r8.v.b.a.S:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType -> com.android.tools.r8.u.b.a.S:
     com.android.tools.r8.jetbrains.kotlin.reflect.KClass klass -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):31:31 -> <init>
     1:1:boolean equals(java.lang.Object):33:33 -> equals
@@ -43763,15 +43824,15 @@
     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.v.b.a.T:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor -> com.android.tools.r8.u.b.a.T:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType getType() -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmFlexibleTypeUpperBound -> com.android.tools.r8.v.b.a.U:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmFlexibleTypeUpperBound -> com.android.tools.r8.u.b.a.U:
     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.v.b.a.V:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction -> com.android.tools.r8.u.b.a.V:
     java.util.List typeParameters -> b
     java.util.List versionRequirements -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmType receiverParameterType -> c
@@ -43783,29 +43844,32 @@
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmType returnType -> e
     1:693:void <init>(int,java.lang.String):293:985 -> <init>
     694:1355:void <init>(int,java.lang.String):325:986 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor visitTypeParameter(int,java.lang.String,int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance):328:328 -> a
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitReceiverParameterType(int):331:331 -> a
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor visitValueParameter(int,java.lang.String):334:334 -> a
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor visitContract():343:343 -> a
-    5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType):346:346 -> a
-    6:627:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor):354:975 -> a
-    628:1251:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor):354:977 -> a
-    1252:1875:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor):356:979 -> a
-    1876:2499:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor):358:981 -> a
-    2500:2500:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor):360:360 -> a
-    2501:2501:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFunctionExtensionVisitor.getType():119:119 -> a
-    2501:2501:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor):360 -> a
-    2502:2502:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor):360:360 -> a
-    2503:2503:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFunctionExtensionVisitor.getType():119:119 -> a
-    2503:2503:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor):360 -> a
-    2504:2504:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor):361:361 -> a
-    2505:2505:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor):357:357 -> a
+    1:1:void setReceiverParameterType(com.android.tools.r8.jetbrains.kotlinx.metadata.KmType):302:302 -> a
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor visitTypeParameter(int,java.lang.String,int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance):328:328 -> a
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitReceiverParameterType(int):331:331 -> a
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor visitValueParameter(int,java.lang.String):334:334 -> a
+    5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor visitContract():343:343 -> a
+    6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType):346:346 -> a
+    7:628:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor):354:975 -> a
+    629:1252:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor):354:977 -> a
+    1253:1876:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor):356:979 -> a
+    1877:2500:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor):358:981 -> a
+    2501:2501:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor):360:360 -> a
+    2502:2502:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFunctionExtensionVisitor.getType():119:119 -> a
+    2502:2502:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor):360 -> a
+    2503:2503:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor):360:360 -> a
+    2504:2504:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFunctionExtensionVisitor.getType():119:119 -> a
+    2504:2504:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor):360 -> a
+    2505:2505:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor):361:361 -> a
+    2506:2506:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor):357:357 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitReturnType(int):337:337 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():340:340 -> c
     1:1:int getFlags():291:291 -> d
     1:1:java.lang.String getName():292:292 -> e
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionExtensionVisitor -> com.android.tools.r8.v.b.a.W:
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor -> com.android.tools.r8.v.b.a.X:
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmType getReceiverParameterType():302:302 -> f
+    1:1:java.util.List getValueParameters():307:307 -> g
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionExtensionVisitor -> com.android.tools.r8.u.b.a.W:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor -> com.android.tools.r8.u.b.a.X:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor delegate -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor):248:248 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):248:248 -> <init>
@@ -43817,37 +43881,55 @@
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitReturnType(int) -> b
     1:1:void visitEnd():310:310 -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement() -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage -> com.android.tools.r8.v.b.a.Y:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage -> com.android.tools.r8.u.b.a.Y:
     java.util.List functions -> b
     java.util.List extensions -> e
     java.util.List typeAliases -> d
     java.util.List properties -> c
-    1:1:void com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor.<init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor):162:162 -> <init>
-    1:1:void com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor.<init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):162 -> <init>
-    1:1:void <init>():175 -> <init>
-    2:808:void <init>():179:985 -> <init>
-    809:1603:void <init>():192:986 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor visitFunction(int,java.lang.String):195:195 -> a
-    2:2:java.util.List getFunctions():179:179 -> a
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor visitFunction(int,java.lang.String):195 -> a
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor visitFunction(int,java.lang.String):195:195 -> a
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor visitProperty(int,java.lang.String,int,int):198:198 -> a
-    5:5:java.util.List getProperties():184:184 -> a
-    5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor visitProperty(int,java.lang.String,int,int):198 -> a
-    6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor visitProperty(int,java.lang.String,int,int):198:198 -> a
-    7:7:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType):204:204 -> a
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor.getDelegate():164:164 -> b
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor.getDelegate():0 -> b
-    1:1:void com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor.visitEnd():178 -> b
-    1:1:void com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor.visitEnd():0 -> b
-    2:2:void com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor.visitEnd():178:178 -> b
-    2:2:void com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor.visitEnd():0 -> b
+    1:811:void <init>():175:985 -> <init>
+    812:1606:void <init>():192:986 -> <init>
+    1:1:java.util.List getFunctions():179:179 -> a
+    1:1:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor):212 -> a
+    2:2:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor):975:975 -> a
+    3:3:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor):212:212 -> a
+    4:4:java.util.List getProperties():184:184 -> a
+    4:4:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor):213 -> a
+    5:5:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor):977:977 -> a
+    6:6:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor):213:213 -> a
+    7:7:java.util.List getTypeAliases():189:189 -> a
+    7:7:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor):214 -> a
+    8:8:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor):979:979 -> a
+    9:776:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor):214:981 -> a
+    777:777:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor):215:215 -> a
+    778:778:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmPackageExtensionVisitor.getType():92:92 -> a
+    778:778:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor):215 -> a
+    779:779:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor):215:215 -> a
+    780:780:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmPackageExtensionVisitor.getType():92:92 -> a
+    780:780:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor):215 -> a
+    781:781:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor):216:216 -> a
+    782:782:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor visitFunction(int,java.lang.String):195:195 -> a
+    783:783:java.util.List getFunctions():179:179 -> a
+    783:783:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor visitFunction(int,java.lang.String):195 -> a
+    784:784:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor visitFunction(int,java.lang.String):195:195 -> a
+    785:785:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor visitProperty(int,java.lang.String,int,int):198:198 -> a
+    786:786:java.util.List getProperties():184:184 -> a
+    786:786:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor visitProperty(int,java.lang.String,int,int):198 -> a
+    787:787:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor visitProperty(int,java.lang.String,int,int):198:198 -> a
+    788:788:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType):204:204 -> a
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor visitTypeAlias(int,java.lang.String):201:201 -> b
+    2:2:java.util.List getTypeAliases():189:189 -> b
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor visitTypeAlias(int,java.lang.String):201 -> b
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor visitTypeAlias(int,java.lang.String):201:201 -> b
-    4:4:java.util.List getTypeAliases():189:189 -> b
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor visitTypeAlias(int,java.lang.String):201 -> b
-    5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor visitTypeAlias(int,java.lang.String):201:201 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageExtensionVisitor -> com.android.tools.r8.v.b.a.Z:
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty -> com.android.tools.r8.v.b.a.a0:
+    1:1:java.util.List getFunctions():179:179 -> c
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageExtensionVisitor -> com.android.tools.r8.u.b.a.Z:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor -> com.android.tools.r8.u.b.a.a0:
+    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>
+    com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType) -> a
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor getDelegate():164:164 -> b
+    1:1:void visitEnd():178 -> b
+    2:2:void visitEnd():178:178 -> b
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty -> com.android.tools.r8.u.b.a.b0:
     java.util.List typeParameters -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameter setterParameter -> d
     java.lang.String name -> i
@@ -43881,8 +43963,8 @@
     1:1:int getGetterFlags():378:378 -> d
     1:1:java.lang.String getName():377:377 -> e
     1:1:int getSetterFlags():379:379 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyExtensionVisitor -> com.android.tools.r8.v.b.a.b0:
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor -> com.android.tools.r8.v.b.a.c0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyExtensionVisitor -> com.android.tools.r8.u.b.a.c0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor -> com.android.tools.r8.u.b.a.d0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor delegate -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor):320:320 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):320:320 -> <init>
@@ -43893,7 +43975,7 @@
     1:1:void visitEnd():376:376 -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitReturnType(int) -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement() -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmType -> com.android.tools.r8.v.b.a.d0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmType -> com.android.tools.r8.u.b.a.e0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmFlexibleTypeUpperBound flexibleTypeUpperBound -> f
     int flags -> h
     java.util.List arguments -> c
@@ -43928,7 +44010,7 @@
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitOuterType(int):661:661 -> b
     1:1:int getFlags():594:594 -> c
     2:2:void visitTypeParameter(int):647:647 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAlias -> com.android.tools.r8.v.b.a.e0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAlias -> com.android.tools.r8.u.b.a.f0:
     java.util.List typeParameters -> b
     java.lang.String name -> h
     java.util.List versionRequirements -> f
@@ -43950,7 +44032,7 @@
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():493:493 -> b
     1:1:int getFlags():450:450 -> c
     1:1:java.lang.String getName():451:451 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor -> com.android.tools.r8.v.b.a.f0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor -> com.android.tools.r8.u.b.a.g0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor delegate -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor):386:386 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):386:386 -> <init>
@@ -43960,8 +44042,8 @@
     1:1:void visitEnd():435:435 -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitUnderlyingType(int) -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement() -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeExtensionVisitor -> com.android.tools.r8.v.b.a.g0:
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter -> com.android.tools.r8.v.b.a.h0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeExtensionVisitor -> com.android.tools.r8.u.b.a.h0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter -> com.android.tools.r8.u.b.a.i0:
     java.util.List upperBounds -> b
     java.util.List extensions -> c
     int id -> f
@@ -43985,15 +44067,15 @@
     1:1:int getId():560:560 -> c
     1:1:java.lang.String getName():559:559 -> d
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance getVariance():561:561 -> e
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterExtensionVisitor -> com.android.tools.r8.v.b.a.i0:
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor -> com.android.tools.r8.v.b.a.j0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterExtensionVisitor -> com.android.tools.r8.u.b.a.j0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor -> com.android.tools.r8.u.b.a.k0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor delegate -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor):475:475 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):475:475 -> <init>
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType) -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitUpperBound(int) -> a
     1:1:void visitEnd():496:496 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeProjection -> com.android.tools.r8.v.b.a.k0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeProjection -> com.android.tools.r8.u.b.a.l0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmType type -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance variance -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeProjection STAR -> c
@@ -44001,44 +44083,46 @@
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance,com.android.tools.r8.jetbrains.kotlinx.metadata.KmType):929:929 -> <init>
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance component1() -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmType component2() -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor -> com.android.tools.r8.v.b.a.l0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor -> com.android.tools.r8.u.b.a.m0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor delegate -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor):511:511 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):511:511 -> <init>
-    com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitAbbreviatedType(int) -> a
-    com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitArgument(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance) -> a
     void visitClass(java.lang.String) -> a
-    com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType) -> a
-    com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitFlexibleTypeUpperBound(int,java.lang.String) -> a
-    1:1:void visitEnd():610:610 -> a
-    com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitOuterType(int) -> b
-    void visitStarProjection() -> b
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitArgument(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance):548:548 -> a
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitAbbreviatedType(int):570:570 -> a
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitFlexibleTypeUpperBound(int,java.lang.String):596:596 -> a
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType):604:604 -> a
+    5:5:void visitEnd():610:610 -> a
     void visitTypeAlias(java.lang.String) -> b
-    void visitTypeParameter(int) -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameter -> com.android.tools.r8.v.b.a.m0:
+    1:1:void visitStarProjection():555:555 -> b
+    2:2: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.u.b.a.n0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmType type -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmType varargElementType -> c
     int flags -> d
     java.lang.String name -> e
     1:1:void <init>(int,java.lang.String):519:519 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitType(int):531:531 -> a
-    2:4:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor):542:544 -> a
+    1:1:void setType(com.android.tools.r8.jetbrains.kotlinx.metadata.KmType):523:523 -> a
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitType(int):531:531 -> a
+    3:5:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor):542:544 -> a
     1:1:int getFlags():517:517 -> b
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitVarargElementType(int):534:534 -> b
     1:1:java.lang.String getName():518:518 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor -> com.android.tools.r8.v.b.a.n0:
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmType getType():523:523 -> d
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor -> com.android.tools.r8.u.b.a.o0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor delegate -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor):445:445 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):445:445 -> <init>
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitType(int) -> a
     1:1:void visitEnd():466:466 -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitVarargElementType(int) -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance -> com.android.tools.r8.v.b.a.o0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance -> com.android.tools.r8.u.b.a.p0:
     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.v.b.a.p0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersion -> com.android.tools.r8.u.b.a.q0:
     int minor -> b
     int patch -> c
     int major -> a
@@ -44047,7 +44131,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.v.b.a.q0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement -> com.android.tools.r8.u.b.a.r0:
     java.lang.Integer errorCode -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel level -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVersionKind kind -> b
@@ -44059,26 +44143,26 @@
     6:8:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor):746:748 -> a
     9:9:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor):747:747 -> a
     10:10:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor):746:746 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel -> com.android.tools.r8.v.b.a.r0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel -> com.android.tools.r8.u.b.a.s0:
     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.v.b.a.s0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVersionKind -> com.android.tools.r8.u.b.a.t0:
     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.v.b.a.t0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor -> com.android.tools.r8.u.b.a.u0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor delegate -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor):622:622 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):622:622 -> <init>
     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.v.b.a.u0.i:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter -> com.android.tools.r8.u.b.a.v0.i:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder t -> b
     1:3:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.StringTable):396:398 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor visitTypeParameter(int,java.lang.String,int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance):408:408 -> a
@@ -44094,10 +44178,8 @@
     6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.access$writeFunction(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,java.lang.String,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):1 -> a
     6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor visitFunction(int,java.lang.String):417 -> a
     7:7:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor visitProperty(int,java.lang.String,int,int):420:420 -> a
-    8:190:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.writeProperty(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,java.lang.String,int,int,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):0:182 -> a
-    8:190:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor visitProperty(int,java.lang.String,int,int):420 -> a
-    191:191:void visitCompanionObject(java.lang.String):426:426 -> a
-    192:192:com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType):447:447 -> a
+    8:8:void visitCompanionObject(java.lang.String):426:426 -> a
+    9:9:com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType):447:447 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitSupertype(int):411:411 -> b
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.writeType(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):57:57 -> b
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.access$writeType(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):1 -> b
@@ -44118,55 +44200,95 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext getC():398:398 -> d
     2:2:void visitSealedSubclass(java.lang.String):440:440 -> d
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder getT():397:397 -> e
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitConstructor$1 -> com.android.tools.r8.v.b.a.u0.a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitConstructor$1 -> com.android.tools.r8.u.b.a.v0.a:
     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 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.v.b.a.u0.b:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitExtensions$1 -> com.android.tools.r8.u.b.a.v0.b:
     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 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.v.b.a.u0.c:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitFunction$1 -> com.android.tools.r8.u.b.a.v0.c:
     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 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.v.b.a.u0.d:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitProperty$1 -> com.android.tools.r8.u.b.a.v0.d:
     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 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.v.b.a.u0.e:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitSupertype$1 -> com.android.tools.r8.u.b.a.v0.e:
     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 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.v.b.a.u0.f:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitTypeAlias$1 -> com.android.tools.r8.u.b.a.v0.f:
     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 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.v.b.a.u0.g:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitTypeParameter$1 -> com.android.tools.r8.u.b.a.v0.g:
     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 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.v.b.a.u0.h:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitVersionRequirement$1 -> com.android.tools.r8.u.b.a.v0.h:
     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 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.ReadContext -> com.android.tools.r8.v.b.a.u0.j:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter -> com.android.tools.r8.u.b.a.v0.n:
+    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder t -> b
+    1:3:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.StringTable):458:460 -> <init>
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor visitFunction(int,java.lang.String):463:463 -> a
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.writeFunction(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,java.lang.String,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):145:145 -> a
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.access$writeFunction(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,java.lang.String,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):1 -> a
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor visitFunction(int,java.lang.String):463 -> a
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor visitProperty(int,java.lang.String,int,int):466:466 -> a
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType):472:472 -> a
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor visitTypeAlias(int,java.lang.String):469:469 -> b
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.writeTypeAlias(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,java.lang.String,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):241:241 -> b
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.access$writeTypeAlias(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,java.lang.String,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):1 -> b
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor visitTypeAlias(int,java.lang.String):469 -> b
+    3:4:void visitEnd():477:478 -> b
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext getC():460:460 -> c
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder getT():459:459 -> d
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitExtensions$1 -> com.android.tools.r8.u.b.a.v0.j:
+    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 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.u.b.a.v0.k:
+    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 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.u.b.a.v0.l:
+    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 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.u.b.a.v0.m:
+    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 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.u.b.a.v0.o:
     java.util.List extensions -> a
     java.util.Map typeParameterNameToId -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable types -> d
@@ -44182,7 +44304,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.v.b.a.u0.k:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadUtilsKt -> com.android.tools.r8.u.b.a.v0.p:
     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
     2:2:boolean com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.startsWith$default(java.lang.String,java.lang.String,boolean,int,java.lang.Object):195:195 -> a
@@ -44521,7 +44643,7 @@
     4837:4837: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
     4838:4838: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.v.b.a.u0.l:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext -> com.android.tools.r8.u.b.a.v0.q:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.MutableVersionRequirementTable versionRequirements -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.StringTable strings -> b
     1:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.StringTable):15:16 -> <init>
@@ -44529,7 +44651,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.v.b.a.u0.p:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1 -> com.android.tools.r8.u.b.a.v0.u:
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1 $output -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder t -> b
     int $flags -> d
@@ -44546,25 +44668,25 @@
     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.v.b.a.u0.m:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1$visitExtensions$1 -> com.android.tools.r8.u.b.a.v0.r:
     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 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.v.b.a.u0.n:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1$visitValueParameter$1 -> com.android.tools.r8.u.b.a.v0.s:
     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 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.v.b.a.u0.o:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1$visitVersionRequirement$1 -> com.android.tools.r8.u.b.a.v0.t:
     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 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.v.b.a.u0.r:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeContract$1 -> com.android.tools.r8.u.b.a.v0.w:
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1 $output -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder t -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext $c -> c
@@ -44575,13 +44697,13 @@
     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.v.b.a.u0.q:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeContract$1$visitEffect$1 -> com.android.tools.r8.u.b.a.v0.v:
     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 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.v.b.a.u0.u:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1 -> com.android.tools.r8.u.b.a.v0.z:
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1 $output -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder t -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext $c -> c
@@ -44602,19 +44724,19 @@
     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.v.b.a.u0.s:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1$visitConclusionOfConditionalEffect$1 -> com.android.tools.r8.u.b.a.v0.x:
     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 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.v.b.a.u0.t:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1$visitConstructorArgument$1 -> com.android.tools.r8.u.b.a.v0.y:
     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 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.v.b.a.u0.y:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1 -> com.android.tools.r8.u.b.a.v0.D:
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1 $output -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder t -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext $c -> c
@@ -44635,25 +44757,25 @@
     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.v.b.a.u0.v:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1$visitAndArgument$1 -> com.android.tools.r8.u.b.a.v0.A:
     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 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.v.b.a.u0.w:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1$visitIsInstanceType$1 -> com.android.tools.r8.u.b.a.v0.B:
     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 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.v.b.a.u0.x:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1$visitOrArgument$1 -> com.android.tools.r8.u.b.a.v0.C:
     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 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.v.b.a.u0.G:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1 -> com.android.tools.r8.u.b.a.v0.L:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder t -> b
     int $flags -> e
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1 $output -> f
@@ -44687,7 +44809,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.v.b.a.u0.z:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitContract$1 -> com.android.tools.r8.u.b.a.v0.E:
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):145:145 -> a
     2:166:void invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder):0:164 -> a
@@ -44705,43 +44827,43 @@
     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 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.v.b.a.u0.A:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitExtensions$1 -> com.android.tools.r8.u.b.a.v0.F:
     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 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.v.b.a.u0.B:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitReceiverParameterType$1 -> com.android.tools.r8.u.b.a.v0.G:
     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 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.v.b.a.u0.C:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitReturnType$1 -> com.android.tools.r8.u.b.a.v0.H:
     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 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.v.b.a.u0.D:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitTypeParameter$1 -> com.android.tools.r8.u.b.a.v0.I:
     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 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.v.b.a.u0.E:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitValueParameter$1 -> com.android.tools.r8.u.b.a.v0.J:
     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 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.v.b.a.u0.F:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitVersionRequirement$1 -> com.android.tools.r8.u.b.a.v0.K:
     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 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.v.b.a.u0.N:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1 -> com.android.tools.r8.u.b.a.v0.T:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder t -> b
     int $getterFlags -> f
     int $setterFlags -> g
@@ -44773,43 +44895,43 @@
     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.v.b.a.u0.H:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitExtensions$1 -> com.android.tools.r8.u.b.a.v0.M:
     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 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.v.b.a.u0.I:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitReceiverParameterType$1 -> com.android.tools.r8.u.b.a.v0.N:
     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 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.v.b.a.u0.J:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitReturnType$1 -> com.android.tools.r8.u.b.a.v0.O:
     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 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.v.b.a.u0.K:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitSetterParameter$1 -> com.android.tools.r8.u.b.a.v0.P:
     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 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.v.b.a.u0.L:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitTypeParameter$1 -> com.android.tools.r8.u.b.a.v0.Q:
     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 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.v.b.a.u0.M:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitVersionRequirement$1 -> com.android.tools.r8.u.b.a.v0.S:
     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 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.v.b.a.u0.U:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1 -> com.android.tools.r8.u.b.a.v0.Z:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder t -> b
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1 $output -> e
     int $flags -> d
@@ -44839,13 +44961,13 @@
     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.v.b.a.u0.O:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitAbbreviatedType$1 -> com.android.tools.r8.u.b.a.v0.U:
     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 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.v.b.a.u0.P:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitArgument$1 -> com.android.tools.r8.u.b.a.v0.V:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance $variance -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):57:57 -> a
@@ -44854,26 +44976,26 @@
     85:85:void 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.v.b.a.u0.Q:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitExtensions$1 -> com.android.tools.r8.u.b.a.v0.W:
     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 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.v.b.a.u0.S:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitFlexibleTypeUpperBound$1 -> com.android.tools.r8.u.b.a.v0.X:
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1 this$0 -> a
     java.lang.String $typeFlexibilityId -> b
     1:1:java.lang.Object invoke(java.lang.Object):57:57 -> a
     2:103:void 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.v.b.a.u0.T:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitOuterType$1 -> com.android.tools.r8.u.b.a.v0.Y:
     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 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.v.b.a.u0.Z:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1 -> com.android.tools.r8.u.b.a.v0.e0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder t -> b
     int $flags -> d
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1 $output -> f
@@ -44899,31 +45021,31 @@
     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.v.b.a.u0.V:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitExpandedType$1 -> com.android.tools.r8.u.b.a.v0.a0:
     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 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.v.b.a.u0.W:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitTypeParameter$1 -> com.android.tools.r8.u.b.a.v0.b0:
     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 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.v.b.a.u0.X:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitUnderlyingType$1 -> com.android.tools.r8.u.b.a.v0.c0:
     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 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.v.b.a.u0.Y:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitVersionRequirement$1 -> com.android.tools.r8.u.b.a.v0.d0:
     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 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.v.b.a.u0.c0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeParameter$1 -> com.android.tools.r8.u.b.a.v0.h0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder t -> b
     int $flags -> f
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1 $output -> h
@@ -44939,19 +45061,19 @@
     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.v.b.a.u0.a0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeParameter$1$visitExtensions$1 -> com.android.tools.r8.u.b.a.v0.f0:
     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 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.v.b.a.u0.b0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeParameter$1$visitUpperBound$1 -> com.android.tools.r8.u.b.a.v0.g0:
     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 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.v.b.a.u0.f0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1 -> com.android.tools.r8.u.b.a.v0.k0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder t -> b
     int $flags -> d
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1 $output -> f
@@ -44968,19 +45090,19 @@
     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.v.b.a.u0.d0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1$visitType$1 -> com.android.tools.r8.u.b.a.v0.i0:
     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 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.v.b.a.u0.e0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1$visitVarargElementType$1 -> com.android.tools.r8.u.b.a.v0.j0:
     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 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.v.b.a.u0.i0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1 -> com.android.tools.r8.u.b.a.v0.n0:
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1 $output -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder t -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext $c -> c
@@ -45003,7 +45125,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.v.b.a.u0.g0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1$visitVersion$1 -> com.android.tools.r8.u.b.a.v0.l0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):271:271 -> a
     2:2:void invoke(int):306:306 -> a
@@ -45011,7 +45133,7 @@
     3:3:java.lang.Object invoke(java.lang.Object):271:271 -> a
     4:4:void 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.v.b.a.u0.h0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1$visitVersion$2 -> com.android.tools.r8.u.b.a.v0.m0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):271:271 -> a
     2:2:void invoke(int):307:307 -> a
@@ -45019,29 +45141,29 @@
     3:3:java.lang.Object invoke(java.lang.Object):271:271 -> a
     4:4:void 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.v.b.a.u0.j0.a:
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmConstructorExtension -> com.android.tools.r8.v.b.a.u0.j0.b:
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmExtension -> com.android.tools.r8.v.b.a.u0.j0.c:
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmFunctionExtension -> com.android.tools.r8.v.b.a.u0.j0.d:
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmPackageExtension -> com.android.tools.r8.v.b.a.u0.j0.e:
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmPropertyExtension -> com.android.tools.r8.v.b.a.u0.j0.f:
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmTypeExtension -> com.android.tools.r8.v.b.a.u0.j0.g:
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmTypeParameterExtension -> com.android.tools.r8.v.b.a.u0.j0.h:
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions -> com.android.tools.r8.v.b.a.u0.j0.k:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmClassExtension -> com.android.tools.r8.u.b.a.v0.o0.a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmConstructorExtension -> com.android.tools.r8.u.b.a.v0.o0.b:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmExtension -> com.android.tools.r8.u.b.a.v0.o0.c:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmFunctionExtension -> com.android.tools.r8.u.b.a.v0.o0.d:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmPackageExtension -> com.android.tools.r8.u.b.a.v0.o0.e:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmPropertyExtension -> com.android.tools.r8.u.b.a.v0.o0.f:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmTypeExtension -> com.android.tools.r8.u.b.a.v0.o0.g:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmTypeParameterExtension -> com.android.tools.r8.u.b.a.v0.o0.h:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions -> com.android.tools.r8.u.b.a.v0.o0.k:
     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.v.b.a.u0.j0.j:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions$Companion -> com.android.tools.r8.u.b.a.v0.o0.j:
     com.android.tools.r8.jetbrains.kotlin.Lazy INSTANCES$delegate -> b
     com.android.tools.r8.jetbrains.kotlin.reflect.KProperty[] $$delegatedProperties -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions$Companion $$INSTANCE -> c
     1:2:void <clinit>():61:62 -> <clinit>
     1:1:void <init>():61:61 -> <init>
     java.util.List getINSTANCES() -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions$Companion$INSTANCES$2 -> com.android.tools.r8.v.b.a.u0.j0.i:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions$Companion$INSTANCES$2 -> com.android.tools.r8.u.b.a.v0.o0.i:
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions$Companion$INSTANCES$2 INSTANCE -> a
     1:2:java.util.List 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.v.b.a.v0.a.a:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation -> com.android.tools.r8.v.b.a.v0.a.k:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1 -> com.android.tools.r8.u.b.a.w0.a.a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation -> com.android.tools.r8.u.b.a.w0.a.k:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> h
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> a
     java.util.List argument_ -> d
@@ -45103,11 +45225,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation getDefaultInstance():1888:1888 -> j
     1:2:void initFields():4210:4211 -> k
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder newBuilder():4324:4324 -> l
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$1 -> com.android.tools.r8.v.b.a.v0.a.b:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$1 -> com.android.tools.r8.u.b.a.w0.a.b:
     1:1:void <init>():1957:1957 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation 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.v.b.a.v0.a.i:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument -> com.android.tools.r8.u.b.a.w0.a.i:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> h
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument defaultInstance -> g
@@ -45165,11 +45287,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument getDefaultInstance():2009:2009 -> 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.v.b.a.v0.a.c:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$1 -> com.android.tools.r8.u.b.a.w0.a.c:
     1:1:void <init>():2080:2080 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument 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.v.b.a.v0.a.d:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Builder -> com.android.tools.r8.u.b.a.w0.a.d:
     int bitField0_ -> b
     int nameId_ -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value value_ -> d
@@ -45223,7 +45345,7 @@
     1:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument buildPartial():3992:4003 -> e
     1:1: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
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value -> com.android.tools.r8.v.b.a.v0.a.h:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value -> com.android.tools.r8.u.b.a.w0.a.h:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value defaultInstance -> p
     int memoizedSerializedSize -> o
     int arrayDimensionCount_ -> l
@@ -45342,11 +45464,11 @@
     1:1:boolean hasFloatValue():2617:2617 -> x
     1:1:boolean hasIntValue():2602:2602 -> y
     1:1:boolean hasStringValue():2647:2647 -> z
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$1 -> com.android.tools.r8.v.b.a.v0.a.e:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$1 -> com.android.tools.r8.u.b.a.w0.a.e:
     1:1:void <init>():2399:2399 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value 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.v.b.a.v0.a.f:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder -> com.android.tools.r8.u.b.a.w0.a.f:
     int arrayDimensionCount_ -> l
     int flags_ -> m
     int classId_ -> h
@@ -45432,7 +45554,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder create():3019:3019 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder access$2100():3005 -> f
     1:3:void ensureArrayElementIsMutable():3530:3532 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type -> com.android.tools.r8.v.b.a.v0.a.g:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type -> com.android.tools.r8.u.b.a.w0.a.g:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type[] $VALUES -> o
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type BYTE -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type CHAR -> c
@@ -45465,7 +45587,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.v.b.a.v0.a.j:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder -> com.android.tools.r8.u.b.a.w0.a.j:
     java.util.List argument_ -> d
     int bitField0_ -> b
     int id_ -> c
@@ -45514,7 +45636,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder create():4348:4348 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder access$4200():4334 -> f
     1:3:void ensureArgumentIsMutable():4481:4483 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class -> com.android.tools.r8.v.b.a.v0.a.o:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class -> com.android.tools.r8.u.b.a.w0.a.o:
     java.util.List sealedSubclassFqName_ -> r
     int nestedClassNameMemoizedSerializedSize -> l
     java.util.List typeAlias_ -> p
@@ -45702,11 +45824,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable getTypeTable():9297:9297 -> x
     1:1:java.util.List getVersionRequirementList():9311:9311 -> y
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable getVersionRequirementTable():9346:9346 -> z
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$1 -> com.android.tools.r8.v.b.a.v0.a.l:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$1 -> com.android.tools.r8.u.b.a.w0.a.l:
     1:1:void <init>():8778:8778 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class 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.v.b.a.v0.a.m:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder -> com.android.tools.r8.u.b.a.w0.a.m:
     java.util.List sealedSubclassFqName_ -> q
     java.util.List enumEntry_ -> p
     java.util.List typeAlias_ -> o
@@ -45822,34 +45944,18 @@
     210:210:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder.build():13766:13766 -> a
     210:210:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addConstructor(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder):10655 -> a
     211:212:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addFunction(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder):10779:10780 -> a
-    213:214:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder.build():15088:15089 -> a
-    213:214:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addFunction(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder):10780 -> a
-    215:215:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addFunction(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder):10780:10780 -> a
-    216:216:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):316:316 -> a
-    216:216:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder.build():15090 -> a
-    216:216:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addFunction(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder):10780 -> a
-    217:217:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder.build():15090:15090 -> a
-    217:217:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addFunction(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder):10780 -> a
-    218:219:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addProperty(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder):10904:10905 -> a
-    220:221:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addTypeAlias(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder):11029:11030 -> a
-    222:223:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder.build():19652:19653 -> a
-    222:223:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addTypeAlias(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder):11030 -> a
-    224:224:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addTypeAlias(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder):11030:11030 -> a
-    225:225:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):316:316 -> a
-    225:225:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder.build():19654 -> a
-    225:225:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addTypeAlias(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder):11030 -> a
-    226:226:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder.build():19654:19654 -> a
-    226:226:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addTypeAlias(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder):11030 -> a
-    227:228:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addEnumEntry(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder):11154:11155 -> a
-    229:230:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder.build():20707:20708 -> a
-    229:230:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addEnumEntry(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder):11155 -> a
-    231:231:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addEnumEntry(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder):11155:11155 -> a
-    232:232:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):316:316 -> a
-    232:232:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder.build():20709 -> a
-    232:232:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addEnumEntry(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder):11155 -> a
-    233:233:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder.build():20709:20709 -> a
-    233:233:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addEnumEntry(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder):11155 -> a
-    234:236:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder setVersionRequirementTable(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):11439:11441 -> a
+    213:214:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addProperty(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder):10904:10905 -> a
+    215:216:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addTypeAlias(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder):11029:11030 -> a
+    217:218:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addEnumEntry(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder):11154:11155 -> a
+    219:220:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder.build():20707:20708 -> a
+    219:220:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addEnumEntry(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder):11155 -> a
+    221:221:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addEnumEntry(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder):11155:11155 -> a
+    222:222:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):316:316 -> a
+    222:222:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder.build():20709 -> a
+    222:222:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addEnumEntry(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder):11155 -> a
+    223:223:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder.build():20709:20709 -> a
+    223:223:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder addEnumEntry(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder):11155 -> a
+    224:226:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder setVersionRequirementTable(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):11439:11441 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class getDefaultInstanceForType():9742:9742 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite getDefaultInstanceForType():9684 -> b
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class getDefaultInstanceForType():9742:9742 -> b
@@ -45884,7 +45990,7 @@
     1:3:void ensureTypeAliasIsMutable():10952:10954 -> o
     1:3:void ensureTypeParameterIsMutable():10195:10197 -> p
     1:3:void ensureVersionRequirementIsMutable():11327:11329 -> q
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Kind -> com.android.tools.r8.v.b.a.v0.a.n:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Kind -> com.android.tools.r8.u.b.a.w0.a.n:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Kind CLASS -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Kind ENUM_CLASS -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Kind INTERFACE -> c
@@ -45899,7 +46005,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.v.b.a.v0.a.r:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor -> com.android.tools.r8.u.b.a.w0.a.r:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
     java.util.List versionRequirement_ -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor defaultInstance -> i
@@ -45962,11 +46068,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor getDefaultInstance():13381:13381 -> 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.v.b.a.v0.a.p:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$1 -> com.android.tools.r8.u.b.a.w0.a.p:
     1:1:void <init>():13474:13474 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor 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.v.b.a.v0.a.q:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder -> com.android.tools.r8.u.b.a.w0.a.q:
     java.util.List valueParameter_ -> f
     int bitField0_ -> d
     int flags_ -> e
@@ -46010,7 +46116,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder access$12500():13728 -> g
     1:3:void ensureValueParameterIsMutable():13916:13918 -> h
     1:3:void ensureVersionRequirementIsMutable():14040:14042 -> i
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract -> com.android.tools.r8.v.b.a.v0.a.u:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract -> com.android.tools.r8.u.b.a.w0.a.u:
     java.util.List effect_ -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract defaultInstance -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> f
@@ -46062,11 +46168,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract getDefaultInstance():23325:23325 -> h
     1:1:void initFields():23439:23439 -> i
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder newBuilder():23541:23541 -> j
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$1 -> com.android.tools.r8.v.b.a.v0.a.s:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$1 -> com.android.tools.r8.u.b.a.w0.a.s:
     1:1:void <init>():23389:23389 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract 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.v.b.a.v0.a.t:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder -> com.android.tools.r8.u.b.a.w0.a.t:
     java.util.List effect_ -> c
     int bitField0_ -> b
     1:91:void <init>():23558:23648 -> <init>
@@ -46110,7 +46216,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder create():23565:23565 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder access$22300():23551 -> f
     1:3:void ensureEffectIsMutable():23651:23653 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect -> com.android.tools.r8.v.b.a.v0.a.z:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect -> com.android.tools.r8.u.b.a.w0.a.z:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType effectType_ -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> a
     java.util.List effectConstructorArgument_ -> d
@@ -46177,11 +46283,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect getDefaultInstance():23855:23855 -> 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.v.b.a.v0.a.v:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$1 -> com.android.tools.r8.u.b.a.w0.a.v:
     1:1:void <init>():23956:23956 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect 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.v.b.a.v0.a.w:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder -> com.android.tools.r8.u.b.a.w0.a.w:
     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
@@ -46242,7 +46348,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder create():24382:24382 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder access$22800():24368 -> f
     1:3:void ensureEffectConstructorArgumentIsMutable():24538:24540 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType -> com.android.tools.r8.v.b.a.v0.a.x:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType -> com.android.tools.r8.u.b.a.w0.a.x:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType CALLS -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType RETURNS_NOT_NULL -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType[] $VALUES -> e
@@ -46255,7 +46361,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.v.b.a.v0.a.y:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind -> com.android.tools.r8.u.b.a.w0.a.y:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind AT_MOST_ONCE -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind EXACTLY_ONCE -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind[] $VALUES -> e
@@ -46268,7 +46374,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.v.b.a.v0.a.C:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry -> com.android.tools.r8.u.b.a.w0.a.C:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> h
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry defaultInstance -> g
@@ -46312,11 +46418,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry getDefaultInstance():20471:20471 -> 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.v.b.a.v0.a.A:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$1 -> com.android.tools.r8.u.b.a.w0.a.A:
     1:1:void <init>():20529:20529 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry 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.v.b.a.v0.a.B:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder -> com.android.tools.r8.u.b.a.w0.a.B:
     int bitField0_ -> d
     int name_ -> e
     1:1:void <init>():20681:20681 -> <init>
@@ -46350,7 +46456,7 @@
     1:8:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry buildPartial():20715:20722 -> f
     1:1: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
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression -> com.android.tools.r8.v.b.a.v0.a.G:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression -> com.android.tools.r8.u.b.a.w0.a.G:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> a
     int memoizedSerializedSize -> k
     int isInstanceTypeId_ -> g
@@ -46440,11 +46546,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression getDefaultInstance():24960:24960 -> s
     1:7:void initFields():25391:25397 -> t
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder newBuilder():25553:25553 -> u
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$1 -> com.android.tools.r8.v.b.a.v0.a.D:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$1 -> com.android.tools.r8.u.b.a.w0.a.D:
     1:1:void <init>():25075:25075 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression 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.v.b.a.v0.a.E:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder -> com.android.tools.r8.u.b.a.w0.a.E:
     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
@@ -46522,7 +46628,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder access$23700():25568 -> f
     1:3:void ensureAndArgumentIsMutable():26005:26007 -> g
     1:3:void ensureOrArgumentIsMutable():26202:26204 -> h
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue -> com.android.tools.r8.v.b.a.v0.a.F:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue -> com.android.tools.r8.u.b.a.w0.a.F:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue NULL -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue TRUE -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue[] $VALUES -> e
@@ -46535,7 +46641,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.v.b.a.v0.a.J:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function -> com.android.tools.r8.u.b.a.w0.a.J:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function defaultInstance -> r
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
     int receiverTypeId_ -> k
@@ -46663,11 +46769,11 @@
     1:1:boolean hasFlags():14538:14538 -> x
     1:1:boolean hasName():14582:14582 -> y
     1:1:boolean hasOldFlags():14567:14567 -> z
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$1 -> com.android.tools.r8.v.b.a.v0.a.H:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$1 -> com.android.tools.r8.u.b.a.w0.a.H:
     1:1:void <init>():14503:14503 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function 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.v.b.a.v0.a.I:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder -> com.android.tools.r8.u.b.a.w0.a.I:
     int receiverTypeId_ -> l
     java.util.List versionRequirement_ -> o
     int returnTypeId_ -> i
@@ -46794,14 +46900,12 @@
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite getDefaultInstanceForType():15034 -> b
     3:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder setFlags(int):15345:15346 -> b
     5:7:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder setReturnType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):15458:15460 -> b
-    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function build():15088:15089 -> c
-    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():15034 -> c
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):316:316 -> c
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function build():15090 -> c
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():15034 -> c
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function build():15090:15090 -> c
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():15034 -> c
-    5:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder setName(int):15423:15424 -> c
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():15034:15034 -> c
+    2:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function build():15088:15089 -> c
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):316:316 -> c
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function build():15090 -> c
+    5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function build():15090:15090 -> c
+    6:7:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder setName(int):15423:15424 -> c
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder create():15047:15047 -> clone
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder clone():15080 -> clone
     1:1:java.lang.Object clone():15034 -> clone
@@ -46813,7 +46917,7 @@
     1:3:void ensureTypeParameterIsMutable():15533:15535 -> h
     1:3:void ensureValueParameterIsMutable():15750:15752 -> i
     1:3:void ensureVersionRequirementIsMutable():15934:15936 -> j
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$MemberKind -> com.android.tools.r8.v.b.a.v0.a.K:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$MemberKind -> com.android.tools.r8.u.b.a.w0.a.K:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$MemberKind SYNTHESIZED -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$MemberKind FAKE_OVERRIDE -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$MemberKind DELEGATION -> d
@@ -46825,7 +46929,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.v.b.a.v0.a.L:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Modality -> com.android.tools.r8.u.b.a.w0.a.L:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Modality ABSTRACT -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Modality SEALED -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Modality FINAL -> b
@@ -46837,7 +46941,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.v.b.a.v0.a.O:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package -> com.android.tools.r8.u.b.a.w0.a.O:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable versionRequirementTable_ -> h
     byte memoizedIsInitialized -> i
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package defaultInstance -> k
@@ -46918,11 +47022,12 @@
     1:1:boolean hasVersionRequirementTable():11825:11825 -> q
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package getDefaultInstance():11572:11572 -> r
     1:5:void initFields():11835:11839 -> s
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$1 -> com.android.tools.r8.v.b.a.v0.a.M:
+    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.u.b.a.w0.a.M:
     1:1:void <init>():11684:11684 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package 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.v.b.a.v0.a.N:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder -> com.android.tools.r8.u.b.a.w0.a.N:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable versionRequirementTable_ -> i
     java.util.List property_ -> f
     java.util.List function_ -> e
@@ -46931,75 +47036,68 @@
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable typeTable_ -> h
     1:603:void <init>():12012:12614 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite):12006:12006 -> a
-    2:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package):12085:12089 -> a
-    7:9:void ensureFunctionIsMutable():12182:12184 -> a
-    7:9:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package):12091 -> a
-    10:17:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package):12092:12099 -> a
-    18:20:void ensurePropertyIsMutable():12307:12309 -> a
-    18:20:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package):12101 -> a
-    21:28:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package):12102:12109 -> a
-    29:31:void ensureTypeAliasIsMutable():12432:12434 -> a
-    29:31:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package):12111 -> a
-    32:37:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package):12112:12117 -> a
-    38:40:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder mergeTypeTable(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):12593:12595 -> a
-    38:40:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package):12117 -> a
-    41:41:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable.newBuilder():12993:12993 -> a
-    41:41:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):12996 -> a
-    41:41:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder mergeTypeTable(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):12595 -> a
-    41:41:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package):12117 -> a
-    42:42:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):12996:12996 -> a
-    42:42:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder mergeTypeTable(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):12595 -> a
-    42:42:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package):12117 -> a
-    43:49:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder mergeTypeTable(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):12595:12601 -> a
-    43:49:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package):12117 -> a
-    50:51:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package):12119:12120 -> a
-    52:54:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder mergeVersionRequirementTable(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):12653:12655 -> a
-    52:54:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package):12120 -> a
-    55:55:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable.newBuilder():22167:22167 -> a
-    55:55:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):22170 -> a
-    55:55:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder mergeVersionRequirementTable(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):12655 -> a
-    55:55:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package):12120 -> a
-    56:56:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):22170:22170 -> a
-    56:56:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder mergeVersionRequirementTable(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):12655 -> a
-    56:56:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package):12120 -> a
-    57:63:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder mergeVersionRequirementTable(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):12655:12661 -> a
-    57:63:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package):12120 -> a
-    64:65:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package):12122:12123 -> a
-    66:72:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):12166:12172 -> a
-    66:72:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):12006 -> a
-    73:77:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):12168:12172 -> a
-    73:77:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):12006 -> a
-    78:78:int getFunctionCount():12198:12198 -> a
-    78:78:boolean isInitialized():12129 -> a
-    79:79:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function getFunction(int):12204:12204 -> a
-    79:79:boolean isInitialized():12130 -> a
-    80:80:boolean isInitialized():12130:12130 -> a
-    81:81:int getPropertyCount():12323:12323 -> a
-    81:81:boolean isInitialized():12135 -> a
-    82:82:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property getProperty(int):12329:12329 -> a
-    82:82:boolean isInitialized():12136 -> a
-    83:83:boolean isInitialized():12136:12136 -> a
-    84:84:int getTypeAliasCount():12448:12448 -> a
-    84:84:boolean isInitialized():12141 -> a
-    85:85:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias getTypeAlias(int):12454:12454 -> a
-    85:85:boolean isInitialized():12142 -> a
-    86:86:boolean isInitialized():12142:12142 -> a
-    87:87:boolean hasTypeTable():12559:12559 -> a
-    87:87:boolean isInitialized():12147 -> a
-    88:88:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable getTypeTable():12565:12565 -> a
-    88:88:boolean isInitialized():12148 -> a
-    89:94:boolean isInitialized():12148:12153 -> a
+    2:34:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package):12085:12117 -> a
+    35:37:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder mergeTypeTable(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):12593:12595 -> a
+    35:37:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package):12117 -> a
+    38:38:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable.newBuilder():12993:12993 -> a
+    38:38:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):12996 -> a
+    38:38:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder mergeTypeTable(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):12595 -> a
+    38:38:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package):12117 -> a
+    39:39:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):12996:12996 -> a
+    39:39:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder mergeTypeTable(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):12595 -> a
+    39:39:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package):12117 -> a
+    40:46:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder mergeTypeTable(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):12595:12601 -> a
+    40:46:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package):12117 -> a
+    47:48:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package):12119:12120 -> a
+    49:51:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder mergeVersionRequirementTable(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):12653:12655 -> a
+    49:51:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package):12120 -> a
+    52:52:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable.newBuilder():22167:22167 -> a
+    52:52:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):22170 -> a
+    52:52:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder mergeVersionRequirementTable(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):12655 -> a
+    52:52:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package):12120 -> a
+    53:53:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):22170:22170 -> a
+    53:53:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder mergeVersionRequirementTable(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):12655 -> a
+    53:53:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package):12120 -> a
+    54:60:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder mergeVersionRequirementTable(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):12655:12661 -> a
+    54:60:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package):12120 -> a
+    61:62:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package):12122:12123 -> a
+    63:69:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):12166:12172 -> a
+    63:69:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):12006 -> a
+    70:74:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):12168:12172 -> a
+    70:74:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):12006 -> a
+    75:75:int getFunctionCount():12198:12198 -> a
+    75:75:boolean isInitialized():12129 -> a
+    76:76:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function getFunction(int):12204:12204 -> a
+    76:76:boolean isInitialized():12130 -> a
+    77:77:boolean isInitialized():12130:12130 -> a
+    78:78:int getPropertyCount():12323:12323 -> a
+    78:78:boolean isInitialized():12135 -> a
+    79:79:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property getProperty(int):12329:12329 -> a
+    79:79:boolean isInitialized():12136 -> a
+    80:80:boolean isInitialized():12136:12136 -> a
+    81:81:int getTypeAliasCount():12448:12448 -> a
+    81:81:boolean isInitialized():12141 -> a
+    82:82:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias getTypeAlias(int):12454:12454 -> a
+    82:82:boolean isInitialized():12142 -> a
+    83:83:boolean isInitialized():12142:12142 -> a
+    84:84:boolean hasTypeTable():12559:12559 -> a
+    84:84:boolean isInitialized():12147 -> a
+    85:85:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable getTypeTable():12565:12565 -> a
+    85:85:boolean isInitialized():12148 -> a
+    86:91:boolean isInitialized():12148:12153 -> a
+    92:93:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder addFunction(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder):12259:12260 -> a
+    94:95:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder addProperty(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder):12384:12385 -> a
+    96:97:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder addTypeAlias(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder):12509:12510 -> a
+    98:100:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder setVersionRequirementTable(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):12634:12636 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package getDefaultInstanceForType():12042:12042 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite getDefaultInstanceForType():12006 -> b
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package getDefaultInstanceForType():12042:12042 -> b
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite getDefaultInstanceForType():12006 -> b
-    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package build():12046:12047 -> c
-    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():12006 -> c
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):316:316 -> c
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package build():12048 -> c
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():12006 -> c
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package build():12048:12048 -> c
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():12006 -> c
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():12006:12006 -> c
+    2:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package build():12046:12047 -> c
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):316:316 -> c
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package build():12048 -> c
+    5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package build():12048:12048 -> c
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder create():12019:12019 -> clone
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder clone():12038 -> clone
     1:1:java.lang.Object clone():12006 -> clone
@@ -47008,7 +47106,10 @@
     1:27:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package buildPartial():12054:12080 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder create():12019:12019 -> g
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder access$10800():12006 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property -> com.android.tools.r8.v.b.a.v0.a.S:
+    1:3:void ensureFunctionIsMutable():12182:12184 -> h
+    1:3:void ensurePropertyIsMutable():12307:12309 -> i
+    1:3:void ensureTypeAliasIsMutable():12432:12434 -> j
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property -> com.android.tools.r8.u.b.a.w0.a.S:
     int setterFlags_ -> n
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter setterValueParameter_ -> l
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
@@ -47126,11 +47227,11 @@
     1:1:boolean hasGetterFlags():16686:16686 -> x
     1:1:boolean hasName():16549:16549 -> y
     1:1:boolean hasOldFlags():16534:16534 -> z
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$1 -> com.android.tools.r8.v.b.a.v0.a.P:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$1 -> com.android.tools.r8.u.b.a.w0.a.P:
     1:1:void <init>():16466:16466 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property 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.v.b.a.v0.a.Q:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder -> com.android.tools.r8.u.b.a.w0.a.Q:
     int getterFlags_ -> n
     int setterFlags_ -> o
     int receiverTypeId_ -> l
@@ -47258,7 +47359,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder access$15000():16993 -> g
     1:3:void ensureTypeParameterIsMutable():17480:17482 -> h
     1:3:void ensureVersionRequirementIsMutable():17868:17870 -> i
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type -> com.android.tools.r8.v.b.a.v0.a.Z:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type -> com.android.tools.r8.u.b.a.w0.a.Z:
     int outerTypeId_ -> n
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
     int typeAliasName_ -> l
@@ -47390,11 +47491,11 @@
     1:1:int getTypeParameterName():5830:5830 -> x
     1:1:boolean hasAbbreviatedType():5902:5902 -> y
     1:1:boolean hasAbbreviatedTypeId():5917:5917 -> z
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$1 -> com.android.tools.r8.v.b.a.v0.a.T:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$1 -> com.android.tools.r8.u.b.a.w0.a.T:
     1:1:void <init>():4972:4972 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type 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.v.b.a.v0.a.X:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument -> com.android.tools.r8.u.b.a.w0.a.X:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument defaultInstance -> h
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection projection_ -> c
@@ -47451,11 +47552,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument getDefaultInstance():5041:5041 -> 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.v.b.a.v0.a.U:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$1 -> com.android.tools.r8.u.b.a.w0.a.U:
     1:1:void <init>():5124:5124 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument 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.v.b.a.v0.a.V:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder -> com.android.tools.r8.u.b.a.w0.a.V:
     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
@@ -47509,7 +47610,7 @@
     1:16:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument buildPartial():5440:5455 -> e
     1:1: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
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection -> com.android.tools.r8.v.b.a.v0.a.W:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection -> com.android.tools.r8.u.b.a.w0.a.W:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection STAR -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection IN -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection OUT -> c
@@ -47524,7 +47625,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.v.b.a.v0.a.Y:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder -> com.android.tools.r8.u.b.a.w0.a.Y:
     int outerTypeId_ -> o
     int typeParameterName_ -> l
     int typeAliasName_ -> m
@@ -47666,7 +47767,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder create():6206:6206 -> g
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder access$5700():6193 -> g
     1:3:void ensureArgumentIsMutable():6434:6436 -> h
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias -> com.android.tools.r8.v.b.a.v0.a.c0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias -> com.android.tools.r8.u.b.a.w0.a.c0:
     int memoizedSerializedSize -> n
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
     int expandedTypeId_ -> j
@@ -47771,11 +47872,11 @@
     1:1:boolean hasUnderlyingType():19268:19268 -> x
     1:1:boolean hasUnderlyingTypeId():19283:19283 -> y
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias getDefaultInstance():19027:19027 -> z
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$1 -> com.android.tools.r8.v.b.a.v0.a.a0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$1 -> com.android.tools.r8.u.b.a.w0.a.a0:
     1:1:void <init>():19172:19172 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias 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.v.b.a.v0.a.b0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder -> com.android.tools.r8.u.b.a.w0.a.b0:
     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
@@ -47861,14 +47962,12 @@
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite getDefaultInstanceForType():19604 -> b
     3:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder setFlags(int):19849:19850 -> b
     5:7:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder setUnderlyingType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type):20046:20048 -> b
-    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias build():19652:19653 -> c
-    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():19604 -> c
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):316:316 -> c
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias build():19654 -> c
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():19604 -> c
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias build():19654:19654 -> c
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():19604 -> c
-    5:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder setName(int):19886:19887 -> c
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite build():19604:19604 -> c
+    2:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias build():19652:19653 -> c
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):316:316 -> c
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias build():19654 -> c
+    5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias build():19654:19654 -> c
+    6:7:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder setName(int):19886:19887 -> c
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder create():19617:19617 -> clone
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder clone():19644 -> clone
     1:1:java.lang.Object clone():19604 -> clone
@@ -47880,7 +47979,7 @@
     1:3:void ensureAnnotationIsMutable():20213:20215 -> h
     1:3:void ensureTypeParameterIsMutable():19904:19906 -> i
     1:3:void ensureVersionRequirementIsMutable():20337:20339 -> j
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter -> com.android.tools.r8.v.b.a.v0.a.g0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter -> com.android.tools.r8.u.b.a.w0.a.g0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
     int memoizedSerializedSize -> l
     int upperBoundIdMemoizedSerializedSize -> j
@@ -47969,11 +48068,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter getDefaultInstance():7264:7264 -> 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.v.b.a.v0.a.d0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$1 -> com.android.tools.r8.u.b.a.w0.a.d0:
     1:1:void <init>():7379:7379 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter 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.v.b.a.v0.a.e0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder -> com.android.tools.r8.u.b.a.w0.a.e0:
     int name_ -> f
     java.util.List upperBoundId_ -> j
     java.util.List upperBound_ -> i
@@ -48033,7 +48132,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder create():7774:7774 -> g
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder access$7600():7761 -> g
     1:3:void ensureUpperBoundIsMutable():8059:8061 -> h
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance -> com.android.tools.r8.v.b.a.v0.a.f0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance -> com.android.tools.r8.u.b.a.w0.a.f0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance IN -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance[] $VALUES -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance OUT -> c
@@ -48046,7 +48145,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.v.b.a.v0.a.j0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable -> com.android.tools.r8.u.b.a.w0.a.j0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> h
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> a
     java.util.List type_ -> c
@@ -48106,11 +48205,11 @@
     1:1:boolean hasFirstNullable():12868:12868 -> i
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable getDefaultInstance():12738:12738 -> j
     1:2:void initFields():12883:12884 -> k
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$1 -> com.android.tools.r8.v.b.a.v0.a.h0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$1 -> com.android.tools.r8.u.b.a.w0.a.h0:
     1:1:void <init>():12807:12807 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable 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.v.b.a.v0.a.i0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder -> com.android.tools.r8.u.b.a.w0.a.i0:
     java.util.List type_ -> c
     int firstNullable_ -> d
     int bitField0_ -> b
@@ -48151,7 +48250,7 @@
     1:13:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable buildPartial():13046:13058 -> e
     1:1: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
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter -> com.android.tools.r8.v.b.a.v0.a.m0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter -> com.android.tools.r8.u.b.a.w0.a.m0:
     byte memoizedIsInitialized -> j
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter defaultInstance -> l
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
@@ -48232,11 +48331,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter getDefaultInstance():18061:18061 -> w
     1:6:void initFields():18280:18285 -> x
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder newBuilder():18441:18441 -> y
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$1 -> com.android.tools.r8.v.b.a.v0.a.k0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$1 -> com.android.tools.r8.u.b.a.w0.a.k0:
     1:1:void <init>():18160:18160 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter 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.v.b.a.v0.a.l0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder -> com.android.tools.r8.u.b.a.w0.a.l0:
     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
@@ -48320,7 +48419,7 @@
     1:28:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter buildPartial():18501:18528 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder create():18464:18464 -> g
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder access$16700():18451 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement -> com.android.tools.r8.v.b.a.v0.a.r0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement -> com.android.tools.r8.u.b.a.w0.a.r0:
     byte memoizedIsInitialized -> i
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level level_ -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> a
@@ -48387,11 +48486,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement getDefaultInstance():20937:20937 -> 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.v.b.a.v0.a.n0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$1 -> com.android.tools.r8.u.b.a.w0.a.n0:
     1:1:void <init>():21034:21034 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement 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.v.b.a.v0.a.o0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder -> com.android.tools.r8.u.b.a.w0.a.o0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level level_ -> e
     int errorCode_ -> f
     int message_ -> g
@@ -48454,7 +48553,7 @@
     1:28:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement buildPartial():21523:21550 -> e
     1:1: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
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level -> com.android.tools.r8.v.b.a.v0.a.p0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level -> com.android.tools.r8.u.b.a.w0.a.p0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level[] $VALUES -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level HIDDEN -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level ERROR -> c
@@ -48467,7 +48566,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.v.b.a.v0.a.q0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind -> com.android.tools.r8.u.b.a.w0.a.q0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind COMPILER_VERSION -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind LANGUAGE_VERSION -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind API_VERSION -> d
@@ -48480,7 +48579,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.v.b.a.v0.a.u0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable -> com.android.tools.r8.u.b.a.w0.a.u0:
     java.util.List requirement_ -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> a
@@ -48528,11 +48627,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable getDefaultInstance():21957:21957 -> i
     1:1:void initFields():22071:22071 -> j
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder newBuilder():22167:22167 -> k
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$1 -> com.android.tools.r8.v.b.a.v0.a.s0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$1 -> com.android.tools.r8.u.b.a.w0.a.s0:
     1:1:void <init>():22021:22021 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable 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.v.b.a.v0.a.t0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder -> com.android.tools.r8.u.b.a.w0.a.t0:
     java.util.List requirement_ -> c
     int bitField0_ -> b
     1:85:void <init>():22184:22268 -> <init>
@@ -48572,7 +48671,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder create():22191:22191 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder access$20900():22177 -> f
     1:3:void ensureRequirementIsMutable():22271:22273 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Visibility -> com.android.tools.r8.v.b.a.v0.a.v0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Visibility -> com.android.tools.r8.u.b.a.w0.a.v0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Visibility LOCAL -> g
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Visibility PRIVATE_TO_THIS -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Visibility PUBLIC -> e
@@ -48586,7 +48685,7 @@
     1:2:void <init>(java.lang.String,int,int,int):186:187 -> <init>
     1:1:int getNumber():158:158 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Visibility[] values():96:96 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.BinaryVersion -> com.android.tools.r8.v.b.a.v0.a.w0.a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.BinaryVersion -> com.android.tools.r8.u.b.a.w0.a.w0.a:
     java.util.List rest -> d
     int[] numbers -> e
     int minor -> b
@@ -48603,7 +48702,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.v.b.a.v0.a.w0.f:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags -> com.android.tools.r8.u.b.a.w0.a.w0.f:
     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
@@ -48639,8 +48738,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.v.b.a.v0.a.w0.b:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField -> com.android.tools.r8.v.b.a.v0.a.w0.c:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$1 -> com.android.tools.r8.u.b.a.w0.a.w0.b:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField -> com.android.tools.r8.u.b.a.w0.a.w0.c:
     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
@@ -48648,7 +48747,7 @@
     4:4:void $$$reportNull$$$0(int):0:0 -> a
     4:4:java.lang.Boolean get(int):265 -> a
     5:5:int toFlags(java.lang.Boolean):270:270 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$EnumLiteFlagField -> com.android.tools.r8.v.b.a.v0.a.w0.d:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$EnumLiteFlagField -> com.android.tools.r8.u.b.a.w0.a.w0.d:
     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
@@ -48659,7 +48758,7 @@
     9:9:int bitWidth(java.lang.Object[]):0 -> a
     10:14:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLite 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.v.b.a.v0.a.w0.e:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField -> com.android.tools.r8.u.b.a.w0.a.w0.e:
     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>
@@ -48669,15 +48768,15 @@
     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.v.b.a.v0.a.w0.g:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable -> com.android.tools.r8.v.b.a.v0.a.w0.h:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver -> com.android.tools.r8.u.b.a.w0.a.w0.g:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable -> com.android.tools.r8.u.b.a.w0.a.w0.h:
     java.util.List types -> a
     1:20:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):21:40 -> <init>
     21:33:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):28:40 -> <init>
     34:34:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):31:31 -> <init>
     35:35:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):22:22 -> <init>
     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.v.b.a.v0.a.w0.l:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement -> com.android.tools.r8.u.b.a.w0.a.w0.l:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version version -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind kind -> b
     java.lang.Integer errorCode -> d
@@ -48691,10 +48790,10 @@
     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.v.b.a.v0.a.w0.i:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Companion -> com.android.tools.r8.u.b.a.w0.a.w0.i:
     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.v.b.a.v0.a.w0.k:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version -> com.android.tools.r8.u.b.a.w0.a.w0.k:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version$Companion Companion -> e
     int minor -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version INFINITY -> d
@@ -48709,10 +48808,10 @@
     int component3() -> c
     1:1:java.lang.String 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.v.b.a.v0.a.w0.j:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version$Companion -> com.android.tools.r8.u.b.a.w0.a.w0.j:
     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.v.b.a.v0.a.w0.n:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable -> com.android.tools.r8.u.b.a.w0.a.w0.n:
     java.util.List infos -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable$Companion Companion -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable EMPTY -> b
@@ -48736,7 +48835,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.v.b.a.v0.a.w0.m:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable$Companion -> com.android.tools.r8.u.b.a.w0.a.w0.m:
     1:1:void <init>():14:14 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):14:14 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable create(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):18:18 -> a
@@ -48744,7 +48843,7 @@
     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:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable create(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):18:19 -> a
     5: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.v.b.a.v0.a.x0.r:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf -> com.android.tools.r8.u.b.a.w0.a.x0.r:
     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
@@ -48759,8 +48858,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.v.b.a.v0.a.x0.a:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature -> com.android.tools.r8.v.b.a.v0.a.x0.d:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$1 -> com.android.tools.r8.u.b.a.w0.a.x0.a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature -> com.android.tools.r8.u.b.a.w0.a.x0.d:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> h
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature defaultInstance -> g
@@ -48814,11 +48913,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature getDefaultInstance():2607:2607 -> k
     1:2:void initFields():2724:2725 -> l
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder newBuilder():2828:2828 -> m
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$1 -> com.android.tools.r8.v.b.a.v0.a.x0.b:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$1 -> com.android.tools.r8.u.b.a.w0.a.x0.b:
     1:1:void <init>():2670:2670 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature 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.v.b.a.v0.a.x0.c:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder -> com.android.tools.r8.u.b.a.w0.a.x0.c:
     int desc_ -> d
     int bitField0_ -> b
     int name_ -> c
@@ -48857,7 +48956,7 @@
     1:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature buildPartial():2881:2892 -> e
     1:1: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
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature -> com.android.tools.r8.v.b.a.v0.a.x0.g:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature -> com.android.tools.r8.u.b.a.w0.a.x0.g:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> h
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature defaultInstance -> g
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> a
@@ -48911,11 +49010,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature getDefaultInstance():2145:2145 -> k
     1:2:void initFields():2262:2263 -> l
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder newBuilder():2366:2366 -> m
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$1 -> com.android.tools.r8.v.b.a.v0.a.x0.e:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$1 -> com.android.tools.r8.u.b.a.w0.a.x0.e:
     1:1:void <init>():2208:2208 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature 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.v.b.a.v0.a.x0.f:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder -> com.android.tools.r8.u.b.a.w0.a.x0.f:
     int desc_ -> d
     int bitField0_ -> b
     int name_ -> c
@@ -48954,7 +49053,7 @@
     1:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature buildPartial():2419:2430 -> e
     1:1: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
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature -> com.android.tools.r8.v.b.a.v0.a.x0.j:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature -> com.android.tools.r8.u.b.a.w0.a.x0.j:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature getter_ -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature setter_ -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> a
@@ -49015,11 +49114,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature getDefaultInstance():3087:3087 -> 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.v.b.a.v0.a.x0.h:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$1 -> com.android.tools.r8.u.b.a.w0.a.x0.h:
     1:1:void <init>():3192:3192 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature 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.v.b.a.v0.a.x0.i:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder -> com.android.tools.r8.u.b.a.w0.a.x0.i:
     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
@@ -49104,7 +49203,7 @@
     1:20:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature buildPartial():3453:3472 -> e
     1:1: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
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes -> com.android.tools.r8.v.b.a.v0.a.x0.q:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes -> com.android.tools.r8.u.b.a.w0.a.x0.q:
     java.util.List record_ -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> h
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> a
@@ -49161,11 +49260,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes getDefaultInstance():83:83 -> 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.v.b.a.v0.a.x0.k:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$1 -> com.android.tools.r8.u.b.a.w0.a.x0.k:
     1:1:void <init>():171:171 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes 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.v.b.a.v0.a.x0.l:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder -> com.android.tools.r8.u.b.a.w0.a.x0.l:
     java.util.List localName_ -> d
     java.util.List record_ -> c
     int bitField0_ -> b
@@ -49200,7 +49299,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder access$1200():1761 -> f
     1:3:void ensureLocalNameIsMutable():1996:1998 -> g
     1:3:void ensureRecordIsMutable():1872:1874 -> h
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record -> com.android.tools.r8.v.b.a.v0.a.x0.p:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record -> com.android.tools.r8.u.b.a.w0.a.x0.p:
     int memoizedSerializedSize -> l
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> a
     int replaceCharMemoizedSerializedSize -> j
@@ -49309,11 +49408,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record getDefaultInstance():341:341 -> s
     1:6:void initFields():773:778 -> t
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder newBuilder():937:937 -> u
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$1 -> com.android.tools.r8.v.b.a.v0.a.x0.m:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$1 -> com.android.tools.r8.u.b.a.w0.a.x0.m:
     1:1:void <init>():470:470 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record 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.v.b.a.v0.a.x0.n:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder -> com.android.tools.r8.u.b.a.w0.a.x0.n:
     java.lang.Object string_ -> e
     int predefinedIndex_ -> d
     java.util.List replaceChar_ -> h
@@ -49373,7 +49472,7 @@
     1:1:boolean hasPredefinedIndex():1152:1152 -> j
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder create():961:961 -> k
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder access$200():947 -> k
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation -> com.android.tools.r8.v.b.a.v0.a.x0.o:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation -> com.android.tools.r8.u.b.a.w0.a.x0.o:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation NONE -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation[] $VALUES -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation DESC_TO_CLASS_ID -> d
@@ -49386,7 +49485,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation valueOf(int):543:543 -> b
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation valueOf(int):542:542 -> b
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation valueOf(int):541:541 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.BitEncoding -> com.android.tools.r8.v.b.a.v0.a.x0.s.a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.BitEncoding -> com.android.tools.r8.u.b.a.w0.a.x0.s.a:
     boolean FORCE_8TO7_ENCODING -> a
     boolean $assertionsDisabled -> b
     1:13:void <clinit>():15:27 -> <clinit>
@@ -49415,7 +49514,7 @@
     263:279:byte[] decode7to8(byte[]):247:263 -> a
     263:279:byte[] decodeBytes(java.lang.String[]):192 -> a
     1:2:java.lang.String[] dropMarker(java.lang.String[]):199:200 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.ClassMapperLite -> com.android.tools.r8.v.b.a.v0.a.x0.s.c:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.ClassMapperLite -> com.android.tools.r8.u.b.a.w0.a.x0.s.c:
     java.util.Map map -> a
     1:10:void <clinit>():20:29 -> <clinit>
     11:11:void <clinit>():21:21 -> <clinit>
@@ -49439,20 +49538,20 @@
     747:784:void <clinit>():32:69 -> <clinit>
     785:785:void <clinit>():20:20 -> <clinit>
     1:1:java.lang.String mapClass(java.lang.String):78:78 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.ClassMapperLite$map$1$1 -> com.android.tools.r8.v.b.a.v0.a.x0.s.b:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.ClassMapperLite$map$1$1 -> com.android.tools.r8.u.b.a.w0.a.x0.s.b:
     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.v.b.a.v0.a.x0.s.d:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmBytecodeBinaryVersion -> com.android.tools.r8.u.b.a.w0.a.x0.s.d:
     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.v.b.a.v0.a.x0.s.g:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature -> com.android.tools.r8.u.b.a.w0.a.x0.s.g:
     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.v.b.a.v0.a.x0.s.e:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Field -> com.android.tools.r8.u.b.a.w0.a.x0.s.e:
     java.lang.String name -> a
     java.lang.String desc -> b
     1:1:void <init>(java.lang.String,java.lang.String):23:23 -> <init>
@@ -49481,7 +49580,7 @@
     3:3:java.lang.String 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.v.b.a.v0.a.x0.s.f:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method -> com.android.tools.r8.u.b.a.w0.a.x0.s.f:
     java.lang.String name -> a
     java.lang.String desc -> b
     1:1:void <init>(java.lang.String,java.lang.String):19:19 -> <init>
@@ -49510,7 +49609,7 @@
     3:3:java.lang.String 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.v.b.a.v0.a.x0.s.h:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMetadataVersion -> com.android.tools.r8.u.b.a.w0.a.x0.s.h:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMetadataVersion INSTANCE -> g
     boolean isStrictSemantics -> f
     1:1:void <clinit>():30:30 -> <clinit>
@@ -49521,7 +49620,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.v.b.a.v0.a.x0.s.j:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmNameResolver -> com.android.tools.r8.u.b.a.w0.a.x0.s.j:
     java.util.List records -> b
     java.util.List PREDEFINED_STRINGS -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes types -> c
@@ -49541,10 +49640,10 @@
     2:2:boolean isLocalClassName(int):75:75 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes getTypes():14:14 -> c
     1:1:java.util.Map access$getPREDEFINED_STRINGS_MAP$cp():13:13 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmNameResolver$Companion -> com.android.tools.r8.v.b.a.v0.a.x0.s.i:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmNameResolver$Companion -> com.android.tools.r8.u.b.a.w0.a.x0.s.i:
     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.v.b.a.v0.a.x0.s.k:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil -> com.android.tools.r8.u.b.a.w0.a.x0.s.k:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite EXTENSION_REGISTRY -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil INSTANCE -> b
     1:2:void <clinit>():18:19 -> <clinit>
@@ -49605,7 +49704,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 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.v.b.a.v0.a.x0.t.a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.serialization.JvmStringTable -> com.android.tools.r8.u.b.a.w0.a.x0.t.a:
     java.util.LinkedHashSet localNames -> d
     java.util.ArrayList records -> b
     java.util.ArrayList strings -> a
@@ -49651,7 +49750,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.v.b.a.v0.a.y0.b:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.Interner -> com.android.tools.r8.u.b.a.w0.a.y0.b:
     java.util.HashMap interned -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.Interner parent -> c
     int firstIndex -> a
@@ -49670,13 +49769,13 @@
     5992:5993:int intern(java.lang.Object):26:27 -> a
     1:1:boolean isEmpty():16:16 -> b
     2:5:java.lang.Integer find(java.lang.Object):19:22 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.Interner$allInternedObjects$$inlined$sortedBy$1 -> com.android.tools.r8.v.b.a.v0.a.y0.a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.Interner$allInternedObjects$$inlined$sortedBy$1 -> com.android.tools.r8.u.b.a.w0.a.y0.a:
     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.v.b.a.v0.a.y0.c:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.MutableVersionRequirementTable -> com.android.tools.r8.u.b.a.w0.a.y0.c:
     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>
     1:6:void <init>():56 -> <init>
@@ -49704,7 +49803,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.v.b.a.v0.a.y0.d:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.TableElementWrapper -> com.android.tools.r8.u.b.a.w0.a.y0.d:
     byte[] bytes -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder builder -> c
     int hashCode -> b
@@ -49712,14 +49811,14 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder getBuilder():13:13 -> a
     1:1:boolean equals(java.lang.Object):20:20 -> equals
     1:1:int hashCode():18:18 -> hashCode
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractMessageLite -> com.android.tools.r8.v.b.a.v0.b.c:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractMessageLite -> com.android.tools.r8.u.b.a.w0.b.c:
     1:1:void <init>():46:46 -> <init>
     void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite.writeTo(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream) -> a
     int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite.getSerializedSize() -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite.newBuilderForType() -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite.toBuilder() -> e
     1:7:byte[] toByteArray():64:70 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractMessageLite$Builder -> com.android.tools.r8.v.b.a.v0.b.b:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractMessageLite$Builder -> com.android.tools.r8.u.b.a.w0.b.b:
     1:1:void <init>():118:118 -> <init>
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder.mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite) -> a
     1:1:void addAll(java.lang.Iterable,java.util.Collection):334:334 -> a
@@ -49728,14 +49827,14 @@
     5:11:void addAll(java.lang.Iterable,java.util.Collection):336:342 -> a
     12:12:void addAll(java.lang.Iterable,java.util.Collection):340:340 -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder.build() -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractMessageLite$Builder$LimitedInputStream -> com.android.tools.r8.v.b.a.v0.b.a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractMessageLite$Builder$LimitedInputStream -> com.android.tools.r8.u.b.a.w0.b.a:
     int limit -> a
     1:2:void <init>(java.io.InputStream,int):245:246 -> <init>
     1:1:int available():251:251 -> available
     1:6:int read():256:261 -> read
     7:13:int read(byte[],int,int):269:275 -> read
     1:3:long skip(long):282:284 -> skip
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractParser -> com.android.tools.r8.v.b.a.v0.b.d:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractParser -> com.android.tools.r8.u.b.a.w0.b.d:
     1:1:void <clinit>():78:78 -> <clinit>
     1:1:void <init>():49:49 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite checkMessageInitialized(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):70:70 -> a
@@ -49789,7 +49888,7 @@
     6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite parsePartialFrom(java.io.InputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):196:196 -> b
     6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite parseFrom(java.io.InputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):209 -> b
     6:6:java.lang.Object parseFrom(java.io.InputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):49 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.BoundedByteString -> com.android.tools.r8.v.b.a.v0.b.g:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.BoundedByteString -> com.android.tools.r8.u.b.a.w0.b.g:
     int bytesLength -> f
     int bytesOffset -> e
     1:14:void <init>(byte[],int,int):64:77 -> <init>
@@ -49804,8 +49903,8 @@
     1:1:java.util.Iterator iterator():47:47 -> iterator
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString$ByteIterator iterator():130:130 -> iterator
     1:1:int size():107:107 -> size
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.BoundedByteString$1 -> com.android.tools.r8.v.b.a.v0.b.e:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.BoundedByteString$BoundedByteIterator -> com.android.tools.r8.v.b.a.v0.b.f:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.BoundedByteString$1 -> com.android.tools.r8.u.b.a.w0.b.e:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.BoundedByteString$BoundedByteIterator -> com.android.tools.r8.u.b.a.w0.b.f:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.BoundedByteString this$0 -> c
     int limit -> b
     int position -> a
@@ -49817,7 +49916,7 @@
     1:4:byte nextByte():153:156 -> nextByte
     5:5:byte nextByte():154:154 -> nextByte
     1:1:void remove():160:160 -> remove
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString -> com.android.tools.r8.v.b.a.v0.b.j:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString -> com.android.tools.r8.u.b.a.w0.b.j:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString EMPTY -> a
     boolean $assertionsDisabled -> b
     1:22:void <clinit>():60:81 -> <clinit>
@@ -49845,8 +49944,8 @@
     int peekCachedHashCode() -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString$Output newOutput():751:751 -> f
     1:1:java.lang.String toString():1019:1019 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString$ByteIterator -> com.android.tools.r8.v.b.a.v0.b.h:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString$Output -> com.android.tools.r8.v.b.a.v0.b.i:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString$ByteIterator -> com.android.tools.r8.u.b.a.w0.b.h:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString$Output -> com.android.tools.r8.u.b.a.w0.b.i:
     int bufferPos -> e
     byte[] buffer -> d
     java.util.ArrayList flushedBuffers -> b
@@ -49871,7 +49970,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.v.b.a.v0.b.l:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream -> com.android.tools.r8.u.b.a.w0.b.l:
     int recursionLimit -> l
     int sizeLimit -> m
     int currentLimit -> j
@@ -49982,8 +50081,8 @@
     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.CodedInputStream$RefillCallback -> com.android.tools.r8.v.b.a.v0.b.k:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream -> com.android.tools.r8.v.b.a.v0.b.n:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream$RefillCallback -> com.android.tools.r8.u.b.a.w0.b.k:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream -> com.android.tools.r8.u.b.a.w0.b.n:
     byte[] buffer -> a
     java.io.OutputStream output -> e
     int totalBytesWritten -> d
@@ -50080,9 +50179,9 @@
     1:1:int computeInt32SizeNoTag(int):794:794 -> f
     int computeRawVarint32Size(int) -> g
     1:1:int computeTagSize(int):1185:1185 -> h
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream$OutOfSpaceException -> com.android.tools.r8.v.b.a.v0.b.m:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream$OutOfSpaceException -> com.android.tools.r8.u.b.a.w0.b.m:
     1:1:void <init>():1016:1016 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite -> com.android.tools.r8.v.b.a.v0.b.p:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite -> com.android.tools.r8.u.b.a.w0.b.p:
     java.util.Map extensionsByNumber -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite EMPTY -> b
     1:1:void <clinit>():159:159 -> <clinit>
@@ -50100,13 +50199,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.v.b.a.v0.b.o:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite$ObjectIntPair -> com.android.tools.r8.u.b.a.w0.b.o:
     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.v.b.a.v0.b.r:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet -> com.android.tools.r8.u.b.a.w0.b.r:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet DEFAULT_INSTANCE -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap fields -> a
     boolean isImmutable -> b
@@ -50360,8 +50459,8 @@
     1:5:void makeImmutable():107:111 -> d
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet emptySet():99:99 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet newFieldSet():92:92 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet$FieldDescriptorLite -> com.android.tools.r8.v.b.a.v0.b.q:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite -> com.android.tools.r8.v.b.a.v0.b.y:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet$FieldDescriptorLite -> com.android.tools.r8.u.b.a.w0.b.q:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite -> com.android.tools.r8.u.b.a.w0.b.y:
     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
@@ -50453,15 +50552,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.v.b.a.v0.b.s:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder -> com.android.tools.r8.v.b.a.v0.b.t:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$1 -> com.android.tools.r8.u.b.a.w0.b.s:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder -> com.android.tools.r8.u.b.a.w0.b.t:
     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() -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString getUnknownFields():123:123 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder -> com.android.tools.r8.v.b.a.v0.b.u:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder -> com.android.tools.r8.u.b.a.w0.b.u:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet extensions -> b
     boolean extensionsIsMutable -> c
     1:3:void <init>():332:334 -> <init>
@@ -50495,7 +50594,7 @@
     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:1:boolean extensionsAreInitialized():471:471 -> e
     1:3:void ensureExtensionsIsMutable():350:352 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage -> com.android.tools.r8.v.b.a.v0.b.v:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage -> com.android.tools.r8.u.b.a.w0.b.v:
     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>
@@ -50531,7 +50630,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.v.b.a.v0.b.v$a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage$ExtensionWriter -> com.android.tools.r8.u.b.a.w0.b.v$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
@@ -50568,7 +50667,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.v.b.a.v0.b.w:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor -> com.android.tools.r8.u.b.a.w0.b.w:
     boolean isPacked -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLiteMap enumTypeMap -> a
     int number -> b
@@ -50579,7 +50678,7 @@
     1:1:int compareTo(java.lang.Object):671:671 -> compareTo
     2:2:int 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.v.b.a.v0.b.x:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension -> com.android.tools.r8.u.b.a.w0.b.x:
     java.lang.Object defaultValue -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor descriptor -> d
     java.lang.reflect.Method enumValueOf -> e
@@ -50601,14 +50700,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.v.b.a.v0.b.B:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal -> com.android.tools.r8.u.b.a.w0.b.B:
     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.v.b.a.v0.b.z:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLite -> com.android.tools.r8.u.b.a.w0.b.z:
     int getNumber() -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLiteMap -> com.android.tools.r8.v.b.a.v0.b.A:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLiteMap -> com.android.tools.r8.u.b.a.w0.b.A:
     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.v.b.a.v0.b.C:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.InvalidProtocolBufferException -> com.android.tools.r8.u.b.a.w0.b.C:
     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>
@@ -50617,14 +50716,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.v.b.a.v0.b.D:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LazyField$LazyIterator -> com.android.tools.r8.u.b.a.w0.b.D:
     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 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.v.b.a.v0.b.G:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString -> com.android.tools.r8.u.b.a.w0.b.G:
     int hash -> d
     byte[] bytes -> c
     1:180:void <init>(byte[]):62:241 -> <init>
@@ -50651,8 +50750,8 @@
     1:1:java.util.Iterator iterator():52:52 -> iterator
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString$ByteIterator iterator():307:307 -> iterator
     1:1:int size():76:76 -> size
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString$1 -> com.android.tools.r8.v.b.a.v0.b.E:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString$LiteralByteIterator -> com.android.tools.r8.v.b.a.v0.b.F:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString$1 -> com.android.tools.r8.u.b.a.w0.b.E:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString$LiteralByteIterator -> com.android.tools.r8.u.b.a.w0.b.F:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString this$0 -> c
     int limit -> b
     int position -> a
@@ -50663,12 +50762,12 @@
     1:1:java.lang.Object next():310 -> next
     1:3:byte nextByte():330:332 -> nextByte
     1:1:void remove():337:337 -> remove
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLiteOrBuilder -> com.android.tools.r8.v.b.a.v0.b.H:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLiteOrBuilder -> com.android.tools.r8.u.b.a.w0.b.H:
     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.v.b.a.v0.b.I:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser -> com.android.tools.r8.u.b.a.w0.b.I:
     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.v.b.a.v0.b.N:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString -> com.android.tools.r8.u.b.a.w0.b.N:
     int[] minLengthByDepth -> i
     int hash -> h
     int leftLength -> f
@@ -50710,8 +50809,8 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString$ByteIterator 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.v.b.a.v0.b.J:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$Balancer -> com.android.tools.r8.v.b.a.v0.b.K:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$1 -> com.android.tools.r8.u.b.a.w0.b.J:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$Balancer -> com.android.tools.r8.u.b.a.w0.b.K:
     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>
@@ -50733,7 +50832,7 @@
     47:47:void 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.v.b.a.v0.b.L:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$PieceIterator -> com.android.tools.r8.u.b.a.w0.b.L:
     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>
@@ -50754,7 +50853,7 @@
     14:14:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString next():765:765 -> next
     15:15:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString next():762:762 -> next
     1:1:void remove():770:770 -> remove
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$RopeByteIterator -> com.android.tools.r8.v.b.a.v0.b.M:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$RopeByteIterator -> com.android.tools.r8.u.b.a.w0.b.M:
     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
@@ -50765,7 +50864,7 @@
     1:1:java.lang.Object next():782 -> next
     1:5:byte nextByte():803:807 -> nextByte
     1:1:void remove():811:811 -> remove
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap -> com.android.tools.r8.v.b.a.v0.b.T:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap -> com.android.tools.r8.u.b.a.w0.b.T:
     java.util.List entryList -> b
     java.util.Map overflowEntries -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EntrySet lazyEntrySet -> e
@@ -50800,7 +50899,7 @@
     1:5:java.util.SortedMap getOverflowEntriesMutable():377:381 -> m
     1:13:java.lang.Object remove(java.lang.Object):279:291 -> remove
     1:1:int size():202:202 -> size
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$1 -> com.android.tools.r8.v.b.a.v0.b.O:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$1 -> com.android.tools.r8.u.b.a.w0.b.O:
     1:1:void <init>(int):100:100 -> <init>
     1:5:void makeImmutable():104:108 -> k
     6:6:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.isRepeated():706:706 -> k
@@ -50810,20 +50909,20 @@
     14:14:void makeImmutable():115 -> k
     15:20:void makeImmutable():116:121 -> k
     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.v.b.a.v0.b.S:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EmptySet -> com.android.tools.r8.u.b.a.w0.b.S:
     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.v.b.a.v0.b.P:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EmptySet$1 -> com.android.tools.r8.u.b.a.w0.b.P:
     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.v.b.a.v0.b.Q:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EmptySet$2 -> com.android.tools.r8.u.b.a.w0.b.Q:
     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.v.b.a.v0.b.T$a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$Entry -> com.android.tools.r8.u.b.a.w0.b.T$a:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap this$0 -> c
     java.lang.Object value -> b
     java.lang.Comparable key -> a
@@ -50847,7 +50946,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.v.b.a.v0.b.T$b:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EntryIterator -> com.android.tools.r8.u.b.a.w0.b.T$b:
     java.util.Iterator lazyOverflowIterator -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap this$0 -> d
     boolean nextCalledBeforeRemove -> b
@@ -50860,7 +50959,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.v.b.a.v0.b.T$c:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EntrySet -> com.android.tools.r8.u.b.a.w0.b.T$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>
@@ -50872,9 +50971,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.v.b.a.v0.b.U:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.UninitializedMessageException -> com.android.tools.r8.u.b.a.w0.b.U:
     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.v.b.a.v0.b.V:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Utf8 -> com.android.tools.r8.u.b.a.w0.b.V:
     int incompleteStateFor(int,int) -> a
     int incompleteStateFor(int,int,int) -> a
     1:66:int partialIsValidUtf8(int,byte[],int,int):163:228 -> a
@@ -50883,10 +50982,10 @@
     1:1:int partialIsValidUtf8(byte[],int,int):252:252 -> b
     2:38:int 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.v.b.a.v0.b.d0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat -> com.android.tools.r8.u.b.a.w0.b.d0:
     int makeTag(int,int) -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$1 -> com.android.tools.r8.v.b.a.v0.b.W:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType -> com.android.tools.r8.v.b.a.v0.b.b0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$1 -> com.android.tools.r8.u.b.a.w0.b.W:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType -> com.android.tools.r8.u.b.a.w0.b.b0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType DOUBLE -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType[] $VALUES -> u
     int wireType -> b
@@ -50915,19 +51014,19 @@
     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.v.b.a.v0.b.X:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType$1 -> com.android.tools.r8.u.b.a.w0.b.X:
     1:1:void <init>(java.lang.String,int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType,int):116:116 -> <init>
     boolean isPackable() -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType$2 -> com.android.tools.r8.v.b.a.v0.b.Y:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType$2 -> com.android.tools.r8.u.b.a.w0.b.Y:
     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.v.b.a.v0.b.Z:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType$3 -> com.android.tools.r8.u.b.a.w0.b.Z:
     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.v.b.a.v0.b.a0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType$4 -> com.android.tools.r8.u.b.a.w0.b.a0:
     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.v.b.a.v0.b.c0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType -> com.android.tools.r8.u.b.a.w0.b.c0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType BOOLEAN -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType STRING -> g
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType FLOAT -> d
@@ -50942,7 +51041,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.v.b.a.w0.a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmClassExtensionVisitor -> com.android.tools.r8.u.b.a.x0.a:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType TYPE -> b
     1:1:void <clinit>():78:78 -> <clinit>
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmClassExtensionVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):48:48 -> <init>
@@ -50952,20 +51051,20 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmClassExtensionVisitor getDelegate():51:51 -> c
     1:1:void visitEnd():68 -> c
     2:2:void visitEnd():68:68 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmConstructorExtensionVisitor -> com.android.tools.r8.v.b.a.w0.b:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmConstructorExtensionVisitor -> com.android.tools.r8.u.b.a.x0.b:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType TYPE -> a
     1:1:void <clinit>():260:260 -> <clinit>
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmConstructorExtensionVisitor):236:236 -> <init>
     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 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmDeclarationContainerExtensionVisitor -> com.android.tools.r8.v.b.a.w0.c:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmDeclarationContainerExtensionVisitor -> com.android.tools.r8.u.b.a.x0.c:
     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>
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor visitLocalDelegatedProperty(int,java.lang.String,int,int) -> a
     void visitModuleName(java.lang.String) -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmDeclarationContainerExtensionVisitor getDelegate():15:15 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature -> com.android.tools.r8.v.b.a.w0.d:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature -> com.android.tools.r8.u.b.a.x0.d:
     java.lang.String name -> a
     java.lang.String desc -> b
     1:1:void <init>(java.lang.String,java.lang.String):51:51 -> <init>
@@ -50994,7 +51093,7 @@
     3:3:java.lang.String getDesc():51:51 -> hashCode
     3:3:int hashCode():0 -> hashCode
     4:4:int hashCode():0:0 -> hashCode
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFunctionExtensionVisitor -> com.android.tools.r8.v.b.a.w0.e:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFunctionExtensionVisitor -> com.android.tools.r8.u.b.a.x0.e:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType TYPE -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFunctionExtensionVisitor delegate -> a
     1:1:void <clinit>():154:154 -> <clinit>
@@ -51004,14 +51103,14 @@
     void visitLambdaClassOriginName(java.lang.String) -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType getType():119:119 -> a
     1:1:void visitEnd():144:144 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMemberSignature -> com.android.tools.r8.v.b.a.w0.f:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMemberSignature -> com.android.tools.r8.u.b.a.x0.f:
     1:1:void <init>():16:16 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):16:16 -> <init>
     java.lang.String asString() -> a
     java.lang.String getDesc() -> b
     java.lang.String getName() -> c
     1:1:java.lang.String toString():30:30 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature -> com.android.tools.r8.v.b.a.w0.g:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature -> com.android.tools.r8.u.b.a.x0.g:
     java.lang.String name -> a
     java.lang.String desc -> b
     1:1:void <init>(java.lang.String,java.lang.String):40:40 -> <init>
@@ -51040,7 +51139,7 @@
     3:3:java.lang.String getDesc():40:40 -> hashCode
     3:3:int hashCode():0 -> hashCode
     4:4:int hashCode():0:0 -> hashCode
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmPackageExtensionVisitor -> com.android.tools.r8.v.b.a.w0.h:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmPackageExtensionVisitor -> com.android.tools.r8.u.b.a.x0.h:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType TYPE -> b
     1:1:void <clinit>():108:108 -> <clinit>
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmPackageExtensionVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):86:86 -> <init>
@@ -51049,7 +51148,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmPackageExtensionVisitor getDelegate():89:89 -> c
     1:1:void visitEnd():98 -> c
     2:2:void visitEnd():98:98 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmPropertyExtensionVisitor -> com.android.tools.r8.v.b.a.w0.i:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmPropertyExtensionVisitor -> com.android.tools.r8.u.b.a.x0.i:
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmPropertyExtensionVisitor delegate -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType TYPE -> b
     1:1:void <clinit>():229:229 -> <clinit>
@@ -51059,7 +51158,7 @@
     void visitSyntheticMethodForAnnotations(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature) -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType getType():165:165 -> a
     1:1:void visitEnd():219:219 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmTypeExtensionVisitor -> com.android.tools.r8.v.b.a.w0.j:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmTypeExtensionVisitor -> com.android.tools.r8.u.b.a.x0.j:
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmTypeExtensionVisitor delegate -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType TYPE -> b
     1:1:void <clinit>():341:341 -> <clinit>
@@ -51069,7 +51168,7 @@
     void visitAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation) -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType getType():307:307 -> a
     1:1:void visitEnd():331:331 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmTypeParameterExtensionVisitor -> com.android.tools.r8.v.b.a.w0.k:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmTypeParameterExtensionVisitor -> com.android.tools.r8.u.b.a.x0.k:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType TYPE -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmTypeParameterExtensionVisitor delegate -> a
     1:1:void <clinit>():296:296 -> <clinit>
@@ -51078,7 +51177,7 @@
     void visitAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation) -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType getType():271:271 -> a
     1:1:void visitEnd():286:286 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader -> com.android.tools.r8.v.b.a.w0.l:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader -> com.android.tools.r8.u.b.a.x0.l:
     java.lang.String packageName -> g
     java.lang.String extraString -> f
     int[] COMPATIBLE_METADATA_VERSION -> i
@@ -51099,13 +51198,13 @@
     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.v.b.a.w0.y:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata -> com.android.tools.r8.u.b.a.x0.A:
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader header -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion Companion -> b
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):25:25 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):25:25 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader getHeader():25:25 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class -> com.android.tools.r8.v.b.a.w0.o:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class -> com.android.tools.r8.u.b.a.x0.o:
     com.android.tools.r8.jetbrains.kotlin.reflect.KProperty[] $$delegatedProperties -> d
     com.android.tools.r8.jetbrains.kotlin.Lazy classData$delegate -> c
     1:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):29:30 -> <init>
@@ -51117,7 +51216,7 @@
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass toKmClass():40 -> b
     4:5:void 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.v.b.a.w0.m:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$Writer -> com.android.tools.r8.u.b.a.x0.m:
     1:1:void <init>():55:55 -> <init>
     1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$Writer,int[],int[],int,int,java.lang.Object):68:69 -> f
     1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class write():0 -> f
@@ -51128,45 +51227,22 @@
     76:77:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class write(int[],int[],int):72 -> f
     76:77:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$Writer,int[],int[],int,int,java.lang.Object):70 -> f
     76:77:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class write():0 -> f
-    78:78:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class write(int[],int[],int):72:72 -> f
-    78:78:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$Writer,int[],int[],int,int,java.lang.Object):70 -> f
-    78:78:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class write():0 -> f
-    79:101:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmWriteUtilsKt.writeProtoBufData(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):0:22 -> f
-    79:101:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class write(int[],int[],int):72 -> f
-    79:101:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$Writer,int[],int[],int,int,java.lang.Object):70 -> f
-    79:101:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class write():0 -> f
-    102:102:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmWriteUtilsKt.writeProtoBufData(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):15:15 -> f
-    102:102:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class write(int[],int[],int):72 -> f
-    102:102:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$Writer,int[],int[],int,int,java.lang.Object):70 -> f
-    102:102:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class write():0 -> f
-    103:105:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class write(int[],int[],int):72:74 -> f
-    103:105:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$Writer,int[],int[],int,int,java.lang.Object):70 -> f
-    103:105:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class write():0 -> f
-    106:109:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class write(int[],int[],int):73:76 -> f
-    106:109:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$Writer,int[],int[],int,int,java.lang.Object):70 -> f
-    106:109:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class write():0 -> f
-    110:110:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmWriteUtilsKt.writeProtoBufData(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):22:22 -> f
-    110:110:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class write(int[],int[],int):72 -> f
-    110:110:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$Writer,int[],int[],int,int,java.lang.Object):70 -> f
-    110:110:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class write():0 -> f
-    111:111:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmWriteUtilsKt.writeProtoBufData(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):21:21 -> f
-    111:111:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class write(int[],int[],int):72 -> f
-    111:111:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$Writer,int[],int[],int,int,java.lang.Object):70 -> f
-    111:111:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class write():0 -> f
-    112:112:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmWriteUtilsKt.writeProtoBufData(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):14:14 -> f
-    112:112:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class write(int[],int[],int):72 -> f
-    112:112:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$Writer,int[],int[],int,int,java.lang.Object):70 -> f
-    112:112:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class write():0 -> f
-    113:113:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):316:316 -> f
-    113:113:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder.build():9748 -> f
-    113:113:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class write(int[],int[],int):72 -> f
-    113:113:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$Writer,int[],int[],int,int,java.lang.Object):70 -> f
-    113:113:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class write():0 -> f
-    114:114:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder.build():9748:9748 -> f
-    114:114:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class write(int[],int[],int):72 -> f
-    114:114:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$Writer,int[],int[],int,int,java.lang.Object):70 -> f
-    114:114:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class write():0 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$classData$2 -> com.android.tools.r8.v.b.a.w0.n:
+    78:80:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class write(int[],int[],int):72:74 -> f
+    78:80:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$Writer,int[],int[],int,int,java.lang.Object):70 -> f
+    78:80:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class write():0 -> f
+    81:84:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class write(int[],int[],int):73:76 -> f
+    81:84:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$Writer,int[],int[],int,int,java.lang.Object):70 -> f
+    81:84:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class write():0 -> f
+    85:85:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):316:316 -> f
+    85:85:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder.build():9748 -> f
+    85:85:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class write(int[],int[],int):72 -> f
+    85:85:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$Writer,int[],int[],int,int,java.lang.Object):70 -> f
+    85:85:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class write():0 -> f
+    86:86:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder.build():9748:9748 -> f
+    86:86:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class write(int[],int[],int):72 -> f
+    86:86:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$Writer,int[],int[],int,int,java.lang.Object):70 -> f
+    86:86:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class write():0 -> f
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$classData$2 -> com.android.tools.r8.u.b.a.x0.n:
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader $header -> a
     1:3:com.android.tools.r8.jetbrains.kotlin.Pair invoke():31:33 -> a
     1:3:java.lang.Object invoke():29 -> a
@@ -51177,10 +51253,10 @@
     5:5:java.lang.Object invoke():29 -> a
     6:6:com.android.tools.r8.jetbrains.kotlin.Pair 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.v.b.a.w0.p:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion -> com.android.tools.r8.u.b.a.x0.p:
     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.v.b.a.w0.r:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade -> com.android.tools.r8.u.b.a.x0.s:
     com.android.tools.r8.jetbrains.kotlin.reflect.KProperty[] $$delegatedProperties -> d
     com.android.tools.r8.jetbrains.kotlin.Lazy packageData$delegate -> c
     1:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):84:85 -> <init>
@@ -51192,7 +51268,17 @@
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage toKmPackage():95 -> b
     4:5:void 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$packageData$2 -> com.android.tools.r8.v.b.a.w0.q:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade$Writer -> com.android.tools.r8.u.b.a.x0.q:
+    1:1:void <init>():110:110 -> <init>
+    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade$Writer,int[],int[],int,int,java.lang.Object):123:124 -> e
+    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade write():0 -> e
+    3:132:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade write(int[],int[],int):0:129 -> e
+    3:132:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade$Writer,int[],int[],int,int,java.lang.Object):125 -> e
+    3:132:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade write():0 -> e
+    133:136:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade write(int[],int[],int):128:131 -> e
+    133:136:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade$Writer,int[],int[],int,int,java.lang.Object):125 -> e
+    133:136:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade write():0 -> e
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade$packageData$2 -> com.android.tools.r8.u.b.a.x0.r:
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader $header -> a
     1:3:com.android.tools.r8.jetbrains.kotlin.Pair invoke():86:88 -> a
     1:3:java.lang.Object invoke():84 -> a
@@ -51203,9 +51289,9 @@
     5:5:java.lang.Object invoke():84 -> a
     6:6:com.android.tools.r8.jetbrains.kotlin.Pair 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.v.b.a.w0.s:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade -> com.android.tools.r8.u.b.a.x0.t:
     1:5:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):217:221 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart -> com.android.tools.r8.v.b.a.w0.u:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart -> com.android.tools.r8.u.b.a.x0.w:
     com.android.tools.r8.jetbrains.kotlin.reflect.KProperty[] $$delegatedProperties -> d
     com.android.tools.r8.jetbrains.kotlin.Lazy packageData$delegate -> c
     1:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):260:261 -> <init>
@@ -51217,7 +51303,17 @@
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage toKmPackage():277 -> b
     4:5:void 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$packageData$2 -> com.android.tools.r8.v.b.a.w0.t:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart$Writer -> com.android.tools.r8.u.b.a.x0.u:
+    1:1:void <init>():292:292 -> <init>
+    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart$Writer,java.lang.String,int[],int[],int,int,java.lang.Object):307:308 -> a
+    1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart write(java.lang.String):0 -> a
+    3:316:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart write(java.lang.String,int[],int[],int):0:313 -> a
+    3:316:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart$Writer,java.lang.String,int[],int[],int,int,java.lang.Object):309 -> a
+    3:316:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart write(java.lang.String):0 -> a
+    317:320:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart write(java.lang.String,int[],int[],int):312:315 -> a
+    317:320:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart$Writer,java.lang.String,int[],int[],int,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.u.b.a.x0.v:
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader $header -> a
     1:3:com.android.tools.r8.jetbrains.kotlin.Pair invoke():262:264 -> a
     1:3:java.lang.Object invoke():260 -> a
@@ -51228,16 +51324,16 @@
     5:5:java.lang.Object invoke():260 -> a
     6:6:com.android.tools.r8.jetbrains.kotlin.Pair 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.v.b.a.w0.w:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass -> com.android.tools.r8.u.b.a.x0.y:
     1:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):140:141 -> <init>
     1:1:boolean isLambda():159:159 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass$functionData$2 -> com.android.tools.r8.v.b.a.w0.v:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass$functionData$2 -> com.android.tools.r8.u.b.a.x0.x:
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader $header -> a
     1:2:com.android.tools.r8.jetbrains.kotlin.Pair 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.v.b.a.w0.x:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Unknown -> com.android.tools.r8.u.b.a.x0.z:
     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.v.b.a.w0.z.a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmClassExtension -> com.android.tools.r8.u.b.a.x0.B.a:
     java.util.List localDelegatedProperties -> c
     java.lang.String anonymousObjectOriginName -> e
     java.lang.String moduleName -> d
@@ -51252,7 +51348,7 @@
     189:189:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor visitLocalDelegatedProperty(int,java.lang.String,int,int):40:40 -> a
     190:190:void visitModuleName(java.lang.String):43:43 -> a
     1:1:void visitAnonymousObjectOriginName(java.lang.String):47:47 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmConstructorExtension -> com.android.tools.r8.v.b.a.w0.z.b:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmConstructorExtension -> com.android.tools.r8.u.b.a.x0.B.b:
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature signature -> b
     1:1:void <init>():133:133 -> <init>
     1:1:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor):133:133 -> a
@@ -51261,7 +51357,7 @@
     145:145:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorExtensionVisitor):141:141 -> a
     145:145:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor):133 -> a
     146:146:void visit(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):137:137 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmFunctionExtension -> com.android.tools.r8.v.b.a.w0.z.c:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmFunctionExtension -> com.android.tools.r8.u.b.a.x0.B.c:
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature signature -> c
     java.lang.String lambdaClassOriginName -> d
     1:1:void <init>():82:82 -> <init>
@@ -51272,64 +51368,77 @@
     101:101:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor):82 -> a
     102:102:void visit(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):87:87 -> a
     103:103:void visitLambdaClassOriginName(java.lang.String):91:91 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions -> com.android.tools.r8.v.b.a.w0.z.k:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions -> com.android.tools.r8.u.b.a.x0.B.m:
     1:1:void <init>():17:17 -> <init>
     1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassExtensionVisitor writeClassExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):108:109 -> a
-    3:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionExtensionVisitor writeFunctionExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):150:151 -> a
-    5:6:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyExtensionVisitor writePropertyExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):167:168 -> a
-    7:8:com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorExtensionVisitor writeConstructorExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):225:226 -> a
-    9:10:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterExtensionVisitor writeTypeParameterExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):238:239 -> a
-    11:12:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeExtensionVisitor writeTypeExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):247:248 -> a
-    13:13:com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmClassExtension createClassExtension():261:261 -> a
-    14:16:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature toJvmMethodSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMemberSignature,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):276:278 -> a
-    14:16:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature access$toJvmMethodSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMemberSignature,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):17 -> a
-    17:18:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder.build():2411:2412 -> a
-    17:18:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature toJvmMethodSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMemberSignature,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):279 -> a
-    17:18:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature access$toJvmMethodSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMemberSignature,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):17 -> a
-    19:19:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature toJvmMethodSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMemberSignature,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):279:279 -> a
-    19:19:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature access$toJvmMethodSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMemberSignature,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):17 -> a
-    20:20:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):316:316 -> a
-    20:20:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder.build():2413 -> a
-    20:20:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature toJvmMethodSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMemberSignature,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):279 -> a
-    20:20:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature access$toJvmMethodSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMemberSignature,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):17 -> a
-    21:21:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder.build():2413:2413 -> a
-    21:21:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature toJvmMethodSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMemberSignature,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):279 -> a
+    3:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageExtensionVisitor writePackageExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):131:132 -> a
+    5:6:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionExtensionVisitor writeFunctionExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):150:151 -> a
+    7:8:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyExtensionVisitor writePropertyExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):167:168 -> a
+    9:10:com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorExtensionVisitor writeConstructorExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):225:226 -> a
+    11:12:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterExtensionVisitor writeTypeParameterExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):238:239 -> a
+    13:14:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeExtensionVisitor writeTypeExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):247:248 -> a
+    15:15:com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmClassExtension createClassExtension():261:261 -> a
+    16:18:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature toJvmMethodSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMemberSignature,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):276:278 -> a
+    16:18:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature access$toJvmMethodSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMemberSignature,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):17 -> a
+    19:20:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder.build():2411:2412 -> a
+    19:20:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature toJvmMethodSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMemberSignature,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):279 -> a
+    19:20:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature access$toJvmMethodSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMemberSignature,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):17 -> a
+    21:21:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature toJvmMethodSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMemberSignature,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):279:279 -> a
     21:21:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature access$toJvmMethodSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMemberSignature,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):17 -> a
-    22:22:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature toJvmMethodSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMemberSignature,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):276:276 -> a
+    22:22:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):316:316 -> a
+    22:22:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder.build():2413 -> a
+    22:22:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature toJvmMethodSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMemberSignature,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):279 -> a
     22:22:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature access$toJvmMethodSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMemberSignature,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):17 -> a
+    23:23:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder.build():2413:2413 -> a
+    23:23:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature toJvmMethodSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMemberSignature,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):279 -> a
+    23:23:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature access$toJvmMethodSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMemberSignature,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):17 -> a
+    24:24:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature toJvmMethodSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMemberSignature,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):276:276 -> a
+    24:24:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature access$toJvmMethodSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMemberSignature,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):17 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmConstructorExtension createConstructorExtension():269:269 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmFunctionExtension createFunctionExtension():265:265 -> c
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmPackageExtension createPackageExtension():263:263 -> d
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmPropertyExtension createPropertyExtension():267:267 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmTypeExtension createTypeExtension():273:273 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmTypeParameterExtension createTypeParameterExtension():271:271 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeClassExtensions$1 -> com.android.tools.r8.v.b.a.w0.z.e:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeClassExtensions$1 -> com.android.tools.r8.u.b.a.x0.B.e:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder $proto -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext $c -> d
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):109:109 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor visitLocalDelegatedProperty(int,java.lang.String,int,int):116:116 -> a
     2:3:void visitModuleName(java.lang.String):121:122 -> a
     1:1:void visitAnonymousObjectOriginName(java.lang.String):111:111 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeClassExtensions$1$visitLocalDelegatedProperty$1 -> com.android.tools.r8.v.b.a.w0.z.d:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeClassExtensions$1$visitLocalDelegatedProperty$1 -> com.android.tools.r8.u.b.a.x0.B.d:
     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 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.v.b.a.w0.z.f:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeConstructorExtensions$1 -> com.android.tools.r8.u.b.a.x0.B.f:
     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.v.b.a.w0.z.g:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeFunctionExtensions$1 -> com.android.tools.r8.u.b.a.x0.B.g:
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions this$0 -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext $c -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder $proto -> d
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):151:151 -> <init>
     1:1:void visit(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):154:154 -> a
     2:2:void visitLambdaClassOriginName(java.lang.String):159:159 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writePropertyExtensions$1 -> com.android.tools.r8.v.b.a.w0.z.h:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writePackageExtensions$1 -> com.android.tools.r8.u.b.a.x0.B.i:
+    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.u.b.a.x0.B.h:
+    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 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.u.b.a.x0.B.j:
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions this$0 -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder signature -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder $proto -> g
@@ -51357,24 +51466,31 @@
     9:9:void visitEnd():216 -> b
     10:10:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder.build():3447:3447 -> b
     10:10:void visitEnd():216 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeTypeExtensions$1 -> com.android.tools.r8.v.b.a.w0.z.i:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeTypeExtensions$1 -> com.android.tools.r8.u.b.a.x0.B.k:
     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.v.b.a.w0.z.j:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeTypeParameterExtensions$1 -> com.android.tools.r8.u.b.a.x0.B.l:
     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.v.b.a.w0.z.l:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmPackageExtension -> com.android.tools.r8.u.b.a.x0.B.n:
     java.util.List localDelegatedProperties -> c
     java.lang.String moduleName -> d
     1:2:void <init>():61:62 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor visitLocalDelegatedProperty(int,java.lang.String,int,int):66:66 -> a
-    2:2:void visitModuleName(java.lang.String):69:69 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmPropertyExtension -> com.android.tools.r8.v.b.a.w0.z.m:
+    1:1:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor):61:61 -> a
+    2:182:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageExtensionVisitor):0:180 -> a
+    2:182:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor):61 -> a
+    183:186:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageExtensionVisitor):75:78 -> a
+    183:186:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor):61 -> a
+    187:187:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageExtensionVisitor):73:73 -> a
+    187:187:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor):61 -> a
+    188:188:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor visitLocalDelegatedProperty(int,java.lang.String,int,int):66:66 -> a
+    189:189:void visitModuleName(java.lang.String):69:69 -> a
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmPropertyExtension -> com.android.tools.r8.u.b.a.x0.B.o:
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature syntheticMethodForAnnotations -> g
     int jvmFlags -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature fieldSignature -> d
@@ -51388,7 +51504,7 @@
     132:132:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor):102 -> a
     133:136: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):115:118 -> a
     137:137:void visitSyntheticMethodForAnnotations(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):122:122 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmTypeExtension -> com.android.tools.r8.v.b.a.w0.z.n:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmTypeExtension -> com.android.tools.r8.u.b.a.x0.B.p:
     java.util.List annotations -> d
     boolean isRaw -> c
     1:3:void <init>():160:162 -> <init>
@@ -51401,7 +51517,7 @@
     185:185:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor):160 -> a
     186:186:void visit(boolean):165:165 -> a
     187:187:void visitAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):169:169 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmTypeParameterExtension -> com.android.tools.r8.v.b.a.w0.z.o:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmTypeParameterExtension -> com.android.tools.r8.u.b.a.x0.B.q:
     java.util.List annotations -> c
     1:2:void <init>():146:147 -> <init>
     1:1:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor):146:146 -> a
@@ -51959,49 +52075,50 @@
     1:5:boolean equals(java.lang.Object):67:71 -> equals
     1:1:int hashCode():76:76 -> hashCode
     1:1:java.lang.String toString():81:81 -> toString
-com.android.tools.r8.kotlin.Kotlin -> com.android.tools.r8.w.a:
-    java.lang.String KOTLIN -> f
+com.android.tools.r8.kotlin.Kotlin -> com.android.tools.r8.v.a:
+    java.lang.String KOTLIN -> g
+    java.lang.String NAME -> f
     com.android.tools.r8.kotlin.Kotlin$Functional functional -> b
     com.android.tools.r8.kotlin.Kotlin$Metadata metadata -> d
     com.android.tools.r8.kotlin.Kotlin$Intrinsics intrinsics -> c
-    java.lang.String NAME -> e
+    java.util.Map knownTypeConversion -> e
     com.android.tools.r8.graph.DexItemFactory factory -> a
-    1:5:void <clinit>():24:28 -> <clinit>
-    1:6:void <init>(com.android.tools.r8.graph.DexItemFactory):40:45 -> <init>
-    1:1:java.lang.String addKotlinPrefix(java.lang.String):31:31 -> a
-    2:2:com.android.tools.r8.kotlin.KotlinInfo getKotlinInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.DiagnosticsHandler):117:117 -> a
-com.android.tools.r8.kotlin.Kotlin$1 -> com.android.tools.r8.w.a$a:
-com.android.tools.r8.kotlin.Kotlin$Functional -> com.android.tools.r8.w.a$b:
+    1:5:void <clinit>():26:30 -> <clinit>
+    1:22:void <init>(com.android.tools.r8.graph.DexItemFactory):44:65 -> <init>
+    1:1:java.lang.String addKotlinPrefix(java.lang.String):33:33 -> a
+    2:2:com.android.tools.r8.kotlin.KotlinInfo getKotlinInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.DiagnosticsHandler):137:137 -> a
+com.android.tools.r8.kotlin.Kotlin$1 -> com.android.tools.r8.v.a$a:
+com.android.tools.r8.kotlin.Kotlin$Functional -> com.android.tools.r8.v.a$b:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap functions -> a
     com.android.tools.r8.graph.DexString kotlinStyleLambdaInstanceName -> b
     boolean $assertionsDisabled -> f
     com.android.tools.r8.graph.DexType lambdaType -> c
     com.android.tools.r8.graph.DexMethod lambdaInitializerMethod -> d
     com.android.tools.r8.kotlin.Kotlin this$0 -> e
-    1:1:void <clinit>():48:48 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.kotlin.Kotlin$1):48:48 -> <init>
-    2:2:void <init>(com.android.tools.r8.kotlin.Kotlin):66:66 -> <init>
-    3:7:void <init>(com.android.tools.r8.kotlin.Kotlin):59:63 -> <init>
-    8:8:void <init>(com.android.tools.r8.kotlin.Kotlin):61:61 -> <init>
-    9:26:void <init>(com.android.tools.r8.kotlin.Kotlin):60:77 -> <init>
-    27:27:void <init>(com.android.tools.r8.kotlin.Kotlin):75:75 -> <init>
-    1:1:com.android.tools.r8.graph.DexType lambda$new$0(java.lang.Integer):62:62 -> a
-    2:2:int getArity(com.android.tools.r8.graph.DexType):85:85 -> a
-    3:3:boolean isFunctionInterface(com.android.tools.r8.graph.DexType):81:81 -> a
-    3:3:int getArity(com.android.tools.r8.graph.DexType):85 -> a
-    4:6:int getArity(com.android.tools.r8.graph.DexType):85:87 -> a
-    1:1:boolean isFunctionInterface(com.android.tools.r8.graph.DexType):81:81 -> b
-com.android.tools.r8.kotlin.Kotlin$Intrinsics -> com.android.tools.r8.w.a$c:
+    1:1:void <clinit>():68:68 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.kotlin.Kotlin$1):68:68 -> <init>
+    2:2:void <init>(com.android.tools.r8.kotlin.Kotlin):86:86 -> <init>
+    3:7:void <init>(com.android.tools.r8.kotlin.Kotlin):79:83 -> <init>
+    8:8:void <init>(com.android.tools.r8.kotlin.Kotlin):81:81 -> <init>
+    9:26:void <init>(com.android.tools.r8.kotlin.Kotlin):80:97 -> <init>
+    27:27:void <init>(com.android.tools.r8.kotlin.Kotlin):95:95 -> <init>
+    1:1:com.android.tools.r8.graph.DexType lambda$new$0(java.lang.Integer):82:82 -> a
+    2:2:int getArity(com.android.tools.r8.graph.DexType):105:105 -> a
+    3:3:boolean isFunctionInterface(com.android.tools.r8.graph.DexType):101:101 -> a
+    3:3:int getArity(com.android.tools.r8.graph.DexType):105 -> a
+    4:6:int getArity(com.android.tools.r8.graph.DexType):105:107 -> a
+    1:1:boolean isFunctionInterface(com.android.tools.r8.graph.DexType):101:101 -> b
+com.android.tools.r8.kotlin.Kotlin$Intrinsics -> com.android.tools.r8.v.a$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
     com.android.tools.r8.graph.DexMethod throwParameterIsNullException -> b
     com.android.tools.r8.kotlin.Kotlin this$0 -> e
-    1:4:void <init>(com.android.tools.r8.kotlin.Kotlin):104:107 -> <init>
-    5:8:void <init>(com.android.tools.r8.kotlin.Kotlin):106:109 -> <init>
-    9:13:void <init>(com.android.tools.r8.kotlin.Kotlin):108:112 -> <init>
-    14:14:void <init>(com.android.tools.r8.kotlin.Kotlin):111:111 -> <init>
-com.android.tools.r8.kotlin.Kotlin$Metadata -> com.android.tools.r8.w.a$d:
+    1:4:void <init>(com.android.tools.r8.kotlin.Kotlin):124:127 -> <init>
+    5:8:void <init>(com.android.tools.r8.kotlin.Kotlin):126:129 -> <init>
+    9:13:void <init>(com.android.tools.r8.kotlin.Kotlin):128:132 -> <init>
+    14:14:void <init>(com.android.tools.r8.kotlin.Kotlin):131:131 -> <init>
+com.android.tools.r8.kotlin.Kotlin$Metadata -> com.android.tools.r8.v.a$d:
     com.android.tools.r8.graph.DexString kind -> b
     com.android.tools.r8.graph.DexString metadataVersion -> c
     com.android.tools.r8.graph.DexString bytecodeVersion -> d
@@ -52012,17 +52129,18 @@
     com.android.tools.r8.graph.DexString packageName -> h
     com.android.tools.r8.graph.DexString extraInt -> i
     com.android.tools.r8.graph.DexType kotlinMetadataType -> a
-    1:10:void <init>(com.android.tools.r8.kotlin.Kotlin):91:100 -> <init>
-com.android.tools.r8.kotlin.KotlinClass -> com.android.tools.r8.w.b:
+    1:10:void <init>(com.android.tools.r8.kotlin.Kotlin):111:120 -> <init>
+com.android.tools.r8.kotlin.KotlinClass -> com.android.tools.r8.v.b:
     boolean $assertionsDisabled -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass kmClass -> e
-    1:1:void <clinit>():20:20 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class,com.android.tools.r8.graph.DexClass):32:32 -> <init>
-    1:3:com.android.tools.r8.kotlin.KotlinClass fromKotlinClassMetadata(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata,com.android.tools.r8.graph.DexClass):26:28 -> a
-    4:15:void rewrite(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):44:55 -> a
-    1:3:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader createHeader():61:63 -> b
-    1:3:void processMetadata():37:39 -> d
-com.android.tools.r8.kotlin.KotlinClassFacade -> com.android.tools.r8.w.c:
+    1:1:void <clinit>():33:33 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class,com.android.tools.r8.graph.DexClass):45:45 -> <init>
+    1:3:com.android.tools.r8.kotlin.KotlinClass fromKotlinClassMetadata(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata,com.android.tools.r8.graph.DexClass):39:41 -> a
+    4:57:void rewrite(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):57:110 -> a
+    58:58:boolean lambda$rewrite$0(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction):90:90 -> a
+    1:3:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader createHeader():117:119 -> b
+    1:3:void processMetadata():50:52 -> d
+com.android.tools.r8.kotlin.KotlinClassFacade -> com.android.tools.r8.v.c:
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade,com.android.tools.r8.graph.DexClass):25:25 -> <init>
@@ -52030,7 +52148,7 @@
     5:6:void rewrite(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):38:39 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader createHeader():45:45 -> b
     1:2:void processMetadata():30:31 -> d
-com.android.tools.r8.kotlin.KotlinClassMetadataReader -> com.android.tools.r8.w.e:
+com.android.tools.r8.kotlin.KotlinClassMetadataReader -> com.android.tools.r8.v.e:
     1:15:com.android.tools.r8.kotlin.KotlinInfo getKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.DiagnosticsHandler):28:42 -> a
     16:16:com.android.tools.r8.kotlin.KotlinInfo getKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.DiagnosticsHandler):40:40 -> a
     17:19:com.android.tools.r8.kotlin.KotlinInfo getKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.DiagnosticsHandler):36:38 -> a
@@ -52082,25 +52200,30 @@
     5:5:java.lang.String getUnboxedString(com.android.tools.r8.graph.DexValue,java.lang.String):129:129 -> b
     1:8:java.lang.String[] getUnboxedStringArray(com.android.tools.r8.graph.DexValue,java.lang.String):115:122 -> c
     9:9:java.lang.String[] getUnboxedStringArray(com.android.tools.r8.graph.DexValue,java.lang.String):116:116 -> c
-com.android.tools.r8.kotlin.KotlinClassMetadataReader$MetadataError -> com.android.tools.r8.w.d:
+com.android.tools.r8.kotlin.KotlinClassMetadataReader$MetadataError -> com.android.tools.r8.v.d:
     1:1:void <init>(java.lang.String):136:136 -> <init>
-com.android.tools.r8.kotlin.KotlinClassPart -> com.android.tools.r8.w.f:
-    boolean $assertionsDisabled -> e
-    1:1:void <clinit>():15:15 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart,com.android.tools.r8.graph.DexClass):28:28 -> <init>
-    1:4:com.android.tools.r8.kotlin.KotlinClassPart fromKotlinClassMetadata(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata,com.android.tools.r8.graph.DexClass):21:24 -> a
-    5:6:void rewrite(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):41:42 -> a
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader createHeader():48:48 -> b
-    1:3:void processMetadata():33:35 -> d
-com.android.tools.r8.kotlin.KotlinFile -> com.android.tools.r8.w.g:
-    boolean $assertionsDisabled -> e
-    1:1:void <clinit>():15:15 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade,com.android.tools.r8.graph.DexClass):28:28 -> <init>
-    1:4:com.android.tools.r8.kotlin.KotlinFile fromKotlinClassMetadata(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata,com.android.tools.r8.graph.DexClass):21:24 -> a
-    5:6:void rewrite(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):41:42 -> a
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader createHeader():48:48 -> b
-    1:3:void processMetadata():33:35 -> d
-com.android.tools.r8.kotlin.KotlinInfo -> com.android.tools.r8.w.h:
+com.android.tools.r8.kotlin.KotlinClassPart -> com.android.tools.r8.v.f:
+    boolean $assertionsDisabled -> f
+    com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage kmPackage -> e
+    1:1:void <clinit>():22:22 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart,com.android.tools.r8.graph.DexClass):35:35 -> <init>
+    1:4:com.android.tools.r8.kotlin.KotlinClassPart fromKotlinClassMetadata(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata,com.android.tools.r8.graph.DexClass):28:31 -> a
+    5:17:void rewrite(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):47:59 -> a
+    1:4:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader createHeader():66:69 -> b
+    5:5:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart.getFacadeClassName():271:271 -> b
+    5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader createHeader():69 -> b
+    6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader createHeader():69:69 -> b
+    1:3:void processMetadata():40:42 -> d
+com.android.tools.r8.kotlin.KotlinFile -> com.android.tools.r8.v.g:
+    boolean $assertionsDisabled -> f
+    com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage kmPackage -> e
+    1:1:void <clinit>():22:22 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade,com.android.tools.r8.graph.DexClass):35:35 -> <init>
+    1:4:com.android.tools.r8.kotlin.KotlinFile fromKotlinClassMetadata(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata,com.android.tools.r8.graph.DexClass):28:31 -> a
+    5:17:void rewrite(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):47:59 -> a
+    1:3:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader createHeader():66:68 -> b
+    1:3:void processMetadata():40:42 -> d
+com.android.tools.r8.kotlin.KotlinInfo -> com.android.tools.r8.v.h:
     com.android.tools.r8.graph.DexClass clazz -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata metadata -> a
     boolean isProcessed -> c
@@ -52113,7 +52236,7 @@
     boolean isSyntheticClass() -> c
     void processMetadata() -> d
     1:2:java.lang.String toString():83:84 -> toString
-com.android.tools.r8.kotlin.KotlinMetadataRewriter -> com.android.tools.r8.w.i:
+com.android.tools.r8.kotlin.KotlinMetadataRewriter -> com.android.tools.r8.v.i:
     com.android.tools.r8.graph.DexItemFactory factory -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.naming.NamingLens lens -> b
@@ -52149,94 +52272,125 @@
     81:81:void lambda$run$2(com.android.tools.r8.graph.DexProgramClass):86:86 -> a
     82:86:com.android.tools.r8.graph.DexValue$DexValueArray createIntArray(int[]):125:129 -> a
     87:91:com.android.tools.r8.graph.DexValue$DexValueArray createStringArray(java.lang.String[]):133:137 -> a
-    92:92:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    92:92:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     92:92:void removeKotlinMetadataFromRenamedClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):41 -> a
     93:93:void removeKotlinMetadataFromRenamedClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):45:45 -> a
-com.android.tools.r8.kotlin.KotlinMetadataSynthesizer -> com.android.tools.r8.w.j:
+com.android.tools.r8.kotlin.KotlinMetadataSynthesizer -> com.android.tools.r8.v.j:
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():14:14 -> <clinit>
-    1:1:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmType toRenamedKmType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):17 -> a
-    2:11:com.android.tools.r8.jetbrains.kotlinx.metadata.KmType toRenamedKmType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):23:32 -> a
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser -> com.android.tools.r8.w.k:
+    1:1:void <clinit>():26:26 -> <clinit>
+    1:1:boolean isExtension(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction):29:29 -> a
+    2:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmType toKmType(java.lang.String):33:34 -> a
+    4:5:com.android.tools.r8.jetbrains.kotlinx.metadata.KmType toRenamedKmType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):41:42 -> a
+    6:7:com.android.tools.r8.jetbrains.kotlinx.metadata.KmType toKmType(java.lang.String):33:34 -> a
+    6:7:com.android.tools.r8.jetbrains.kotlinx.metadata.KmType toRenamedKmType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):42 -> a
+    8:12:com.android.tools.r8.jetbrains.kotlinx.metadata.KmType toRenamedKmType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):45:49 -> a
+    13:13:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
+    13:13:com.android.tools.r8.jetbrains.kotlinx.metadata.KmType toRenamedKmType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):52 -> a
+    14:24:com.android.tools.r8.jetbrains.kotlinx.metadata.KmType toRenamedKmType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):58:68 -> a
+    25:33:boolean isCompatible(com.android.tools.r8.jetbrains.kotlinx.metadata.KmType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):77:85 -> a
+    34:40:boolean isCompatibleConstructor(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):90:96 -> a
+    41:41:boolean isCompatibleExtension(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):127:127 -> a
+    42:42:com.android.tools.r8.jetbrains.kotlinx.metadata.KmType com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction.getReturnType():312:312 -> a
+    42:42:boolean isCompatibleExtension(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):130 -> a
+    43:53:boolean isCompatibleExtension(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):130:140 -> a
+    54:60:boolean isCompatibleExtension(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):139:145 -> a
+    61:61:com.android.tools.r8.jetbrains.kotlinx.metadata.KmType com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction.getReturnType():312:312 -> a
+    61:61:boolean isCompatibleExtension(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):130 -> a
+    62:76:com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor toRenamedKmConstructor(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):158:172 -> a
+    77:77:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction toRenamedKmFunction(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):181:181 -> a
+    78:95:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction toRenamedKmFunctionHelper(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,boolean):200:217 -> a
+    96:408:void com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction.setReturnType(com.android.tools.r8.jetbrains.kotlinx.metadata.KmType):0:312 -> a
+    96:408:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction toRenamedKmFunctionHelper(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,boolean):218 -> a
+    409:417:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction toRenamedKmFunctionHelper(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,boolean):220:228 -> a
+    418:418:void com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction.setReturnType(com.android.tools.r8.jetbrains.kotlinx.metadata.KmType):0:0 -> a
+    418:418:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction toRenamedKmFunctionHelper(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,boolean):218 -> a
+    419:428:void populateKmValueParameters(java.util.List,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,boolean):238:247 -> a
+    1:1:boolean isCompatibleFunction(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):105:105 -> b
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmType com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction.getReturnType():312:312 -> b
+    2:2:boolean isCompatibleFunction(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):108 -> b
+    3:12:boolean isCompatibleFunction(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):108:117 -> b
+    13:13:com.android.tools.r8.jetbrains.kotlinx.metadata.KmType com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction.getReturnType():312:312 -> b
+    13:13:boolean isCompatibleFunction(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):108 -> b
+    14:14:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction toRenamedKmFunctionAsExtension(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):189:189 -> b
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser -> com.android.tools.r8.v.k:
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():21:21 -> <clinit>
-    1:21:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result parse(java.lang.String):112:132 -> a
-    22:22:boolean com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$BufferedStringReader.readExpectedLine(java.lang.String):52:52 -> a
-    22:22:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result parse(java.lang.String):134 -> a
-    23:23:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result parse(java.lang.String):168:168 -> a
-    24:55:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result parse(java.lang.String):137:168 -> a
-    56:76:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result parse(java.lang.String):142:162 -> a
-    77:77:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder.build():275:275 -> a
-    77:77:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result parse(java.lang.String):167 -> a
-    78:78:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result parse(java.lang.String):168:168 -> a
-    79:79:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result parse(java.lang.String):163:163 -> a
-    80:80:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result parse(java.lang.String):151:151 -> a
-    81:118:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result parse(java.lang.String):131:168 -> a
-    119:119:void lambda$parse$0(com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder,java.util.List):147:147 -> a
-    120:134:void addFileToBuilder(java.lang.String,java.lang.String,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder):177:191 -> a
-    120:134:void lambda$parse$0(com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder,java.util.List):147 -> a
-    135:135:int asInteger(java.lang.String):204:204 -> a
-    135:135:void addFileToBuilder(java.lang.String,java.lang.String,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder):191 -> a
-    135:135:void lambda$parse$0(com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder,java.util.List):147 -> a
-    136:139:void addFileToBuilder(java.lang.String,java.lang.String,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder):192:195 -> a
-    136:139:void lambda$parse$0(com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder,java.util.List):147 -> a
-    140:140:int asInteger(java.lang.String):206:206 -> a
-    140:140:void addFileToBuilder(java.lang.String,java.lang.String,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder):191 -> a
-    140:140:void lambda$parse$0(com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder,java.util.List):147 -> a
-    141:141:void addFileToBuilder(java.lang.String,java.lang.String,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder):188:188 -> a
-    141:141:void lambda$parse$0(com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder,java.util.List):147 -> a
-    142:142:void addFileToBuilder(java.lang.String,java.lang.String,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder):184:184 -> a
-    142:142:void lambda$parse$0(com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder,java.util.List):147 -> a
-    143:143:void addFileToBuilder(java.lang.String,java.lang.String,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder):179:179 -> a
-    143:143:void lambda$parse$0(com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder,java.util.List):147 -> a
-    1:1:void lambda$parse$1(com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder,java.util.List):159:159 -> b
-    2:31:void addDebugEntryToBuilder(java.lang.String,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder):218:247 -> b
-    2:31:void lambda$parse$1(com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder,java.util.List):159 -> b
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$1 -> com.android.tools.r8.w.k$a:
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$BufferedStringReader -> com.android.tools.r8.w.k$b:
+    1:1:void <clinit>():22:22 -> <clinit>
+    1:21:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result parse(java.lang.String):113:133 -> a
+    22:22:boolean com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$BufferedStringReader.readExpectedLine(java.lang.String):53:53 -> a
+    22:22:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result parse(java.lang.String):135 -> a
+    23:23:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result parse(java.lang.String):169:169 -> a
+    24:55:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result parse(java.lang.String):138:169 -> a
+    56:76:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result parse(java.lang.String):143:163 -> a
+    77:77:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder.build():273:273 -> a
+    77:77:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result parse(java.lang.String):168 -> a
+    78:78:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result parse(java.lang.String):169:169 -> a
+    79:79:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result parse(java.lang.String):164:164 -> a
+    80:80:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result parse(java.lang.String):152:152 -> a
+    81:118:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result parse(java.lang.String):132:169 -> a
+    119:119:void lambda$parse$0(com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder,java.util.List):148:148 -> a
+    120:134:void addFileToBuilder(java.lang.String,java.lang.String,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder):178:192 -> a
+    120:134:void lambda$parse$0(com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder,java.util.List):148 -> a
+    135:135:int asInteger(java.lang.String):205:205 -> a
+    135:135:void addFileToBuilder(java.lang.String,java.lang.String,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder):192 -> a
+    135:135:void lambda$parse$0(com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder,java.util.List):148 -> a
+    136:139:void addFileToBuilder(java.lang.String,java.lang.String,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder):193:196 -> a
+    136:139:void lambda$parse$0(com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder,java.util.List):148 -> a
+    140:140:int asInteger(java.lang.String):207:207 -> a
+    140:140:void addFileToBuilder(java.lang.String,java.lang.String,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder):192 -> a
+    140:140:void lambda$parse$0(com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder,java.util.List):148 -> a
+    141:141:void addFileToBuilder(java.lang.String,java.lang.String,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder):189:189 -> a
+    141:141:void lambda$parse$0(com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder,java.util.List):148 -> a
+    142:142:void addFileToBuilder(java.lang.String,java.lang.String,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder):185:185 -> a
+    142:142:void lambda$parse$0(com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder,java.util.List):148 -> a
+    143:143:void addFileToBuilder(java.lang.String,java.lang.String,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder):180:180 -> a
+    143:143:void lambda$parse$0(com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder,java.util.List):148 -> a
+    1:1:void lambda$parse$1(com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder,java.util.List):160:160 -> b
+    2:26:void addDebugEntryToBuilder(java.lang.String,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder):220:244 -> b
+    2:26:void lambda$parse$1(com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder,java.util.List):160 -> b
+    27:34:void 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.v.k$a:
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$BufferedStringReader -> com.android.tools.r8.v.k$b:
     java.io.BufferedReader reader -> a
     java.lang.String readLine -> b
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():37:37 -> <clinit>
-    1:2:void <init>(java.lang.String):43:44 -> <init>
-    1:1:boolean readExpectedLine(java.lang.String):52:52 -> a
-    1:1:void readExpectedLineOrThrow(java.lang.String):57 -> a
-    2:2:void readExpectedLineOrThrow(java.lang.String):58:58 -> a
-    3:3:boolean isEOF():64:64 -> a
-    4:22:void readUntil(java.lang.String,int,com.android.tools.r8.utils.ThrowingConsumer):82:100 -> a
-    1:1:java.lang.String readNextLine():48:48 -> b
-    2:5:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$BufferedStringReader readUntil(java.lang.String):68:71 -> b
-    1:1:void close():107:107 -> close
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$KotlinSourceDebugExtensionParserException -> com.android.tools.r8.w.k$c:
-    1:1:void <init>(java.lang.String):33:33 -> <init>
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Position -> com.android.tools.r8.w.k$d:
+    1:1:void <clinit>():38:38 -> <clinit>
+    1:2:void <init>(java.lang.String):44:45 -> <init>
+    1:1:boolean readExpectedLine(java.lang.String):53:53 -> a
+    1:1:void readExpectedLineOrThrow(java.lang.String):58 -> a
+    2:2:void readExpectedLineOrThrow(java.lang.String):59:59 -> a
+    3:3:boolean isEOF():65:65 -> a
+    4:22:void readUntil(java.lang.String,int,com.android.tools.r8.utils.ThrowingConsumer):83:101 -> a
+    1:1:java.lang.String readNextLine():49:49 -> b
+    2: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.v.k$c:
+    1:1:void <init>(java.lang.String):34:34 -> <init>
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Position -> com.android.tools.r8.v.k$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):306:308 -> <init>
-    1:1:com.android.tools.r8.naming.Range getRange():316:316 -> a
-    1:1:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Source getSource():312:312 -> b
-    1:9:java.lang.String toString():321:329 -> toString
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result -> com.android.tools.r8.w.k$e:
-    java.util.Map files -> a
-    java.util.Map positions -> b
-    1:1:void <init>(java.util.Map,java.util.Map,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$1):251:251 -> <init>
-    2:4:void <init>(java.util.Map,java.util.Map):256:258 -> <init>
-    1:1:java.util.Map getFiles():262:262 -> a
-    1:1:java.util.Map getPositions():266:266 -> b
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder -> com.android.tools.r8.w.k$f:
-    java.util.Map files -> a
-    java.util.Map positions -> b
-    1:3:void <init>():270:272 -> <init>
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Source -> com.android.tools.r8.w.k$g:
+    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.v.k$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.v.k$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.v.k$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):279:279 -> <init>
-    2:4:void <init>(java.lang.String,java.lang.String):283:285 -> <init>
-    1:1:java.lang.String getFileName():289:289 -> a
-    1:1:java.lang.String getPath():293:293 -> b
-    1:1:java.lang.String toString():298:298 -> toString
-com.android.tools.r8.kotlin.KotlinSyntheticClass -> com.android.tools.r8.w.m:
+    1:1:void <init>(java.lang.String,java.lang.String,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$1):277:277 -> <init>
+    2:4:void <init>(java.lang.String,java.lang.String):281:283 -> <init>
+    1:1:java.lang.String getFileName():287:287 -> a
+    1:1:java.lang.String getPath():291:291 -> b
+    1:1:java.lang.String toString():296:296 -> toString
+com.android.tools.r8.kotlin.KotlinSyntheticClass -> com.android.tools.r8.v.m:
     com.android.tools.r8.kotlin.KotlinSyntheticClass$Flavour flavour -> e
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():14:14 -> <clinit>
@@ -52255,13 +52409,13 @@
     1:3:void processMetadata():45:47 -> d
     1:1:boolean isJavaStyleLambda():74:74 -> e
     1:1:boolean isKotlinStyleLambda():70:70 -> f
-com.android.tools.r8.kotlin.KotlinSyntheticClass$Flavour -> com.android.tools.r8.w.l:
+com.android.tools.r8.kotlin.KotlinSyntheticClass$Flavour -> com.android.tools.r8.v.l:
     com.android.tools.r8.kotlin.KotlinSyntheticClass$Flavour Unclassified -> c
     com.android.tools.r8.kotlin.KotlinSyntheticClass$Flavour JavaStyleLambda -> b
     com.android.tools.r8.kotlin.KotlinSyntheticClass$Flavour KotlinStyleLambda -> a
     1:3:void <clinit>():16:18 -> <clinit>
     1:1:void <init>(java.lang.String,int):15:15 -> <init>
-com.android.tools.r8.logging.Log -> com.android.tools.r8.x.a:
+com.android.tools.r8.logging.Log -> com.android.tools.r8.w.a:
     java.util.Set CLASS_FILTER -> b
     boolean ENABLED -> a
     1:1:void <clinit>():12:12 -> <clinit>
@@ -52377,7 +52531,7 @@
     73:79:void registerClassAsUsed(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):187 -> a
     80:88:void registerClassAsUsed(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):189:197 -> a
     89:95:com.android.tools.r8.graph.DexString computeName(com.android.tools.r8.graph.DexType):238:244 -> a
-    96:96:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    96:96:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     96:96:com.android.tools.r8.graph.DexString computeName(com.android.tools.r8.graph.DexType):244 -> a
     97:105:com.android.tools.r8.graph.DexString computeName(com.android.tools.r8.graph.DexType):245:253 -> a
     106:123:com.android.tools.r8.naming.ClassNameMinifier$Namespace getStateForOuterClass(com.android.tools.r8.graph.DexType,java.lang.String):318:335 -> a
@@ -52386,7 +52540,7 @@
     127:131:java.lang.String getParentPackagePrefix(java.lang.String):441:445 -> a
     1:1:com.android.tools.r8.naming.ClassNameMinifier$ClassNamingStrategy access$200(com.android.tools.r8.naming.ClassNameMinifier):38:38 -> b
     2:2:com.android.tools.r8.graph.DexType getOutClassForType(com.android.tools.r8.graph.DexType):220:220 -> b
-    3:3:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> b
+    3:3:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> b
     3:3:com.android.tools.r8.graph.DexType getOutClassForType(com.android.tools.r8.graph.DexType):220 -> b
     4:8:com.android.tools.r8.graph.DexType getOutClassForType(com.android.tools.r8.graph.DexType):229:233 -> b
     9:26:com.android.tools.r8.naming.ClassNameMinifier$Namespace getStateForPackagePrefix(java.lang.String):295:312 -> b
@@ -52403,7 +52557,7 @@
     9:9:void renameArrayTypeIfNeeded(com.android.tools.r8.graph.DexType):345 -> d
     10:16:void renameArrayTypeIfNeeded(com.android.tools.r8.graph.DexType):346:352 -> d
     1:5:void renameDanglingType(com.android.tools.r8.graph.DexType):175:179 -> e
-    6:6:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> e
+    6:6:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> e
     6:6:void renameDanglingType(com.android.tools.r8.graph.DexType):179 -> e
     7:9:void renameDanglingType(com.android.tools.r8.graph.DexType):179:181 -> e
     10:10:com.android.tools.r8.naming.ClassNameMinifier$Namespace lambda$getStateForPackagePrefix$2(java.lang.String):302:302 -> e
@@ -52597,7 +52751,7 @@
     11:11:com.android.tools.r8.naming.FieldNameMinifier$FieldRenaming computeRenaming(java.util.Collection,com.android.tools.r8.utils.Timing):48 -> a
     12:22:void reserveFieldNames():96:106 -> a
     12:22:com.android.tools.r8.naming.FieldNameMinifier$FieldRenaming computeRenaming(java.util.Collection,com.android.tools.r8.utils.Timing):48 -> a
-    23:23:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    23:23:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     23:23:void reserveFieldNames():106 -> a
     23:23:com.android.tools.r8.naming.FieldNameMinifier$FieldRenaming computeRenaming(java.util.Collection,com.android.tools.r8.utils.Timing):48 -> a
     24:32:void reserveFieldNames():108:116 -> a
@@ -52629,7 +52783,7 @@
     61:69:void renameFieldsInInterfacePartition(java.util.Set):199:207 -> a
     61:69:void renameFieldsInInterfaces(java.util.Collection):170 -> a
     61:69:com.android.tools.r8.naming.FieldNameMinifier$FieldRenaming computeRenaming(java.util.Collection,com.android.tools.r8.utils.Timing):52 -> a
-    70:70:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    70:70:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     70:70:void renameFieldsInInterfacePartition(java.util.Set):207 -> a
     70:70:void renameFieldsInInterfaces(java.util.Collection):170 -> a
     70:70:com.android.tools.r8.naming.FieldNameMinifier$FieldRenaming computeRenaming(java.util.Collection,com.android.tools.r8.utils.Timing):52 -> a
@@ -52644,13 +52798,13 @@
     87:87:com.android.tools.r8.naming.ReservedFieldNamingState getReservedFieldNamingState(com.android.tools.r8.graph.DexType):77:77 -> a
     87:87:void lambda$propagateReservedFieldNamesUpwards$1(com.android.tools.r8.graph.DexProgramClass):124 -> a
     88:89:void lambda$propagateReservedFieldNamesUpwards$1(com.android.tools.r8.graph.DexProgramClass):126:127 -> a
-    90:90:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
-    90:90:boolean com.android.tools.r8.graph.DexType.isProgramType(com.android.tools.r8.graph.DexDefinitionSupplier):271 -> a
+    90:90:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
+    90:90:boolean com.android.tools.r8.graph.DexType.isProgramType(com.android.tools.r8.graph.DexDefinitionSupplier):287 -> a
     90:90:void lambda$propagateReservedFieldNamesUpwards$1(com.android.tools.r8.graph.DexProgramClass):127 -> a
-    91:91:boolean com.android.tools.r8.graph.DexType.isProgramType(com.android.tools.r8.graph.DexDefinitionSupplier):272:272 -> a
+    91:91:boolean com.android.tools.r8.graph.DexType.isProgramType(com.android.tools.r8.graph.DexDefinitionSupplier):288:288 -> a
     91:91:void lambda$propagateReservedFieldNamesUpwards$1(com.android.tools.r8.graph.DexProgramClass):127 -> a
     92:93:void lambda$propagateReservedFieldNamesUpwards$1(com.android.tools.r8.graph.DexProgramClass):128:129 -> a
-    94:94:boolean com.android.tools.r8.graph.DexType.isProgramType(com.android.tools.r8.graph.DexDefinitionSupplier):271:271 -> a
+    94:94:boolean com.android.tools.r8.graph.DexType.isProgramType(com.android.tools.r8.graph.DexDefinitionSupplier):287:287 -> a
     94:94:void lambda$propagateReservedFieldNamesUpwards$1(com.android.tools.r8.graph.DexProgramClass):127 -> a
     95:99:void lambda$renameFieldsInClasses$3(java.util.Map,com.android.tools.r8.graph.DexClass):143:147 -> a
     100:100:void com.android.tools.r8.naming.FieldNamingState.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.MemberNamingStrategy):26:26 -> a
@@ -52662,10 +52816,10 @@
     115:116:void lambda$renameFieldsInClasses$3(java.util.Map,com.android.tools.r8.graph.DexClass):162:163 -> a
     117:117:void renameNonReboundAccessesToField(com.android.tools.r8.graph.FieldAccessInfo):232:232 -> a
     118:121:void renameNonReboundAccessToField(com.android.tools.r8.graph.DexField):237:240 -> a
-    122:122:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexField):179:179 -> a
+    122:122:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexField):181:181 -> a
     122:122:void renameNonReboundAccessToField(com.android.tools.r8.graph.DexField):240 -> a
     123:127:void renameNonReboundAccessToField(com.android.tools.r8.graph.DexField):242:246 -> a
-    128:128:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    128:128:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     128:128:void renameNonReboundAccessToField(com.android.tools.r8.graph.DexField):246 -> a
     129:143:void renameNonReboundAccessToField(com.android.tools.r8.graph.DexField):248:262 -> a
     1:1:com.android.tools.r8.naming.ReservedFieldNamingState lambda$getOrCreateReservedFieldNamingState$0(com.android.tools.r8.graph.DexType):82:82 -> b
@@ -52691,7 +52845,7 @@
     1:1:java.util.List access$100(com.android.tools.r8.naming.FieldNameMinifier$InterfacePartitioning,java.util.Collection):266:266 -> a
     2:9:java.util.List sortedPartitions(java.util.Collection):276:283 -> a
     10:18:java.util.Set buildSortedPartition(com.android.tools.r8.graph.DexClass):290:298 -> a
-    19:19:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    19:19:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     19:19:java.util.Set buildSortedPartition(com.android.tools.r8.graph.DexClass):298 -> a
     20:40:java.util.Set buildSortedPartition(com.android.tools.r8.graph.DexClass):303:323 -> a
     41:41:int lambda$buildSortedPartition$0(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):290:290 -> a
@@ -52707,7 +52861,7 @@
     6:6:void includeReservations(com.android.tools.r8.naming.ReservedFieldNamingState):69:69 -> a
     6:6:com.android.tools.r8.naming.FieldNamingState createChildState(com.android.tools.r8.naming.ReservedFieldNamingState):48 -> a
     7:9:com.android.tools.r8.graph.DexString getOrCreateNameFor(com.android.tools.r8.graph.DexField):53:55 -> a
-    10:10:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    10:10:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     10:10:com.android.tools.r8.graph.DexString getOrCreateNameFor(com.android.tools.r8.graph.DexField):55 -> a
     11:13:com.android.tools.r8.graph.DexString getOrCreateNameFor(com.android.tools.r8.graph.DexField):57:59 -> a
     14:14:java.lang.Object com.android.tools.r8.naming.FieldNamingStateBase.getOrCreateInternalState(com.android.tools.r8.graph.DexField):29:29 -> a
@@ -52776,49 +52930,51 @@
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap identifierNameStrings -> b
     boolean $assertionsDisabled -> d
     com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfo -> c
-    1:1:void <clinit>():52:52 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.graph.AppView):58:61 -> <init>
-    boolean lambda$decoupleIdentifierNameStringForInvokeInstruction$0(com.android.tools.r8.ir.code.ConstString,com.android.tools.r8.ir.code.Instruction) -> a
-    boolean lambda$decoupleIdentifierNameStringForInvokeInstruction$1(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Instruction) -> a
-    1:2:void decoupleIdentifierNameStringsInFields():65:66 -> a
-    3:15:void decoupleIdentifierNameStringInStaticField(com.android.tools.r8.graph.DexEncodedField):73:85 -> a
-    3:15:void decoupleIdentifierNameStringsInFields():67 -> a
-    16:16:void decoupleIdentifierNameStringInStaticField(com.android.tools.r8.graph.DexEncodedField):84:84 -> a
-    16:16:void decoupleIdentifierNameStringsInFields():67 -> a
-    17:47:void decoupleIdentifierNameStringsInBlocks(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.Set):95:125 -> a
-    48:48:void decoupleIdentifierNameStringsInBlocks(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.Set):124:124 -> a
-    49:49:void decoupleIdentifierNameStringsInBlocks(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.Set):121:121 -> a
-    50:104:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForFieldPutInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):137:191 -> a
-    50:104:void decoupleIdentifierNameStringsInBlocks(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.Set):120 -> a
-    105:105:com.android.tools.r8.ir.code.FieldInstruction com.android.tools.r8.ir.code.FieldInstruction.asFieldInstruction():0:0 -> a
-    105:105:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForFieldPutInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):138 -> a
-    105:105:void decoupleIdentifierNameStringsInBlocks(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.Set):120 -> a
-    106:223:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):201:318 -> a
-    224:227:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):209:212 -> a
-    228:229:int getIdentifierPositionInArguments(com.android.tools.r8.ir.code.InvokeMethod):337:338 -> a
-    228:229:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):216 -> a
-    230:231:boolean com.android.tools.r8.naming.IdentifierNameStringUtils.isClassNameComparison(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexItemFactory):169:170 -> a
-    230:231:int getIdentifierPositionInArguments(com.android.tools.r8.ir.code.InvokeMethod):338 -> a
-    230:231:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):216 -> a
-    232:238:int getIdentifierPositionInArguments(com.android.tools.r8.ir.code.InvokeMethod):339:345 -> a
-    232:238:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):216 -> a
-    239:248:int getIdentifierPositionInArguments(com.android.tools.r8.ir.code.InvokeMethod):344:353 -> a
-    239:248:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):216 -> a
-    249:249:int getIdentifierPositionInArguments(com.android.tools.r8.ir.code.InvokeMethod):352:352 -> a
-    249:249:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):216 -> a
-    250:275:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):217:242 -> a
-    276:276:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):298:298 -> a
-    276:276:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):242 -> a
-    277:357:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):245:325 -> a
-    358:364:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):324:330 -> a
-    365:365:com.android.tools.r8.ir.code.Invoke com.android.tools.r8.ir.code.Invoke.create(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List):66:66 -> a
-    365:365:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):329 -> a
-    366:369:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):328:331 -> a
-    370:370:com.android.tools.r8.ir.code.Value lambda$decoupleIdentifierNameStringForInvokeInstruction$2(com.android.tools.r8.ir.code.Value[],com.android.tools.r8.ir.code.Value,long):326:326 -> a
-    371:377:void warnUndeterminedIdentifierIfNecessary(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):362:368 -> a
-    378:378:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
-    378:378:void warnUndeterminedIdentifierIfNecessary(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):368 -> a
-    379:400:void warnUndeterminedIdentifierIfNecessary(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):370:391 -> a
+    1:1:void <clinit>():54:54 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.graph.AppView):60:63 -> <init>
+    boolean lambda$decoupleIdentifierNameStringForInvokeInstruction$1(com.android.tools.r8.ir.code.ConstString,com.android.tools.r8.ir.code.Instruction) -> a
+    boolean lambda$decoupleIdentifierNameStringForInvokeInstruction$2(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Instruction) -> a
+    1:2:void decoupleIdentifierNameStringsInFields(java.util.concurrent.ExecutorService):68:69 -> a
+    3:3:void decoupleIdentifierNameStringsInFields(java.util.concurrent.ExecutorService):68:68 -> a
+    4:4:void lambda$decoupleIdentifierNameStringsInFields$0(com.android.tools.r8.graph.DexProgramClass):71:71 -> a
+    5:17:void decoupleIdentifierNameStringInStaticField(com.android.tools.r8.graph.DexEncodedField):80:92 -> a
+    5:17:void lambda$decoupleIdentifierNameStringsInFields$0(com.android.tools.r8.graph.DexProgramClass):72 -> a
+    18:18:void decoupleIdentifierNameStringInStaticField(com.android.tools.r8.graph.DexEncodedField):91:91 -> a
+    18:18:void lambda$decoupleIdentifierNameStringsInFields$0(com.android.tools.r8.graph.DexProgramClass):72 -> a
+    19:49:void decoupleIdentifierNameStringsInBlocks(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.Set):102:132 -> a
+    50:50:void decoupleIdentifierNameStringsInBlocks(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.Set):131:131 -> a
+    51:51:void decoupleIdentifierNameStringsInBlocks(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.Set):128:128 -> a
+    52:106:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForFieldPutInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):144:198 -> a
+    52:106:void decoupleIdentifierNameStringsInBlocks(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.Set):127 -> a
+    107:107:com.android.tools.r8.ir.code.FieldInstruction com.android.tools.r8.ir.code.FieldInstruction.asFieldInstruction():0:0 -> a
+    107:107:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForFieldPutInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):145 -> a
+    107:107:void decoupleIdentifierNameStringsInBlocks(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.Set):127 -> a
+    108:225:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):208:325 -> a
+    226:229:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):216:219 -> a
+    230:231:int getIdentifierPositionInArguments(com.android.tools.r8.ir.code.InvokeMethod):344:345 -> a
+    230:231:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):223 -> a
+    232:233:boolean com.android.tools.r8.naming.IdentifierNameStringUtils.isClassNameComparison(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexItemFactory):169:170 -> a
+    232:233:int getIdentifierPositionInArguments(com.android.tools.r8.ir.code.InvokeMethod):345 -> a
+    232:233:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):223 -> a
+    234:240:int getIdentifierPositionInArguments(com.android.tools.r8.ir.code.InvokeMethod):346:352 -> a
+    234:240:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):223 -> a
+    241:250:int getIdentifierPositionInArguments(com.android.tools.r8.ir.code.InvokeMethod):351:360 -> a
+    241:250:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):223 -> a
+    251:251:int getIdentifierPositionInArguments(com.android.tools.r8.ir.code.InvokeMethod):359:359 -> a
+    251:251:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):223 -> a
+    252:277:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):224:249 -> a
+    278:278:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):298:298 -> a
+    278:278:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):249 -> a
+    279:359:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):252:332 -> a
+    360:366:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):331:337 -> a
+    367:367:com.android.tools.r8.ir.code.Invoke com.android.tools.r8.ir.code.Invoke.create(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List):66:66 -> a
+    367:367:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):336 -> a
+    368:371:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):335:338 -> a
+    372:372:com.android.tools.r8.ir.code.Value lambda$decoupleIdentifierNameStringForInvokeInstruction$3(com.android.tools.r8.ir.code.Value[],com.android.tools.r8.ir.code.Value,long):333:333 -> a
+    373:379:void warnUndeterminedIdentifierIfNecessary(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):369:375 -> a
+    380:380:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
+    380:380:void warnUndeterminedIdentifierIfNecessary(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):375 -> a
+    381:402:void warnUndeterminedIdentifierIfNecessary(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):377:398 -> a
 com.android.tools.r8.naming.IdentifierNameStringUtils -> com.android.tools.r8.naming.p:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():35:35 -> <clinit>
@@ -52832,7 +52988,7 @@
     124:133:com.android.tools.r8.graph.DexType inferTypeFromConstStringValue(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.code.Value):307:316 -> a
     124:133:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):214 -> a
     134:154:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):221:241 -> a
-    155:155:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    155:155:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     155:155:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):241 -> a
     156:171:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):245:260 -> a
     172:210:com.android.tools.r8.graph.DexTypeList retrieveDexTypeListFromClassList(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):519:557 -> a
@@ -52846,7 +53002,7 @@
     226:229:int getPositionOfFirstConstString(com.android.tools.r8.ir.code.Instruction):274:277 -> a
     230:258:com.android.tools.r8.graph.DexReference inferMemberFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):324:352 -> a
     230:258:com.android.tools.r8.graph.DexReference inferMemberOrTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):288 -> a
-    259:259:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    259:259:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     259:259:com.android.tools.r8.graph.DexReference inferMemberFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):352 -> a
     259:259:com.android.tools.r8.graph.DexReference inferMemberOrTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):288 -> a
     260:260:com.android.tools.r8.graph.DexReference inferMemberFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):356:356 -> a
@@ -52977,7 +53133,7 @@
     1:1:void <init>(com.android.tools.r8.naming.InterfaceMethodNameMinifier,com.android.tools.r8.graph.DexClass):108:108 -> <init>
     2:7:void <init>(com.android.tools.r8.naming.InterfaceMethodNameMinifier,com.android.tools.r8.graph.DexClass):104:109 -> <init>
     1:2:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexMethod):115:116 -> a
-    3:3:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):184:184 -> a
+    3:3:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):186:186 -> a
     3:3:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexMethod):116 -> a
     4:4:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexMethod):118:118 -> a
     5:5: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):115:115 -> a
@@ -53111,7 +53267,7 @@
     15:15:com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming computeRenaming(java.util.Collection,java.util.Set,com.android.tools.r8.utils.Timing):175 -> a
     16:32:com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming computeRenaming(java.util.Collection,java.util.Set,com.android.tools.r8.utils.Timing):176:192 -> a
     33:50:void assignNamesToClassesMethods(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodNamingState):196:213 -> a
-    51:51:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    51:51:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     51:51:void assignNamesToClassesMethods(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodNamingState):213 -> a
     52:61:void assignNamesToClassesMethods(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodNamingState):214:223 -> a
     62:62:com.android.tools.r8.naming.MethodNamingState lambda$assignNamesToClassesMethods$2(com.android.tools.r8.naming.MethodNamingState,com.android.tools.r8.naming.MethodReservationState,com.android.tools.r8.graph.DexType):201:201 -> a
@@ -53119,7 +53275,7 @@
     78:79:void com.android.tools.r8.naming.MethodNamingState.addRenaming(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod):70:71 -> a
     78:79:void assignNameToMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.MethodNamingState):243 -> a
     80:89:com.android.tools.r8.naming.MethodReservationState allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):275:284 -> a
-    90:90:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    90:90:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     90:90: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):284 -> a
     91:91: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):286:286 -> a
     92:92:java.lang.Iterable shuffleMethods(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):331:331 -> a
@@ -53128,13 +53284,13 @@
     103:103: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):293:293 -> a
     104:104:com.android.tools.r8.naming.MethodReservationState lambda$allocateReservationStateAndReserve$3(com.android.tools.r8.naming.MethodReservationState,com.android.tools.r8.graph.DexType):282:282 -> a
     105:111:com.android.tools.r8.naming.MethodNamingState getOrAllocateMethodNamingStates(com.android.tools.r8.graph.DexType):306:312 -> a
-    112:112:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    112:112:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     112:112:com.android.tools.r8.naming.MethodNamingState getOrAllocateMethodNamingStates(com.android.tools.r8.graph.DexType):312 -> a
     113:121:com.android.tools.r8.naming.MethodNamingState getOrAllocateMethodNamingStates(com.android.tools.r8.graph.DexType):314:322 -> a
     1:1:com.android.tools.r8.com.google.common.collect.BiMap access$100(com.android.tools.r8.naming.MethodNameMinifier):87:87 -> b
     2:2:java.lang.Object lambda$getKeyTransform$1(com.android.tools.r8.graph.DexMethod):150:150 -> b
     3:11:void reserveNamesInClasses(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):256:264 -> b
-    12:12:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> b
+    12:12:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> b
     12:12:void reserveNamesInClasses(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):264 -> b
     13:16:void reserveNamesInClasses(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):265:268 -> b
     17:17:void reserveNamesInClasses(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):266:266 -> b
@@ -53275,16 +53431,16 @@
     41:44:java.util.Map getRenamedItems(java.lang.Class,java.util.function.Predicate,java.util.function.Function):152:155 -> a
     45:45:boolean lambda$getRenamedItems$1(java.lang.Class,java.util.function.Predicate,com.android.tools.r8.graph.DexItem):153:153 -> a
     46:50:boolean checkTargetCanBeTranslated(com.android.tools.r8.graph.DexMethod):170:174 -> a
-    51:51:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    51:51:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     51:51:boolean checkTargetCanBeTranslated(com.android.tools.r8.graph.DexMethod):174 -> a
     52:61:boolean checkTargetCanBeTranslated(com.android.tools.r8.graph.DexMethod):175:184 -> a
-    62:62:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    62:62:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     62:62:boolean checkTargetCanBeTranslated(com.android.tools.r8.graph.DexMethod):184 -> a
     63:63:boolean checkTargetCanBeTranslated(com.android.tools.r8.graph.DexMethod):186:186 -> a
-    64:64:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    64:64:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     64:64:boolean checkTargetCanBeTranslated(com.android.tools.r8.graph.DexMethod):186 -> a
     65:65:boolean checkTargetCanBeTranslated(com.android.tools.r8.graph.DexMethod):188:188 -> a
-    66:66:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    66:66:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     66:66:boolean checkTargetCanBeTranslated(com.android.tools.r8.graph.DexMethod):188 -> a
     67:74:boolean checkTargetCanBeTranslated(com.android.tools.r8.graph.DexMethod):189:196 -> a
     75:75:boolean checkTargetCanBeTranslated(com.android.tools.r8.graph.DexMethod):189:189 -> a
@@ -53333,7 +53489,7 @@
     1:1:void <clinit>():215:215 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.AppView):222:224 -> <init>
     1:2:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):232:233 -> a
-    3:3:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):184:184 -> a
+    3:3:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):186:186 -> a
     3:3:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):233 -> a
     4:4:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):234:234 -> a
     5:5:com.android.tools.r8.graph.DexString getNextName(com.android.tools.r8.naming.InternalNamingState,boolean):256:256 -> a
@@ -53347,7 +53503,7 @@
     15:16:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexClass):272:273 -> a
     17:17:boolean allowMemberRenaming(com.android.tools.r8.graph.DexClass):280:280 -> a
     1:1:boolean checkAllowMemberRenaming(com.android.tools.r8.graph.DexType):284:284 -> c
-    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> c
+    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> c
     2:2:boolean checkAllowMemberRenaming(com.android.tools.r8.graph.DexType):284 -> c
     3:3:boolean checkAllowMemberRenaming(com.android.tools.r8.graph.DexType):285:285 -> c
 com.android.tools.r8.naming.NamingLens -> com.android.tools.r8.naming.I:
@@ -53365,22 +53521,24 @@
     java.lang.String lookupPackageName(java.lang.String) -> a
     boolean verifyNoOverlap(java.util.Map) -> a
     1:9:com.android.tools.r8.graph.DexString lookupName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexItemFactory):57:65 -> a
-    10:14:com.android.tools.r8.graph.DexProto lookupProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexItemFactory):83:87 -> a
-    15:15:com.android.tools.r8.graph.DexProto lookupProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexItemFactory):83:83 -> a
-    16:16:com.android.tools.r8.graph.DexType lambda$lookupProto$0(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):86:86 -> a
-    17:17:com.android.tools.r8.graph.DexType[] lambda$lookupProto$1(int):87:87 -> a
-    18:26:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):91:99 -> a
-    27:37:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):140:150 -> a
-    38:41:com.android.tools.r8.graph.DexField lookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexItemFactory):69:72 -> a
-    38:41:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):150 -> a
-    42:42:com.android.tools.r8.graph.DexField lookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexItemFactory):69:69 -> a
-    42:42:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):150 -> a
-    43:49:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):151:157 -> a
-    50:53:com.android.tools.r8.graph.DexMethod lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):76:79 -> a
-    50:53:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):157 -> a
-    54:54:com.android.tools.r8.graph.DexMethod lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):76:76 -> a
-    54:54:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):157 -> a
-    55:57:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):158:160 -> a
+    10:13:com.android.tools.r8.graph.DexMethod lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):76:79 -> a
+    14:14:com.android.tools.r8.graph.DexMethod lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):76:76 -> a
+    15:19:com.android.tools.r8.graph.DexProto lookupProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexItemFactory):83:87 -> a
+    20:20:com.android.tools.r8.graph.DexProto lookupProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexItemFactory):83:83 -> a
+    21:21:com.android.tools.r8.graph.DexType lambda$lookupProto$0(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):86:86 -> a
+    22:22:com.android.tools.r8.graph.DexType[] lambda$lookupProto$1(int):87:87 -> a
+    23:31:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):91:99 -> a
+    32:42:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):140:150 -> a
+    43:46:com.android.tools.r8.graph.DexField lookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexItemFactory):69:72 -> a
+    43:46:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):150 -> a
+    47:47:com.android.tools.r8.graph.DexField lookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexItemFactory):69:69 -> a
+    47:47:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):150 -> a
+    48:54:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):151:157 -> a
+    55:58:com.android.tools.r8.graph.DexMethod lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):76:79 -> a
+    55:58:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):157 -> a
+    59:59:com.android.tools.r8.graph.DexMethod lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):76:76 -> a
+    59:59:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):157 -> a
+    60:62:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):158:160 -> a
     com.android.tools.r8.graph.DexString lookupName(com.android.tools.r8.graph.DexMethod) -> b
     1:1:com.android.tools.r8.naming.NamingLens getIdentityLens():113:113 -> b
     2:3:java.lang.String lookupInternalName(com.android.tools.r8.graph.DexType):121:122 -> b
@@ -53426,7 +53584,7 @@
     30:31:java.lang.String lookupPackageName(java.lang.String):125 -> a
     32:32:java.lang.String lookupPackageName(java.lang.String):126:126 -> a
     33:33:void forAllRenamedTypes(java.util.function.Consumer):142:142 -> a
-    34:34:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():324:324 -> a
+    34:34:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():316:316 -> a
     34:34:void forAllRenamedTypes(java.util.function.Consumer):142 -> a
     35:37:void forAllRenamedTypes(java.util.function.Consumer):143:145 -> a
     38:51:java.util.Map getRenamedItems(java.lang.Class,java.util.function.Predicate,java.util.function.Function):152:165 -> a
@@ -53463,7 +53621,7 @@
     2:31:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):94:123 -> a
     32:40:void computeDefaultInterfaceMethodMethods():328:336 -> a
     32:40:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):124 -> a
-    41:41:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    41:41:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     41:41:void computeDefaultInterfaceMethodMethods():336 -> a
     41:41:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):124 -> a
     42:42:void computeDefaultInterfaceMethodMethods():338:338 -> a
@@ -53471,7 +53629,7 @@
     43:47:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):354:358 -> a
     43:47:void computeDefaultInterfaceMethodMethods():338 -> a
     43:47:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):124 -> a
-    48:48:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    48:48:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     48:48:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):358 -> a
     48:48:void computeDefaultInterfaceMethodMethods():338 -> a
     48:48:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):124 -> a
@@ -53486,36 +53644,36 @@
     70:70:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):124 -> a
     71:117:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):125:171 -> a
     118:118:void lambda$run$2(java.util.ArrayDeque,com.android.tools.r8.graph.DexType):115:115 -> a
-    119:119:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    119:119:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     119:119:void lambda$run$2(java.util.ArrayDeque,com.android.tools.r8.graph.DexType):115 -> a
     120:121:void lambda$run$2(java.util.ArrayDeque,com.android.tools.r8.graph.DexType):116:117 -> a
     122:123:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):177:178 -> a
-    124:124:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    124:124:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     124:124:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):178 -> a
     125:147:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):181:203 -> a
     148:163:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):200:215 -> a
     164:167:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):214:217 -> a
-    168:168:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):184:184 -> a
+    168:168:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):186:186 -> a
     168:168:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):217 -> a
     169:174:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):218:223 -> a
     175:188:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):218:231 -> a
     189:202:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):230:243 -> a
-    203:203:boolean com.android.tools.r8.graph.DexClass.isAbstract():626:626 -> a
+    203:203:boolean com.android.tools.r8.graph.DexClass.isAbstract():676:676 -> a
     203:203:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):243 -> a
     204:217:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):244:257 -> a
     218:218:void lambda$computeMapping$4(java.util.Deque,com.android.tools.r8.graph.DexType):252:252 -> a
     219:225:void addNonPrivateInterfaceMappings(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.graph.DexType[]):263:269 -> a
-    226:226:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    226:226:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     226:226:void addNonPrivateInterfaceMappings(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.graph.DexType[]):269 -> a
     227:227:void addNonPrivateInterfaceMappings(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.graph.DexType[]):271:271 -> a
     228:228:void lambda$addNonPrivateInterfaceMappings$6(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.naming.MemberNaming):267:267 -> a
     229:234:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):281:286 -> a
     235:237:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):285:287 -> a
-    238:238:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):184:184 -> a
+    238:238:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):186:186 -> a
     238:238:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):287 -> a
     239:245:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):288:294 -> a
     246:248:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):293:295 -> a
-    249:249:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexField):179:179 -> a
+    249:249:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexField):181:181 -> a
     249:249:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):295 -> a
     250:251:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):296:297 -> a
     252:253:void addMemberNaming(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.MemberNaming,java.util.Map):304:305 -> a
@@ -53534,7 +53692,7 @@
     1:3:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexType,char[],com.android.tools.r8.naming.InternalNamingState,java.util.function.Predicate):397:399 -> a
     4:4:boolean isRenamedByApplyMapping(com.android.tools.r8.graph.DexType):429:429 -> a
     1:1:com.android.tools.r8.graph.DexString reservedDescriptor(com.android.tools.r8.graph.DexType):407:407 -> b
-    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> b
+    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> b
     2:2:com.android.tools.r8.graph.DexString reservedDescriptor(com.android.tools.r8.graph.DexType):407 -> b
     3:18:com.android.tools.r8.graph.DexString reservedDescriptor(com.android.tools.r8.graph.DexType):409:424 -> b
 com.android.tools.r8.naming.ProguardMapMinifier$ApplyMappingMemberNamingStrategy -> com.android.tools.r8.naming.N:
@@ -53545,20 +53703,20 @@
     1:4:void <init>(com.android.tools.r8.graph.AppView,java.util.Map):441:444 -> <init>
     boolean allowMemberRenaming(com.android.tools.r8.graph.DexClass) -> a
     1:1:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):452:452 -> a
-    2:2:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):184:184 -> a
+    2:2:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):186:186 -> a
     2:2:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):452 -> a
     3:13:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):453:463 -> a
-    14:14:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    14:14:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     14:14:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):464 -> a
     15:15:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):464:464 -> a
     16:16:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):463:463 -> a
     17:17:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):473:473 -> a
-    18:18:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexField):179:179 -> a
+    18:18:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexField):181:181 -> a
     18:18:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):475 -> a
     19:19:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):475:475 -> a
     20:20:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):473:473 -> a
     21:23:com.android.tools.r8.graph.DexString nextName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate,com.android.tools.r8.utils.TriFunction):491:493 -> a
-    24:24:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    24:24:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     24:24:com.android.tools.r8.graph.DexString nextName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate,com.android.tools.r8.utils.TriFunction):493 -> a
     25:29:com.android.tools.r8.graph.DexString nextName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate,com.android.tools.r8.utils.TriFunction):494:498 -> a
     30:36:void reportReservationError(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString):547:553 -> a
@@ -53876,7 +54034,7 @@
     1:1:void <init>(java.lang.String,int):22:22 -> <init>
     1:39:com.android.tools.r8.graph.DexString map(java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,int):44:82 -> a
     40:49:com.android.tools.r8.graph.DexString map(java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,int):68:77 -> a
-    50:51:java.lang.String com.android.tools.r8.utils.DescriptorUtils.getCanonicalNameFromDescriptor(java.lang.String):284:285 -> a
+    50:51:java.lang.String com.android.tools.r8.utils.DescriptorUtils.getCanonicalNameFromDescriptor(java.lang.String):286:287 -> a
     50:51:com.android.tools.r8.graph.DexString map(java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,int):61 -> a
     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
@@ -53967,16 +54125,16 @@
     27:28:void lambda$run$4(com.android.tools.r8.naming.signature.GenericSignatureParser,com.android.tools.r8.naming.signature.GenericSignatureRewriter$GenericSignatureCollector,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):71:72 -> a
     29:67:com.android.tools.r8.graph.DexAnnotationSet rewriteGenericSignatures(com.android.tools.r8.graph.DexAnnotationSet,java.util.function.Consumer,java.util.function.Supplier,java.util.function.BiConsumer):89:127 -> a
     68:73:void parseError(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.origin.Origin,java.lang.String,java.lang.reflect.GenericSignatureFormatError):132:137 -> a
-    74:74:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():720:720 -> a
+    74:74:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():770:770 -> a
     74:74:void parseError(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.origin.Origin,java.lang.String,java.lang.reflect.GenericSignatureFormatError):137 -> a
     75:88:void parseError(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.origin.Origin,java.lang.String,java.lang.reflect.GenericSignatureFormatError):137:150 -> a
-    89:89:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():716:716 -> a
+    89:89:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():766:766 -> a
     89:89:void lambda$run$0(com.android.tools.r8.graph.DexClass,java.lang.String,java.lang.reflect.GenericSignatureFormatError):60 -> a
     90:90:void lambda$run$0(com.android.tools.r8.graph.DexClass,java.lang.String,java.lang.reflect.GenericSignatureFormatError):60:60 -> a
-    91:91:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():716:716 -> a
+    91:91:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():766:766 -> a
     91:91:void lambda$run$1(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexClass,java.lang.String,java.lang.reflect.GenericSignatureFormatError):68 -> a
     92:92:void lambda$run$1(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexClass,java.lang.String,java.lang.reflect.GenericSignatureFormatError):68:68 -> a
-    93:93:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():716:716 -> a
+    93:93:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():766:766 -> a
     93:93:void lambda$run$3(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass,java.lang.String,java.lang.reflect.GenericSignatureFormatError):76 -> a
     94:94:void lambda$run$3(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass,java.lang.String,java.lang.reflect.GenericSignatureFormatError):76:76 -> a
     1:1:java.util.Map access$200(com.android.tools.r8.naming.signature.GenericSignatureRewriter):29:29 -> b
@@ -54007,7 +54165,7 @@
     1:1:void parsedIdentifier(java.lang.String):167:167 -> b
     2:2:void start():223:223 -> b
     1:1:java.lang.String getRenamedSignature():157:157 -> c
-com.android.tools.r8.optimize.ClassAndMemberPublicizer -> com.android.tools.r8.y.a:
+com.android.tools.r8.optimize.ClassAndMemberPublicizer -> com.android.tools.r8.x.a:
     com.android.tools.r8.graph.DexApplication application -> a
     com.android.tools.r8.ir.optimize.MethodPoolCollection methodPoolCollection -> c
     com.android.tools.r8.optimize.PublicizerLense$PublicizedLenseBuilder lenseBuilder -> d
@@ -54025,7 +54183,7 @@
     91:91:boolean publicizeMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):114:114 -> a
     91:91:void lambda$publicizeType$1(com.android.tools.r8.graph.DexClass,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):87 -> a
     92:92:void lambda$publicizeType$1(com.android.tools.r8.graph.DexClass,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):88:88 -> a
-com.android.tools.r8.optimize.InvokeSingleTargetExtractor -> com.android.tools.r8.y.c:
+com.android.tools.r8.optimize.InvokeSingleTargetExtractor -> com.android.tools.r8.x.c:
     com.android.tools.r8.optimize.InvokeSingleTargetExtractor$InvokeKind kind -> a
     com.android.tools.r8.graph.DexMethod target -> b
     boolean $assertionsDisabled -> c
@@ -54047,7 +54205,7 @@
     1:1:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):87:87 -> registerStaticFieldRead
     1:1:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):92:92 -> registerStaticFieldWrite
     1:1:boolean registerTypeReference(com.android.tools.r8.graph.DexType):97:97 -> registerTypeReference
-com.android.tools.r8.optimize.InvokeSingleTargetExtractor$InvokeKind -> com.android.tools.r8.y.b:
+com.android.tools.r8.optimize.InvokeSingleTargetExtractor$InvokeKind -> com.android.tools.r8.x.b:
     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
@@ -54055,7 +54213,7 @@
     com.android.tools.r8.optimize.InvokeSingleTargetExtractor$InvokeKind VIRTUAL -> a
     1:5:void <clinit>():101:105 -> <clinit>
     1:1:void <init>(java.lang.String,int):100:100 -> <init>
-com.android.tools.r8.optimize.MemberRebindingAnalysis -> com.android.tools.r8.y.d:
+com.android.tools.r8.optimize.MemberRebindingAnalysis -> com.android.tools.r8.x.d:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.optimize.MemberRebindingLense$Builder builder -> d
     com.android.tools.r8.utils.InternalOptions options -> c
@@ -54064,34 +54222,34 @@
     1:1:void <clinit>():27:27 -> <clinit>
     1:6:void <init>(com.android.tools.r8.graph.AppView):35:40 -> <init>
     1:1:com.android.tools.r8.graph.DexMethod validTargetFor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):44:44 -> a
-    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     2:2:com.android.tools.r8.graph.DexMethod validTargetFor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):44 -> a
     3:14:com.android.tools.r8.graph.DexMethod validTargetFor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):45:56 -> a
     15:15:com.android.tools.r8.graph.DexType firstLibraryClassForInterfaceTarget(java.lang.Object,com.android.tools.r8.graph.DexType,java.util.function.BiFunction):77:77 -> a
-    16:16:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    16:16:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     16:16:com.android.tools.r8.graph.DexType firstLibraryClassForInterfaceTarget(java.lang.Object,com.android.tools.r8.graph.DexType,java.util.function.BiFunction):77 -> a
     17:33:com.android.tools.r8.graph.DexType firstLibraryClassForInterfaceTarget(java.lang.Object,com.android.tools.r8.graph.DexType,java.util.function.BiFunction):78:94 -> a
     34:34:com.android.tools.r8.graph.DexType firstLibraryClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):101:101 -> a
-    35:35:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    35:35:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     35:35:com.android.tools.r8.graph.DexType firstLibraryClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):101 -> a
     36:37:com.android.tools.r8.graph.DexType firstLibraryClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):101:102 -> a
-    38:38:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    38:38:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     38:38:com.android.tools.r8.graph.DexType firstLibraryClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):102 -> a
     39:40:com.android.tools.r8.graph.DexType firstLibraryClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):103:104 -> a
-    41:41:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    41:41:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     41:41:com.android.tools.r8.graph.DexType firstLibraryClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):104 -> a
     42:42:com.android.tools.r8.graph.DexType firstLibraryClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):106:106 -> a
     43:43:com.android.tools.r8.graph.DexEncodedMethod anyLookup(com.android.tools.r8.graph.DexMethod):118:118 -> a
     44:49:void computeMethodRebinding(java.util.Map,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):125:130 -> a
-    50:50:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    50:50:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     50:50:void computeMethodRebinding(java.util.Map,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):130 -> a
     51:58:void computeMethodRebinding(java.util.Map,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):131:138 -> a
-    59:59:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    59:59:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     59:59:void computeMethodRebinding(java.util.Map,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):138 -> a
     60:60:void computeMethodRebinding(java.util.Map,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):139:139 -> a
     61:61:boolean needsBridgeForInterfaceMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Invoke$Type):169:169 -> a
     61:61:void computeMethodRebinding(java.util.Map,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):145 -> a
-    62:62:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():345:345 -> a
+    62:62:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():337:337 -> a
     62:62:boolean needsBridgeForInterfaceMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Invoke$Type):169 -> a
     62:62:void computeMethodRebinding(java.util.Map,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):145 -> a
     63:66:boolean needsBridgeForInterfaceMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Invoke$Type):169:172 -> a
@@ -54106,27 +54264,27 @@
     87:87:boolean lambda$computeMethodRebinding$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):156:156 -> a
     88:89:boolean mayNeedBridgeForVisibility(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):213:214 -> a
     88:89:boolean lambda$computeMethodRebinding$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):156 -> a
-    90:90:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    90:90:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     90:90:boolean mayNeedBridgeForVisibility(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):214 -> a
     90:90:boolean lambda$computeMethodRebinding$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):156 -> a
     91:97:boolean mayNeedBridgeForVisibility(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):218:224 -> a
     91:97:boolean lambda$computeMethodRebinding$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):156 -> a
     98:101:com.android.tools.r8.graph.DexProgramClass findHolderForInterfaceMethodBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):200:203 -> a
-    102:102:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    102:102:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     102:102:com.android.tools.r8.graph.DexProgramClass findHolderForInterfaceMethodBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):203 -> a
     103:107:com.android.tools.r8.graph.DexProgramClass findHolderForInterfaceMethodBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):205:209 -> a
     108:114:com.android.tools.r8.graph.DexProgramClass findHolderForVisibilityBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,java.lang.String):254:260 -> a
-    115:115:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    115:115:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     115:115:com.android.tools.r8.graph.DexProgramClass findHolderForVisibilityBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,java.lang.String):260 -> a
     116:120:com.android.tools.r8.graph.DexProgramClass findHolderForVisibilityBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,java.lang.String):261:265 -> a
-    121:121:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    121:121:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     121:121:com.android.tools.r8.graph.DexProgramClass findHolderForVisibilityBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,java.lang.String):265 -> a
     122:132:com.android.tools.r8.graph.DexProgramClass findHolderForVisibilityBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,java.lang.String):266:276 -> a
     133:133:void computeFieldRebindingForIndirectAccesses(com.android.tools.r8.graph.FieldAccessInfo):288:288 -> a
     134:152:void computeFieldRebindingForIndirectAccessWithContexts(com.android.tools.r8.graph.DexField,java.util.Set):294:312 -> a
     153:153:com.android.tools.r8.graph.DexField validTargetFor(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField,java.util.function.BiFunction):61:61 -> a
     153:153:void computeFieldRebindingForIndirectAccessWithContexts(com.android.tools.r8.graph.DexField,java.util.Set):313 -> a
-    154:154:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    154:154:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     154:154:com.android.tools.r8.graph.DexField validTargetFor(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField,java.util.function.BiFunction):61 -> a
     154:154:void computeFieldRebindingForIndirectAccessWithContexts(com.android.tools.r8.graph.DexField,java.util.Set):313 -> a
     155:165:com.android.tools.r8.graph.DexField validTargetFor(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField,java.util.function.BiFunction):62:72 -> a
@@ -54135,7 +54293,7 @@
     167:167:void computeFieldRebindingForIndirectAccessWithContexts(com.android.tools.r8.graph.DexField,java.util.Set):312:312 -> a
     168:168:boolean lambda$computeFieldRebindingForIndirectAccessWithContexts$1(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod):310:310 -> a
     169:169:boolean isClassTypeVisibleFromContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):328:328 -> a
-    170:170:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    170:170:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     170:170:boolean isClassTypeVisibleFromContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):329 -> a
     171:171:boolean isClassTypeVisibleFromContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):330:330 -> a
     172:174:boolean isClassTypeVisibleFromContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):335:337 -> a
@@ -54145,19 +54303,19 @@
     2:4:void computeFieldRebinding():282:284 -> b
     5:9:boolean isTypeVisibleFromContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):319:323 -> b
     1:1:com.android.tools.r8.graph.DexEncodedMethod interfaceLookup(com.android.tools.r8.graph.DexMethod):114:114 -> c
-com.android.tools.r8.optimize.MemberRebindingLense -> com.android.tools.r8.y.f:
+com.android.tools.r8.optimize.MemberRebindingLense -> com.android.tools.r8.x.f:
     com.android.tools.r8.graph.AppView appView -> a
     1:7:void <init>(com.android.tools.r8.graph.AppView,java.util.Map,java.util.Map,com.android.tools.r8.graph.GraphLense):43:49 -> <init>
     8:16:void <init>(com.android.tools.r8.graph.AppView,java.util.Map,java.util.Map,com.android.tools.r8.graph.GraphLense):42:50 -> <init>
     1:1:com.android.tools.r8.optimize.MemberRebindingLense$Builder builder(com.android.tools.r8.graph.AppView):54:54 -> a
     1:1:com.android.tools.r8.ir.code.Invoke$Type mapInvocationType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):59:59 -> mapInvocationType
-com.android.tools.r8.optimize.MemberRebindingLense$Builder -> com.android.tools.r8.y.e:
+com.android.tools.r8.optimize.MemberRebindingLense$Builder -> com.android.tools.r8.x.e:
     com.android.tools.r8.graph.AppView appView -> f
     boolean $assertionsDisabled -> g
     1:1:void <clinit>():18:18 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.AppView):22:23 -> <init>
     1:5:com.android.tools.r8.graph.GraphLense build(com.android.tools.r8.graph.GraphLense):27:31 -> a
-com.android.tools.r8.optimize.PublicizerLense -> com.android.tools.r8.y.i:
+com.android.tools.r8.optimize.PublicizerLense -> com.android.tools.r8.x.i:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set publicizedMethods -> b
     boolean $assertionsDisabled -> c
@@ -54169,21 +54327,21 @@
     1:5:com.android.tools.r8.graph.GraphLense$GraphLenseLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):44:48 -> lookupMethod
     6:9:boolean publicizedMethodIsPresentOnHolder(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):55:58 -> lookupMethod
     6:9:com.android.tools.r8.graph.GraphLense$GraphLenseLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):48 -> lookupMethod
-    10:10:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> lookupMethod
+    10:10:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> lookupMethod
     10:10:boolean publicizedMethodIsPresentOnHolder(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):58 -> lookupMethod
     10:10:com.android.tools.r8.graph.GraphLense$GraphLenseLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):48 -> lookupMethod
     11:14:boolean publicizedMethodIsPresentOnHolder(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):59:62 -> lookupMethod
     11:14:com.android.tools.r8.graph.GraphLense$GraphLenseLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):48 -> lookupMethod
     15:17:com.android.tools.r8.graph.GraphLense$GraphLenseLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):49:51 -> lookupMethod
-com.android.tools.r8.optimize.PublicizerLense$1 -> com.android.tools.r8.y.g:
-com.android.tools.r8.optimize.PublicizerLense$PublicizedLenseBuilder -> com.android.tools.r8.y.h:
+com.android.tools.r8.optimize.PublicizerLense$1 -> com.android.tools.r8.x.g:
+com.android.tools.r8.optimize.PublicizerLense$PublicizedLenseBuilder -> com.android.tools.r8.x.h:
     java.util.Set publicizedMethods -> a
     1:1:void <init>(com.android.tools.r8.optimize.PublicizerLense$1):70:70 -> <init>
     2:2:void <init>():73:73 -> <init>
     3:3:void <init>():71:71 -> <init>
     1:4:com.android.tools.r8.graph.GraphLense build(com.android.tools.r8.graph.AppView):77:80 -> a
     5:5:void add(com.android.tools.r8.graph.DexMethod):84:84 -> a
-com.android.tools.r8.optimize.VisibilityBridgeRemover -> com.android.tools.r8.y.j:
+com.android.tools.r8.optimize.VisibilityBridgeRemover -> com.android.tools.r8.x.j:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.function.Consumer unneededVisibilityBridgeConsumer -> b
     boolean $assertionsDisabled -> c
@@ -54206,7 +54364,7 @@
     43:43:void run():105:105 -> a
     44:50:void removeUnneededVisibilityBridgesFromClass(com.android.tools.r8.graph.DexProgramClass):36:42 -> a
     44:50:void run():106 -> a
-com.android.tools.r8.org.objectweb.asm.AnnotationVisitor -> com.android.tools.r8.z.a.a.a:
+com.android.tools.r8.org.objectweb.asm.AnnotationVisitor -> com.android.tools.r8.y.a.a.a:
     1:1:void <init>(int):56:56 -> <init>
     2:4:void <init>(int,com.android.tools.r8.org.objectweb.asm.AnnotationVisitor):67:69 -> <init>
     void visit(java.lang.String,java.lang.Object) -> a
@@ -54214,7 +54372,7 @@
     com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitArray(java.lang.String) -> a
     void visitEnd() -> a
     void visitEnum(java.lang.String,java.lang.String,java.lang.String) -> a
-com.android.tools.r8.org.objectweb.asm.AnnotationWriter -> com.android.tools.r8.z.a.a.b:
+com.android.tools.r8.org.objectweb.asm.AnnotationWriter -> com.android.tools.r8.y.a.a.b:
     com.android.tools.r8.org.objectweb.asm.AnnotationWriter previousAnnotation -> f
     com.android.tools.r8.org.objectweb.asm.AnnotationWriter nextAnnotation -> g
     com.android.tools.r8.org.objectweb.asm.SymbolTable symbolTable -> a
@@ -54247,7 +54405,7 @@
     179:181:int computeParameterAnnotationsSize(java.lang.String,com.android.tools.r8.org.objectweb.asm.AnnotationWriter[],int):496:498 -> a
     182:205:void putParameterAnnotations(int,com.android.tools.r8.org.objectweb.asm.AnnotationWriter[],int,com.android.tools.r8.org.objectweb.asm.ByteVector):524:547 -> a
     1:8:int computeAnnotationsSize(java.lang.String):332:339 -> b
-com.android.tools.r8.org.objectweb.asm.Attribute -> com.android.tools.r8.z.a.a.d:
+com.android.tools.r8.org.objectweb.asm.Attribute -> com.android.tools.r8.y.a.a.d:
     byte[] content -> b
     java.lang.String type -> a
     com.android.tools.r8.org.objectweb.asm.Attribute nextAttribute -> c
@@ -54272,7 +54430,7 @@
     31:31:void putAttributes(com.android.tools.r8.org.objectweb.asm.SymbolTable,byte[],int,int,int,com.android.tools.r8.org.objectweb.asm.ByteVector):311 -> a
     32:34:void putAttributes(com.android.tools.r8.org.objectweb.asm.SymbolTable,byte[],int,int,int,com.android.tools.r8.org.objectweb.asm.ByteVector):313:315 -> a
     35:45:void putAttributes(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,int,com.android.tools.r8.org.objectweb.asm.ByteVector):336:346 -> a
-com.android.tools.r8.org.objectweb.asm.Attribute$Set -> com.android.tools.r8.z.a.a.c:
+com.android.tools.r8.org.objectweb.asm.Attribute$Set -> com.android.tools.r8.y.a.a.c:
     com.android.tools.r8.org.objectweb.asm.Attribute[] data -> b
     int size -> a
     1:6:void <init>():351:356 -> <init>
@@ -54282,7 +54440,7 @@
     5:10:void add(com.android.tools.r8.org.objectweb.asm.Attribute):384:389 -> a
     5:10:void addAttributes(com.android.tools.r8.org.objectweb.asm.Attribute):362 -> a
     11:11:void addAttributes(com.android.tools.r8.org.objectweb.asm.Attribute):364:364 -> a
-com.android.tools.r8.org.objectweb.asm.ByteVector -> com.android.tools.r8.z.a.a.e:
+com.android.tools.r8.org.objectweb.asm.ByteVector -> com.android.tools.r8.y.a.a.e:
     byte[] data -> a
     int length -> b
     1:2:void <init>():45:46 -> <init>
@@ -54301,7 +54459,7 @@
     20:30:com.android.tools.r8.org.objectweb.asm.ByteVector put122(int,int,int):195:205 -> b
     1:8:com.android.tools.r8.org.objectweb.asm.ByteVector putShort(int):110:117 -> c
     1:5:void enlarge(int):355:359 -> d
-com.android.tools.r8.org.objectweb.asm.ClassReader -> com.android.tools.r8.z.a.a.f:
+com.android.tools.r8.org.objectweb.asm.ClassReader -> com.android.tools.r8.y.a.a.f:
     int[] bootstrapMethodOffsets -> f
     byte[] classFileBuffer -> b
     byte[] b -> a
@@ -54487,9 +54645,9 @@
     1:2:int readUnsignedShort(int):3362:3363 -> f
     3:9:java.lang.String readUtf(int,char[]):3436:3442 -> f
     1:25:int[] readBootstrapMethodsAttribute(int):3241:3265 -> g
-com.android.tools.r8.org.objectweb.asm.ClassTooLargeException -> com.android.tools.r8.z.a.a.g:
+com.android.tools.r8.org.objectweb.asm.ClassTooLargeException -> com.android.tools.r8.y.a.a.g:
     1:1:void <init>(java.lang.String,int):49:49 -> <init>
-com.android.tools.r8.org.objectweb.asm.ClassVisitor -> com.android.tools.r8.z.a.a.h:
+com.android.tools.r8.org.objectweb.asm.ClassVisitor -> com.android.tools.r8.y.a.a.h:
     com.android.tools.r8.org.objectweb.asm.ClassVisitor cv -> b
     int api -> a
     1:1:void <init>(int):57:57 -> <init>
@@ -54511,7 +54669,7 @@
     35:36:void visitEnd():325:326 -> a
     1:5:void visitNestMember(java.lang.String):235:239 -> b
     6:6:void visitNestMember(java.lang.String):236:236 -> b
-com.android.tools.r8.org.objectweb.asm.ClassWriter -> com.android.tools.r8.z.a.a.i:
+com.android.tools.r8.org.objectweb.asm.ClassWriter -> com.android.tools.r8.y.a.a.i:
     int numberOfInnerClasses -> n
     com.android.tools.r8.org.objectweb.asm.FieldWriter firstField -> j
     int interfaceCount -> h
@@ -54563,7 +54721,7 @@
     224:243:byte[] toByteArray():639 -> b
     244:244:byte[] toByteArray():641:641 -> b
     245:245:byte[] toByteArray():538:538 -> b
-com.android.tools.r8.org.objectweb.asm.ConstantDynamic -> com.android.tools.r8.z.a.a.j:
+com.android.tools.r8.org.objectweb.asm.ConstantDynamic -> com.android.tools.r8.y.a.a.j:
     java.lang.Object[] bootstrapMethodArguments -> d
     java.lang.String name -> a
     java.lang.String descriptor -> b
@@ -54576,7 +54734,7 @@
     1:8:boolean equals(java.lang.Object):155:162 -> equals
     1:4:int hashCode():167:170 -> hashCode
     1:7:java.lang.String toString():175:181 -> toString
-com.android.tools.r8.org.objectweb.asm.Context -> com.android.tools.r8.z.a.a.k:
+com.android.tools.r8.org.objectweb.asm.Context -> com.android.tools.r8.y.a.a.k:
     int currentFrameType -> n
     java.lang.String currentMethodDescriptor -> f
     int currentFrameLocalCount -> o
@@ -54597,15 +54755,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.z.a.a.l:
+com.android.tools.r8.org.objectweb.asm.CurrentFrame -> com.android.tools.r8.y.a.a.l:
     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.z.a.a.m:
+com.android.tools.r8.org.objectweb.asm.Edge -> com.android.tools.r8.y.a.a.m:
     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.z.a.a.n:
+com.android.tools.r8.org.objectweb.asm.FieldVisitor -> com.android.tools.r8.y.a.a.n:
     com.android.tools.r8.org.objectweb.asm.FieldVisitor fv -> a
     1:1:void <init>(int):55:55 -> <init>
     2:7:void <init>(int,com.android.tools.r8.org.objectweb.asm.FieldVisitor):66:71 -> <init>
@@ -54613,7 +54771,7 @@
     void visitEnd() -> a
     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:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):119:120 -> a
-com.android.tools.r8.org.objectweb.asm.FieldWriter -> com.android.tools.r8.z.a.a.o:
+com.android.tools.r8.org.objectweb.asm.FieldWriter -> com.android.tools.r8.y.a.a.o:
     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
@@ -54633,7 +54791,7 @@
     14:66:void putFieldInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):220:272 -> a
     67:67: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.z.a.a.p:
+com.android.tools.r8.org.objectweb.asm.Frame -> com.android.tools.r8.y.a.a.p:
     short outputStackTop -> g
     short outputStackStart -> f
     int[] initializations -> i
@@ -54730,7 +54888,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.z.a.a.q:
+com.android.tools.r8.org.objectweb.asm.Handle -> com.android.tools.r8.y.a.a.q:
     boolean isInterface -> e
     java.lang.String name -> c
     java.lang.String owner -> b
@@ -54745,7 +54903,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.z.a.a.r:
+com.android.tools.r8.org.objectweb.asm.Handler -> com.android.tools.r8.y.a.a.r:
     com.android.tools.r8.org.objectweb.asm.Handler nextHandler -> f
     com.android.tools.r8.org.objectweb.asm.Label handlerPc -> c
     int catchType -> d
@@ -54761,7 +54919,7 @@
     25:26:void <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.z.a.a.s:
+com.android.tools.r8.org.objectweb.asm.Label -> com.android.tools.r8.y.a.a.s:
     com.android.tools.r8.org.objectweb.asm.Frame frame -> k
     com.android.tools.r8.org.objectweb.asm.Edge outgoingEdges -> m
     int bytecodeOffset -> e
@@ -54789,9 +54947,9 @@
     92:126:void addSubroutineRetSuccessors(com.android.tools.r8.org.objectweb.asm.Label):541:575 -> a
     1:13:com.android.tools.r8.org.objectweb.asm.Label pushSuccessors(com.android.tools.r8.org.objectweb.asm.Label):591:603 -> b
     1:1:java.lang.String toString():619:619 -> toString
-com.android.tools.r8.org.objectweb.asm.MethodTooLargeException -> com.android.tools.r8.z.a.a.t:
+com.android.tools.r8.org.objectweb.asm.MethodTooLargeException -> com.android.tools.r8.y.a.a.t:
     1:1:void <init>(java.lang.String,java.lang.String,java.lang.String,int):57:57 -> <init>
-com.android.tools.r8.org.objectweb.asm.MethodVisitor -> com.android.tools.r8.z.a.a.u:
+com.android.tools.r8.org.objectweb.asm.MethodVisitor -> com.android.tools.r8.y.a.a.u:
     int api -> h
     com.android.tools.r8.org.objectweb.asm.MethodVisitor mv -> i
     1:1:void <init>(int):69:69 -> <init>
@@ -54824,19 +54982,19 @@
     65:66:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):696:697 -> a
     67:71:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitLocalVariableAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,com.android.tools.r8.org.objectweb.asm.Label[],com.android.tools.r8.org.objectweb.asm.Label[],int[],java.lang.String,boolean):729:733 -> a
     72:72:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitLocalVariableAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,com.android.tools.r8.org.objectweb.asm.Label[],com.android.tools.r8.org.objectweb.asm.Label[],int[],java.lang.String,boolean):730:730 -> a
-    void visitCode() -> b
     1:5:void visitParameter(java.lang.String,int):100:104 -> b
     6:6:void visitParameter(java.lang.String,int):101:101 -> b
-    7:8:void visitIntInsn(int,int):332:333 -> b
-    9:13:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTryCatchAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):666:670 -> b
-    14:14:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTryCatchAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):667:667 -> b
-    15:16:void visitLineNumber(int,com.android.tools.r8.org.objectweb.asm.Label):749:750 -> b
-    void visitEnd() -> c
+    7:8:void visitCode():220:221 -> b
+    9:10:void visitIntInsn(int,int):332:333 -> b
+    11:15:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTryCatchAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):666:670 -> b
+    16:16:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTryCatchAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):667:667 -> b
+    17:18:void visitLineNumber(int,com.android.tools.r8.org.objectweb.asm.Label):749:750 -> b
     1:5:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):156:160 -> c
     6:6:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):157:157 -> c
     7:8:void visitMaxs(int,int):761:762 -> c
+    9:10:void visitEnd():771:772 -> c
     1:2:void visitVarInsn(int,int):347:348 -> d
-com.android.tools.r8.org.objectweb.asm.MethodWriter -> com.android.tools.r8.z.a.a.v:
+com.android.tools.r8.org.objectweb.asm.MethodWriter -> com.android.tools.r8.y.a.a.v:
     com.android.tools.r8.org.objectweb.asm.AnnotationWriter lastRuntimeVisibleAnnotation -> I
     int nameIndex -> l
     boolean hasAsmInstructions -> f0
@@ -55025,7 +55183,7 @@
     197:214:void com.android.tools.r8.org.objectweb.asm.Frame.putAbstractType(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,com.android.tools.r8.org.objectweb.asm.ByteVector):1453:1470 -> g
     197:214:void putAbstractTypes(int,int):1956 -> g
     1:10:void endCurrentBasicBlockWithNoSuccessor():1791:1800 -> h
-com.android.tools.r8.org.objectweb.asm.ModuleVisitor -> com.android.tools.r8.z.a.a.w:
+com.android.tools.r8.org.objectweb.asm.ModuleVisitor -> com.android.tools.r8.y.a.a.w:
     1:1:void <init>(int):55:55 -> <init>
     2:4:void <init>(int,com.android.tools.r8.org.objectweb.asm.ModuleVisitor):66:68 -> <init>
     void visitExport(java.lang.String,int,java.lang.String[]) -> a
@@ -55035,7 +55193,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.z.a.a.x:
+com.android.tools.r8.org.objectweb.asm.ModuleWriter -> com.android.tools.r8.y.a.a.x:
     com.android.tools.r8.org.objectweb.asm.ByteVector provides -> n
     int packageCount -> o
     com.android.tools.r8.org.objectweb.asm.ByteVector usesIndex -> l
@@ -55064,7 +55222,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.z.a.a.y:
+com.android.tools.r8.org.objectweb.asm.Opcodes -> com.android.tools.r8.y.a.a.y:
     java.lang.Integer FLOAT -> c
     java.lang.Integer DOUBLE -> d
     java.lang.Integer LONG -> e
@@ -55073,7 +55231,7 @@
     java.lang.Integer TOP -> a
     java.lang.Integer INTEGER -> b
     1:7:void <clinit>():376:382 -> <clinit>
-com.android.tools.r8.org.objectweb.asm.SymbolTable -> com.android.tools.r8.z.a.a.A:
+com.android.tools.r8.org.objectweb.asm.SymbolTable -> com.android.tools.r8.y.a.a.A:
     com.android.tools.r8.org.objectweb.asm.ClassWriter classWriter -> a
     int typeCount -> k
     int bootstrapMethodCount -> i
@@ -55216,7 +55374,7 @@
     2:2:int addType(java.lang.String):1138 -> e
     3:10:int addType(java.lang.String):1139:1146 -> 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.z.a.a.z:
+com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry -> com.android.tools.r8.y.a.a.z:
     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
@@ -55243,7 +55401,7 @@
     40:40:void <init>(int,int,java.lang.String,java.lang.String,java.lang.String,long,int):1296:1296 -> <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.z.a.a.B:
+com.android.tools.r8.org.objectweb.asm.Type -> com.android.tools.r8.y.a.a.B:
     com.android.tools.r8.org.objectweb.asm.Type FLOAT_TYPE -> k
     com.android.tools.r8.org.objectweb.asm.Type INT_TYPE -> j
     com.android.tools.r8.org.objectweb.asm.Type DOUBLE_TYPE -> m
@@ -55280,7 +55438,7 @@
     1:1:com.android.tools.r8.org.objectweb.asm.Type getType(java.lang.String):177:177 -> g
     1:4:int hashCode():873:876 -> hashCode
     1:1:java.lang.String toString():889:889 -> toString
-com.android.tools.r8.org.objectweb.asm.TypePath -> com.android.tools.r8.z.a.a.C:
+com.android.tools.r8.org.objectweb.asm.TypePath -> com.android.tools.r8.y.a.a.C:
     byte[] typePathContainer -> a
     int typePathOffset -> b
     1:3:void <init>(byte[],int):72:74 -> <init>
@@ -55297,7 +55455,7 @@
     7:7:java.lang.String toString():174:174 -> toString
     8:8:java.lang.String toString():171:171 -> toString
     9:24:java.lang.String toString():168:183 -> toString
-com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter -> com.android.tools.r8.z.a.a.D.b:
+com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter -> com.android.tools.r8.y.a.a.D.b:
     java.util.BitSet sharedSubroutineInsns -> F
     java.util.Map subroutinesInsns -> E
     java.util.BitSet mainSubroutineInsns -> D
@@ -55336,7 +55494,7 @@
     103:105:void emitCode():307:309 -> c
     103:105:void visitEnd():147 -> c
     106:107:void visitEnd():149:150 -> c
-com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation -> com.android.tools.r8.z.a.a.D.a:
+com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation -> com.android.tools.r8.y.a.a.D.a:
     java.util.Map clonedLabels -> c
     com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation parent -> a
     java.util.BitSet subroutineInsns -> b
@@ -55353,7 +55511,7 @@
     1:1:com.android.tools.r8.org.objectweb.asm.tree.LabelNode get(java.lang.Object):550:550 -> get
     1:1:java.lang.Object get(java.lang.Object):419 -> get
     1:1:int hashCode():560:560 -> hashCode
-com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode -> com.android.tools.r8.z.a.a.E.a:
+com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode -> com.android.tools.r8.y.a.a.E.a:
     java.util.List visibleTypeAnnotations -> b
     java.util.List invisibleTypeAnnotations -> c
     int index -> f
@@ -55370,7 +55528,7 @@
     1:5:void acceptAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor):180:184 -> b
     6:15:void acceptAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor):183:192 -> b
     16:16:void acceptAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor):191:191 -> b
-com.android.tools.r8.org.objectweb.asm.tree.AnnotationNode -> com.android.tools.r8.z.a.a.E.b:
+com.android.tools.r8.org.objectweb.asm.tree.AnnotationNode -> com.android.tools.r8.y.a.a.E.b:
     java.util.List values -> b
     java.lang.String desc -> a
     1:3:void <init>(java.lang.String):63:65 -> <init>
@@ -55404,7 +55562,7 @@
     82:90:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitArray(java.lang.String):150:158 -> a
     91:98:void accept(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor):189:196 -> a
     99:115:void accept(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,java.lang.Object):210:226 -> a
-com.android.tools.r8.org.objectweb.asm.tree.FieldInsnNode -> com.android.tools.r8.z.a.a.E.c:
+com.android.tools.r8.org.objectweb.asm.tree.FieldInsnNode -> com.android.tools.r8.y.a.a.E.c:
     java.lang.String owner -> g
     java.lang.String desc -> i
     java.lang.String name -> h
@@ -55412,7 +55570,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.z.a.a.E.d:
+com.android.tools.r8.org.objectweb.asm.tree.FrameNode -> com.android.tools.r8.y.a.a.E.d:
     int type -> g
     java.util.List stack -> i
     java.util.List local -> h
@@ -55431,14 +55589,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.z.a.a.E.e:
+com.android.tools.r8.org.objectweb.asm.tree.IincInsnNode -> com.android.tools.r8.y.a.a.E.e:
     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.z.a.a.E.f:
+com.android.tools.r8.org.objectweb.asm.tree.InsnList -> com.android.tools.r8.y.a.a.E.f:
     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
@@ -55453,18 +55611,18 @@
     5:10:void resetLabels():469:474 -> b
     1:1:int size():61:61 -> c
     1:6:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode[] toArray():176:181 -> d
-com.android.tools.r8.org.objectweb.asm.tree.InsnNode -> com.android.tools.r8.z.a.a.E.g:
+com.android.tools.r8.org.objectweb.asm.tree.InsnNode -> com.android.tools.r8.y.a.a.E.g:
     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.z.a.a.E.h:
+com.android.tools.r8.org.objectweb.asm.tree.IntInsnNode -> com.android.tools.r8.y.a.a.E.h:
     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.z.a.a.E.i:
+com.android.tools.r8.org.objectweb.asm.tree.InvokeDynamicInsnNode -> com.android.tools.r8.y.a.a.E.i:
     java.lang.String name -> g
     java.lang.String desc -> h
     com.android.tools.r8.org.objectweb.asm.Handle bsm -> i
@@ -55473,7 +55631,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.z.a.a.E.j:
+com.android.tools.r8.org.objectweb.asm.tree.JumpInsnNode -> com.android.tools.r8.y.a.a.E.j:
     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
@@ -55482,7 +55640,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.z.a.a.E.k:
+com.android.tools.r8.org.objectweb.asm.tree.LabelNode -> com.android.tools.r8.y.a.a.E.k:
     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
@@ -55490,13 +55648,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.z.a.a.E.l:
+com.android.tools.r8.org.objectweb.asm.tree.LdcInsnNode -> com.android.tools.r8.y.a.a.E.l:
     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.z.a.a.E.m:
+com.android.tools.r8.org.objectweb.asm.tree.LineNumberNode -> com.android.tools.r8.y.a.a.E.m:
     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>
@@ -55506,14 +55664,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.z.a.a.E.n:
+com.android.tools.r8.org.objectweb.asm.tree.LocalVariableAnnotationNode -> com.android.tools.r8.y.a.a.E.n:
     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):115:118 -> <init>
     1:10:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor,boolean):128:137 -> a
     11:11:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor,boolean):136:136 -> a
-com.android.tools.r8.org.objectweb.asm.tree.LocalVariableNode -> com.android.tools.r8.z.a.a.E.o:
+com.android.tools.r8.org.objectweb.asm.tree.LocalVariableNode -> com.android.tools.r8.y.a.a.E.o:
     int index -> f
     java.lang.String name -> a
     java.lang.String signature -> c
@@ -55521,7 +55679,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.z.a.a.E.p:
+com.android.tools.r8.org.objectweb.asm.tree.LookupSwitchInsnNode -> com.android.tools.r8.y.a.a.E.p:
     com.android.tools.r8.org.objectweb.asm.tree.LabelNode dflt -> g
     java.util.List labels -> i
     java.util.List keys -> h
@@ -55532,7 +55690,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.z.a.a.E.q:
+com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode -> com.android.tools.r8.y.a.a.E.q:
     java.lang.String owner -> g
     java.lang.String desc -> i
     java.lang.String name -> h
@@ -55541,7 +55699,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.z.a.a.E.s:
+com.android.tools.r8.org.objectweb.asm.tree.MethodNode -> com.android.tools.r8.y.a.a.E.s:
     java.util.List attrs -> p
     java.util.List invisibleTypeAnnotations -> o
     java.lang.String desc -> j
@@ -55630,22 +55788,22 @@
     1:11:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):278:288 -> c
     12:13:void visitMaxs(int,int):550:551 -> c
     1:1:void visitVarInsn(int,int):370:370 -> d
-com.android.tools.r8.org.objectweb.asm.tree.MethodNode$1 -> com.android.tools.r8.z.a.a.E.r:
+com.android.tools.r8.org.objectweb.asm.tree.MethodNode$1 -> com.android.tools.r8.y.a.a.E.r:
     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):249:249 -> <init>
     1:2:boolean add(java.lang.Object):252:253 -> add
-com.android.tools.r8.org.objectweb.asm.tree.MultiANewArrayInsnNode -> com.android.tools.r8.z.a.a.E.t:
+com.android.tools.r8.org.objectweb.asm.tree.MultiANewArrayInsnNode -> com.android.tools.r8.y.a.a.E.t:
     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.z.a.a.E.u:
+com.android.tools.r8.org.objectweb.asm.tree.ParameterNode -> com.android.tools.r8.y.a.a.E.u:
     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.z.a.a.E.v:
+com.android.tools.r8.org.objectweb.asm.tree.TableSwitchInsnNode -> com.android.tools.r8.y.a.a.E.v:
     com.android.tools.r8.org.objectweb.asm.tree.LabelNode dflt -> i
     int max -> h
     java.util.List labels -> j
@@ -55657,7 +55815,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.z.a.a.E.w:
+com.android.tools.r8.org.objectweb.asm.tree.TryCatchBlockNode -> com.android.tools.r8.y.a.a.E.w:
     java.util.List invisibleTypeAnnotations -> f
     java.util.List visibleTypeAnnotations -> e
     com.android.tools.r8.org.objectweb.asm.tree.LabelNode start -> a
@@ -55665,29 +55823,29 @@
     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.z.a.a.E.x:
+com.android.tools.r8.org.objectweb.asm.tree.TypeAnnotationNode -> com.android.tools.r8.y.a.a.E.x:
     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):81:83 -> <init>
-com.android.tools.r8.org.objectweb.asm.tree.TypeInsnNode -> com.android.tools.r8.z.a.a.E.y:
+com.android.tools.r8.org.objectweb.asm.tree.TypeInsnNode -> com.android.tools.r8.y.a.a.E.y:
     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.z.a.a.E.z:
+com.android.tools.r8.org.objectweb.asm.tree.Util -> com.android.tools.r8.y.a.a.E.z:
     1:3:java.util.List asArrayList(int):44:46 -> a
     4:8:java.util.List asArrayList(java.lang.Object[]):53:57 -> a
     9:13:java.util.List asArrayList(int[]):108:112 -> a
     14:16:java.util.List asArrayList(int,java.lang.Object[]):151:153 -> a
-com.android.tools.r8.org.objectweb.asm.tree.VarInsnNode -> com.android.tools.r8.z.a.a.E.A:
+com.android.tools.r8.org.objectweb.asm.tree.VarInsnNode -> com.android.tools.r8.y.a.a.E.A:
     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.z.a.a.F.a:
+com.android.tools.r8.org.objectweb.asm.util.Printer -> com.android.tools.r8.y.a.a.F.a:
     java.lang.String[] OPCODES -> a
     1:1:void <clinit>():53:53 -> <clinit>
 com.android.tools.r8.origin.ArchiveEntryOrigin -> com.android.tools.r8.origin.ArchiveEntryOrigin:
@@ -55909,6 +56067,20 @@
     1:1:com.android.tools.r8.references.TypeReference typeFromTypeName(java.lang.String):84:84 -> typeFromTypeName
 com.android.tools.r8.references.TypeReference -> com.android.tools.r8.references.TypeReference:
     1:1:java.lang.String getTypeName():62:62 -> getTypeName
+com.android.tools.r8.retrace.AmbiguousComparator -> com.android.tools.r8.retrace.b:
+    java.util.function.BiFunction getter -> a
+    1:2:void <init>(java.util.function.BiFunction):21:22 -> <init>
+    1:16:int compare(java.lang.Object,java.lang.Object):27:42 -> compare
+    17:17:int compare(java.lang.Object,java.lang.Object):40:40 -> compare
+com.android.tools.r8.retrace.AmbiguousComparator$SortKeys -> com.android.tools.r8.retrace.a:
+    com.android.tools.r8.retrace.AmbiguousComparator$SortKeys CLASS -> a
+    com.android.tools.r8.retrace.AmbiguousComparator$SortKeys[] $VALUES -> e
+    com.android.tools.r8.retrace.AmbiguousComparator$SortKeys LINE -> d
+    com.android.tools.r8.retrace.AmbiguousComparator$SortKeys METHOD -> b
+    com.android.tools.r8.retrace.AmbiguousComparator$SortKeys SOURCE -> c
+    1:4:void <clinit>():13:16 -> <clinit>
+    5:5:void <clinit>():12:12 -> <clinit>
+    1:1:void <init>(java.lang.String,int):12:12 -> <init>
 com.android.tools.r8.retrace.Result -> com.android.tools.r8.retrace.Result:
     1:1:void <init>():12:12 -> <init>
 com.android.tools.r8.retrace.Retrace -> com.android.tools.r8.retrace.Retrace:
@@ -55956,12 +56128,12 @@
 com.android.tools.r8.retrace.Retrace$MainAction -> com.android.tools.r8.retrace.Retrace$b:
 com.android.tools.r8.retrace.Retrace$RetraceAbortException -> com.android.tools.r8.retrace.Retrace$c:
     1:1:void <init>():173:173 -> <init>
-com.android.tools.r8.retrace.RetraceBase -> com.android.tools.r8.retrace.a:
+com.android.tools.r8.retrace.RetraceBase -> com.android.tools.r8.retrace.c:
     com.android.tools.r8.retrace.RetraceClassResult retrace(com.android.tools.r8.references.ClassReference) -> a
     com.android.tools.r8.retrace.RetraceMethodResult retrace(com.android.tools.r8.references.MethodReference) -> a
     com.android.tools.r8.retrace.RetraceTypeResult retrace(com.android.tools.r8.references.TypeReference) -> a
     java.lang.String retraceSourceFile(com.android.tools.r8.references.ClassReference,java.lang.String,com.android.tools.r8.references.ClassReference,boolean) -> a
-com.android.tools.r8.retrace.RetraceBaseImpl -> com.android.tools.r8.retrace.b:
+com.android.tools.r8.retrace.RetraceBaseImpl -> com.android.tools.r8.retrace.d:
     com.android.tools.r8.naming.ClassNameMapper classNameMapper -> a
     java.util.Set UNKNOWN_SOURCEFILE_NAMES -> b
     boolean $assertionsDisabled -> c
@@ -56054,7 +56226,7 @@
     19:19:com.android.tools.r8.retrace.RetraceCommand build():125:125 -> a
     20:20:com.android.tools.r8.retrace.RetraceCommand build():122:122 -> a
     21:21:com.android.tools.r8.retrace.RetraceCommand build():119:119 -> a
-com.android.tools.r8.retrace.RetraceCommandLineResult -> com.android.tools.r8.retrace.c:
+com.android.tools.r8.retrace.RetraceCommandLineResult -> com.android.tools.r8.retrace.e:
     java.util.List nodes -> a
     1:2:void <init>(java.util.List):13:14 -> <init>
     1:1:java.util.List getNodes():18:18 -> a
@@ -56119,230 +56291,259 @@
     com.android.tools.r8.retrace.RetraceMethodResult retraceMethodResult -> b
     1:1:void <init>(com.android.tools.r8.retrace.RetraceMethodResult,com.android.tools.r8.retrace.RetraceClassResult$Element,com.android.tools.r8.references.MethodReference,com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange,com.android.tools.r8.retrace.RetraceMethodResult$1):131:131 -> <init>
     2:6:void <init>(com.android.tools.r8.retrace.RetraceMethodResult,com.android.tools.r8.retrace.RetraceClassResult$Element,com.android.tools.r8.references.MethodReference,com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange):142:146 -> <init>
-    1:1:int getOriginalLineNumber(int):162:162 -> a
-    2:2:int getFirstLineNumberOfOriginalRange():166:166 -> a
-    3:8:int com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange.getFirstLineNumberOfOriginalRange():423:428 -> a
-    3:8:int getFirstLineNumberOfOriginalRange():169 -> a
+    1:4:boolean containsMinifiedLineNumber(int):166:169 -> a
+    5:8:int getFirstLineNumberOfOriginalRange():178:181 -> a
+    9:14:int com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange.getFirstLineNumberOfOriginalRange():423:428 -> a
+    9:14:int getFirstLineNumberOfOriginalRange():181 -> a
     1:1:com.android.tools.r8.references.MethodReference getMethodReference():150:150 -> b
+    2:2:int getOriginalLineNumber(int):162:162 -> b
     1:1:com.android.tools.r8.retrace.RetraceMethodResult getRetraceMethodResult():154:154 -> c
-com.android.tools.r8.retrace.RetraceRegularExpression -> com.android.tools.r8.retrace.r:
+    1:1:boolean hasNoLineNumberRange():174:174 -> d
+com.android.tools.r8.retrace.RetraceRegularExpression -> com.android.tools.r8.retrace.u:
     java.util.List stackTrace -> b
     com.android.tools.r8.DiagnosticsHandler diagnosticsHandler -> c
     com.android.tools.r8.retrace.RetraceRegularExpression$RegularExpressionGroup[] groups -> e
     com.android.tools.r8.retrace.RetraceBase retraceBase -> a
+    boolean $assertionsDisabled -> f
     java.lang.String regularExpression -> d
-    1:1:void <init>(com.android.tools.r8.retrace.RetraceBase,java.util.List,com.android.tools.r8.DiagnosticsHandler,java.lang.String):53:53 -> <init>
-    2:24:void <init>(com.android.tools.r8.retrace.RetraceBase,java.util.List,com.android.tools.r8.DiagnosticsHandler,java.lang.String):35:57 -> <init>
-    1:1:com.android.tools.r8.DiagnosticsHandler access$2000(com.android.tools.r8.retrace.RetraceRegularExpression):26:26 -> a
-    2:3:com.android.tools.r8.retrace.RetraceCommandLineResult retrace():61:62 -> a
-    4:26:java.lang.String registerGroups(java.lang.String,java.util.List):90:112 -> a
-    4:26:com.android.tools.r8.retrace.RetraceCommandLineResult retrace():62 -> a
-    27:30:java.lang.String registerGroups(java.lang.String,java.util.List):111:114 -> a
-    27:30:com.android.tools.r8.retrace.RetraceCommandLineResult retrace():62 -> a
-    31:51:com.android.tools.r8.retrace.RetraceCommandLineResult retrace():63:83 -> a
-com.android.tools.r8.retrace.RetraceRegularExpression$1 -> com.android.tools.r8.retrace.d:
-com.android.tools.r8.retrace.RetraceRegularExpression$BinaryNameGroup -> com.android.tools.r8.retrace.e:
-    1:1:void <init>():362:362 -> <init>
-    2:2:void <init>(com.android.tools.r8.retrace.RetraceRegularExpression$1):362:362 -> <init>
-    java.lang.String shortName() -> a
-    1:1:java.lang.String getClassName(com.android.tools.r8.references.ClassReference):376:376 -> a
-    java.lang.String subExpression() -> b
-    1:1:com.android.tools.r8.references.ClassReference classFromMatch(java.lang.String):381:381 -> b
-com.android.tools.r8.retrace.RetraceRegularExpression$ClassNameGroup -> com.android.tools.r8.retrace.f:
-    1:1:void <init>():304:304 -> <init>
-    2:2:void <init>(com.android.tools.r8.retrace.RetraceRegularExpression$1):304:304 -> <init>
-    java.lang.String getClassName(com.android.tools.r8.references.ClassReference) -> a
-    1:1:com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString$RetraceStringBuilder com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString.transform():176:176 -> a
-    1:1:void lambda$createHandler$0(java.util.List,com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString,java.util.regex.Matcher,java.lang.String,com.android.tools.r8.retrace.RetraceClassResult$Element):324 -> a
-    2:7:void lambda$createHandler$0(java.util.List,com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString,java.util.regex.Matcher,java.lang.String,com.android.tools.r8.retrace.RetraceClassResult$Element):325:330 -> a
-    8:12:void lambda$createHandler$0(java.util.List,com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString,java.util.regex.Matcher,java.lang.String,com.android.tools.r8.retrace.RetraceClassResult$Element):327:331 -> a
-    13:13:void lambda$createHandler$0(java.util.List,com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString,java.util.regex.Matcher,java.lang.String,com.android.tools.r8.retrace.RetraceClassResult$Element):322:322 -> a
-    14:14:com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString$RetraceStringBuilder com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString.transform():176:176 -> a
-    14:14:void lambda$createHandler$0(java.util.List,com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString,java.util.regex.Matcher,java.lang.String,com.android.tools.r8.retrace.RetraceClassResult$Element):324 -> a
-    15:15:com.android.tools.r8.retrace.RetraceRegularExpression$RegularExpressionGroupHandler createHandler(java.lang.String):312:312 -> a
-    16:23:java.util.List lambda$createHandler$1(java.lang.String,java.util.List,java.util.regex.Matcher,com.android.tools.r8.retrace.RetraceBase):313:320 -> a
-    com.android.tools.r8.references.ClassReference classFromMatch(java.lang.String) -> b
-com.android.tools.r8.retrace.RetraceRegularExpression$FieldNameGroup -> com.android.tools.r8.retrace.g:
+    1:1:void <clinit>():27:27 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.retrace.RetraceBase,java.util.List,com.android.tools.r8.DiagnosticsHandler,java.lang.String):54:54 -> <init>
+    2:24:void <init>(com.android.tools.r8.retrace.RetraceBase,java.util.List,com.android.tools.r8.DiagnosticsHandler,java.lang.String):36:58 -> <init>
+    1:1:com.android.tools.r8.DiagnosticsHandler access$2300(com.android.tools.r8.retrace.RetraceRegularExpression):27:27 -> a
+    2:3:com.android.tools.r8.retrace.RetraceCommandLineResult retrace():62:63 -> a
+    4:26:java.lang.String registerGroups(java.lang.String,java.util.List):133:155 -> a
+    4:26:com.android.tools.r8.retrace.RetraceCommandLineResult retrace():63 -> a
+    27:30:java.lang.String registerGroups(java.lang.String,java.util.List):154:157 -> a
+    27:30:com.android.tools.r8.retrace.RetraceCommandLineResult retrace():63 -> a
+    31:71:com.android.tools.r8.retrace.RetraceCommandLineResult retrace():64:104 -> a
+com.android.tools.r8.retrace.RetraceRegularExpression$1 -> com.android.tools.r8.retrace.f:
+com.android.tools.r8.retrace.RetraceRegularExpression$BinaryNameGroup -> com.android.tools.r8.retrace.g:
     1:1:void <init>():453:453 -> <init>
     2:2:void <init>(com.android.tools.r8.retrace.RetraceRegularExpression$1):453:453 -> <init>
     java.lang.String shortName() -> a
-    1:1:com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString$RetraceStringBuilder com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString.transform():176:176 -> a
-    1:1:void lambda$createHandler$0(com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString,java.util.regex.Matcher,java.lang.String,java.util.List,com.android.tools.r8.retrace.RetraceFieldResult$Element):483 -> a
-    2:9:void lambda$createHandler$0(com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString,java.util.regex.Matcher,java.lang.String,java.util.List,com.android.tools.r8.retrace.RetraceFieldResult$Element):485:492 -> a
-    10:18:void lambda$createHandler$0(com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString,java.util.regex.Matcher,java.lang.String,java.util.List,com.android.tools.r8.retrace.RetraceFieldResult$Element):490:498 -> a
-    19:23:void lambda$createHandler$0(com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString,java.util.regex.Matcher,java.lang.String,java.util.List,com.android.tools.r8.retrace.RetraceFieldResult$Element):495:499 -> a
-    24:24:com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString$RetraceStringBuilder com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString.transform():176:176 -> a
-    24:24:void lambda$createHandler$0(com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString,java.util.regex.Matcher,java.lang.String,java.util.List,com.android.tools.r8.retrace.RetraceFieldResult$Element):483 -> a
-    25:25:com.android.tools.r8.retrace.RetraceRegularExpression$RegularExpressionGroupHandler createHandler(java.lang.String):467:467 -> a
-    26:39:java.util.List lambda$createHandler$1(java.lang.String,java.util.List,java.util.regex.Matcher,com.android.tools.r8.retrace.RetraceBase):468:481 -> a
+    1:1:java.lang.String getClassName(com.android.tools.r8.references.ClassReference):467:467 -> a
     java.lang.String subExpression() -> b
-com.android.tools.r8.retrace.RetraceRegularExpression$FieldOrReturnTypeGroup -> com.android.tools.r8.retrace.h:
-    1:1:void <init>():615:615 -> <init>
-    2:2:void <init>(com.android.tools.r8.retrace.RetraceRegularExpression$1):615:615 -> <init>
+    1:1:com.android.tools.r8.references.ClassReference classFromMatch(java.lang.String):472:472 -> b
+com.android.tools.r8.retrace.RetraceRegularExpression$ClassNameGroup -> com.android.tools.r8.retrace.h:
+    1:1:void <init>():395:395 -> <init>
+    2:2:void <init>(com.android.tools.r8.retrace.RetraceRegularExpression$1):395:395 -> <init>
+    java.lang.String getClassName(com.android.tools.r8.references.ClassReference) -> a
+    1:1:com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString$RetraceStringBuilder com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString.transform():228:228 -> a
+    1:1:void lambda$createHandler$0(java.util.List,com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString,java.util.regex.Matcher,java.lang.String,com.android.tools.r8.retrace.RetraceClassResult$Element):415 -> a
+    2:7:void lambda$createHandler$0(java.util.List,com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString,java.util.regex.Matcher,java.lang.String,com.android.tools.r8.retrace.RetraceClassResult$Element):416:421 -> a
+    8:12:void lambda$createHandler$0(java.util.List,com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString,java.util.regex.Matcher,java.lang.String,com.android.tools.r8.retrace.RetraceClassResult$Element):418:422 -> a
+    13:13:void lambda$createHandler$0(java.util.List,com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString,java.util.regex.Matcher,java.lang.String,com.android.tools.r8.retrace.RetraceClassResult$Element):413:413 -> a
+    14:14:com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString$RetraceStringBuilder com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString.transform():228:228 -> a
+    14:14:void lambda$createHandler$0(java.util.List,com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString,java.util.regex.Matcher,java.lang.String,com.android.tools.r8.retrace.RetraceClassResult$Element):415 -> a
+    15:15:com.android.tools.r8.retrace.RetraceRegularExpression$RegularExpressionGroupHandler createHandler(java.lang.String):403:403 -> a
+    16:23:java.util.List lambda$createHandler$1(java.lang.String,java.util.List,java.util.regex.Matcher,com.android.tools.r8.retrace.RetraceBase):404:411 -> a
+    com.android.tools.r8.references.ClassReference classFromMatch(java.lang.String) -> b
+com.android.tools.r8.retrace.RetraceRegularExpression$FieldNameGroup -> com.android.tools.r8.retrace.i:
+    1:1:void <init>():545:545 -> <init>
+    2:2:void <init>(com.android.tools.r8.retrace.RetraceRegularExpression$1):545:545 -> <init>
     java.lang.String shortName() -> a
-    1:1:com.android.tools.r8.retrace.RetraceRegularExpression$RegularExpressionGroupHandler createHandler(java.lang.String):629:629 -> a
-    2:14:java.util.List lambda$createHandler$1(java.lang.String,java.util.List,java.util.regex.Matcher,com.android.tools.r8.retrace.RetraceBase):630:642 -> a
+    1:1:com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString$RetraceStringBuilder com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString.transform():228:228 -> a
+    1:1:void lambda$createHandler$0(com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString,java.util.regex.Matcher,java.lang.String,java.util.List,com.android.tools.r8.retrace.RetraceFieldResult$Element):575 -> a
+    2:9:void lambda$createHandler$0(com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString,java.util.regex.Matcher,java.lang.String,java.util.List,com.android.tools.r8.retrace.RetraceFieldResult$Element):577:584 -> a
+    10:18:void lambda$createHandler$0(com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString,java.util.regex.Matcher,java.lang.String,java.util.List,com.android.tools.r8.retrace.RetraceFieldResult$Element):582:590 -> a
+    19:23:void lambda$createHandler$0(com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString,java.util.regex.Matcher,java.lang.String,java.util.List,com.android.tools.r8.retrace.RetraceFieldResult$Element):587:591 -> a
+    24:24:com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString$RetraceStringBuilder com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString.transform():228:228 -> a
+    24:24:void lambda$createHandler$0(com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString,java.util.regex.Matcher,java.lang.String,java.util.List,com.android.tools.r8.retrace.RetraceFieldResult$Element):575 -> a
+    25:25:com.android.tools.r8.retrace.RetraceRegularExpression$RegularExpressionGroupHandler createHandler(java.lang.String):559:559 -> a
+    26:39:java.util.List lambda$createHandler$1(java.lang.String,java.util.List,java.util.regex.Matcher,com.android.tools.r8.retrace.RetraceBase):560:573 -> a
+    java.lang.String subExpression() -> b
+com.android.tools.r8.retrace.RetraceRegularExpression$FieldOrReturnTypeGroup -> com.android.tools.r8.retrace.j:
+    1:1:void <init>():723:723 -> <init>
+    2:2:void <init>(com.android.tools.r8.retrace.RetraceRegularExpression$1):723:723 -> <init>
+    java.lang.String shortName() -> a
+    1:1:com.android.tools.r8.retrace.RetraceRegularExpression$RegularExpressionGroupHandler createHandler(java.lang.String):737:737 -> a
+    2:14:java.util.List lambda$createHandler$1(java.lang.String,java.util.List,java.util.regex.Matcher,com.android.tools.r8.retrace.RetraceBase):738:750 -> a
     15:15:com.android.tools.r8.retrace.RetraceTypeResult com.android.tools.r8.retrace.RetraceTypeResult.forEach(java.util.function.Consumer):40:40 -> a
-    15:15:java.util.List lambda$createHandler$1(java.lang.String,java.util.List,java.util.regex.Matcher,com.android.tools.r8.retrace.RetraceBase):642 -> a
-    16:16:void lambda$createHandler$0(java.util.List,com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString,java.util.regex.Matcher,java.lang.String,com.android.tools.r8.retrace.RetraceTypeResult$Element):644:644 -> a
-    17:17:com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString$RetraceStringBuilder com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString.transform():176:176 -> a
-    17:17:void lambda$createHandler$0(java.util.List,com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString,java.util.regex.Matcher,java.lang.String,com.android.tools.r8.retrace.RetraceTypeResult$Element):647 -> a
-    18:22:void lambda$createHandler$0(java.util.List,com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString,java.util.regex.Matcher,java.lang.String,com.android.tools.r8.retrace.RetraceTypeResult$Element):648:652 -> a
-    23:27:void lambda$createHandler$0(java.util.List,com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString,java.util.regex.Matcher,java.lang.String,com.android.tools.r8.retrace.RetraceTypeResult$Element):649:653 -> a
-    28:28:void lambda$createHandler$0(java.util.List,com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString,java.util.regex.Matcher,java.lang.String,com.android.tools.r8.retrace.RetraceTypeResult$Element):645:645 -> a
-    29:29:com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString$RetraceStringBuilder com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString.transform():176:176 -> a
-    29:29:void lambda$createHandler$0(java.util.List,com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString,java.util.regex.Matcher,java.lang.String,com.android.tools.r8.retrace.RetraceTypeResult$Element):647 -> a
+    15:15:java.util.List lambda$createHandler$1(java.lang.String,java.util.List,java.util.regex.Matcher,com.android.tools.r8.retrace.RetraceBase):750 -> a
+    16:16:void lambda$createHandler$0(java.util.List,com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString,java.util.regex.Matcher,java.lang.String,com.android.tools.r8.retrace.RetraceTypeResult$Element):752:752 -> a
+    17:17:com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString$RetraceStringBuilder com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString.transform():228:228 -> a
+    17:17:void lambda$createHandler$0(java.util.List,com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString,java.util.regex.Matcher,java.lang.String,com.android.tools.r8.retrace.RetraceTypeResult$Element):755 -> a
+    18:22:void lambda$createHandler$0(java.util.List,com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString,java.util.regex.Matcher,java.lang.String,com.android.tools.r8.retrace.RetraceTypeResult$Element):756:760 -> a
+    23:27:void lambda$createHandler$0(java.util.List,com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString,java.util.regex.Matcher,java.lang.String,com.android.tools.r8.retrace.RetraceTypeResult$Element):757:761 -> a
+    28:28:void lambda$createHandler$0(java.util.List,com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString,java.util.regex.Matcher,java.lang.String,com.android.tools.r8.retrace.RetraceTypeResult$Element):753:753 -> a
+    29:29:com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString$RetraceStringBuilder com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString.transform():228:228 -> a
+    29:29:void lambda$createHandler$0(java.util.List,com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString,java.util.regex.Matcher,java.lang.String,com.android.tools.r8.retrace.RetraceTypeResult$Element):755 -> a
     java.lang.String subExpression() -> b
-com.android.tools.r8.retrace.RetraceRegularExpression$LineNumberGroup -> com.android.tools.r8.retrace.i:
+com.android.tools.r8.retrace.RetraceRegularExpression$LineNumberGroup -> com.android.tools.r8.retrace.k:
     com.android.tools.r8.retrace.RetraceRegularExpression this$0 -> a
-    1:1:void <init>(com.android.tools.r8.retrace.RetraceRegularExpression):552:552 -> <init>
-    2:2:void <init>(com.android.tools.r8.retrace.RetraceRegularExpression,com.android.tools.r8.retrace.RetraceRegularExpression$1):552:552 -> <init>
+    1:1:void <init>(com.android.tools.r8.retrace.RetraceRegularExpression):645:645 -> <init>
+    2:2:void <init>(com.android.tools.r8.retrace.RetraceRegularExpression,com.android.tools.r8.retrace.RetraceRegularExpression$1):645:645 -> <init>
     java.lang.String shortName() -> a
-    1:1:com.android.tools.r8.retrace.RetraceRegularExpression$RegularExpressionGroupHandler createHandler(java.lang.String):566:566 -> a
-    2:25:java.util.List lambda$createHandler$0(java.lang.String,java.util.List,java.util.regex.Matcher,com.android.tools.r8.retrace.RetraceBase):567:590 -> a
-    26:37:java.util.List lambda$createHandler$0(java.lang.String,java.util.List,java.util.regex.Matcher,com.android.tools.r8.retrace.RetraceBase):587:598 -> a
-    38:38:com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString$RetraceStringBuilder com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString.transform():176:176 -> a
-    38:38:java.util.List lambda$createHandler$0(java.lang.String,java.util.List,java.util.regex.Matcher,com.android.tools.r8.retrace.RetraceBase):602 -> a
-    39:39:java.util.List lambda$createHandler$0(java.lang.String,java.util.List,java.util.regex.Matcher,com.android.tools.r8.retrace.RetraceBase):604:604 -> a
-    40:42:java.util.List lambda$createHandler$0(java.lang.String,java.util.List,java.util.regex.Matcher,com.android.tools.r8.retrace.RetraceBase):603:605 -> a
-    43:43:java.util.List lambda$createHandler$0(java.lang.String,java.util.List,java.util.regex.Matcher,com.android.tools.r8.retrace.RetraceBase):600:600 -> a
-    44:44:com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString$RetraceStringBuilder com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString.transform():176:176 -> a
-    44:44:java.util.List lambda$createHandler$0(java.lang.String,java.util.List,java.util.regex.Matcher,com.android.tools.r8.retrace.RetraceBase):602 -> a
+    1:1:com.android.tools.r8.retrace.RetraceRegularExpression$RegularExpressionGroupHandler createHandler(java.lang.String):659:659 -> a
+    2:30:java.util.List lambda$createHandler$0(java.lang.String,java.util.List,java.util.regex.Matcher,com.android.tools.r8.retrace.RetraceBase):660:688 -> a
+    31:44:java.util.List lambda$createHandler$0(java.lang.String,java.util.List,java.util.regex.Matcher,com.android.tools.r8.retrace.RetraceBase):685:698 -> a
+    45:53:java.util.List lambda$createHandler$0(java.lang.String,java.util.List,java.util.regex.Matcher,com.android.tools.r8.retrace.RetraceBase):695:703 -> a
+    54:54:com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString$RetraceStringBuilder com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString.transform():228:228 -> a
+    54:54:java.util.List lambda$createHandler$0(java.lang.String,java.util.List,java.util.regex.Matcher,com.android.tools.r8.retrace.RetraceBase):706 -> a
+    55:60:java.util.List lambda$createHandler$0(java.lang.String,java.util.List,java.util.regex.Matcher,com.android.tools.r8.retrace.RetraceBase):707:712 -> a
+    61:65:java.util.List lambda$createHandler$0(java.lang.String,java.util.List,java.util.regex.Matcher,com.android.tools.r8.retrace.RetraceBase):709:713 -> a
+    66:66:java.util.List lambda$createHandler$0(java.lang.String,java.util.List,java.util.regex.Matcher,com.android.tools.r8.retrace.RetraceBase):704:704 -> a
+    67:67:com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString$RetraceStringBuilder com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString.transform():228:228 -> a
+    67:67:java.util.List lambda$createHandler$0(java.lang.String,java.util.List,java.util.regex.Matcher,com.android.tools.r8.retrace.RetraceBase):706 -> a
+    68:68:java.util.List lambda$createHandler$0(java.lang.String,java.util.List,java.util.regex.Matcher,com.android.tools.r8.retrace.RetraceBase):671:671 -> a
     java.lang.String subExpression() -> b
-com.android.tools.r8.retrace.RetraceRegularExpression$MethodArgumentsGroup -> com.android.tools.r8.retrace.j:
+com.android.tools.r8.retrace.RetraceRegularExpression$MethodArgumentsGroup -> com.android.tools.r8.retrace.l:
     com.android.tools.r8.retrace.RetraceRegularExpression this$0 -> a
-    1:1:void <init>(com.android.tools.r8.retrace.RetraceRegularExpression):661:661 -> <init>
-    2:2:void <init>(com.android.tools.r8.retrace.RetraceRegularExpression,com.android.tools.r8.retrace.RetraceRegularExpression$1):661:661 -> <init>
+    1:1:void <init>(com.android.tools.r8.retrace.RetraceRegularExpression):769:769 -> <init>
+    2:2:void <init>(com.android.tools.r8.retrace.RetraceRegularExpression,com.android.tools.r8.retrace.RetraceRegularExpression$1):769:769 -> <init>
     java.lang.String shortName() -> a
-    1:1:com.android.tools.r8.retrace.RetraceRegularExpression$RegularExpressionGroupHandler createHandler(java.lang.String):675:675 -> a
-    2:40:java.util.List lambda$createHandler$3(java.lang.String,java.util.List,java.util.regex.Matcher,com.android.tools.r8.retrace.RetraceBase):676:714 -> a
-    41:51:java.util.List lambda$createHandler$3(java.lang.String,java.util.List,java.util.regex.Matcher,com.android.tools.r8.retrace.RetraceBase):713:723 -> a
-    52:61:java.util.List lambda$createHandler$3(java.lang.String,java.util.List,java.util.regex.Matcher,com.android.tools.r8.retrace.RetraceBase):720:729 -> a
-    62:62:com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString$RetraceStringBuilder com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString.transform():176:176 -> a
-    62:62:java.util.List lambda$createHandler$3(java.lang.String,java.util.List,java.util.regex.Matcher,com.android.tools.r8.retrace.RetraceBase):732 -> a
-    63:67:java.util.List lambda$createHandler$3(java.lang.String,java.util.List,java.util.regex.Matcher,com.android.tools.r8.retrace.RetraceBase):734:738 -> a
-    68:74:java.util.List lambda$createHandler$3(java.lang.String,java.util.List,java.util.regex.Matcher,com.android.tools.r8.retrace.RetraceBase):733:739 -> a
-    75:75:java.util.List lambda$createHandler$3(java.lang.String,java.util.List,java.util.regex.Matcher,com.android.tools.r8.retrace.RetraceBase):730:730 -> a
-    76:83:java.util.Set lambda$createHandler$1(com.android.tools.r8.retrace.RetraceBase,java.util.Set,java.lang.String):687:694 -> a
+    1:1:com.android.tools.r8.retrace.RetraceRegularExpression$RegularExpressionGroupHandler createHandler(java.lang.String):783:783 -> a
+    2:40:java.util.List lambda$createHandler$3(java.lang.String,java.util.List,java.util.regex.Matcher,com.android.tools.r8.retrace.RetraceBase):784:822 -> a
+    41:51:java.util.List lambda$createHandler$3(java.lang.String,java.util.List,java.util.regex.Matcher,com.android.tools.r8.retrace.RetraceBase):821:831 -> a
+    52:61:java.util.List lambda$createHandler$3(java.lang.String,java.util.List,java.util.regex.Matcher,com.android.tools.r8.retrace.RetraceBase):828:837 -> a
+    62:62:com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString$RetraceStringBuilder com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString.transform():228:228 -> a
+    62:62:java.util.List lambda$createHandler$3(java.lang.String,java.util.List,java.util.regex.Matcher,com.android.tools.r8.retrace.RetraceBase):840 -> a
+    63:67:java.util.List lambda$createHandler$3(java.lang.String,java.util.List,java.util.regex.Matcher,com.android.tools.r8.retrace.RetraceBase):842:846 -> a
+    68:74:java.util.List lambda$createHandler$3(java.lang.String,java.util.List,java.util.regex.Matcher,com.android.tools.r8.retrace.RetraceBase):841:847 -> a
+    75:75:java.util.List lambda$createHandler$3(java.lang.String,java.util.List,java.util.regex.Matcher,com.android.tools.r8.retrace.RetraceBase):838:838 -> a
+    76:83:java.util.Set lambda$createHandler$1(com.android.tools.r8.retrace.RetraceBase,java.util.Set,java.lang.String):795:802 -> a
     84:84:com.android.tools.r8.retrace.RetraceTypeResult com.android.tools.r8.retrace.RetraceTypeResult.forEach(java.util.function.Consumer):40:40 -> a
-    84:84:java.util.Set lambda$createHandler$1(com.android.tools.r8.retrace.RetraceBase,java.util.Set,java.lang.String):695 -> a
-    85:89:void lambda$createHandler$0(java.util.Set,java.util.Set,com.android.tools.r8.retrace.RetraceTypeResult$Element):697:701 -> a
-    90:90:java.util.Set lambda$createHandler$2(java.util.Set,java.util.Set):707:707 -> a
+    84:84:java.util.Set lambda$createHandler$1(com.android.tools.r8.retrace.RetraceBase,java.util.Set,java.lang.String):803 -> a
+    85:89:void lambda$createHandler$0(java.util.Set,java.util.Set,com.android.tools.r8.retrace.RetraceTypeResult$Element):805:809 -> a
+    90:90:java.util.Set lambda$createHandler$2(java.util.Set,java.util.Set):815:815 -> a
     java.lang.String subExpression() -> b
-com.android.tools.r8.retrace.RetraceRegularExpression$MethodNameGroup -> com.android.tools.r8.retrace.k:
-    1:1:void <init>():385:385 -> <init>
-    2:2:void <init>(com.android.tools.r8.retrace.RetraceRegularExpression$1):385:385 -> <init>
+com.android.tools.r8.retrace.RetraceRegularExpression$MethodNameGroup -> com.android.tools.r8.retrace.m:
+    1:1:void <init>():476:476 -> <init>
+    2:2:void <init>(com.android.tools.r8.retrace.RetraceRegularExpression$1):476:476 -> <init>
     java.lang.String shortName() -> a
-    1:1:com.android.tools.r8.retrace.RetraceRegularExpression$RegularExpressionGroupHandler createHandler(java.lang.String):399:399 -> a
-    2:15:java.util.List lambda$createHandler$1(java.lang.String,java.util.List,java.util.regex.Matcher,com.android.tools.r8.retrace.RetraceBase):400:413 -> a
-    16:24:void lambda$createHandler$0(com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString,java.util.regex.Matcher,java.lang.String,java.util.List,com.android.tools.r8.retrace.RetraceMethodResult$Element):415:423 -> a
-    25:25:com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString$RetraceStringBuilder com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString.transform():176:176 -> a
-    25:25:void lambda$createHandler$0(com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString,java.util.regex.Matcher,java.lang.String,java.util.List,com.android.tools.r8.retrace.RetraceMethodResult$Element):427 -> a
-    26:33:void lambda$createHandler$0(com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString,java.util.regex.Matcher,java.lang.String,java.util.List,com.android.tools.r8.retrace.RetraceMethodResult$Element):429:436 -> a
-    34:44:void lambda$createHandler$0(com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString,java.util.regex.Matcher,java.lang.String,java.util.List,com.android.tools.r8.retrace.RetraceMethodResult$Element):434:444 -> a
-    45:49:void lambda$createHandler$0(com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString,java.util.regex.Matcher,java.lang.String,java.util.List,com.android.tools.r8.retrace.RetraceMethodResult$Element):441:445 -> a
+    1:1:com.android.tools.r8.retrace.RetraceRegularExpression$RegularExpressionGroupHandler createHandler(java.lang.String):490:490 -> a
+    2:15:java.util.List lambda$createHandler$1(java.lang.String,java.util.List,java.util.regex.Matcher,com.android.tools.r8.retrace.RetraceBase):491:504 -> a
+    16:24:void lambda$createHandler$0(com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString,java.util.regex.Matcher,java.lang.String,java.util.List,com.android.tools.r8.retrace.RetraceMethodResult$Element):506:514 -> a
+    25:25:com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString$RetraceStringBuilder com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString.transform():228:228 -> a
+    25:25:void lambda$createHandler$0(com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString,java.util.regex.Matcher,java.lang.String,java.util.List,com.android.tools.r8.retrace.RetraceMethodResult$Element):518 -> a
+    26:33:void lambda$createHandler$0(com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString,java.util.regex.Matcher,java.lang.String,java.util.List,com.android.tools.r8.retrace.RetraceMethodResult$Element):520:527 -> a
+    34:45:void lambda$createHandler$0(com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString,java.util.regex.Matcher,java.lang.String,java.util.List,com.android.tools.r8.retrace.RetraceMethodResult$Element):525:536 -> a
+    46:50:void lambda$createHandler$0(com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString,java.util.regex.Matcher,java.lang.String,java.util.List,com.android.tools.r8.retrace.RetraceMethodResult$Element):533:537 -> a
     java.lang.String subExpression() -> b
-com.android.tools.r8.retrace.RetraceRegularExpression$RegularExpressionGroup -> com.android.tools.r8.retrace.l:
-    1:1:void <init>():292:292 -> <init>
-    2:2:void <init>(com.android.tools.r8.retrace.RetraceRegularExpression$1):292:292 -> <init>
+com.android.tools.r8.retrace.RetraceRegularExpression$RegularExpressionGroup -> com.android.tools.r8.retrace.n:
+    1:1:void <init>():383:383 -> <init>
+    2:2:void <init>(com.android.tools.r8.retrace.RetraceRegularExpression$1):383:383 -> <init>
     com.android.tools.r8.retrace.RetraceRegularExpression$RegularExpressionGroupHandler createHandler(java.lang.String) -> a
     java.lang.String shortName() -> a
     java.lang.String subExpression() -> b
-com.android.tools.r8.retrace.RetraceRegularExpression$RegularExpressionGroupHandler -> com.android.tools.r8.retrace.m:
+com.android.tools.r8.retrace.RetraceRegularExpression$RegularExpressionGroupHandler -> com.android.tools.r8.retrace.o:
     java.util.List handleMatch(java.util.List,java.util.regex.Matcher,com.android.tools.r8.retrace.RetraceBase) -> a
-com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString -> com.android.tools.r8.retrace.o:
+com.android.tools.r8.retrace.RetraceRegularExpression$RetraceLineComparator -> com.android.tools.r8.retrace.p:
+    boolean $assertionsDisabled -> b
+    1:1:void <clinit>():107:107 -> <clinit>
+    1:1:void <init>():110:110 -> <init>
+    1:11:java.lang.String lambda$new$0(com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString,com.android.tools.r8.retrace.AmbiguousComparator$SortKeys):112:122 -> a
+    12:12:java.lang.String lambda$new$0(com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString,com.android.tools.r8.retrace.AmbiguousComparator$SortKeys):120:120 -> a
+    13:13:java.lang.String lambda$new$0(com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString,com.android.tools.r8.retrace.AmbiguousComparator$SortKeys):118:118 -> a
+    14:14:java.lang.String lambda$new$0(com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString,com.android.tools.r8.retrace.AmbiguousComparator$SortKeys):116:116 -> a
+    15:25:java.lang.String lambda$new$0(com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString,com.android.tools.r8.retrace.AmbiguousComparator$SortKeys):114:124 -> a
+com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString -> com.android.tools.r8.retrace.r:
     java.lang.String retracedString -> g
     com.android.tools.r8.retrace.RetraceMethodResult$Element methodContext -> d
     com.android.tools.r8.references.TypeReference typeOrReturnTypeContext -> e
+    boolean isAmbiguous -> i
+    int lineNumber -> j
+    java.lang.String source -> k
     com.android.tools.r8.retrace.RetraceRegularExpression$ClassNameGroup classNameGroup -> b
     com.android.tools.r8.references.ClassReference qualifiedContext -> c
     int adjustedIndex -> h
     com.android.tools.r8.retrace.RetraceClassResult$Element classContext -> a
     boolean hasTypeOrReturnTypeContext -> f
-    1:1:void <init>(com.android.tools.r8.retrace.RetraceClassResult$Element,com.android.tools.r8.retrace.RetraceRegularExpression$ClassNameGroup,com.android.tools.r8.references.ClassReference,com.android.tools.r8.retrace.RetraceMethodResult$Element,com.android.tools.r8.references.TypeReference,boolean,java.lang.String,int,com.android.tools.r8.retrace.RetraceRegularExpression$1):121:121 -> <init>
-    2:10:void <init>(com.android.tools.r8.retrace.RetraceClassResult$Element,com.android.tools.r8.retrace.RetraceRegularExpression$ClassNameGroup,com.android.tools.r8.references.ClassReference,com.android.tools.r8.retrace.RetraceMethodResult$Element,com.android.tools.r8.references.TypeReference,boolean,java.lang.String,int):140:148 -> <init>
-    1:1:com.android.tools.r8.references.ClassReference access$1000(com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString):121:121 -> a
-    2:2:com.android.tools.r8.retrace.RetraceClassResult$Element getClassContext():160:160 -> a
-    1:1:com.android.tools.r8.retrace.RetraceMethodResult$Element access$1100(com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString):121:121 -> b
-    2:2:com.android.tools.r8.retrace.RetraceMethodResult$Element getMethodContext():164:164 -> b
-    1:1:com.android.tools.r8.references.TypeReference access$1200(com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString):121:121 -> c
-    2:2:com.android.tools.r8.references.ClassReference getQualifiedContext():172:172 -> c
-    1:1:boolean access$1300(com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString):121:121 -> d
-    2:2:java.lang.String getRetracedString():152:152 -> d
-    1:1:java.lang.String access$1400(com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString):121:121 -> e
-    2:2:com.android.tools.r8.references.TypeReference getTypeOrReturnTypeContext():168:168 -> e
-    1:1:int access$1500(com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString):121:121 -> f
-    2:2:boolean hasTypeOrReturnTypeContext():156:156 -> f
-    1:1:com.android.tools.r8.retrace.RetraceClassResult$Element access$800(com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString):121:121 -> g
-    1:1:com.android.tools.r8.retrace.RetraceRegularExpression$ClassNameGroup access$900(com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString):121:121 -> h
-com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString$RetraceStringBuilder -> com.android.tools.r8.retrace.n:
+    1:1:void <init>(com.android.tools.r8.retrace.RetraceClassResult$Element,com.android.tools.r8.retrace.RetraceRegularExpression$ClassNameGroup,com.android.tools.r8.references.ClassReference,com.android.tools.r8.retrace.RetraceMethodResult$Element,com.android.tools.r8.references.TypeReference,boolean,java.lang.String,int,boolean,int,java.lang.String,com.android.tools.r8.retrace.RetraceRegularExpression$1):164:164 -> <init>
+    2:13:void <init>(com.android.tools.r8.retrace.RetraceClassResult$Element,com.android.tools.r8.retrace.RetraceRegularExpression$ClassNameGroup,com.android.tools.r8.references.ClassReference,com.android.tools.r8.retrace.RetraceMethodResult$Element,com.android.tools.r8.references.TypeReference,boolean,java.lang.String,int,boolean,int,java.lang.String):189:200 -> <init>
+    1:1:com.android.tools.r8.retrace.RetraceRegularExpression$ClassNameGroup access$1000(com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString):164:164 -> a
+    2:2:com.android.tools.r8.retrace.RetraceClassResult$Element getClassContext():212:212 -> a
+    1:1:com.android.tools.r8.references.ClassReference access$1100(com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString):164:164 -> b
+    2:2:int getLineNumber():232:232 -> b
+    1:1:com.android.tools.r8.retrace.RetraceMethodResult$Element access$1200(com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString):164:164 -> c
+    2:2:com.android.tools.r8.retrace.RetraceMethodResult$Element getMethodContext():216:216 -> c
+    1:1:com.android.tools.r8.references.TypeReference access$1300(com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString):164:164 -> d
+    2:2:com.android.tools.r8.references.ClassReference getQualifiedContext():224:224 -> d
+    1:1:boolean access$1400(com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString):164:164 -> e
+    2:2:java.lang.String getRetracedString():204:204 -> e
+    1:1:java.lang.String access$1500(com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString):164:164 -> f
+    2:2:java.lang.String getSource():236:236 -> f
+    1:1:int access$1600(com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString):164:164 -> g
+    2:2:com.android.tools.r8.references.TypeReference getTypeOrReturnTypeContext():220:220 -> g
+    1:1:int access$1700(com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString):164:164 -> h
+    2:2:boolean hasTypeOrReturnTypeContext():208:208 -> h
+    1:1:java.lang.String access$1800(com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString):164:164 -> i
+    1:1:boolean access$800(com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString):164:164 -> j
+    1:1:com.android.tools.r8.retrace.RetraceClassResult$Element access$900(com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString):164:164 -> k
+com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString$RetraceStringBuilder -> com.android.tools.r8.retrace.q:
+    boolean $assertionsDisabled -> m
     java.lang.String retracedString -> g
+    int maxReplaceStringIndex -> l
     com.android.tools.r8.retrace.RetraceMethodResult$Element methodContext -> d
     com.android.tools.r8.references.TypeReference typeOrReturnTypeContext -> e
-    boolean $assertionsDisabled -> j
+    boolean isAmbiguous -> i
+    int lineNumber -> j
+    java.lang.String source -> k
     com.android.tools.r8.retrace.RetraceRegularExpression$ClassNameGroup classNameGroup -> b
     com.android.tools.r8.references.ClassReference qualifiedContext -> c
     int adjustedIndex -> h
     com.android.tools.r8.retrace.RetraceClassResult$Element classContext -> a
-    int maxReplaceStringIndex -> i
     boolean hasTypeOrReturnTypeContext -> f
-    1:1:void <clinit>():179:179 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.retrace.RetraceClassResult$Element,com.android.tools.r8.retrace.RetraceRegularExpression$ClassNameGroup,com.android.tools.r8.references.ClassReference,com.android.tools.r8.retrace.RetraceMethodResult$Element,com.android.tools.r8.references.TypeReference,boolean,java.lang.String,int):200:200 -> <init>
-    2:20:void <init>(com.android.tools.r8.retrace.RetraceClassResult$Element,com.android.tools.r8.retrace.RetraceRegularExpression$ClassNameGroup,com.android.tools.r8.references.ClassReference,com.android.tools.r8.retrace.RetraceMethodResult$Element,com.android.tools.r8.references.TypeReference,boolean,java.lang.String,int):190:208 -> <init>
-    1:1:com.android.tools.r8.retrace.RetraceRegularExpression$ClassNameGroup access$1900(com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString$RetraceStringBuilder):179:179 -> a
-    2:2:com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString$RetraceStringBuilder create(java.lang.String):212:212 -> a
-    3:11:com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString$RetraceStringBuilder create(com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString):216:224 -> a
-    12:13:com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString$RetraceStringBuilder setClassContext(com.android.tools.r8.retrace.RetraceClassResult$Element,com.android.tools.r8.retrace.RetraceRegularExpression$ClassNameGroup):228:229 -> a
-    14:14:com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString$RetraceStringBuilder setMethodContext(com.android.tools.r8.retrace.RetraceMethodResult$Element):234:234 -> a
-    15:16:com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString$RetraceStringBuilder setTypeOrReturnTypeContext(com.android.tools.r8.references.TypeReference):239:240 -> a
-    17:17:com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString$RetraceStringBuilder setQualifiedContext(com.android.tools.r8.references.ClassReference):245:245 -> a
-    18:21:com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString$RetraceStringBuilder replaceInString(java.lang.String,java.lang.String):250:253 -> a
-    22:22:com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString$RetraceStringBuilder replaceInString(java.lang.String,int,int):257:257 -> a
-    23:23:com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString build():273:273 -> a
-    1:7:com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString$RetraceStringBuilder replaceInStringRaw(java.lang.String,int,int):262:268 -> b
-com.android.tools.r8.retrace.RetraceRegularExpression$SourceFileGroup -> com.android.tools.r8.retrace.p:
-    1:1:void <init>():507:507 -> <init>
-    2:2:void <init>(com.android.tools.r8.retrace.RetraceRegularExpression$1):507:507 -> <init>
+    1:1:void <clinit>():239:239 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.retrace.RetraceClassResult$Element,com.android.tools.r8.retrace.RetraceRegularExpression$ClassNameGroup,com.android.tools.r8.references.ClassReference,com.android.tools.r8.retrace.RetraceMethodResult$Element,com.android.tools.r8.references.TypeReference,boolean,java.lang.String,int,boolean,int,java.lang.String):266:266 -> <init>
+    2:26:void <init>(com.android.tools.r8.retrace.RetraceClassResult$Element,com.android.tools.r8.retrace.RetraceRegularExpression$ClassNameGroup,com.android.tools.r8.references.ClassReference,com.android.tools.r8.retrace.RetraceMethodResult$Element,com.android.tools.r8.references.TypeReference,boolean,java.lang.String,int,boolean,int,java.lang.String):253:277 -> <init>
+    1:1:com.android.tools.r8.retrace.RetraceRegularExpression$ClassNameGroup access$2200(com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString$RetraceStringBuilder):239:239 -> a
+    2:13:com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString$RetraceStringBuilder create(com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString):286:297 -> a
+    14:15:com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString$RetraceStringBuilder setClassContext(com.android.tools.r8.retrace.RetraceClassResult$Element,com.android.tools.r8.retrace.RetraceRegularExpression$ClassNameGroup):301:302 -> a
+    16:16:com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString$RetraceStringBuilder setMethodContext(com.android.tools.r8.retrace.RetraceMethodResult$Element):307:307 -> a
+    17:18:com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString$RetraceStringBuilder setTypeOrReturnTypeContext(com.android.tools.r8.references.TypeReference):312:313 -> a
+    19:19:com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString$RetraceStringBuilder setQualifiedContext(com.android.tools.r8.references.ClassReference):318:318 -> a
+    20:20:com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString$RetraceStringBuilder setAmbiguous(boolean):323:323 -> a
+    21:21:com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString$RetraceStringBuilder setLineNumber(int):328:328 -> a
+    22:22:com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString$RetraceStringBuilder setSource(java.lang.String):333:333 -> a
+    23:26:com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString$RetraceStringBuilder replaceInString(java.lang.String,java.lang.String):338:341 -> a
+    27:27:com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString$RetraceStringBuilder replaceInString(java.lang.String,int,int):345:345 -> a
+    28:28:com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString build():361:361 -> a
+    1:1:com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString$RetraceStringBuilder create(java.lang.String):281:281 -> b
+    2:8:com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString$RetraceStringBuilder replaceInStringRaw(java.lang.String,int,int):350:356 -> b
+com.android.tools.r8.retrace.RetraceRegularExpression$SourceFileGroup -> com.android.tools.r8.retrace.s:
+    1:1:void <init>():599:599 -> <init>
+    2:2:void <init>(com.android.tools.r8.retrace.RetraceRegularExpression$1):599:599 -> <init>
     java.lang.String shortName() -> a
-    1:1:com.android.tools.r8.retrace.RetraceRegularExpression$RegularExpressionGroupHandler createHandler(java.lang.String):521:521 -> a
-    2:17:java.util.List lambda$createHandler$0(java.lang.String,java.util.List,java.util.regex.Matcher,com.android.tools.r8.retrace.RetraceBase):522:537 -> a
-    18:23:java.util.List lambda$createHandler$0(java.lang.String,java.util.List,java.util.regex.Matcher,com.android.tools.r8.retrace.RetraceBase):534:539 -> a
-    24:24:com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString$RetraceStringBuilder com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString.transform():176:176 -> a
-    24:24:java.util.List lambda$createHandler$0(java.lang.String,java.util.List,java.util.regex.Matcher,com.android.tools.r8.retrace.RetraceBase):542 -> a
-    25:25:java.util.List lambda$createHandler$0(java.lang.String,java.util.List,java.util.regex.Matcher,com.android.tools.r8.retrace.RetraceBase):544:544 -> a
-    26:28:java.util.List lambda$createHandler$0(java.lang.String,java.util.List,java.util.regex.Matcher,com.android.tools.r8.retrace.RetraceBase):543:545 -> a
-    29:29:java.util.List lambda$createHandler$0(java.lang.String,java.util.List,java.util.regex.Matcher,com.android.tools.r8.retrace.RetraceBase):540:540 -> a
+    1:1:com.android.tools.r8.retrace.RetraceRegularExpression$RegularExpressionGroupHandler createHandler(java.lang.String):613:613 -> a
+    2:17:java.util.List lambda$createHandler$0(java.lang.String,java.util.List,java.util.regex.Matcher,com.android.tools.r8.retrace.RetraceBase):614:629 -> a
+    18:23:java.util.List lambda$createHandler$0(java.lang.String,java.util.List,java.util.regex.Matcher,com.android.tools.r8.retrace.RetraceBase):626:631 -> a
+    24:24:com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString$RetraceStringBuilder com.android.tools.r8.retrace.RetraceRegularExpression$RetraceString.transform():228:228 -> a
+    24:24:java.util.List lambda$createHandler$0(java.lang.String,java.util.List,java.util.regex.Matcher,com.android.tools.r8.retrace.RetraceBase):634 -> a
+    25:27:java.util.List lambda$createHandler$0(java.lang.String,java.util.List,java.util.regex.Matcher,com.android.tools.r8.retrace.RetraceBase):635:637 -> a
+    28:30:java.util.List lambda$createHandler$0(java.lang.String,java.util.List,java.util.regex.Matcher,com.android.tools.r8.retrace.RetraceBase):636:638 -> a
+    31:31:java.util.List lambda$createHandler$0(java.lang.String,java.util.List,java.util.regex.Matcher,com.android.tools.r8.retrace.RetraceBase):632:632 -> a
     java.lang.String subExpression() -> b
-com.android.tools.r8.retrace.RetraceRegularExpression$TypeNameGroup -> com.android.tools.r8.retrace.q:
-    1:1:void <init>():339:339 -> <init>
-    2:2:void <init>(com.android.tools.r8.retrace.RetraceRegularExpression$1):339:339 -> <init>
+com.android.tools.r8.retrace.RetraceRegularExpression$TypeNameGroup -> com.android.tools.r8.retrace.t:
+    1:1:void <init>():430:430 -> <init>
+    2:2:void <init>(com.android.tools.r8.retrace.RetraceRegularExpression$1):430:430 -> <init>
     java.lang.String shortName() -> a
-    1:1:java.lang.String getClassName(com.android.tools.r8.references.ClassReference):353:353 -> a
+    1:1:java.lang.String getClassName(com.android.tools.r8.references.ClassReference):444:444 -> a
     java.lang.String subExpression() -> b
-    1:1:com.android.tools.r8.references.ClassReference classFromMatch(java.lang.String):358:358 -> b
-com.android.tools.r8.retrace.RetraceStackTrace -> com.android.tools.r8.retrace.z:
+    1:1:com.android.tools.r8.references.ClassReference classFromMatch(java.lang.String):449:449 -> b
+com.android.tools.r8.retrace.RetraceStackTrace -> com.android.tools.r8.retrace.C:
     java.util.List stackTrace -> b
     com.android.tools.r8.DiagnosticsHandler diagnosticsHandler -> c
     com.android.tools.r8.retrace.RetraceBase retraceBase -> a
-    1:4:void <init>(com.android.tools.r8.retrace.RetraceBase,java.util.List,com.android.tools.r8.DiagnosticsHandler):87:90 -> <init>
-    1:7:com.android.tools.r8.retrace.RetraceCommandLineResult retrace():94:100 -> a
-    8:11:void retraceLine(java.util.List,int,java.util.List):104:107 -> a
-    12:12:com.android.tools.r8.retrace.RetraceStackTrace$StackTraceLine parseLine(int,java.lang.String):478:478 -> a
-    12:12:void retraceLine(java.util.List,int,java.util.List):107 -> a
-    13:33:com.android.tools.r8.retrace.RetraceStackTrace$ExceptionLine com.android.tools.r8.retrace.RetraceStackTrace$ExceptionLine.tryParse(java.lang.String):192:212 -> a
-    13:33:com.android.tools.r8.retrace.RetraceStackTrace$StackTraceLine parseLine(int,java.lang.String):482 -> a
-    13:33:void retraceLine(java.util.List,int,java.util.List):107 -> a
-    34:44:com.android.tools.r8.retrace.RetraceStackTrace$StackTraceLine com.android.tools.r8.retrace.RetraceStackTrace$MoreLine.tryParse(java.lang.String):427:437 -> a
-    34:44:com.android.tools.r8.retrace.RetraceStackTrace$StackTraceLine parseLine(int,java.lang.String):486 -> a
-    34:44:void retraceLine(java.util.List,int,java.util.List):107 -> a
-    45:46:com.android.tools.r8.retrace.RetraceStackTrace$StackTraceLine parseLine(int,java.lang.String):488:489 -> a
-    45:46:void retraceLine(java.util.List,int,java.util.List):107 -> a
-    47:50:com.android.tools.r8.retrace.RetraceStackTrace$StackTraceLine parseLine(int,java.lang.String):488:491 -> a
-    47:50:void retraceLine(java.util.List,int,java.util.List):107 -> a
-    51:54:void retraceLine(java.util.List,int,java.util.List):108:111 -> a
-    55:56:com.android.tools.r8.retrace.RetraceStackTrace$StackTraceLine parseLine(int,java.lang.String):474:475 -> a
-    55:56:void retraceLine(java.util.List,int,java.util.List):107 -> a
-com.android.tools.r8.retrace.RetraceStackTrace$AtLine -> com.android.tools.r8.retrace.s:
+    1:4:void <init>(com.android.tools.r8.retrace.RetraceBase,java.util.List,com.android.tools.r8.DiagnosticsHandler):89:92 -> <init>
+    1:7:com.android.tools.r8.retrace.RetraceCommandLineResult retrace():96:102 -> a
+    8:11:void retraceLine(java.util.List,int,java.util.List):106:109 -> a
+    12:12:com.android.tools.r8.retrace.RetraceStackTrace$StackTraceLine parseLine(int,java.lang.String):480:480 -> a
+    12:12:void retraceLine(java.util.List,int,java.util.List):109 -> a
+    13:33:com.android.tools.r8.retrace.RetraceStackTrace$ExceptionLine com.android.tools.r8.retrace.RetraceStackTrace$ExceptionLine.tryParse(java.lang.String):194:214 -> a
+    13:33:com.android.tools.r8.retrace.RetraceStackTrace$StackTraceLine parseLine(int,java.lang.String):484 -> a
+    13:33:void retraceLine(java.util.List,int,java.util.List):109 -> a
+    34:44:com.android.tools.r8.retrace.RetraceStackTrace$StackTraceLine com.android.tools.r8.retrace.RetraceStackTrace$MoreLine.tryParse(java.lang.String):429:439 -> a
+    34:44:com.android.tools.r8.retrace.RetraceStackTrace$StackTraceLine parseLine(int,java.lang.String):488 -> a
+    34:44:void retraceLine(java.util.List,int,java.util.List):109 -> a
+    45:46:com.android.tools.r8.retrace.RetraceStackTrace$StackTraceLine parseLine(int,java.lang.String):490:491 -> a
+    45:46:void retraceLine(java.util.List,int,java.util.List):109 -> a
+    47:50:com.android.tools.r8.retrace.RetraceStackTrace$StackTraceLine parseLine(int,java.lang.String):490:493 -> a
+    47:50:void retraceLine(java.util.List,int,java.util.List):109 -> a
+    51:54:void retraceLine(java.util.List,int,java.util.List):110:113 -> a
+    55:56:com.android.tools.r8.retrace.RetraceStackTrace$StackTraceLine parseLine(int,java.lang.String):476:477 -> a
+    55:56:void retraceLine(java.util.List,int,java.util.List):109 -> a
+com.android.tools.r8.retrace.RetraceStackTrace$AtLine -> com.android.tools.r8.retrace.v:
     int linePosition -> f
     java.lang.String startingWhitespace -> a
     boolean isAmbiguous -> g
@@ -56350,74 +56551,79 @@
     java.lang.String at -> b
     java.lang.String fileName -> e
     java.lang.String method -> d
-    1:8:void <init>(java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String,int,boolean):279:286 -> <init>
+    1:8:void <init>(java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String,int,boolean):281:288 -> <init>
     com.android.tools.r8.retrace.RetraceStackTrace$AtLine asAtLine() -> a
-    1:1:boolean access$000(com.android.tools.r8.retrace.RetraceStackTrace$AtLine):259:259 -> a
-    2:51:com.android.tools.r8.retrace.RetraceStackTrace$AtLine tryParse(java.lang.String):291:340 -> a
-    52:59:java.util.List retrace(com.android.tools.r8.retrace.RetraceBase):352:359 -> a
-    60:68:void lambda$retrace$0(java.util.List,com.android.tools.r8.retrace.RetraceBase,com.android.tools.r8.references.ClassReference,com.android.tools.r8.retrace.RetraceMethodResult$Element):361:369 -> a
-    69:69:void lambda$retrace$0(java.util.List,com.android.tools.r8.retrace.RetraceBase,com.android.tools.r8.references.ClassReference,com.android.tools.r8.retrace.RetraceMethodResult$Element):368:368 -> a
-    70:70:boolean hasLinePosition():347:347 -> a
-    70:70:void lambda$retrace$0(java.util.List,com.android.tools.r8.retrace.RetraceBase,com.android.tools.r8.references.ClassReference,com.android.tools.r8.retrace.RetraceMethodResult$Element):370 -> a
-    71:73:void lambda$retrace$0(java.util.List,com.android.tools.r8.retrace.RetraceBase,com.android.tools.r8.references.ClassReference,com.android.tools.r8.retrace.RetraceMethodResult$Element):371:373 -> a
-    74:74:void lambda$retrace$0(java.util.List,com.android.tools.r8.retrace.RetraceBase,com.android.tools.r8.references.ClassReference,com.android.tools.r8.retrace.RetraceMethodResult$Element):362:362 -> a
-    75:81:java.lang.String toString(java.lang.String,java.lang.String):384:390 -> a
+    1:1:boolean access$000(com.android.tools.r8.retrace.RetraceStackTrace$AtLine):261:261 -> a
+    2:51:com.android.tools.r8.retrace.RetraceStackTrace$AtLine tryParse(java.lang.String):293:342 -> a
+    52:59:java.util.List retrace(com.android.tools.r8.retrace.RetraceBase):354:361 -> a
+    60:68:void lambda$retrace$0(java.util.List,com.android.tools.r8.retrace.RetraceBase,com.android.tools.r8.references.ClassReference,com.android.tools.r8.retrace.RetraceMethodResult$Element):363:371 -> a
+    69:69:void lambda$retrace$0(java.util.List,com.android.tools.r8.retrace.RetraceBase,com.android.tools.r8.references.ClassReference,com.android.tools.r8.retrace.RetraceMethodResult$Element):370:370 -> a
+    70:70:boolean hasLinePosition():349:349 -> a
+    70:70:void lambda$retrace$0(java.util.List,com.android.tools.r8.retrace.RetraceBase,com.android.tools.r8.references.ClassReference,com.android.tools.r8.retrace.RetraceMethodResult$Element):372 -> a
+    71:73:void lambda$retrace$0(java.util.List,com.android.tools.r8.retrace.RetraceBase,com.android.tools.r8.references.ClassReference,com.android.tools.r8.retrace.RetraceMethodResult$Element):373:375 -> a
+    74:74:void lambda$retrace$0(java.util.List,com.android.tools.r8.retrace.RetraceBase,com.android.tools.r8.references.ClassReference,com.android.tools.r8.retrace.RetraceMethodResult$Element):364:364 -> a
+    75:81:java.lang.String toString(java.lang.String,java.lang.String):386:392 -> a
     82:90:java.lang.String com.android.tools.r8.com.google.common.base.Strings.padStart(java.lang.String,int,char):90:98 -> a
-    82:90:java.lang.String toString(java.lang.String,java.lang.String):390 -> a
-    91:104:java.lang.String toString(java.lang.String,java.lang.String):390:403 -> a
+    82:90:java.lang.String toString(java.lang.String,java.lang.String):392 -> a
+    91:104:java.lang.String toString(java.lang.String,java.lang.String):392:405 -> a
     105:105:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
     105:105:java.lang.String com.android.tools.r8.com.google.common.base.Strings.padStart(java.lang.String,int,char):89 -> a
-    105:105:java.lang.String toString(java.lang.String,java.lang.String):390 -> a
+    105:105:java.lang.String toString(java.lang.String,java.lang.String):392 -> a
     boolean isAtLine() -> b
-    1:1:java.lang.String access$100(com.android.tools.r8.retrace.RetraceStackTrace$AtLine):259:259 -> b
-    1:1:java.lang.String access$200(com.android.tools.r8.retrace.RetraceStackTrace$AtLine):259:259 -> c
-    1:1:java.lang.String access$300(com.android.tools.r8.retrace.RetraceStackTrace$AtLine):259:259 -> d
-    1:1:java.lang.String access$400(com.android.tools.r8.retrace.RetraceStackTrace$AtLine):259:259 -> e
-    1:1:int access$500(com.android.tools.r8.retrace.RetraceStackTrace$AtLine):259:259 -> f
-    1:1:java.lang.String toString():380:380 -> toString
-com.android.tools.r8.retrace.RetraceStackTrace$AtStackTraceLineComparator -> com.android.tools.r8.retrace.t:
-    1:1:void <init>():60:60 -> <init>
-    1:1:int compare(java.lang.Object,java.lang.Object):60:60 -> compare
-    2:16:int compare(com.android.tools.r8.retrace.RetraceStackTrace$StackTraceLine,com.android.tools.r8.retrace.RetraceStackTrace$StackTraceLine):64:78 -> compare
-    2:16:int compare(java.lang.Object,java.lang.Object):60 -> compare
-com.android.tools.r8.retrace.RetraceStackTrace$ExceptionLine -> com.android.tools.r8.retrace.u:
+    1:1:java.lang.String access$100(com.android.tools.r8.retrace.RetraceStackTrace$AtLine):261:261 -> b
+    1:1:java.lang.String access$200(com.android.tools.r8.retrace.RetraceStackTrace$AtLine):261:261 -> c
+    1:1:java.lang.String access$300(com.android.tools.r8.retrace.RetraceStackTrace$AtLine):261:261 -> d
+    1:1:java.lang.String access$400(com.android.tools.r8.retrace.RetraceStackTrace$AtLine):261:261 -> e
+    1:1:int access$500(com.android.tools.r8.retrace.RetraceStackTrace$AtLine):261:261 -> f
+    1:1:java.lang.String toString():382:382 -> toString
+com.android.tools.r8.retrace.RetraceStackTrace$AtStackTraceLineComparator -> com.android.tools.r8.retrace.w:
+    boolean $assertionsDisabled -> b
+    1:1:void <clinit>():60:60 -> <clinit>
+    1:1:void <init>():63:63 -> <init>
+    1:13:java.lang.String lambda$new$0(com.android.tools.r8.retrace.RetraceStackTrace$StackTraceLine,com.android.tools.r8.retrace.AmbiguousComparator$SortKeys):65:77 -> a
+    14:14:java.lang.String lambda$new$0(com.android.tools.r8.retrace.RetraceStackTrace$StackTraceLine,com.android.tools.r8.retrace.AmbiguousComparator$SortKeys):75:75 -> a
+    15:15:java.lang.String lambda$new$0(com.android.tools.r8.retrace.RetraceStackTrace$StackTraceLine,com.android.tools.r8.retrace.AmbiguousComparator$SortKeys):73:73 -> a
+    16:16:java.lang.String lambda$new$0(com.android.tools.r8.retrace.RetraceStackTrace$StackTraceLine,com.android.tools.r8.retrace.AmbiguousComparator$SortKeys):71:71 -> a
+    17:27:java.lang.String lambda$new$0(com.android.tools.r8.retrace.RetraceStackTrace$StackTraceLine,com.android.tools.r8.retrace.AmbiguousComparator$SortKeys):69:79 -> a
+com.android.tools.r8.retrace.RetraceStackTrace$ExceptionLine -> com.android.tools.r8.retrace.x:
     java.lang.String initialWhiteSpace -> a
     java.lang.String exceptionClass -> c
     java.lang.String description -> b
     java.lang.String message -> d
-    1:5:void <init>(java.lang.String,java.lang.String,java.lang.String,java.lang.String):184:188 -> <init>
-    1:4:java.util.List retrace(com.android.tools.r8.retrace.RetraceBase):217:220 -> a
-    5:9:void lambda$retrace$0(java.util.List,com.android.tools.r8.retrace.RetraceClassResult$Element):222:226 -> a
-    10:10:void lambda$retrace$0(java.util.List,com.android.tools.r8.retrace.RetraceClassResult$Element):222:222 -> a
-    1:1:java.lang.String toString():233:233 -> toString
-com.android.tools.r8.retrace.RetraceStackTrace$MoreLine -> com.android.tools.r8.retrace.v:
+    1:5:void <init>(java.lang.String,java.lang.String,java.lang.String,java.lang.String):186:190 -> <init>
+    1:4:java.util.List retrace(com.android.tools.r8.retrace.RetraceBase):219:222 -> a
+    5:9:void lambda$retrace$0(java.util.List,com.android.tools.r8.retrace.RetraceClassResult$Element):224:228 -> a
+    10:10:void lambda$retrace$0(java.util.List,com.android.tools.r8.retrace.RetraceClassResult$Element):224:224 -> a
+    1:1:java.lang.String toString():235:235 -> toString
+com.android.tools.r8.retrace.RetraceStackTrace$MoreLine -> com.android.tools.r8.retrace.y:
     java.lang.String line -> a
-    1:2:void <init>(java.lang.String):420:421 -> <init>
-    1:1:java.util.List retrace(com.android.tools.r8.retrace.RetraceBase):445:445 -> a
-    1:1:java.lang.String toString():450:450 -> toString
-com.android.tools.r8.retrace.RetraceStackTrace$StackTraceLine -> com.android.tools.r8.retrace.w:
-    1:1:void <init>():114:114 -> <init>
+    1:2:void <init>(java.lang.String):422:423 -> <init>
+    1:1:java.util.List retrace(com.android.tools.r8.retrace.RetraceBase):447:447 -> a
+    1:1:java.lang.String toString():452:452 -> toString
+com.android.tools.r8.retrace.RetraceStackTrace$StackTraceLine -> com.android.tools.r8.retrace.z:
+    1:1:void <init>():116:116 -> <init>
     com.android.tools.r8.retrace.RetraceStackTrace$AtLine asAtLine() -> a
     java.util.List retrace(com.android.tools.r8.retrace.RetraceBase) -> a
-    1:1:int firstNonWhiteSpaceCharacterFromIndex(java.lang.String,int):119:119 -> a
-    2:2:int firstCharFromIndex(java.lang.String,int,char):123:123 -> a
-    3:3:boolean lambda$firstCharFromIndex$0(char,java.lang.Character):123:123 -> a
-    4:9:int firstFromIndex(java.lang.String,int,java.util.function.Predicate):127:132 -> a
+    1:1:int firstNonWhiteSpaceCharacterFromIndex(java.lang.String,int):121:121 -> a
+    2:2:int firstCharFromIndex(java.lang.String,int,char):125:125 -> a
+    3:3:boolean lambda$firstCharFromIndex$0(char,java.lang.Character):125:125 -> a
+    4:9:int firstFromIndex(java.lang.String,int,java.util.function.Predicate):129:134 -> a
     boolean isAtLine() -> b
-com.android.tools.r8.retrace.RetraceStackTrace$StackTraceNode -> com.android.tools.r8.retrace.x:
+com.android.tools.r8.retrace.RetraceStackTrace$StackTraceNode -> com.android.tools.r8.retrace.A:
     java.util.List lines -> a
     boolean $assertionsDisabled -> b
-    1:1:void <clinit>():23:23 -> <clinit>
-    1:4:void <init>(java.util.List):27:30 -> <init>
-    1:9:void append(java.util.List):34:42 -> a
-    10:24:void append(java.util.List):41:55 -> a
-    25:25:boolean lambda$append$0(com.android.tools.r8.retrace.RetraceStackTrace$StackTraceLine):42:42 -> a
-com.android.tools.r8.retrace.RetraceStackTrace$UnknownLine -> com.android.tools.r8.retrace.y:
+    1:1:void <clinit>():22:22 -> <clinit>
+    1:4:void <init>(java.util.List):26:29 -> <init>
+    1:9:void append(java.util.List):33:41 -> a
+    10:21:void append(java.util.List):40:51 -> a
+    22:27:void append(java.util.List):50:55 -> a
+    28:28:boolean lambda$append$0(com.android.tools.r8.retrace.RetraceStackTrace$StackTraceLine):41:41 -> a
+com.android.tools.r8.retrace.RetraceStackTrace$UnknownLine -> com.android.tools.r8.retrace.B:
     java.lang.String line -> a
-    1:2:void <init>(java.lang.String):457:458 -> <init>
-    1:1:java.util.List retrace(com.android.tools.r8.retrace.RetraceBase):463:463 -> a
-    1:1:java.lang.String toString():468:468 -> toString
-com.android.tools.r8.retrace.RetraceTypeResult -> com.android.tools.r8.retrace.B:
+    1:2:void <init>(java.lang.String):459:460 -> <init>
+    1:1:java.util.List retrace(com.android.tools.r8.retrace.RetraceBase):465:465 -> a
+    1:1:java.lang.String toString():470:470 -> toString
+com.android.tools.r8.retrace.RetraceTypeResult -> com.android.tools.r8.retrace.E:
     com.android.tools.r8.retrace.RetraceBase retraceBase -> b
     com.android.tools.r8.references.TypeReference obfuscatedType -> a
     1:3:void <init>(com.android.tools.r8.references.TypeReference,com.android.tools.r8.retrace.RetraceBase):18:20 -> <init>
@@ -56427,7 +56633,7 @@
     1:1:com.android.tools.r8.retrace.Result forEach(java.util.function.Consumer):13 -> forEach
     1:10:java.util.stream.Stream stream():26:35 -> stream
     11:11:java.util.stream.Stream stream():27:27 -> stream
-com.android.tools.r8.retrace.RetraceTypeResult$Element -> com.android.tools.r8.retrace.A:
+com.android.tools.r8.retrace.RetraceTypeResult$Element -> com.android.tools.r8.retrace.D:
     com.android.tools.r8.references.TypeReference typeReference -> a
     1:2:void <init>(com.android.tools.r8.references.TypeReference):48:49 -> <init>
     1:1:com.android.tools.r8.references.TypeReference getTypeReference():53:53 -> a
@@ -56453,147 +56659,150 @@
 com.android.tools.r8.shaking.AnnotationRemover -> com.android.tools.r8.shaking.AnnotationRemover:
     1:1:void <clinit>():29:29 -> <clinit>
     1:4:void <init>(com.android.tools.r8.graph.AppView,java.util.Set):36:39 -> <init>
-    1:1:com.android.tools.r8.graph.DexAnnotationElement lambda$rewriteEncodedAnnotation$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationElement):263:263 -> a
-    2:2:boolean lambda$rewriteAnnotationElement$1(com.android.tools.r8.graph.DexAnnotationElement,com.android.tools.r8.graph.DexEncodedMethod):282:282 -> a
-    3:14:boolean lambda$stripAttributes$2(boolean,com.android.tools.r8.graph.DexProgramClass,boolean,com.android.tools.r8.graph.InnerClassAttribute):331:342 -> a
-    1:7:void clearAnnotations(com.android.tools.r8.graph.AppView):357:363 -> clearAnnotations
-    1:43:java.util.Set computeClassesToRetainInnerClassAttributeFor(com.android.tools.r8.graph.AppView):181:223 -> computeClassesToRetainInnerClassAttributeFor
-    44:44:java.util.Set computeClassesToRetainInnerClassAttributeFor(com.android.tools.r8.graph.AppView):183:183 -> computeClassesToRetainInnerClassAttributeFor
-    1:3:boolean enclosingMethodPinned(com.android.tools.r8.graph.DexClass):287:289 -> enclosingMethodPinned
-    1:1:com.android.tools.r8.shaking.AnnotationRemover ensureValid():138:138 -> ensureValid
-    1:1:boolean filterAnnotations(com.android.tools.r8.graph.DexAnnotation):47:47 -> filterAnnotations
-    2:2:boolean filterAnnotations(com.android.tools.r8.graph.DexAnnotation):46:46 -> filterAnnotations
-    1:15:boolean filterParameterAnnotations(com.android.tools.r8.graph.DexAnnotation):118:132 -> filterParameterAnnotations
-    16:28:boolean filterParameterAnnotations(com.android.tools.r8.graph.DexAnnotation):122:134 -> filterParameterAnnotations
-    1:5:boolean hasGenericEnclosingClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.Set):147:151 -> hasGenericEnclosingClass
-    1:2:boolean hasInnerClassesFromSet(com.android.tools.r8.graph.DexProgramClass,java.util.Set):293:294 -> hasInnerClassesFromSet
-    1:2:boolean hasSignatureAnnotation(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory):159:160 -> hasSignatureAnnotation
-    1:2:boolean isAnnotationTypeLive(com.android.tools.r8.graph.DexAnnotation):110:111 -> isAnnotationTypeLive
-    1:1:void processField(com.android.tools.r8.graph.DexEncodedField):245:245 -> processField
-    1:3:void processMethod(com.android.tools.r8.graph.DexEncodedMethod):239:241 -> processMethod
-    1:5:com.android.tools.r8.graph.DexAnnotation rewriteAnnotation(com.android.tools.r8.graph.DexAnnotation):250:254 -> rewriteAnnotation
-    1:1:com.android.tools.r8.graph.DexAnnotationElement rewriteAnnotationElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationElement):273:273 -> rewriteAnnotationElement
-    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> rewriteAnnotationElement
-    2:2:com.android.tools.r8.graph.DexAnnotationElement rewriteAnnotationElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationElement):273 -> rewriteAnnotationElement
-    3:6:com.android.tools.r8.graph.DexAnnotationElement rewriteAnnotationElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationElement):279:282 -> rewriteAnnotationElement
-    1:8:com.android.tools.r8.graph.DexEncodedAnnotation rewriteEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):258:265 -> rewriteEncodedAnnotation
-    9:9:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> rewriteEncodedAnnotation
-    9:9:com.android.tools.r8.graph.DexEncodedAnnotation rewriteEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):265 -> rewriteEncodedAnnotation
-    10:11:com.android.tools.r8.graph.DexEncodedAnnotation rewriteEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):266:267 -> rewriteEncodedAnnotation
-    12:12:com.android.tools.r8.graph.DexEncodedAnnotation rewriteEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):266:266 -> rewriteEncodedAnnotation
-    1:5:void run():230:234 -> run
-    1:9:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):56:64 -> shouldKeepAnnotation
-    10:10:boolean com.android.tools.r8.graph.DexAnnotation.isMemberClassesAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):137:137 -> shouldKeepAnnotation
-    10:10:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):64 -> shouldKeepAnnotation
-    11:12:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):64:65 -> shouldKeepAnnotation
-    13:13:boolean com.android.tools.r8.graph.DexAnnotation.isEnclosingMethodAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):128:128 -> shouldKeepAnnotation
-    13:13:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):65 -> shouldKeepAnnotation
-    14:15:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):65:66 -> shouldKeepAnnotation
-    16:16:boolean com.android.tools.r8.graph.DexAnnotation.isEnclosingClassAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):123:123 -> shouldKeepAnnotation
-    16:16:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):66 -> shouldKeepAnnotation
-    17:18:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):66:67 -> shouldKeepAnnotation
-    19:19:boolean com.android.tools.r8.graph.DexAnnotation.isThrowingAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):268:268 -> shouldKeepAnnotation
-    19:19:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):67 -> shouldKeepAnnotation
-    20:23:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):70:73 -> shouldKeepAnnotation
-    24:24:boolean com.android.tools.r8.graph.DexAnnotation.isSourceDebugExtension(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):284:284 -> shouldKeepAnnotation
-    24:24:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):74 -> shouldKeepAnnotation
-    25:25:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):77:77 -> shouldKeepAnnotation
-    26:26:boolean com.android.tools.r8.graph.DexAnnotation.isParameterNameAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):289:289 -> shouldKeepAnnotation
-    26:26:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):78 -> shouldKeepAnnotation
-    27:27:boolean com.android.tools.r8.graph.DexAnnotation.isAnnotationDefaultAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):279:279 -> shouldKeepAnnotation
-    27:27:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):81 -> shouldKeepAnnotation
-    28:28:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):105:105 -> shouldKeepAnnotation
-    29:29:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):89:89 -> shouldKeepAnnotation
-    30:30:boolean com.android.tools.r8.graph.DexAnnotation.isSynthesizedClassMapAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):399:399 -> shouldKeepAnnotation
-    30:30:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):95 -> shouldKeepAnnotation
-    31:31:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):99:99 -> shouldKeepAnnotation
-    1:45:void stripAttributes(com.android.tools.r8.graph.DexProgramClass):308:352 -> stripAttributes
-    46:55:void stripAttributes(com.android.tools.r8.graph.DexProgramClass):320:329 -> stripAttributes
+    1:1:com.android.tools.r8.graph.DexAnnotation lambda$run$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotation):234:234 -> a
+    2:2:com.android.tools.r8.graph.DexAnnotation lambda$processMethod$1(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexAnnotation):242:242 -> a
+    3:3:com.android.tools.r8.graph.DexAnnotation lambda$processField$2(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexAnnotation):249:249 -> a
+    4:4:com.android.tools.r8.graph.DexAnnotationElement lambda$rewriteEncodedAnnotation$3(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationElement):267:267 -> a
+    5:5:boolean lambda$rewriteAnnotationElement$4(com.android.tools.r8.graph.DexAnnotationElement,com.android.tools.r8.graph.DexEncodedMethod):286:286 -> a
+    6:17:boolean lambda$stripAttributes$5(boolean,com.android.tools.r8.graph.DexProgramClass,boolean,com.android.tools.r8.graph.InnerClassAttribute):335:346 -> a
+    1:7:void clearAnnotations(com.android.tools.r8.graph.AppView):361:367 -> clearAnnotations
+    1:43:java.util.Set computeClassesToRetainInnerClassAttributeFor(com.android.tools.r8.graph.AppView):182:224 -> computeClassesToRetainInnerClassAttributeFor
+    44:44:java.util.Set computeClassesToRetainInnerClassAttributeFor(com.android.tools.r8.graph.AppView):184:184 -> computeClassesToRetainInnerClassAttributeFor
+    1:3:boolean enclosingMethodPinned(com.android.tools.r8.graph.DexClass):291:293 -> enclosingMethodPinned
+    1:1:com.android.tools.r8.shaking.AnnotationRemover ensureValid():139:139 -> ensureValid
+    1:1:boolean filterAnnotations(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):44:44 -> filterAnnotations
+    1:15:boolean filterParameterAnnotations(com.android.tools.r8.graph.DexAnnotation):119:133 -> filterParameterAnnotations
+    16:28:boolean filterParameterAnnotations(com.android.tools.r8.graph.DexAnnotation):123:135 -> filterParameterAnnotations
+    1:5:boolean hasGenericEnclosingClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.Set):148:152 -> hasGenericEnclosingClass
+    1:2:boolean hasInnerClassesFromSet(com.android.tools.r8.graph.DexProgramClass,java.util.Set):297:298 -> hasInnerClassesFromSet
+    1:2:boolean hasSignatureAnnotation(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory):160:161 -> hasSignatureAnnotation
+    1:2:boolean isAnnotationTypeLive(com.android.tools.r8.graph.DexAnnotation):111:112 -> isAnnotationTypeLive
+    1:2:void processField(com.android.tools.r8.graph.DexEncodedField):248:249 -> processField
+    1:4:void processMethod(com.android.tools.r8.graph.DexEncodedMethod):241:244 -> processMethod
+    1:5:com.android.tools.r8.graph.DexAnnotation rewriteAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):254:258 -> rewriteAnnotation
+    1:1:com.android.tools.r8.graph.DexAnnotationElement rewriteAnnotationElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationElement):277:277 -> rewriteAnnotationElement
+    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> rewriteAnnotationElement
+    2:2:com.android.tools.r8.graph.DexAnnotationElement rewriteAnnotationElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationElement):277 -> rewriteAnnotationElement
+    3:6:com.android.tools.r8.graph.DexAnnotationElement rewriteAnnotationElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationElement):283:286 -> rewriteAnnotationElement
+    1:8:com.android.tools.r8.graph.DexEncodedAnnotation rewriteEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):262:269 -> rewriteEncodedAnnotation
+    9:9:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> rewriteEncodedAnnotation
+    9:9:com.android.tools.r8.graph.DexEncodedAnnotation rewriteEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):269 -> rewriteEncodedAnnotation
+    10:11:com.android.tools.r8.graph.DexEncodedAnnotation rewriteEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):270:271 -> rewriteEncodedAnnotation
+    12:12:com.android.tools.r8.graph.DexEncodedAnnotation rewriteEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):270:270 -> rewriteEncodedAnnotation
+    1:6:void run():231:236 -> run
+    1:11:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.AppView):53:63 -> shouldKeepAnnotation
+    12:12:boolean com.android.tools.r8.graph.DexAnnotation.isMemberClassesAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):137:137 -> shouldKeepAnnotation
+    12:12:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.AppView):63 -> shouldKeepAnnotation
+    13:14:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.AppView):63:64 -> shouldKeepAnnotation
+    15:15:boolean com.android.tools.r8.graph.DexAnnotation.isEnclosingMethodAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):128:128 -> shouldKeepAnnotation
+    15:15:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.AppView):64 -> shouldKeepAnnotation
+    16:17:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.AppView):64:65 -> shouldKeepAnnotation
+    18:18:boolean com.android.tools.r8.graph.DexAnnotation.isEnclosingClassAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):123:123 -> shouldKeepAnnotation
+    18:18:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.AppView):65 -> shouldKeepAnnotation
+    19:20:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.AppView):65:66 -> shouldKeepAnnotation
+    21:21:boolean com.android.tools.r8.graph.DexAnnotation.isThrowingAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):268:268 -> shouldKeepAnnotation
+    21:21:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.AppView):66 -> shouldKeepAnnotation
+    22:22:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.AppView):69:69 -> shouldKeepAnnotation
+    23:23:boolean com.android.tools.r8.graph.DexAnnotation.isSourceDebugExtension(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):284:284 -> shouldKeepAnnotation
+    23:23:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.AppView):72 -> shouldKeepAnnotation
+    24:26:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.AppView):73:75 -> shouldKeepAnnotation
+    27:31:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.AppView):74:78 -> shouldKeepAnnotation
+    32:32:boolean com.android.tools.r8.graph.DexAnnotation.isParameterNameAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):289:289 -> shouldKeepAnnotation
+    32:32:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.AppView):79 -> shouldKeepAnnotation
+    33:33:boolean com.android.tools.r8.graph.DexAnnotation.isAnnotationDefaultAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):279:279 -> shouldKeepAnnotation
+    33:33:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.AppView):82 -> shouldKeepAnnotation
+    34:34:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.AppView):106:106 -> shouldKeepAnnotation
+    35:35:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.AppView):90:90 -> shouldKeepAnnotation
+    36:36:boolean com.android.tools.r8.graph.DexAnnotation.isSynthesizedClassMapAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):399:399 -> shouldKeepAnnotation
+    36:36:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.AppView):96 -> shouldKeepAnnotation
+    37:37:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.AppView):100:100 -> shouldKeepAnnotation
+    1:45:void stripAttributes(com.android.tools.r8.graph.DexProgramClass):312:356 -> stripAttributes
+    46:55:void stripAttributes(com.android.tools.r8.graph.DexProgramClass):324:333 -> stripAttributes
 com.android.tools.r8.shaking.AppInfoWithLiveness -> com.android.tools.r8.shaking.AppInfoWithLiveness:
     1:1:void <clinit>():58:58 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexApplication,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.SortedSet,java.util.Set,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.Set,java.util.SortedSet,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,java.util.Map,java.util.Set,java.util.Set):225:225 -> <init>
-    2:190:void <init>(com.android.tools.r8.graph.DexApplication,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.SortedSet,java.util.Set,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.Set,java.util.SortedSet,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,java.util.Map,java.util.Set,java.util.Set):75:263 -> <init>
-    191:191:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.SortedSet,java.util.Set,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.Set,java.util.SortedSet,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,java.util.Map,java.util.Set,java.util.Set):306:306 -> <init>
-    192:461:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.SortedSet,java.util.Set,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.Set,java.util.SortedSet,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,java.util.Map,java.util.Set,java.util.Set):75:344 -> <init>
-    462:502:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness):348:388 -> <init>
-    503:542:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexApplication,java.util.Collection,java.util.Collection):396:435 -> <init>
-    543:588:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexApplication,java.util.Collection,java.util.Collection):396:441 -> <init>
-    589:589:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):446:446 -> <init>
-    590:1010:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):75:495 -> <init>
-    1011:1029:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):491:509 -> <init>
-    1030:1046:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):505:521 -> <init>
-    1047:1054:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):517:524 -> <init>
-    1055:1055:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Map,java.util.Map):531:531 -> <init>
-    1056:1552:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Map,java.util.Map):75:571 -> <init>
-    1:8:void lambda$withStaticFieldWrites$0(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexEncodedField,java.util.Set):651:658 -> a
-    9:14:void lambda$withoutStaticFieldsWrites$1(java.util.Set,com.android.tools.r8.graph.FieldAccessInfoImpl):672:677 -> a
-    15:15:java.util.Set lambda$rewriteKeysConservativelyWhileMergingValues$2(com.android.tools.r8.graph.PresortedComparable):842:842 -> a
-    1:3:com.android.tools.r8.shaking.AppInfoWithLiveness addEnumValueInfoMaps(java.util.Map):1342:1344 -> addEnumValueInfoMaps
-    1:3:com.android.tools.r8.shaking.AppInfoWithLiveness addSwitchMaps(java.util.Map):1335:1337 -> addSwitchMaps
-    1:12:boolean assertNoItemRemoved(java.util.Collection,java.util.Collection):706:717 -> assertNoItemRemoved
-    1:15:boolean canVirtualMethodBeImplementedInExtraSubclass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):890:904 -> canVirtualMethodBeImplementedInExtraSubclass
-    1:33:java.util.Collection computeReachableInterfaces(java.util.Set):595:627 -> computeReachableInterfaces
-    1:3:java.util.SortedSet filter(java.util.Set,java.util.function.Predicate):685:687 -> filter
-    4:4:java.util.SortedSet filter(java.util.Set,java.util.function.Predicate):685:685 -> filter
-    1:44:com.android.tools.r8.graph.DexEncodedMethod findSingleTargetFromSubtypes(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,boolean,boolean):1142:1185 -> findSingleTargetFromSubtypes
-    1:2:java.util.Map getEnumValueInfoMapFor(com.android.tools.r8.graph.DexType):691:692 -> getEnumValueInfoMapFor
-    1:1:com.android.tools.r8.graph.FieldAccessInfoCollection getFieldAccessInfoCollection():702:702 -> getFieldAccessInfoCollection
-    1:2:java.util.Set getPinnedItems():933:934 -> getPinnedItems
-    1:2:java.util.Set getPrunedTypes():965:966 -> getPrunedTypes
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getSwitchMapFor(com.android.tools.r8.graph.DexField):696:697 -> getSwitchMapFor
-    1:2:boolean hasAnyInstantiatedLambdas(com.android.tools.r8.graph.DexProgramClass):851:852 -> hasAnyInstantiatedLambdas
-    1:1:boolean hasLiveness():857:857 -> hasLiveness
-    1:5:boolean hasPinnedInstanceInitializer(com.android.tools.r8.graph.DexType):873:877 -> hasPinnedInstanceInitializer
-    1:10:boolean interfacesMayHaveDefaultFor(com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexMethod):1201:1210 -> interfacesMayHaveDefaultFor
-    1:7:boolean isFieldOnlyWrittenInMethod(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod):796:802 -> isFieldOnlyWrittenInMethod
-    1:11:boolean isFieldRead(com.android.tools.r8.graph.DexEncodedField):758:768 -> isFieldRead
-    1:2:boolean isFieldWritten(com.android.tools.r8.graph.DexEncodedField):772:773 -> isFieldWritten
-    1:12:boolean isFieldWrittenByFieldPutInstruction(com.android.tools.r8.graph.DexEncodedField):777:788 -> isFieldWrittenByFieldPutInstruction
-    1:5:boolean isInstantiatedDirectly(com.android.tools.r8.graph.DexProgramClass):723:727 -> isInstantiatedDirectly
-    1:2:boolean isInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexProgramClass):753:754 -> isInstantiatedDirectlyOrIndirectly
-    1:19:boolean isInstantiatedIndirectly(com.android.tools.r8.graph.DexProgramClass):731:749 -> isInstantiatedIndirectly
-    1:4:boolean isInvalidSingleVirtualTarget(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1011:1014 -> isInvalidSingleVirtualTarget
-    1:2:boolean isLibraryOrClasspathField(com.android.tools.r8.graph.DexEncodedField):821:822 -> isLibraryOrClasspathField
-    1:1:boolean isLiveProgramClass(com.android.tools.r8.graph.DexProgramClass):575:575 -> isLiveProgramClass
-    1:2:boolean isLiveProgramType(com.android.tools.r8.graph.DexType):579:580 -> isLiveProgramType
-    1:1:boolean isLockCandidate(com.android.tools.r8.graph.DexType):639:639 -> isLockCandidate
-    1:8:boolean isNonProgramTypeOrLiveProgramType(com.android.tools.r8.graph.DexType):584:591 -> isNonProgramTypeOrLiveProgramType
-    1:2:boolean isPinned(com.android.tools.r8.graph.DexReference):868:869 -> isPinned
-    1:5:boolean isStaticFieldWrittenOnlyInEnclosingStaticInitializer(com.android.tools.r8.graph.DexEncodedField):808:812 -> isStaticFieldWrittenOnlyInEnclosingStaticInitializer
+    1:1:void <init>(com.android.tools.r8.graph.DexApplication,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.SortedSet,java.util.Set,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,java.util.Map,java.util.Set,java.util.Set):221:221 -> <init>
+    2:185:void <init>(com.android.tools.r8.graph.DexApplication,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.SortedSet,java.util.Set,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,java.util.Map,java.util.Set,java.util.Set):75:258 -> <init>
+    186:186:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.SortedSet,java.util.Set,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,java.util.Map,java.util.Set,java.util.Set):300:300 -> <init>
+    187:449:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.SortedSet,java.util.Set,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,java.util.Map,java.util.Set,java.util.Set):75:337 -> <init>
+    450:489:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness):341:380 -> <init>
+    490:528:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexApplication,java.util.Collection,java.util.Collection):388:426 -> <init>
+    529:573:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexApplication,java.util.Collection,java.util.Collection):388:432 -> <init>
+    574:574:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):437:437 -> <init>
+    575:985:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):75:485 -> <init>
+    986:1004:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):481:499 -> <init>
+    1005:1021:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):495:511 -> <init>
+    1022:1029:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):507:514 -> <init>
+    1030:1030:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Map,java.util.Map):521:521 -> <init>
+    1031:1515:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Map,java.util.Map):75:559 -> <init>
+    1:8:void lambda$withStaticFieldWrites$0(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexEncodedField,java.util.Set):639:646 -> a
+    9:14:void lambda$withoutStaticFieldsWrites$1(java.util.Set,com.android.tools.r8.graph.FieldAccessInfoImpl):660:665 -> a
+    15:15:java.util.Set lambda$rewriteKeysConservativelyWhileMergingValues$2(com.android.tools.r8.graph.PresortedComparable):830:830 -> a
+    1:3:com.android.tools.r8.shaking.AppInfoWithLiveness addEnumValueInfoMaps(java.util.Map):1330:1332 -> addEnumValueInfoMaps
+    1:3:com.android.tools.r8.shaking.AppInfoWithLiveness addSwitchMaps(java.util.Map):1323:1325 -> addSwitchMaps
+    1:12:boolean assertNoItemRemoved(java.util.Collection,java.util.Collection):694:705 -> assertNoItemRemoved
+    1:15:boolean canVirtualMethodBeImplementedInExtraSubclass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):878:892 -> canVirtualMethodBeImplementedInExtraSubclass
+    1:33:java.util.Collection computeReachableInterfaces(java.util.Set):583:615 -> computeReachableInterfaces
+    1:3:java.util.SortedSet filter(java.util.Set,java.util.function.Predicate):673:675 -> filter
+    4:4:java.util.SortedSet filter(java.util.Set,java.util.function.Predicate):673:673 -> filter
+    1:44:com.android.tools.r8.graph.DexEncodedMethod findSingleTargetFromSubtypes(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,boolean,boolean):1130:1173 -> findSingleTargetFromSubtypes
+    1:2:java.util.Map getEnumValueInfoMapFor(com.android.tools.r8.graph.DexType):679:680 -> getEnumValueInfoMapFor
+    1:1:com.android.tools.r8.graph.FieldAccessInfoCollection getFieldAccessInfoCollection():690:690 -> getFieldAccessInfoCollection
+    1:2:java.util.Set getPinnedItems():921:922 -> getPinnedItems
+    1:2:java.util.Set getPrunedTypes():953:954 -> getPrunedTypes
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getSwitchMapFor(com.android.tools.r8.graph.DexField):684:685 -> getSwitchMapFor
+    1:2:boolean hasAnyInstantiatedLambdas(com.android.tools.r8.graph.DexProgramClass):839:840 -> hasAnyInstantiatedLambdas
+    1:1:boolean hasLiveness():845:845 -> hasLiveness
+    1:5:boolean hasPinnedInstanceInitializer(com.android.tools.r8.graph.DexType):861:865 -> hasPinnedInstanceInitializer
+    1:10:boolean interfacesMayHaveDefaultFor(com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexMethod):1189:1198 -> interfacesMayHaveDefaultFor
+    1:7:boolean isFieldOnlyWrittenInMethod(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod):784:790 -> isFieldOnlyWrittenInMethod
+    1:11:boolean isFieldRead(com.android.tools.r8.graph.DexEncodedField):746:756 -> isFieldRead
+    1:2:boolean isFieldWritten(com.android.tools.r8.graph.DexEncodedField):760:761 -> isFieldWritten
+    1:12:boolean isFieldWrittenByFieldPutInstruction(com.android.tools.r8.graph.DexEncodedField):765:776 -> isFieldWrittenByFieldPutInstruction
+    1:5:boolean isInstantiatedDirectly(com.android.tools.r8.graph.DexProgramClass):711:715 -> isInstantiatedDirectly
+    1:2:boolean isInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexProgramClass):741:742 -> isInstantiatedDirectlyOrIndirectly
+    1:19:boolean isInstantiatedIndirectly(com.android.tools.r8.graph.DexProgramClass):719:737 -> isInstantiatedIndirectly
+    1:4:boolean isInvalidSingleVirtualTarget(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):999:1002 -> isInvalidSingleVirtualTarget
+    1:2:boolean isLibraryOrClasspathField(com.android.tools.r8.graph.DexEncodedField):809:810 -> isLibraryOrClasspathField
+    1:1:boolean isLiveProgramClass(com.android.tools.r8.graph.DexProgramClass):563:563 -> isLiveProgramClass
+    1:2:boolean isLiveProgramType(com.android.tools.r8.graph.DexType):567:568 -> isLiveProgramType
+    1:1:boolean isLockCandidate(com.android.tools.r8.graph.DexType):627:627 -> isLockCandidate
+    1:8:boolean isNonProgramTypeOrLiveProgramType(com.android.tools.r8.graph.DexType):572:579 -> isNonProgramTypeOrLiveProgramType
+    1:2:boolean isPinned(com.android.tools.r8.graph.DexReference):856:857 -> isPinned
+    1:5:boolean isStaticFieldWrittenOnlyInEnclosingStaticInitializer(com.android.tools.r8.graph.DexEncodedField):796:800 -> isStaticFieldWrittenOnlyInEnclosingStaticInitializer
     1:2:java.util.Set com.android.tools.r8.utils.SetUtils.newIdentityHashSet(java.lang.Object):16:17 -> isVirtualMethodPinnedDirectlyOrInAncestor
-    1:2:boolean isVirtualMethodPinnedDirectlyOrInAncestor(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):913 -> isVirtualMethodPinnedDirectlyOrInAncestor
-    3:14:boolean isVirtualMethodPinnedDirectlyOrInAncestor(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):914:925 -> isVirtualMethodPinnedDirectlyOrInAncestor
-    1:2:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1218:1219 -> lookupSingleInterfaceTarget
-    3:20:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1227:1244 -> lookupSingleInterfaceTarget
-    21:73:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1243:1295 -> lookupSingleInterfaceTarget
+    1:2:boolean isVirtualMethodPinnedDirectlyOrInAncestor(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):901 -> isVirtualMethodPinnedDirectlyOrInAncestor
+    3:14:boolean isVirtualMethodPinnedDirectlyOrInAncestor(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):902:913 -> isVirtualMethodPinnedDirectlyOrInAncestor
+    1:2:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1206:1207 -> lookupSingleInterfaceTarget
+    3:20:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1215:1232 -> lookupSingleInterfaceTarget
+    21:73:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1231:1283 -> lookupSingleInterfaceTarget
     74:74:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> lookupSingleInterfaceTarget
-    74:74:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1295 -> lookupSingleInterfaceTarget
-    75:110:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1296:1331 -> lookupSingleInterfaceTarget
-    1:16: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.DexType):971:986 -> lookupSingleTarget
-    17:17: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.DexType):984:984 -> lookupSingleTarget
-    18:18: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.DexType):982:982 -> lookupSingleTarget
-    19:19: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.DexType):980:980 -> lookupSingleTarget
-    20:20: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.DexType):978:978 -> lookupSingleTarget
-    1:2:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1019:1020 -> lookupSingleVirtualTarget
-    3:35:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1028:1060 -> lookupSingleVirtualTarget
-    36:92:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1059:1115 -> lookupSingleVirtualTarget
-    93:99:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1111:1117 -> lookupSingleVirtualTarget
-    100:109:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1110:1119 -> lookupSingleVirtualTarget
-    110:110:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1097:1097 -> lookupSingleVirtualTarget
-    1:2:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexReference):816:817 -> mayPropagateValueFor
-    1:2:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.DexApplication,java.util.Collection,java.util.Collection):945:946 -> prunedCopyFrom
-    1:5:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet rewriteItems(java.util.Set,java.util.function.Function):827:831 -> rewriteItems
-    1:10:java.util.SortedMap rewriteKeysConservativelyWhileMergingValues(java.util.Map,java.util.function.Function):837:846 -> rewriteKeysConservativelyWhileMergingValues
-    1:2:com.android.tools.r8.shaking.AppInfoWithLiveness rewrittenWithLense(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):951:952 -> rewrittenWithLense
-    1:9:com.android.tools.r8.graph.DexEncodedMethod validateSingleVirtualTarget(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):994:1002 -> validateSingleVirtualTarget
-    1:2:boolean wasPruned(com.android.tools.r8.graph.DexType):960:961 -> wasPruned
-    1:1:com.android.tools.r8.shaking.AppInfoWithLiveness withLiveness():863:863 -> withLiveness
-    1:6:com.android.tools.r8.shaking.AppInfoWithLiveness withStaticFieldWrites(java.util.Map):644:649 -> withStaticFieldWrites
-    1:6:com.android.tools.r8.shaking.AppInfoWithLiveness withoutStaticFieldsWrites(java.util.Set):665:670 -> withoutStaticFieldsWrites
+    74:74:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1283 -> lookupSingleInterfaceTarget
+    75:110:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1284:1319 -> lookupSingleInterfaceTarget
+    1:16: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.DexType):959:974 -> lookupSingleTarget
+    17:17: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.DexType):972:972 -> lookupSingleTarget
+    18:18: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.DexType):970:970 -> lookupSingleTarget
+    19:19: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.DexType):968:968 -> lookupSingleTarget
+    20:20: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.DexType):966:966 -> lookupSingleTarget
+    1:2:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1007:1008 -> lookupSingleVirtualTarget
+    3:35:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1016:1048 -> lookupSingleVirtualTarget
+    36:92:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1047:1103 -> lookupSingleVirtualTarget
+    93:99:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1099:1105 -> lookupSingleVirtualTarget
+    100:109:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1098:1107 -> lookupSingleVirtualTarget
+    110:110:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1085:1085 -> lookupSingleVirtualTarget
+    1:2:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexReference):804:805 -> mayPropagateValueFor
+    1:2:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.DexApplication,java.util.Collection,java.util.Collection):933:934 -> prunedCopyFrom
+    1:5:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet rewriteItems(java.util.Set,java.util.function.Function):815:819 -> rewriteItems
+    1:10:java.util.SortedMap rewriteKeysConservativelyWhileMergingValues(java.util.Map,java.util.function.Function):825:834 -> rewriteKeysConservativelyWhileMergingValues
+    1:2:com.android.tools.r8.shaking.AppInfoWithLiveness rewrittenWithLense(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):939:940 -> rewrittenWithLense
+    1:9:com.android.tools.r8.graph.DexEncodedMethod validateSingleVirtualTarget(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):982:990 -> validateSingleVirtualTarget
+    1:2:boolean wasPruned(com.android.tools.r8.graph.DexType):948:949 -> wasPruned
+    1:1:com.android.tools.r8.shaking.AppInfoWithLiveness withLiveness():851:851 -> withLiveness
+    1:6:com.android.tools.r8.shaking.AppInfoWithLiveness withStaticFieldWrites(java.util.Map):632:637 -> withStaticFieldWrites
+    1:6:com.android.tools.r8.shaking.AppInfoWithLiveness withoutStaticFieldsWrites(java.util.Set):653:658 -> withoutStaticFieldsWrites
 com.android.tools.r8.shaking.AppInfoWithLiveness$1 -> com.android.tools.r8.shaking.AppInfoWithLiveness$1:
-    1:1:void <clinit>():976:976 -> <clinit>
+    1:1:void <clinit>():964:964 -> <clinit>
 com.android.tools.r8.shaking.AppInfoWithLiveness$EnumValueInfo -> com.android.tools.r8.shaking.AppInfoWithLiveness$EnumValueInfo:
-    1:3:void <init>(com.android.tools.r8.graph.DexType,int):176:178 -> <init>
+    1:3:void <init>(com.android.tools.r8.graph.DexType,int):173:175 -> <init>
 com.android.tools.r8.shaking.ClassInlineRule -> com.android.tools.r8.shaking.ClassInlineRule:
     1:15:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ClassInlineRule$Type):73:87 -> <init>
     1:1:com.android.tools.r8.shaking.ClassInlineRule$Builder builder():91:91 -> builder
@@ -56694,47 +56903,47 @@
     1:6:java.util.List run():26:31 -> run
 com.android.tools.r8.shaking.Enqueuer -> com.android.tools.r8.shaking.Enqueuer:
     1:1:void <clinit>():111:111 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.Enqueuer$Mode):307:307 -> <init>
-    2:198:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.Enqueuer$Mode):139:335 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.Enqueuer$Mode):302:302 -> <init>
+    2:193:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.Enqueuer$Mode):139:330 -> <init>
     1:1:void com.android.tools.r8.graph.analysis.EnqueuerAnalysis.processNewlyLiveField(com.android.tools.r8.graph.DexEncodedField):0:0 -> a
-    1:1:void lambda$markInstanceFieldAsLive$28(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1829 -> a
+    1:1:void lambda$markInstanceFieldAsLive$28(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1825 -> a
     boolean lambda$markVirtualMethodAsReachable$32(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod) -> a
     void lambda$newSetWithoutReasonReporter$2(java.lang.Object,com.android.tools.r8.shaking.KeepReason) -> a
-    2:2:com.android.tools.r8.shaking.EnqueuerUseRegistryFactory lambda$createUseRegistryFactory$0(com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):349:349 -> a
-    3:8:void lambda$getNonPinnedWrittenFields$1(java.util.function.Predicate,java.util.Set,com.android.tools.r8.graph.FieldAccessInfoImpl):395:400 -> a
-    9:9:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexField):179:179 -> a
-    9:9:void lambda$getNonPinnedWrittenFields$1(java.util.function.Predicate,java.util.Set,com.android.tools.r8.graph.FieldAccessInfoImpl):400 -> a
-    10:16:void lambda$getNonPinnedWrittenFields$1(java.util.function.Predicate,java.util.Set,com.android.tools.r8.graph.FieldAccessInfoImpl):402:408 -> a
-    17:17:java.util.Set lambda$registerMethodWithTargetAndContext$4(com.android.tools.r8.graph.DexMethod):543:543 -> a
-    18:18:void lambda$traceInvokeDirect$5(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):754:754 -> a
-    19:19:java.lang.Boolean lambda$registerDeferredActionForDeadProtoBuilder$7(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Action,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):771:771 -> a
-    20:20:boolean lambda$registerDeferredActionForDeadProtoBuilder$6(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.Action):772:772 -> a
-    21:21:void lambda$traceNewInstance$8(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):910:910 -> a
-    22:22:java.lang.Boolean lambda$traceStaticFieldRead$9(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):1037:1037 -> a
-    23:23:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$classReferencedFromReporter$11(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):1102:1102 -> a
-    24:24:boolean lambda$markTypeAsLive$16(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotation):1242:1242 -> a
-    25:25:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$ensureMethodsContinueToWidenAccess$18(com.android.tools.r8.graph.DexType):1254:1254 -> a
-    26:26:void lambda$processNewlyInstantiatedClass$22(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1513:1513 -> a
-    27:27:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markInstanceFieldAsReachable$29(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):1940:1940 -> a
-    28:28:com.android.tools.r8.shaking.Enqueuer$SetWithReason lambda$markInstanceFieldAsReachable$31(com.android.tools.r8.graph.DexProgramClass):1961:1961 -> a
-    29:32:void lambda$markFailedResolutionTargets$34(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexEncodedMethod):2138:2141 -> a
-    33:33:java.util.Set lambda$markSuperMethodAsReachable$35(com.android.tools.r8.graph.DexEncodedMethod):2204:2204 -> a
-    34:34:void lambda$createAppInfo$36(com.android.tools.r8.com.google.common.collect.ImmutableSortedSet$Builder,com.android.tools.r8.graph.DexAnnotation):2267:2267 -> a
-    35:35:boolean lambda$createAppInfo$37(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessInfoImpl):2272:2272 -> a
-    36:36:java.util.Set lambda$trace$38(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):2372:2372 -> a
-    37:37:void lambda$trace$39(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2405:2405 -> a
-    38:38:void lambda$addConsequentRootSet$40(com.android.tools.r8.graph.DexReference,java.util.Map):2451:2451 -> a
-    39:39:void lambda$addConsequentRootSet$41(com.android.tools.r8.graph.DexType,java.util.Set):2456:2456 -> a
+    2:2:com.android.tools.r8.shaking.EnqueuerUseRegistryFactory lambda$createUseRegistryFactory$0(com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):344:344 -> a
+    3:8:void lambda$getNonPinnedWrittenFields$1(java.util.function.Predicate,java.util.Set,com.android.tools.r8.graph.FieldAccessInfoImpl):390:395 -> a
+    9:9:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexField):181:181 -> a
+    9:9:void lambda$getNonPinnedWrittenFields$1(java.util.function.Predicate,java.util.Set,com.android.tools.r8.graph.FieldAccessInfoImpl):395 -> a
+    10:16:void lambda$getNonPinnedWrittenFields$1(java.util.function.Predicate,java.util.Set,com.android.tools.r8.graph.FieldAccessInfoImpl):397:403 -> a
+    17:17:java.util.Set lambda$registerMethodWithTargetAndContext$4(com.android.tools.r8.graph.DexMethod):538:538 -> a
+    18:18:void lambda$traceInvokeDirect$5(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):749:749 -> a
+    19:19:java.lang.Boolean lambda$registerDeferredActionForDeadProtoBuilder$7(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Action,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):766:766 -> a
+    20:20:boolean lambda$registerDeferredActionForDeadProtoBuilder$6(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.Action):767:767 -> a
+    21:21:void lambda$traceNewInstance$8(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):905:905 -> a
+    22:22:java.lang.Boolean lambda$traceStaticFieldRead$9(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):1032:1032 -> a
+    23:23:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$classReferencedFromReporter$11(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):1097:1097 -> a
+    24:24:boolean lambda$markTypeAsLive$16(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotation):1237:1237 -> a
+    25:25:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$ensureMethodsContinueToWidenAccess$18(com.android.tools.r8.graph.DexType):1249:1249 -> a
+    26:26:void lambda$processNewlyInstantiatedClass$22(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1509:1509 -> a
+    27:27:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markInstanceFieldAsReachable$29(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):1936:1936 -> a
+    28:28:com.android.tools.r8.shaking.Enqueuer$SetWithReason lambda$markInstanceFieldAsReachable$31(com.android.tools.r8.graph.DexProgramClass):1957:1957 -> a
+    29:32:void lambda$markFailedResolutionTargets$34(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexEncodedMethod):2135:2138 -> a
+    33:33:java.util.Set lambda$markSuperMethodAsReachable$35(com.android.tools.r8.graph.DexEncodedMethod):2196:2196 -> a
+    34:34:void lambda$createAppInfo$36(com.android.tools.r8.com.google.common.collect.ImmutableSortedSet$Builder,com.android.tools.r8.graph.DexAnnotation):2259:2259 -> a
+    35:35:boolean lambda$createAppInfo$37(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessInfoImpl):2264:2264 -> a
+    36:36:java.util.Set lambda$trace$38(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):2362:2362 -> a
+    37:37:void lambda$trace$39(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2395:2395 -> a
+    38:38:void lambda$addConsequentRootSet$40(com.android.tools.r8.graph.DexReference,java.util.Map):2441:2441 -> a
+    39:39:void lambda$addConsequentRootSet$41(com.android.tools.r8.graph.DexType,java.util.Set):2446:2446 -> a
     40:40:boolean com.android.tools.r8.graph.DexType.isDexType():0:0 -> a
-    40:40:void lambda$addConsequentRootSet$41(com.android.tools.r8.graph.DexType,java.util.Set):2456 -> a
-    41:41:void lambda$addConsequentRootSet$41(com.android.tools.r8.graph.DexType,java.util.Set):2457:2457 -> a
-    42:42:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
-    42:42:void lambda$addConsequentRootSet$41(com.android.tools.r8.graph.DexType,java.util.Set):2457 -> a
-    43:43:void lambda$addConsequentRootSet$41(com.android.tools.r8.graph.DexType,java.util.Set):2458:2458 -> a
+    40:40:void lambda$addConsequentRootSet$41(com.android.tools.r8.graph.DexType,java.util.Set):2446 -> a
+    41:41:void lambda$addConsequentRootSet$41(com.android.tools.r8.graph.DexType,java.util.Set):2447:2447 -> a
+    42:42:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
+    42:42:void lambda$addConsequentRootSet$41(com.android.tools.r8.graph.DexType,java.util.Set):2447 -> a
+    43:43:void lambda$addConsequentRootSet$41(com.android.tools.r8.graph.DexType,java.util.Set):2448:2448 -> a
     44:44:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexType.asDexType():0:0 -> a
-    44:44:void lambda$addConsequentRootSet$41(com.android.tools.r8.graph.DexType,java.util.Set):2457 -> a
-    45:45:void lambda$markMethodAsLive$42(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexAnnotation):2629:2629 -> a
-    46:46:void lambda$markMethodAsLive$43(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2636:2636 -> a
+    44:44:void lambda$addConsequentRootSet$41(com.android.tools.r8.graph.DexType,java.util.Set):2447 -> a
+    45:45:void lambda$markMethodAsLive$42(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexAnnotation):2619:2619 -> a
+    46:46:void lambda$markMethodAsLive$43(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2626:2626 -> a
     1:1:void access$1000(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):111:111 -> access$1000
     1:1:void access$1100(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):111:111 -> access$1100
     1:1:void access$1200(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):111:111 -> access$1200
@@ -56744,403 +56953,404 @@
     1:1:void access$700(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):111:111 -> access$700
     1:1:com.android.tools.r8.utils.InternalOptions access$800(com.android.tools.r8.shaking.Enqueuer):111:111 -> access$800
     1:1:com.android.tools.r8.graph.DexProgramClass access$900(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType):111:111 -> access$900
-    1:8:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet,boolean):2447:2454 -> addConsequentRootSet
+    1:8:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet,boolean):2437:2444 -> addConsequentRootSet
     1:1:void com.android.tools.r8.graph.analysis.EnqueuerAnalysis.processNewlyLiveField(com.android.tools.r8.graph.DexEncodedField):0:0 -> b
-    1:1:void lambda$markStaticFieldAsLive$27(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1811 -> b
-    2:2:java.lang.Boolean lambda$traceStaticFieldWrite$10(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):1082:1082 -> b
-    3:3:void lambda$markTypeAsLive$17(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotation):1243:1243 -> b
-    4:4:java.util.Set lambda$markInterfaceTypeAsLiveViaInheritanceClause$19(com.android.tools.r8.graph.DexProgramClass):1289:1289 -> b
-    5:5:java.util.Set lambda$handleAnnotation$20(com.android.tools.r8.graph.DexType):1319:1319 -> b
-    6:6:void lambda$markMethodAsTargeted$21(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexAnnotation):1487:1487 -> b
-    7:7:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markFieldAsTargeted$23(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):1772:1772 -> b
-    8:8:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markInstanceFieldAsReachable$30(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):1942:1942 -> b
-    1:1:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$12(com.android.tools.r8.graph.DexType):1156:1156 -> c
-    2:2:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markFieldAsTargeted$24(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):1773:1773 -> c
-    3:3:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markStaticFieldAsLive$25(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):1780:1780 -> c
-    4:4:com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet lambda$markPossibleTargetsAsReachable$33(com.android.tools.r8.graph.DexProgramClass):2053:2053 -> c
-    1:1:java.util.function.Function classReferencedFromReporter(com.android.tools.r8.graph.DexEncodedMethod):1102:1102 -> classReferencedFromReporter
-    1:4:void compatEnqueueHolderIfDependentNonStaticMember(com.android.tools.r8.graph.DexClass,java.util.Set):527:530 -> compatEnqueueHolderIfDependentNonStaticMember
-    1:5:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():2464:2468 -> computeDelayedInterfaceMethodSyntheticBridges
-    6:10:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():2467:2471 -> computeDelayedInterfaceMethodSyntheticBridges
-    1:16:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping):2265:2280 -> createAppInfo
-    17:58:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping):2279:2320 -> createAppInfo
-    59:62:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping):2319:2322 -> createAppInfo
-    1:5:com.android.tools.r8.shaking.EnqueuerUseRegistryFactory createUseRegistryFactory():347:351 -> createUseRegistryFactory
-    1:1:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$13(com.android.tools.r8.graph.DexType):1175:1175 -> d
-    2:2:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markStaticFieldAsLive$26(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):1782:1782 -> d
-    3:3:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markParameterAndReturnTypesAsLive$45(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):2648:2648 -> d
-    1:1:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$14(com.android.tools.r8.graph.DexType):1182:1182 -> e
-    2:2:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markParameterAndReturnTypesAsLive$46(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):2652:2652 -> e
-    1:1:void enqueueDependentItem(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexDefinition,java.util.Set):1297:1297 -> enqueueDependentItem
-    1:11:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):499:509 -> enqueueFirstNonSerializableClassInitializer
-    12:12:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():742:742 -> enqueueFirstNonSerializableClassInitializer
-    12:12:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):510 -> enqueueFirstNonSerializableClassInitializer
-    13:13:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):510:510 -> enqueueFirstNonSerializableClassInitializer
-    1:3:boolean enqueueMarkMethodLiveAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):517:519 -> enqueueMarkMethodLiveAction
-    1:1:void enqueueRootItem(java.util.Map$Entry):428:428 -> enqueueRootItem
-    2:2:com.android.tools.r8.graph.DexDefinition com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexReference):174:174 -> enqueueRootItem
-    2:2:void enqueueRootItem(java.util.Map$Entry):428 -> enqueueRootItem
-    3:3:void enqueueRootItem(java.util.Map$Entry):430:430 -> enqueueRootItem
-    4:4:void enqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set):438:438 -> enqueueRootItem
-    1:1:void enqueueRootItems(java.util.Map):424:424 -> enqueueRootItems
-    1:13:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):1430:1442 -> ensureFromLibraryOrThrow
-    14:14:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> ensureFromLibraryOrThrow
-    14:14:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):1442 -> ensureFromLibraryOrThrow
-    15:26:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):1443:1454 -> ensureFromLibraryOrThrow
-    1:4:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.DexClass):1252:1255 -> ensureMethodsContinueToWidenAccess
-    5:9:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1260:1264 -> ensureMethodsContinueToWidenAccess
-    1:1:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$15(com.android.tools.r8.graph.DexType):1205:1205 -> f
-    2:2:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markReferencedTypesAsLive$44(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):2641:2641 -> f
-    1:4:void finalizeLibraryMethodOverrideInformation():2246:2249 -> finalizeLibraryMethodOverrideInformation
-    1:33:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget findAndMarkResolutionTarget(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):2099:2131 -> findAndMarkResolutionTarget
-    1:1:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$registerMethodWithTargetAndContext$3(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):542:542 -> g
-    1:5:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):2147:2151 -> generatedEnumValuesMethod
-    6:11:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):2150:2155 -> generatedEnumValuesMethod
-    1:1:com.android.tools.r8.shaking.GraphReporter getGraphReporter():343:343 -> getGraphReporter
-    1:1:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):1113:1113 -> getInvokeSuperTarget
-    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> getInvokeSuperTarget
-    2:2:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):1113 -> getInvokeSuperTarget
-    3:6:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):1114:1117 -> getInvokeSuperTarget
-    7:7:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> getInvokeSuperTarget
-    7:7:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):1117 -> getInvokeSuperTarget
-    8:13:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):1118:1123 -> getInvokeSuperTarget
-    1:1:com.android.tools.r8.shaking.Enqueuer$Mode getMode():339:339 -> getMode
-    1:24:java.util.Set getNonPinnedWrittenFields(java.util.function.Predicate):392:415 -> getNonPinnedWrittenFields
-    25:25:java.util.Set getNonPinnedWrittenFields(java.util.function.Predicate):411:411 -> getNonPinnedWrittenFields
-    1:1:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNull(com.android.tools.r8.graph.DexType):368:368 -> getProgramClassOrNull
-    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> getProgramClassOrNull
-    2:2:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNull(com.android.tools.r8.graph.DexType):368 -> getProgramClassOrNull
-    3:11:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNull(com.android.tools.r8.graph.DexType):370:378 -> getProgramClassOrNull
-    1:1:com.android.tools.r8.shaking.EnqueuerUseRegistryFactory getUseRegistryFactory():355:355 -> getUseRegistryFactory
-    1:3:void handleAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1311:1313 -> handleAnnotation
-    4:4:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> handleAnnotation
-    4:4:void handleAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1313 -> handleAnnotation
-    5:18:void handleAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1314:1327 -> handleAnnotation
-    1:9:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetBuilder):2476:2484 -> handleInterfaceMethodSyntheticBridgeAction
-    10:10:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):184:184 -> handleInterfaceMethodSyntheticBridgeAction
-    10:10:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetBuilder):2484 -> handleInterfaceMethodSyntheticBridgeAction
-    11:21:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetBuilder):2485:2495 -> handleInterfaceMethodSyntheticBridgeAction
-    1:29:void handleInvokeOfDirectTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1397:1425 -> handleInvokeOfDirectTarget
-    1:23:void handleInvokeOfStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1331:1353 -> handleInvokeOfStaticTarget
-    1:8:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2787:2794 -> handleJavaLangClassNewInstance
-    9:17:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2793:2801 -> handleJavaLangClassNewInstance
-    18:18:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():742:742 -> handleJavaLangClassNewInstance
-    18:18:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2805 -> handleJavaLangClassNewInstance
-    19:22:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2807:2810 -> handleJavaLangClassNewInstance
-    1:6:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2962:2967 -> handleJavaLangEnumValueOf
-    1:21:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2817:2837 -> handleJavaLangReflectConstructorNewInstance
-    22:48:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2836:2862 -> handleJavaLangReflectConstructorNewInstance
-    49:49:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():742:742 -> handleJavaLangReflectConstructorNewInstance
-    49:49:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2864 -> handleJavaLangReflectConstructorNewInstance
-    50:94:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2866:2910 -> handleJavaLangReflectConstructorNewInstance
-    1:32:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2920:2951 -> handleJavaLangReflectProxyNewProxyInstance
-    1:7:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2682:2688 -> handleReflectiveBehavior
-    8:48:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2693:2733 -> handleReflectiveBehavior
-    49:49:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():742:742 -> handleReflectiveBehavior
-    49:49:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2734 -> handleReflectiveBehavior
-    50:61:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2735:2746 -> handleReflectiveBehavior
-    62:62:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexField):179:179 -> handleReflectiveBehavior
-    62:62:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2746 -> handleReflectiveBehavior
-    63:79:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2755:2771 -> handleReflectiveBehavior
-    80:80:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):184:184 -> handleReflectiveBehavior
-    80:80:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2771 -> handleReflectiveBehavior
-    81:86:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2775:2780 -> handleReflectiveBehavior
-    87:88:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2777:2778 -> handleReflectiveBehavior
-    1:13:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):3006:3018 -> handleServiceInstantiation
-    1:19:void handleServiceLoaderInvocation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2973:2991 -> handleServiceLoaderInvocation
-    20:36:void handleServiceLoaderInvocation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2984:3000 -> handleServiceLoaderInvocation
-    1:8:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):443:450 -> internalEnqueueRootItem
-    9:9:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():742:742 -> internalEnqueueRootItem
-    9:9:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):451 -> internalEnqueueRootItem
-    10:14:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):452:456 -> internalEnqueueRootItem
-    15:20:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):453:458 -> internalEnqueueRootItem
-    21:21:boolean com.android.tools.r8.graph.DexClass.isExternalizable(com.android.tools.r8.graph.AppView):782:782 -> internalEnqueueRootItem
-    21:21:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):458 -> internalEnqueueRootItem
-    22:33:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):459:470 -> internalEnqueueRootItem
-    34:46:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):467:479 -> internalEnqueueRootItem
-    47:55:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):476:484 -> internalEnqueueRootItem
-    56:56:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):482:482 -> internalEnqueueRootItem
-    1:1:boolean isFieldLive(com.android.tools.r8.graph.DexEncodedField):1902:1902 -> isFieldLive
-    1:2:boolean isFieldRead(com.android.tools.r8.graph.DexEncodedField):1906:1907 -> isFieldRead
-    1:2:boolean isFieldWrittenInMethodSatisfying(com.android.tools.r8.graph.DexEncodedField,java.util.function.Predicate):1912:1913 -> isFieldWrittenInMethodSatisfying
-    1:5:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.DexEncodedField):1917:1921 -> isFieldWrittenOutsideDefaultConstructor
-    6:6:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> isFieldWrittenOutsideDefaultConstructor
-    6:6:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.DexEncodedField):1921 -> isFieldWrittenOutsideDefaultConstructor
-    7:7:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():742:742 -> isFieldWrittenOutsideDefaultConstructor
-    7:7:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.DexEncodedField):1922 -> isFieldWrittenOutsideDefaultConstructor
-    8:9:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.DexEncodedField):1924:1925 -> isFieldWrittenOutsideDefaultConstructor
-    10:10:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():742:742 -> isFieldWrittenOutsideDefaultConstructor
-    10:10:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.DexEncodedField):1922 -> isFieldWrittenOutsideDefaultConstructor
-    1:1:boolean isInstantiatedOrHasInstantiatedSubtype(com.android.tools.r8.graph.DexProgramClass):1929:1929 -> isInstantiatedOrHasInstantiatedSubtype
-    1:1:boolean isProgramClass(com.android.tools.r8.graph.DexType):364:364 -> isProgramClass
-    1:6:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap joinIdentifierNameStrings(java.util.Set,java.util.Set):2338:2343 -> joinIdentifierNameStrings
-    1:6:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2664:2669 -> markClassAsInstantiatedWithCompatRule
-    7:7:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():742:742 -> markClassAsInstantiatedWithCompatRule
-    7:7:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2670 -> markClassAsInstantiatedWithCompatRule
-    8:10:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2671:2673 -> markClassAsInstantiatedWithCompatRule
-    11:11:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2671:2671 -> markClassAsInstantiatedWithCompatRule
-    1:3:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2656:2658 -> markClassAsInstantiatedWithReason
-    4:4:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():742:742 -> markClassAsInstantiatedWithReason
-    4:4:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2658 -> markClassAsInstantiatedWithReason
-    5:5:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2658:2658 -> markClassAsInstantiatedWithReason
-    1:1:void markDirectAndIndirectClassInitializersAsLive(com.android.tools.r8.graph.DexProgramClass):1358:1358 -> markDirectAndIndirectClassInitializersAsLive
+    1:1:void lambda$markStaticFieldAsLive$27(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1807 -> b
+    2:2:java.lang.Boolean lambda$traceStaticFieldWrite$10(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):1077:1077 -> b
+    3:3:void lambda$markTypeAsLive$17(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotation):1238:1238 -> b
+    4:4:java.util.Set lambda$markInterfaceTypeAsLiveViaInheritanceClause$19(com.android.tools.r8.graph.DexProgramClass):1284:1284 -> b
+    5:5:java.util.Set lambda$handleAnnotation$20(com.android.tools.r8.graph.DexType):1314:1314 -> b
+    6:6:void lambda$markMethodAsTargeted$21(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexAnnotation):1483:1483 -> b
+    7:7:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markFieldAsTargeted$23(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):1768:1768 -> b
+    8:8:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markInstanceFieldAsReachable$30(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):1938:1938 -> b
+    1:1:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$12(com.android.tools.r8.graph.DexType):1151:1151 -> c
+    2:2:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markFieldAsTargeted$24(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):1769:1769 -> c
+    3:3:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markStaticFieldAsLive$25(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):1776:1776 -> c
+    4:4:com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet lambda$markPossibleTargetsAsReachable$33(com.android.tools.r8.graph.DexProgramClass):2049:2049 -> c
+    1:1:java.util.function.Function classReferencedFromReporter(com.android.tools.r8.graph.DexEncodedMethod):1097:1097 -> classReferencedFromReporter
+    1:4:void compatEnqueueHolderIfDependentNonStaticMember(com.android.tools.r8.graph.DexClass,java.util.Set):522:525 -> compatEnqueueHolderIfDependentNonStaticMember
+    1:5:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():2454:2458 -> computeDelayedInterfaceMethodSyntheticBridges
+    6:10:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():2457:2461 -> computeDelayedInterfaceMethodSyntheticBridges
+    1:16:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping):2257:2272 -> createAppInfo
+    17:56:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping):2271:2310 -> createAppInfo
+    57:60:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping):2309:2312 -> createAppInfo
+    1:5:com.android.tools.r8.shaking.EnqueuerUseRegistryFactory createUseRegistryFactory():342:346 -> createUseRegistryFactory
+    1:1:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$13(com.android.tools.r8.graph.DexType):1170:1170 -> d
+    2:2:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markStaticFieldAsLive$26(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):1778:1778 -> d
+    3:3:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markParameterAndReturnTypesAsLive$45(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):2639:2639 -> d
+    1:1:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$14(com.android.tools.r8.graph.DexType):1177:1177 -> e
+    2:2:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markParameterAndReturnTypesAsLive$46(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):2643:2643 -> e
+    1:1:void enqueueDependentItem(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexDefinition,java.util.Set):1292:1292 -> enqueueDependentItem
+    1:11:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):494:504 -> enqueueFirstNonSerializableClassInitializer
+    12:12:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():792:792 -> enqueueFirstNonSerializableClassInitializer
+    12:12:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):505 -> enqueueFirstNonSerializableClassInitializer
+    13:13:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):505:505 -> enqueueFirstNonSerializableClassInitializer
+    1:3:boolean enqueueMarkMethodLiveAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):512:514 -> enqueueMarkMethodLiveAction
+    1:1:void enqueueRootItem(java.util.Map$Entry):423:423 -> enqueueRootItem
+    2:2:com.android.tools.r8.graph.DexDefinition com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexReference):176:176 -> enqueueRootItem
+    2:2:void enqueueRootItem(java.util.Map$Entry):423 -> enqueueRootItem
+    3:3:void enqueueRootItem(java.util.Map$Entry):425:425 -> enqueueRootItem
+    4:4:void enqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set):433:433 -> enqueueRootItem
+    1:1:void enqueueRootItems(java.util.Map):419:419 -> enqueueRootItems
+    1:13:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):1426:1438 -> ensureFromLibraryOrThrow
+    14:14:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> ensureFromLibraryOrThrow
+    14:14:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):1438 -> ensureFromLibraryOrThrow
+    15:26:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):1439:1450 -> ensureFromLibraryOrThrow
+    1:4:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.DexClass):1247:1250 -> ensureMethodsContinueToWidenAccess
+    5:9:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1255:1259 -> ensureMethodsContinueToWidenAccess
+    1:1:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$15(com.android.tools.r8.graph.DexType):1200:1200 -> f
+    2:2:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markReferencedTypesAsLive$44(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):2631:2631 -> f
+    1:4:void finalizeLibraryMethodOverrideInformation():2238:2241 -> finalizeLibraryMethodOverrideInformation
+    1:33:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget findAndMarkResolutionTarget(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):2095:2127 -> findAndMarkResolutionTarget
+    1:1:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$registerMethodWithTargetAndContext$3(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):537:537 -> g
+    1:5:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):2144:2148 -> generatedEnumValuesMethod
+    6:11:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):2147:2152 -> generatedEnumValuesMethod
+    1:1:com.android.tools.r8.shaking.GraphReporter getGraphReporter():338:338 -> getGraphReporter
+    1:1:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):1108:1108 -> getInvokeSuperTarget
+    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> getInvokeSuperTarget
+    2:2:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):1108 -> getInvokeSuperTarget
+    3:6:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):1109:1112 -> getInvokeSuperTarget
+    7:7:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> getInvokeSuperTarget
+    7:7:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):1112 -> getInvokeSuperTarget
+    8:13:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):1113:1118 -> getInvokeSuperTarget
+    1:1:com.android.tools.r8.shaking.Enqueuer$Mode getMode():334:334 -> getMode
+    1:24:java.util.Set getNonPinnedWrittenFields(java.util.function.Predicate):387:410 -> getNonPinnedWrittenFields
+    25:25:java.util.Set getNonPinnedWrittenFields(java.util.function.Predicate):406:406 -> getNonPinnedWrittenFields
+    1:1:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNull(com.android.tools.r8.graph.DexType):363:363 -> getProgramClassOrNull
+    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> getProgramClassOrNull
+    2:2:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNull(com.android.tools.r8.graph.DexType):363 -> getProgramClassOrNull
+    3:11:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNull(com.android.tools.r8.graph.DexType):365:373 -> getProgramClassOrNull
+    1:1:com.android.tools.r8.shaking.EnqueuerUseRegistryFactory getUseRegistryFactory():350:350 -> getUseRegistryFactory
+    1:3:void handleAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1306:1308 -> handleAnnotation
+    4:4:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> handleAnnotation
+    4:4:void handleAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1308 -> handleAnnotation
+    5:18:void handleAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1309:1322 -> handleAnnotation
+    1:9:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetBuilder):2466:2474 -> handleInterfaceMethodSyntheticBridgeAction
+    10:10:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):186:186 -> handleInterfaceMethodSyntheticBridgeAction
+    10:10:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetBuilder):2474 -> handleInterfaceMethodSyntheticBridgeAction
+    11:21:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetBuilder):2475:2485 -> handleInterfaceMethodSyntheticBridgeAction
+    1:29:void handleInvokeOfDirectTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1393:1421 -> handleInvokeOfDirectTarget
+    1:15:void handleInvokeOfStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1335:1349 -> handleInvokeOfStaticTarget
+    1:8:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2778:2785 -> handleJavaLangClassNewInstance
+    9:17:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2784:2792 -> handleJavaLangClassNewInstance
+    18:18:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():792:792 -> handleJavaLangClassNewInstance
+    18:18:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2796 -> handleJavaLangClassNewInstance
+    19:22:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2798:2801 -> handleJavaLangClassNewInstance
+    1:6:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2953:2958 -> handleJavaLangEnumValueOf
+    1:21:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2808:2828 -> handleJavaLangReflectConstructorNewInstance
+    22:48:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2827:2853 -> handleJavaLangReflectConstructorNewInstance
+    49:49:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():792:792 -> handleJavaLangReflectConstructorNewInstance
+    49:49:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2855 -> handleJavaLangReflectConstructorNewInstance
+    50:94:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2857:2901 -> handleJavaLangReflectConstructorNewInstance
+    1:32:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2911:2942 -> handleJavaLangReflectProxyNewProxyInstance
+    1:7:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2673:2679 -> handleReflectiveBehavior
+    8:48:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2684:2724 -> handleReflectiveBehavior
+    49:49:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():792:792 -> handleReflectiveBehavior
+    49:49:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2725 -> handleReflectiveBehavior
+    50:61:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2726:2737 -> handleReflectiveBehavior
+    62:62:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexField):181:181 -> handleReflectiveBehavior
+    62:62:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2737 -> handleReflectiveBehavior
+    63:79:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2746:2762 -> handleReflectiveBehavior
+    80:80:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):186:186 -> handleReflectiveBehavior
+    80:80:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2762 -> handleReflectiveBehavior
+    81:86:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2766:2771 -> handleReflectiveBehavior
+    87:88:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2768:2769 -> handleReflectiveBehavior
+    1:13:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):2997:3009 -> handleServiceInstantiation
+    1:19:void handleServiceLoaderInvocation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2964:2982 -> handleServiceLoaderInvocation
+    20:36:void handleServiceLoaderInvocation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2975:2991 -> handleServiceLoaderInvocation
+    1:8:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):438:445 -> internalEnqueueRootItem
+    9:9:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():792:792 -> internalEnqueueRootItem
+    9:9:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):446 -> internalEnqueueRootItem
+    10:14:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):447:451 -> internalEnqueueRootItem
+    15:20:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):448:453 -> internalEnqueueRootItem
+    21:21:boolean com.android.tools.r8.graph.DexClass.isExternalizable(com.android.tools.r8.graph.AppView):832:832 -> internalEnqueueRootItem
+    21:21:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):453 -> internalEnqueueRootItem
+    22:33:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):454:465 -> internalEnqueueRootItem
+    34:46:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):462:474 -> internalEnqueueRootItem
+    47:55:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):471:479 -> internalEnqueueRootItem
+    56:56:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):477:477 -> internalEnqueueRootItem
+    1:1:boolean isFieldLive(com.android.tools.r8.graph.DexEncodedField):1898:1898 -> isFieldLive
+    1:2:boolean isFieldRead(com.android.tools.r8.graph.DexEncodedField):1902:1903 -> isFieldRead
+    1:2:boolean isFieldWrittenInMethodSatisfying(com.android.tools.r8.graph.DexEncodedField,java.util.function.Predicate):1908:1909 -> isFieldWrittenInMethodSatisfying
+    1:5:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.DexEncodedField):1913:1917 -> isFieldWrittenOutsideDefaultConstructor
+    6:6:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> isFieldWrittenOutsideDefaultConstructor
+    6:6:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.DexEncodedField):1917 -> isFieldWrittenOutsideDefaultConstructor
+    7:7:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():792:792 -> isFieldWrittenOutsideDefaultConstructor
+    7:7:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.DexEncodedField):1918 -> isFieldWrittenOutsideDefaultConstructor
+    8:9:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.DexEncodedField):1920:1921 -> isFieldWrittenOutsideDefaultConstructor
+    10:10:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():792:792 -> isFieldWrittenOutsideDefaultConstructor
+    10:10:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.DexEncodedField):1918 -> isFieldWrittenOutsideDefaultConstructor
+    1:1:boolean isInstantiatedOrHasInstantiatedSubtype(com.android.tools.r8.graph.DexProgramClass):1925:1925 -> isInstantiatedOrHasInstantiatedSubtype
+    1:1:boolean isProgramClass(com.android.tools.r8.graph.DexType):359:359 -> isProgramClass
+    1:6:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap joinIdentifierNameStrings(java.util.Set,java.util.Set):2328:2333 -> joinIdentifierNameStrings
+    1:6:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2655:2660 -> markClassAsInstantiatedWithCompatRule
+    7:7:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():792:792 -> markClassAsInstantiatedWithCompatRule
+    7:7:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2661 -> markClassAsInstantiatedWithCompatRule
+    8:10:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2662:2664 -> markClassAsInstantiatedWithCompatRule
+    11:11:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2662:2662 -> markClassAsInstantiatedWithCompatRule
+    1:3:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2647:2649 -> markClassAsInstantiatedWithReason
+    4:4:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():792:792 -> markClassAsInstantiatedWithReason
+    4:4:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2649 -> markClassAsInstantiatedWithReason
+    5:5:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2649:2649 -> markClassAsInstantiatedWithReason
+    1:1:void markDirectAndIndirectClassInitializersAsLive(com.android.tools.r8.graph.DexProgramClass):1354:1354 -> markDirectAndIndirectClassInitializersAsLive
     2:3:java.util.Set com.android.tools.r8.utils.SetUtils.newIdentityHashSet(java.lang.Object):16:17 -> markDirectAndIndirectClassInitializersAsLive
-    2:3:void markDirectAndIndirectClassInitializersAsLive(com.android.tools.r8.graph.DexProgramClass):1359 -> markDirectAndIndirectClassInitializersAsLive
-    4:16:void markDirectAndIndirectClassInitializersAsLive(com.android.tools.r8.graph.DexProgramClass):1360:1372 -> markDirectAndIndirectClassInitializersAsLive
-    1:7:boolean markDirectClassInitializerAsLive(com.android.tools.r8.graph.DexProgramClass):1380:1386 -> markDirectClassInitializerAsLive
-    1:13:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1871:1883 -> markDirectStaticOrConstructorMethodAsLive
+    2:3:void markDirectAndIndirectClassInitializersAsLive(com.android.tools.r8.graph.DexProgramClass):1355 -> markDirectAndIndirectClassInitializersAsLive
+    4:16:void markDirectAndIndirectClassInitializersAsLive(com.android.tools.r8.graph.DexProgramClass):1356:1368 -> markDirectAndIndirectClassInitializersAsLive
+    1:7:boolean markDirectClassInitializerAsLive(com.android.tools.r8.graph.DexProgramClass):1376:1382 -> markDirectClassInitializerAsLive
+    1:13:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1867:1879 -> markDirectStaticOrConstructorMethodAsLive
     14:14:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> markDirectStaticOrConstructorMethodAsLive
-    14:14:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1882 -> markDirectStaticOrConstructorMethodAsLive
-    1:7:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2159:2165 -> markEnumValuesAsReachable
-    1:1:void markFailedResolutionTargets(com.android.tools.r8.graph.ResolutionResult$FailedResolutionResult,com.android.tools.r8.shaking.KeepReason):2136:2136 -> markFailedResolutionTargets
-    1:5:void markFieldAsKept(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):2544:2548 -> markFieldAsKept
-    1:2:void markFieldAsTargeted(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):1772:1773 -> markFieldAsTargeted
-    1:6:void markInstanceFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1815:1820 -> markInstanceFieldAsLive
+    14:14:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1878 -> markDirectStaticOrConstructorMethodAsLive
+    1:7:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2156:2162 -> markEnumValuesAsReachable
+    1:2:void markFailedResolutionTargets(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ResolutionResult$FailedResolutionResult,com.android.tools.r8.shaking.KeepReason):2132:2133 -> markFailedResolutionTargets
+    1:5:void markFieldAsKept(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):2534:2538 -> markFieldAsKept
+    1:2:void markFieldAsTargeted(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):1768:1769 -> markFieldAsTargeted
+    1:6:void markInstanceFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1811:1816 -> markInstanceFieldAsLive
     7:7:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> markInstanceFieldAsLive
-    7:7:void markInstanceFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1820 -> markInstanceFieldAsLive
-    8:15:void markInstanceFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1822:1829 -> markInstanceFieldAsLive
-    1:3:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1934:1936 -> markInstanceFieldAsReachable
+    7:7:void markInstanceFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1816 -> markInstanceFieldAsLive
+    8:15:void markInstanceFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1818:1825 -> markInstanceFieldAsLive
+    1:3:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1930:1932 -> markInstanceFieldAsReachable
     4:4:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> markInstanceFieldAsReachable
-    4:4:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1936 -> markInstanceFieldAsReachable
-    5:28:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1939:1962 -> markInstanceFieldAsReachable
-    1:2:void markInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1834:1835 -> markInstantiated
+    4:4:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1932 -> markInstanceFieldAsReachable
+    5:28:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1935:1958 -> markInstanceFieldAsReachable
+    1:2:void markInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1830:1831 -> markInstantiated
     3:3:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> markInstantiated
-    3:3:void markInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1835 -> markInstantiated
-    4:4:void markInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1837:1837 -> markInstantiated
-    1:7:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):488:494 -> markInterfaceAsInstantiated
-    1:20:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1271:1290 -> markInterfaceTypeAsLiveViaInheritanceClause
-    21:21:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1277:1277 -> markInterfaceTypeAsLiveViaInheritanceClause
-    1:1:void markLambdaInstantiated(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):1841:1841 -> markLambdaInstantiated
-    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> markLambdaInstantiated
-    2:2:void markLambdaInstantiated(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):1841 -> markLambdaInstantiated
-    3:24:void markLambdaInstantiated(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):1843:1864 -> markLambdaInstantiated
-    1:25:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass):1636:1660 -> markLibraryAndClasspathMethodOverridesAsLive
-    1:25:void markMethodAsKept(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2508:2532 -> markMethodAsKept
-    26:35:void markMethodAsKept(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2529:2538 -> markMethodAsKept
-    1:16:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2599:2614 -> markMethodAsLive
+    3:3:void markInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1831 -> markInstantiated
+    4:4:void markInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1833:1833 -> markInstantiated
+    1:7:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):483:489 -> markInterfaceAsInstantiated
+    1:20:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1266:1285 -> markInterfaceTypeAsLiveViaInheritanceClause
+    21:21:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1272:1272 -> markInterfaceTypeAsLiveViaInheritanceClause
+    1:1:void markLambdaInstantiated(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):1837:1837 -> markLambdaInstantiated
+    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> markLambdaInstantiated
+    2:2:void markLambdaInstantiated(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):1837 -> markLambdaInstantiated
+    3:24:void markLambdaInstantiated(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):1839:1860 -> markLambdaInstantiated
+    1:25:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass):1632:1656 -> markLibraryAndClasspathMethodOverridesAsLive
+    1:25:void markMethodAsKept(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2498:2522 -> markMethodAsKept
+    26:35:void markMethodAsKept(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2519:2528 -> markMethodAsKept
+    1:16:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2589:2604 -> markMethodAsLive
     17:17:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> markMethodAsLive
-    17:17:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2614 -> markMethodAsLive
-    18:22:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2616:2620 -> markMethodAsLive
-    23:26:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2619:2622 -> markMethodAsLive
-    27:42:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2621:2636 -> markMethodAsLive
-    1:1:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2678:2678 -> markMethodAsLiveWithCompatRule
-    1:12:void markMethodAsTargeted(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1479:1490 -> markMethodAsTargeted
+    17:17:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2604 -> markMethodAsLive
+    18:22:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2606:2610 -> markMethodAsLive
+    23:26:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2609:2612 -> markMethodAsLive
+    27:42:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2611:2626 -> markMethodAsLive
+    1:1:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2669:2669 -> markMethodAsLiveWithCompatRule
+    1:12:void markMethodAsTargeted(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1475:1486 -> markMethodAsTargeted
     13:13:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> markMethodAsTargeted
-    13:13:void markMethodAsTargeted(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1490 -> markMethodAsTargeted
-    14:18:void markMethodAsTargeted(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1492:1496 -> markMethodAsTargeted
-    1:1:void markNonStaticDirectMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1393:1393 -> markNonStaticDirectMethodAsReachable
+    13:13:void markMethodAsTargeted(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1486 -> markMethodAsTargeted
+    14:18:void markMethodAsTargeted(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1488:1492 -> markMethodAsTargeted
+    1:1:void markNonStaticDirectMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1389:1389 -> markNonStaticDirectMethodAsReachable
     1:2:java.util.Set com.android.tools.r8.utils.SetUtils.newIdentityHashSet(java.lang.Object):16:17 -> markOverridesAsLibraryMethodOverrides
-    1:2:void markOverridesAsLibraryMethodOverrides(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):1678 -> markOverridesAsLibraryMethodOverrides
-    3:17:void markOverridesAsLibraryMethodOverrides(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):1679:1693 -> markOverridesAsLibraryMethodOverrides
-    1:5:void markParameterAndReturnTypesAsLive(com.android.tools.r8.graph.DexEncodedMethod):2646:2650 -> markParameterAndReturnTypesAsLive
-    1:1:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):2042:2042 -> markPossibleTargetsAsReachable
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():345:345 -> markPossibleTargetsAsReachable
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1113 -> markPossibleTargetsAsReachable
-    2:2:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):2042 -> markPossibleTargetsAsReachable
-    3:4:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):2042:2043 -> markPossibleTargetsAsReachable
-    5:5:boolean com.android.tools.r8.graph.DexEncodedMethod.isAbstract():253:253 -> markPossibleTargetsAsReachable
-    5:5:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):2043 -> markPossibleTargetsAsReachable
-    6:52:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):2043:2089 -> markPossibleTargetsAsReachable
-    53:59:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):2086:2092 -> markPossibleTargetsAsReachable
-    60:63:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):2069:2072 -> markPossibleTargetsAsReachable
-    64:64:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):2069:2069 -> markPossibleTargetsAsReachable
-    1:3:void markReferencedTypesAsLive(com.android.tools.r8.graph.DexEncodedMethod):2640:2642 -> markReferencedTypesAsLive
-    1:7:void markResolutionAsLive(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ResolutionResult):1665:1671 -> markResolutionAsLive
-    8:8:void markResolutionAsLive(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ResolutionResult):1670:1670 -> markResolutionAsLive
-    1:19:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1778:1796 -> markStaticFieldAsLive
+    1:2:void markOverridesAsLibraryMethodOverrides(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):1674 -> markOverridesAsLibraryMethodOverrides
+    3:17:void markOverridesAsLibraryMethodOverrides(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):1675:1689 -> markOverridesAsLibraryMethodOverrides
+    1:5:void markParameterAndReturnTypesAsLive(com.android.tools.r8.graph.DexEncodedMethod):2637:2641 -> markParameterAndReturnTypesAsLive
+    1:1:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):2038:2038 -> markPossibleTargetsAsReachable
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():337:337 -> markPossibleTargetsAsReachable
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1105 -> markPossibleTargetsAsReachable
+    2:2:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):2038 -> markPossibleTargetsAsReachable
+    3:4:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):2038:2039 -> markPossibleTargetsAsReachable
+    5:5:boolean com.android.tools.r8.graph.DexEncodedMethod.isAbstract():257:257 -> markPossibleTargetsAsReachable
+    5:5:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):2039 -> markPossibleTargetsAsReachable
+    6:52:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):2039:2085 -> markPossibleTargetsAsReachable
+    53:59:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):2082:2088 -> markPossibleTargetsAsReachable
+    60:63:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):2065:2068 -> markPossibleTargetsAsReachable
+    64:64:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):2065:2065 -> markPossibleTargetsAsReachable
+    1:3:void markReferencedTypesAsLive(com.android.tools.r8.graph.DexEncodedMethod):2630:2632 -> markReferencedTypesAsLive
+    1:7:void markResolutionAsLive(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ResolutionResult):1661:1667 -> markResolutionAsLive
+    8:8:void markResolutionAsLive(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ResolutionResult):1666:1666 -> markResolutionAsLive
+    1:19:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1774:1792 -> markStaticFieldAsLive
     20:20:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> markStaticFieldAsLive
-    20:20:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1796 -> markStaticFieldAsLive
-    21:22:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1799:1800 -> markStaticFieldAsLive
+    20:20:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1792 -> markStaticFieldAsLive
+    21:22:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1795:1796 -> markStaticFieldAsLive
     23:23:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> markStaticFieldAsLive
-    23:23:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1800 -> markStaticFieldAsLive
-    24:31:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1804:1811 -> markStaticFieldAsLive
-    1:13:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2172:2184 -> markSuperMethodAsReachable
-    14:33:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2181:2200 -> markSuperMethodAsReachable
-    34:34:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> markSuperMethodAsReachable
-    34:34:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2200 -> markSuperMethodAsReachable
-    35:40:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2203:2208 -> markSuperMethodAsReachable
-    1:16:void markTypeAsLive(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):1142:1157 -> markTypeAsLive
-    17:17:void markTypeAsLive(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):1154:1154 -> markTypeAsLive
-    18:33:void markTypeAsLive(com.android.tools.r8.graph.DexType,java.util.function.Function):1161:1176 -> markTypeAsLive
-    34:34:void markTypeAsLive(com.android.tools.r8.graph.DexType,java.util.function.Function):1173:1173 -> markTypeAsLive
-    35:37:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1180:1182 -> markTypeAsLive
-    38:38:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1180:1180 -> markTypeAsLive
-    39:44:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1188:1193 -> markTypeAsLive
+    23:23:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1796 -> markStaticFieldAsLive
+    24:31:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1800:1807 -> markStaticFieldAsLive
+    1:9:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2168:2176 -> markSuperMethodAsReachable
+    10:27:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2175:2192 -> markSuperMethodAsReachable
+    28:28:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> markSuperMethodAsReachable
+    28:28:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2192 -> markSuperMethodAsReachable
+    29:34:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2195:2200 -> markSuperMethodAsReachable
+    1:16:void markTypeAsLive(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):1137:1152 -> markTypeAsLive
+    17:17:void markTypeAsLive(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):1149:1149 -> markTypeAsLive
+    18:33:void markTypeAsLive(com.android.tools.r8.graph.DexType,java.util.function.Function):1156:1171 -> markTypeAsLive
+    34:34:void markTypeAsLive(com.android.tools.r8.graph.DexType,java.util.function.Function):1168:1168 -> markTypeAsLive
+    35:37:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1175:1177 -> markTypeAsLive
+    38:38:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1175:1175 -> markTypeAsLive
+    39:44:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1183:1188 -> markTypeAsLive
     45:45:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> markTypeAsLive
-    45:45:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1193 -> markTypeAsLive
-    46:97:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1196:1247 -> markTypeAsLive
-    98:98:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():720:720 -> markTypeAsLive
-    98:98:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1248 -> markTypeAsLive
-    99:99:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1248:1248 -> markTypeAsLive
-    100:100:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1247:1247 -> markTypeAsLive
-    1:5:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1889:1893 -> markVirtualMethodAsLive
-    6:11:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1891:1896 -> markVirtualMethodAsLive
+    45:45:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1188 -> markTypeAsLive
+    46:97:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1191:1242 -> markTypeAsLive
+    98:98:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():770:770 -> markTypeAsLive
+    98:98:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1243 -> markTypeAsLive
+    99:99:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1243:1243 -> markTypeAsLive
+    100:100:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1242:1242 -> markTypeAsLive
+    1:5:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1885:1889 -> markVirtualMethodAsLive
+    6:11:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1887:1892 -> markVirtualMethodAsLive
     12:12:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> markVirtualMethodAsLive
-    12:12:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1896 -> markVirtualMethodAsLive
-    1:1:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1969:1969 -> markVirtualMethodAsReachable
-    2:29:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1977:2004 -> markVirtualMethodAsReachable
+    12:12:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1892 -> markVirtualMethodAsLive
+    1:1:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1965:1965 -> markVirtualMethodAsReachable
+    2:29:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1973:2000 -> markVirtualMethodAsReachable
     30:30:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> markVirtualMethodAsReachable
-    30:30:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):2004 -> markVirtualMethodAsReachable
-    31:46:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):2008:2023 -> markVirtualMethodAsReachable
-    47:47:java.util.Set com.android.tools.r8.graph.ResolutionResult.lookupVirtualDispatchTargets(boolean,com.android.tools.r8.graph.AppInfoWithSubtyping):76:76 -> markVirtualMethodAsReachable
-    47:47:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):2026 -> markVirtualMethodAsReachable
-    48:51:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):2027:2030 -> markVirtualMethodAsReachable
-    52:52:boolean com.android.tools.r8.graph.DexEncodedMethod.isAbstract():253:253 -> markVirtualMethodAsReachable
-    52:52:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):2031 -> markVirtualMethodAsReachable
-    53:53:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):2034:2034 -> markVirtualMethodAsReachable
-    1:1:com.android.tools.r8.shaking.Enqueuer$SetWithReason newSetWithoutReasonReporter():420:420 -> newSetWithoutReasonReporter
-    1:13:void populateInstantiatedTypesCache(com.android.tools.r8.graph.DexProgramClass):1538:1550 -> populateInstantiatedTypesCache
-    1:1:void processAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1307:1307 -> processAnnotation
-    1:2:void processAnnotations(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation[]):1301:1302 -> processAnnotations
-    1:15:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1508:1522 -> processNewlyInstantiatedClass
+    30:30:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):2000 -> markVirtualMethodAsReachable
+    31:46:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):2004:2019 -> markVirtualMethodAsReachable
+    47:47:java.util.Set com.android.tools.r8.graph.ResolutionResult.lookupVirtualDispatchTargets(boolean,com.android.tools.r8.graph.AppInfoWithSubtyping):77:77 -> markVirtualMethodAsReachable
+    47:47:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):2022 -> markVirtualMethodAsReachable
+    48:51:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):2023:2026 -> markVirtualMethodAsReachable
+    52:52:boolean com.android.tools.r8.graph.DexEncodedMethod.isAbstract():257:257 -> markVirtualMethodAsReachable
+    52:52:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):2027 -> markVirtualMethodAsReachable
+    53:53:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):2030:2030 -> markVirtualMethodAsReachable
+    1:1:com.android.tools.r8.shaking.Enqueuer$SetWithReason newSetWithoutReasonReporter():415:415 -> newSetWithoutReasonReporter
+    1:13:void populateInstantiatedTypesCache(com.android.tools.r8.graph.DexProgramClass):1534:1546 -> populateInstantiatedTypesCache
+    1:1:void processAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1302:1302 -> processAnnotation
+    1:2:void processAnnotations(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation[]):1296:1297 -> processAnnotations
+    1:15:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1504:1518 -> processNewlyInstantiatedClass
     16:16:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> processNewlyInstantiatedClass
-    16:16:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1522 -> processNewlyInstantiatedClass
-    17:26:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1525:1534 -> processNewlyInstantiatedClass
-    1:1:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):359:359 -> registerAnalysis
-    1:7:boolean registerDeferredActionForDeadProtoBuilder(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Action):767:773 -> registerDeferredActionForDeadProtoBuilder
-    8:8:boolean registerDeferredActionForDeadProtoBuilder(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Action):769:769 -> registerDeferredActionForDeadProtoBuilder
-    1:2:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):557:558 -> registerFieldAccess
-    3:31:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod,boolean):563:591 -> registerFieldAccess
-    1:1:boolean registerFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):549:549 -> registerFieldRead
-    1:1:boolean registerFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):553:553 -> registerFieldWrite
-    1:4:boolean registerMethodWithTargetAndContext(java.util.Map,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):540:543 -> registerMethodWithTargetAndContext
-    1:2:void reportMissingClass(com.android.tools.r8.graph.DexType):1460:1461 -> reportMissingClass
+    16:16:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1518 -> processNewlyInstantiatedClass
+    17:26:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1521:1530 -> processNewlyInstantiatedClass
+    1:1:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):354:354 -> registerAnalysis
+    1:7:boolean registerDeferredActionForDeadProtoBuilder(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Action):762:768 -> registerDeferredActionForDeadProtoBuilder
+    8:8:boolean registerDeferredActionForDeadProtoBuilder(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Action):764:764 -> registerDeferredActionForDeadProtoBuilder
+    1:2:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):552:553 -> registerFieldAccess
+    3:31:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod,boolean):558:586 -> registerFieldAccess
+    1:1:boolean registerFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):544:544 -> registerFieldRead
+    1:1:boolean registerFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):548:548 -> registerFieldWrite
+    1:4:boolean registerMethodWithTargetAndContext(java.util.Map,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):535:538 -> registerMethodWithTargetAndContext
+    1:2:void reportMissingClass(com.android.tools.r8.graph.DexType):1456:1457 -> reportMissingClass
     3:3:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> reportMissingClass
-    3:3:void reportMissingClass(com.android.tools.r8.graph.DexType):1461 -> reportMissingClass
-    1:2:void reportMissingField(com.android.tools.r8.graph.DexField):1472:1473 -> reportMissingField
+    3:3:void reportMissingClass(com.android.tools.r8.graph.DexType):1457 -> reportMissingClass
+    1:2:void reportMissingField(com.android.tools.r8.graph.DexField):1468:1469 -> reportMissingField
     3:3:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> reportMissingField
-    3:3:void reportMissingField(com.android.tools.r8.graph.DexField):1473 -> reportMissingField
-    1:2:void reportMissingMethod(com.android.tools.r8.graph.DexMethod):1466:1467 -> reportMissingMethod
+    3:3:void reportMissingField(com.android.tools.r8.graph.DexField):1469 -> reportMissingField
+    1:2:void reportMissingMethod(com.android.tools.r8.graph.DexMethod):1462:1463 -> reportMissingMethod
     3:3:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> reportMissingMethod
-    3:3:void reportMissingMethod(com.android.tools.r8.graph.DexMethod):1467 -> reportMissingMethod
-    1:1:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2554:2554 -> shouldMarkLibraryMethodOverrideAsReachable
-    2:2:boolean com.android.tools.r8.graph.DexEncodedMethod.isAbstract():253:253 -> shouldMarkLibraryMethodOverrideAsReachable
-    2:2:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2556 -> shouldMarkLibraryMethodOverrideAsReachable
-    3:15:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2560:2572 -> shouldMarkLibraryMethodOverrideAsReachable
-    16:16:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> shouldMarkLibraryMethodOverrideAsReachable
-    16:16:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2572 -> shouldMarkLibraryMethodOverrideAsReachable
-    17:29:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2577:2589 -> shouldMarkLibraryMethodOverrideAsReachable
-    1:6:java.util.SortedSet toSortedDescriptorSet(java.util.Set):2328:2333 -> toSortedDescriptorSet
-    1:84:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2349:2432 -> trace
-    85:96:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2431:2442 -> trace
-    97:97:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2440:2440 -> trace
-    1:10: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):2233:2242 -> traceApplication
-    1:63:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexEncodedMethod):595:657 -> traceCallSite
-    64:64:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexEncodedMethod):654:654 -> traceCallSite
-    65:65:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexEncodedMethod):651:651 -> traceCallSite
-    66:66:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexEncodedMethod):648:648 -> traceCallSite
-    67:67:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexEncodedMethod):645:645 -> traceCallSite
-    68:107:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexEncodedMethod):642:681 -> traceCallSite
-    1:1:boolean traceCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):687:687 -> traceCheckCast
-    1:8:boolean traceConstClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):693:700 -> traceConstClass
-    1:10:boolean traceConstClassOrCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):704:713 -> traceConstClassOrCheckCast
-    11:11:boolean traceConstClassOrCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):712:712 -> traceConstClassOrCheckCast
-    1:20:boolean traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):937:956 -> traceInstanceFieldRead
+    3:3:void reportMissingMethod(com.android.tools.r8.graph.DexMethod):1463 -> reportMissingMethod
+    1:4:com.android.tools.r8.graph.ResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1326:1329 -> resolveMethod
+    1:1:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2544:2544 -> shouldMarkLibraryMethodOverrideAsReachable
+    2:2:boolean com.android.tools.r8.graph.DexEncodedMethod.isAbstract():257:257 -> shouldMarkLibraryMethodOverrideAsReachable
+    2:2:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2546 -> shouldMarkLibraryMethodOverrideAsReachable
+    3:15:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2550:2562 -> shouldMarkLibraryMethodOverrideAsReachable
+    16:16:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> shouldMarkLibraryMethodOverrideAsReachable
+    16:16:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2562 -> shouldMarkLibraryMethodOverrideAsReachable
+    17:29:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2567:2579 -> shouldMarkLibraryMethodOverrideAsReachable
+    1:6:java.util.SortedSet toSortedDescriptorSet(java.util.Set):2318:2323 -> toSortedDescriptorSet
+    1:84:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2339:2422 -> trace
+    85:96:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2421:2432 -> trace
+    97:97:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2430:2430 -> trace
+    1:10: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):2225:2234 -> traceApplication
+    1:63:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexEncodedMethod):590:652 -> traceCallSite
+    64:64:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexEncodedMethod):649:649 -> traceCallSite
+    65:65:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexEncodedMethod):646:646 -> traceCallSite
+    66:66:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexEncodedMethod):643:643 -> traceCallSite
+    67:67:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexEncodedMethod):640:640 -> traceCallSite
+    68:107:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexEncodedMethod):637:676 -> traceCallSite
+    1:1:boolean traceCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):682:682 -> traceCheckCast
+    1:8:boolean traceConstClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):688:695 -> traceConstClass
+    1:10:boolean traceConstClassOrCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):699:708 -> traceConstClassOrCheckCast
+    11:11:boolean traceConstClassOrCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):707:707 -> traceConstClassOrCheckCast
+    1:20:boolean traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):932:951 -> traceInstanceFieldRead
     21:21:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> traceInstanceFieldRead
-    21:21:boolean traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):956 -> traceInstanceFieldRead
-    22:30:boolean traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):961:969 -> traceInstanceFieldRead
-    31:31:boolean traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):968:968 -> traceInstanceFieldRead
-    1:20:boolean traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):974:993 -> traceInstanceFieldWrite
+    21:21:boolean traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):951 -> traceInstanceFieldRead
+    22:30:boolean traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):956:964 -> traceInstanceFieldRead
+    31:31:boolean traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):963:963 -> traceInstanceFieldRead
+    1:20:boolean traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):969:988 -> traceInstanceFieldWrite
     21:21:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> traceInstanceFieldWrite
-    21:21:boolean traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):993 -> traceInstanceFieldWrite
-    22:30:boolean traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):998:1006 -> traceInstanceFieldWrite
-    1:13:boolean traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):749:761 -> traceInvokeDirect
-    14:14:boolean traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):760:760 -> traceInvokeDirect
-    15:19:boolean traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):785:789 -> traceInvokeDirect
+    21:21:boolean traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):988 -> traceInstanceFieldWrite
+    22:30:boolean traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):993:1001 -> traceInstanceFieldWrite
+    1:13:boolean traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):744:756 -> traceInvokeDirect
+    14:14:boolean traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):755:755 -> traceInvokeDirect
+    15:19:boolean traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):780:784 -> traceInvokeDirect
     20:20:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> traceInvokeDirect
-    20:20:boolean traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):789 -> traceInvokeDirect
-    21:21:boolean traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):791:791 -> traceInvokeDirect
-    1:1:boolean traceInvokeDirectFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):780:780 -> traceInvokeDirectFromLambda
-    2:2:boolean traceInvokeDirectFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):779:779 -> traceInvokeDirectFromLambda
-    1:1:boolean traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):798:798 -> traceInvokeInterface
-    2:2:boolean traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):797:797 -> traceInvokeInterface
-    3:7:boolean traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):808:812 -> traceInvokeInterface
+    20:20:boolean traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):784 -> traceInvokeDirect
+    21:21:boolean traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):786:786 -> traceInvokeDirect
+    1:1:boolean traceInvokeDirectFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):775:775 -> traceInvokeDirectFromLambda
+    2:2:boolean traceInvokeDirectFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):774:774 -> traceInvokeDirectFromLambda
+    1:1:boolean traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):793:793 -> traceInvokeInterface
+    2:2:boolean traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):792:792 -> traceInvokeInterface
+    3:7:boolean traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):803:807 -> traceInvokeInterface
     8:8:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> traceInvokeInterface
-    8:8:boolean traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):812 -> traceInvokeInterface
-    9:9:boolean traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):814:814 -> traceInvokeInterface
-    1:1:boolean traceInvokeInterfaceFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):803:803 -> traceInvokeInterfaceFromLambda
-    2:2:boolean traceInvokeInterfaceFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):802:802 -> traceInvokeInterfaceFromLambda
-    1:1:boolean traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):821:821 -> traceInvokeStatic
-    2:2:boolean traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):820:820 -> traceInvokeStatic
-    3:26:boolean traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):831:854 -> traceInvokeStatic
+    8:8:boolean traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):807 -> traceInvokeInterface
+    9:9:boolean traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):809:809 -> traceInvokeInterface
+    1:1:boolean traceInvokeInterfaceFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):798:798 -> traceInvokeInterfaceFromLambda
+    2:2:boolean traceInvokeInterfaceFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):797:797 -> traceInvokeInterfaceFromLambda
+    1:1:boolean traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):816:816 -> traceInvokeStatic
+    2:2:boolean traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):815:815 -> traceInvokeStatic
+    3:26:boolean traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):826:849 -> traceInvokeStatic
     27:27:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> traceInvokeStatic
-    27:27:boolean traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):854 -> traceInvokeStatic
-    28:28:boolean traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):856:856 -> traceInvokeStatic
-    1:1:boolean traceInvokeStaticFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):826:826 -> traceInvokeStaticFromLambda
-    2:2:boolean traceInvokeStaticFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):825:825 -> traceInvokeStaticFromLambda
-    1:6:boolean traceInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):864:869 -> traceInvokeSuper
+    27:27:boolean traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):849 -> traceInvokeStatic
+    28:28:boolean traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):851:851 -> traceInvokeStatic
+    1:1:boolean traceInvokeStaticFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):821:821 -> traceInvokeStaticFromLambda
+    2:2:boolean traceInvokeStaticFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):820:820 -> traceInvokeStaticFromLambda
+    1:6:boolean traceInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):859:864 -> traceInvokeSuper
     7:7:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> traceInvokeSuper
-    7:7:boolean traceInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):869 -> traceInvokeSuper
-    8:8:boolean traceInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):871:871 -> traceInvokeSuper
-    1:1:boolean traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):878:878 -> traceInvokeVirtual
-    2:2:boolean traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):877:877 -> traceInvokeVirtual
-    3:10:boolean traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):888:895 -> traceInvokeVirtual
-    11:22:boolean traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):890:901 -> traceInvokeVirtual
+    7:7:boolean traceInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):864 -> traceInvokeSuper
+    8:8:boolean traceInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):866:866 -> traceInvokeSuper
+    1:1:boolean traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):873:873 -> traceInvokeVirtual
+    2:2:boolean traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):872:872 -> traceInvokeVirtual
+    3:10:boolean traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):883:890 -> traceInvokeVirtual
+    11:22:boolean traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):885:896 -> traceInvokeVirtual
     23:23:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> traceInvokeVirtual
-    23:23:boolean traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):901 -> traceInvokeVirtual
-    24:24:boolean traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):903:903 -> traceInvokeVirtual
-    1:1:boolean traceInvokeVirtualFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):883:883 -> traceInvokeVirtualFromLambda
-    2:2:boolean traceInvokeVirtualFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):882:882 -> traceInvokeVirtualFromLambda
-    1:8:java.util.Set traceMainDex(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2217:2224 -> traceMainDex
+    23:23:boolean traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):896 -> traceInvokeVirtual
+    24:24:boolean traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):898:898 -> traceInvokeVirtual
+    1:1:boolean traceInvokeVirtualFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):878:878 -> traceInvokeVirtualFromLambda
+    2:2:boolean traceInvokeVirtualFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):877:877 -> traceInvokeVirtualFromLambda
+    1:8:java.util.Set traceMainDex(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2209:2216 -> traceMainDex
     1:1:boolean com.android.tools.r8.graph.DexMethodHandle.isMethodHandle():297:297 -> traceMethodHandle
-    1:1:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.DexEncodedMethod):728 -> traceMethodHandle
-    2:10:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.DexEncodedMethod):728:736 -> traceMethodHandle
-    1:8:boolean traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):908:915 -> traceNewInstance
-    9:14:boolean traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):925:930 -> traceNewInstance
-    1:1:boolean traceNewInstanceFromLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):920:920 -> traceNewInstanceFromLambda
-    2:2:boolean traceNewInstanceFromLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):919:919 -> traceNewInstanceFromLambda
-    1:19:boolean traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):1011:1029 -> traceStaticFieldRead
+    1:1:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.DexEncodedMethod):723 -> traceMethodHandle
+    2:10:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.DexEncodedMethod):723:731 -> traceMethodHandle
+    1:8:boolean traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):903:910 -> traceNewInstance
+    9:14:boolean traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):920:925 -> traceNewInstance
+    1:1:boolean traceNewInstanceFromLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):915:915 -> traceNewInstanceFromLambda
+    2:2:boolean traceNewInstanceFromLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):914:914 -> traceNewInstanceFromLambda
+    1:19:boolean traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):1006:1024 -> traceStaticFieldRead
     20:20:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> traceStaticFieldRead
-    20:20:boolean traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):1029 -> traceStaticFieldRead
-    21:28:boolean traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):1032:1039 -> traceStaticFieldRead
-    29:45:boolean traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):1035:1051 -> traceStaticFieldRead
-    1:19:boolean traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):1056:1074 -> traceStaticFieldWrite
+    20:20:boolean traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):1024 -> traceStaticFieldRead
+    21:28:boolean traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):1027:1034 -> traceStaticFieldRead
+    29:45:boolean traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):1030:1046 -> traceStaticFieldRead
+    1:19:boolean traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):1051:1069 -> traceStaticFieldWrite
     20:20:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> traceStaticFieldWrite
-    20:20:boolean traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):1074 -> traceStaticFieldWrite
-    21:28:boolean traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):1077:1084 -> traceStaticFieldWrite
-    29:45:boolean traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):1080:1096 -> traceStaticFieldWrite
-    1:1:boolean traceTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):743:743 -> traceTypeReference
-    1:8:void transitionDefaultMethodsForInstantiatedClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ScopedDexMethodSet):1701:1708 -> transitionDefaultMethodsForInstantiatedClass
-    1:4:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexClass):1749:1752 -> transitionDependentItemsForInstantiatedClass
-    5:5:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> transitionDependentItemsForInstantiatedClass
-    5:5:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexClass):1752 -> transitionDependentItemsForInstantiatedClass
-    6:7:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexClass):1754:1755 -> transitionDependentItemsForInstantiatedClass
-    1:9:void transitionFieldsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1734:1742 -> transitionFieldsForInstantiatedClass
-    1:22:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1571:1592 -> transitionMethodsForInstantiatedClass
-    23:23:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> transitionMethodsForInstantiatedClass
-    23:23:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1592 -> transitionMethodsForInstantiatedClass
-    24:50:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1594:1620 -> transitionMethodsForInstantiatedClass
-    51:51:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> transitionMethodsForInstantiatedClass
-    51:51:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1620 -> transitionMethodsForInstantiatedClass
-    52:56:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1622:1626 -> transitionMethodsForInstantiatedClass
-    57:57:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> transitionMethodsForInstantiatedClass
-    57:57:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1626 -> transitionMethodsForInstantiatedClass
-    58:58:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1628:1628 -> transitionMethodsForInstantiatedClass
-    1:9:void transitionNonAbstractMethodsToLiveAndShadow(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet,com.android.tools.r8.shaking.ScopedDexMethodSet):1714:1722 -> transitionNonAbstractMethodsToLiveAndShadow
-    10:10:void transitionNonAbstractMethodsToLiveAndShadow(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet,com.android.tools.r8.shaking.ScopedDexMethodSet):1721:1721 -> transitionNonAbstractMethodsToLiveAndShadow
-    11:11:void transitionNonAbstractMethodsToLiveAndShadow(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet,com.android.tools.r8.shaking.ScopedDexMethodSet):1718:1718 -> transitionNonAbstractMethodsToLiveAndShadow
-    1:3:void transitionReachableVirtualMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet):1106:1108 -> transitionReachableVirtualMethods
-    1:9:void transitionUnusedInterfaceToLive(com.android.tools.r8.graph.DexProgramClass):1759:1767 -> transitionUnusedInterfaceToLive
-    1:5:void unpinLambdaMethods():2499:2503 -> unpinLambdaMethods
-    1:3:boolean verifyKeptGraph():2256:2258 -> verifyKeptGraph
-    1:2:boolean verifyMethodIsTargeted(com.android.tools.r8.graph.DexEncodedMethod):1131:1132 -> verifyMethodIsTargeted
-    1:1:boolean verifyTypeIsLive(com.android.tools.r8.graph.DexProgramClass):1137:1137 -> verifyTypeIsLive
-    1:5:void warnIfLibraryTypeInheritsFromProgramType(com.android.tools.r8.graph.DexLibraryClass):383:387 -> warnIfLibraryTypeInheritsFromProgramType
+    20:20:boolean traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):1069 -> traceStaticFieldWrite
+    21:28:boolean traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):1072:1079 -> traceStaticFieldWrite
+    29:45:boolean traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):1075:1091 -> traceStaticFieldWrite
+    1:1:boolean traceTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):738:738 -> traceTypeReference
+    1:8:void transitionDefaultMethodsForInstantiatedClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ScopedDexMethodSet):1697:1704 -> transitionDefaultMethodsForInstantiatedClass
+    1:4:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexClass):1745:1748 -> transitionDependentItemsForInstantiatedClass
+    5:5:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> transitionDependentItemsForInstantiatedClass
+    5:5:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexClass):1748 -> transitionDependentItemsForInstantiatedClass
+    6:7:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexClass):1750:1751 -> transitionDependentItemsForInstantiatedClass
+    1:9:void transitionFieldsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1730:1738 -> transitionFieldsForInstantiatedClass
+    1:22:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1567:1588 -> transitionMethodsForInstantiatedClass
+    23:23:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> transitionMethodsForInstantiatedClass
+    23:23:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1588 -> transitionMethodsForInstantiatedClass
+    24:50:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1590:1616 -> transitionMethodsForInstantiatedClass
+    51:51:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> transitionMethodsForInstantiatedClass
+    51:51:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1616 -> transitionMethodsForInstantiatedClass
+    52:56:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1618:1622 -> transitionMethodsForInstantiatedClass
+    57:57:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> transitionMethodsForInstantiatedClass
+    57:57:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1622 -> transitionMethodsForInstantiatedClass
+    58:58:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1624:1624 -> transitionMethodsForInstantiatedClass
+    1:9:void transitionNonAbstractMethodsToLiveAndShadow(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet,com.android.tools.r8.shaking.ScopedDexMethodSet):1710:1718 -> transitionNonAbstractMethodsToLiveAndShadow
+    10:10:void transitionNonAbstractMethodsToLiveAndShadow(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet,com.android.tools.r8.shaking.ScopedDexMethodSet):1717:1717 -> transitionNonAbstractMethodsToLiveAndShadow
+    11:11:void transitionNonAbstractMethodsToLiveAndShadow(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet,com.android.tools.r8.shaking.ScopedDexMethodSet):1714:1714 -> transitionNonAbstractMethodsToLiveAndShadow
+    1:3:void transitionReachableVirtualMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet):1101:1103 -> transitionReachableVirtualMethods
+    1:9:void transitionUnusedInterfaceToLive(com.android.tools.r8.graph.DexProgramClass):1755:1763 -> transitionUnusedInterfaceToLive
+    1:5:void unpinLambdaMethods():2489:2493 -> unpinLambdaMethods
+    1:3:boolean verifyKeptGraph():2248:2250 -> verifyKeptGraph
+    1:2:boolean verifyMethodIsTargeted(com.android.tools.r8.graph.DexEncodedMethod):1126:1127 -> verifyMethodIsTargeted
+    1:1:boolean verifyTypeIsLive(com.android.tools.r8.graph.DexProgramClass):1132:1132 -> verifyTypeIsLive
+    1:5:void warnIfLibraryTypeInheritsFromProgramType(com.android.tools.r8.graph.DexLibraryClass):378:382 -> warnIfLibraryTypeInheritsFromProgramType
 com.android.tools.r8.shaking.Enqueuer$1 -> com.android.tools.r8.shaking.Enqueuer$1:
-    1:1:void <clinit>():640:640 -> <clinit>
+    1:1:void <clinit>():635:635 -> <clinit>
 com.android.tools.r8.shaking.Enqueuer$AnnotationReferenceMarker -> com.android.tools.r8.shaking.Enqueuer$AnnotationReferenceMarker:
-    1:1:void <init>(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.shaking.Enqueuer$1):3197:3197 -> <init>
-    2:5:void <init>(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.shaking.KeepReason):3204:3207 -> <init>
-    1:1:boolean addField(com.android.tools.r8.graph.DexField):3217:3217 -> addField
-    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> addField
-    2:2:boolean addField(com.android.tools.r8.graph.DexField):3217 -> addField
-    3:13:boolean addField(com.android.tools.r8.graph.DexField):3221:3231 -> addField
-    14:14:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():345:345 -> addField
-    14:14:boolean addField(com.android.tools.r8.graph.DexField):3231 -> addField
-    15:27:boolean addField(com.android.tools.r8.graph.DexField):3231:3243 -> addField
-    1:10:boolean addMethod(com.android.tools.r8.graph.DexMethod):3251:3260 -> addMethod
-    11:18:boolean addMethod(com.android.tools.r8.graph.DexMethod):3259:3266 -> addMethod
-    1:2:boolean addType(com.android.tools.r8.graph.DexType):3296:3297 -> addType
+    1:1:void <init>(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.shaking.Enqueuer$1):3188:3188 -> <init>
+    2:5:void <init>(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.shaking.KeepReason):3195:3198 -> <init>
+    1:1:boolean addField(com.android.tools.r8.graph.DexField):3208:3208 -> addField
+    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> addField
+    2:2:boolean addField(com.android.tools.r8.graph.DexField):3208 -> addField
+    3:13:boolean addField(com.android.tools.r8.graph.DexField):3212:3222 -> addField
+    14:14:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():337:337 -> addField
+    14:14:boolean addField(com.android.tools.r8.graph.DexField):3222 -> addField
+    15:27:boolean addField(com.android.tools.r8.graph.DexField):3222:3234 -> addField
+    1:10:boolean addMethod(com.android.tools.r8.graph.DexMethod):3242:3251 -> addMethod
+    11:18:boolean addMethod(com.android.tools.r8.graph.DexMethod):3250:3257 -> addMethod
+    1:2:boolean addType(com.android.tools.r8.graph.DexType):3287:3288 -> addType
     1:1:com.android.tools.r8.graph.DexString com.android.tools.r8.dex.IndexedItemCollection.getRenamedDescriptor(com.android.tools.r8.graph.DexType):111:111 -> getRenamedDescriptor
     1:1:com.android.tools.r8.graph.DexString getRenamedDescriptor(com.android.tools.r8.graph.DexType):0 -> getRenamedDescriptor
     1:1:com.android.tools.r8.graph.DexString com.android.tools.r8.dex.IndexedItemCollection.getRenamedName(com.android.tools.r8.graph.DexMethod):103:103 -> getRenamedName
@@ -57148,19 +57358,19 @@
     2:2:com.android.tools.r8.graph.DexString com.android.tools.r8.dex.IndexedItemCollection.getRenamedName(com.android.tools.r8.graph.DexField):107:107 -> getRenamedName
     2:2:com.android.tools.r8.graph.DexString getRenamedName(com.android.tools.r8.graph.DexField):0 -> getRenamedName
 com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet -> com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet:
-    1:1:void <init>(com.android.tools.r8.shaking.Enqueuer,java.util.function.BiConsumer):3060:3060 -> <init>
-    2:7:void <init>(com.android.tools.r8.shaking.Enqueuer,java.util.function.BiConsumer):3056:3061 -> <init>
-    1:1:java.util.Set access$400(com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet):3054:3054 -> access$400
-    1:3:boolean add(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):3065:3067 -> add
-    1:1:boolean contains(com.android.tools.r8.graph.DexEncodedMethod):3071:3071 -> contains
-    1:1:java.util.Set getItems():3075:3075 -> getItems
+    1:1:void <init>(com.android.tools.r8.shaking.Enqueuer,java.util.function.BiConsumer):3051:3051 -> <init>
+    2:7:void <init>(com.android.tools.r8.shaking.Enqueuer,java.util.function.BiConsumer):3047:3052 -> <init>
+    1:1:java.util.Set access$400(com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet):3045:3045 -> access$400
+    1:3:boolean add(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):3056:3058 -> add
+    1:1:boolean contains(com.android.tools.r8.graph.DexEncodedMethod):3062:3062 -> contains
+    1:1:java.util.Set getItems():3066:3066 -> getItems
 com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget -> com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget:
-    1:3:void <clinit>():3103:3105 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):3114:3117 -> <init>
-    1:2:boolean equals(java.lang.Object):3133:3134 -> equals
-    1:1:int hashCode():3127:3127 -> hashCode
-    1:1:boolean isUnresolved():3121:3121 -> isUnresolved
-    1:1:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget unresolved():3111:3111 -> unresolved
+    1:3:void <clinit>():3094:3096 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):3105:3108 -> <init>
+    1:2:boolean equals(java.lang.Object):3124:3125 -> equals
+    1:1:int hashCode():3118:3118 -> hashCode
+    1:1:boolean isUnresolved():3112:3112 -> isUnresolved
+    1:1:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget unresolved():3102:3102 -> unresolved
 com.android.tools.r8.shaking.Enqueuer$Mode -> com.android.tools.r8.shaking.Enqueuer$Mode:
     1:4:void <clinit>():114:117 -> <clinit>
     5:5:void <clinit>():113:113 -> <clinit>
@@ -57172,34 +57382,34 @@
     1:1:com.android.tools.r8.shaking.Enqueuer$Mode valueOf(java.lang.String):113:113 -> valueOf
     1:1:com.android.tools.r8.shaking.Enqueuer$Mode[] values():113:113 -> values
 com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet -> com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet:
-    1:4:void <init>():3138:3141 -> <init>
-    5:5:void <init>(com.android.tools.r8.shaking.Enqueuer$1):3138:3138 -> <init>
-    1:8:boolean add(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget):3152:3159 -> add
-    1:1:java.util.Set getMethods():3144:3144 -> getMethods
-    1:1:java.util.Set getReasons(com.android.tools.r8.graph.DexEncodedMethod):3148:3148 -> getReasons
+    1:4:void <init>():3129:3132 -> <init>
+    5:5:void <init>(com.android.tools.r8.shaking.Enqueuer$1):3129:3129 -> <init>
+    1:8:boolean add(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget):3143:3150 -> add
+    1:1:java.util.Set getMethods():3135:3135 -> getMethods
+    1:1:java.util.Set getReasons(com.android.tools.r8.graph.DexEncodedMethod):3139:3139 -> getReasons
 com.android.tools.r8.shaking.Enqueuer$SetWithReason -> com.android.tools.r8.shaking.Enqueuer$SetWithReason:
-    1:1:void <init>(java.util.function.BiConsumer):3085:3085 -> <init>
-    2:7:void <init>(java.util.function.BiConsumer):3081:3086 -> <init>
-    1:1:java.util.Set access$200(com.android.tools.r8.shaking.Enqueuer$SetWithReason):3079:3079 -> access$200
-    1:2:boolean add(java.lang.Object,com.android.tools.r8.shaking.KeepReason):3090:3091 -> add
-    1:1:boolean contains(java.lang.Object):3095:3095 -> contains
-    1:1:java.util.Set getItems():3099:3099 -> getItems
+    1:1:void <init>(java.util.function.BiConsumer):3076:3076 -> <init>
+    2:7:void <init>(java.util.function.BiConsumer):3072:3077 -> <init>
+    1:1:java.util.Set access$200(com.android.tools.r8.shaking.Enqueuer$SetWithReason):3070:3070 -> access$200
+    1:2:boolean add(java.lang.Object,com.android.tools.r8.shaking.KeepReason):3081:3082 -> add
+    1:1:boolean contains(java.lang.Object):3086:3086 -> contains
+    1:1:java.util.Set getItems():3090:3090 -> getItems
 com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason -> com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason:
-    1:1:void <clinit>():3023:3023 -> <clinit>
-    1:4:void <init>():3023:3026 -> <init>
-    5:5:void <init>(com.android.tools.r8.shaking.Enqueuer$1):3023:3023 -> <init>
-    1:1:java.util.List lambda$registerDeferredAction$0(java.lang.Object):3043:3043 -> a
-    1:1:java.util.Set access$300(com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason):3023:3023 -> access$300
-    1:3:boolean add(java.lang.Object,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):3029:3031 -> add
-    1:1:boolean contains(java.lang.Object):3038:3038 -> contains
-    1:1:java.util.Set getItems():3050:3050 -> getItems
-    1:2:boolean registerDeferredAction(java.lang.Object,com.android.tools.r8.utils.Action):3042:3043 -> registerDeferredAction
+    1:1:void <clinit>():3014:3014 -> <clinit>
+    1:4:void <init>():3014:3017 -> <init>
+    5:5:void <init>(com.android.tools.r8.shaking.Enqueuer$1):3014:3014 -> <init>
+    1:1:java.util.List lambda$registerDeferredAction$0(java.lang.Object):3034:3034 -> a
+    1:1:java.util.Set access$300(com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason):3014:3014 -> access$300
+    1:3:boolean add(java.lang.Object,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):3020:3022 -> add
+    1:1:boolean contains(java.lang.Object):3029:3029 -> contains
+    1:1:java.util.Set getItems():3041:3041 -> getItems
+    1:2:boolean registerDeferredAction(java.lang.Object,com.android.tools.r8.utils.Action):3033:3034 -> registerDeferredAction
 com.android.tools.r8.shaking.Enqueuer$TargetWithContext -> com.android.tools.r8.shaking.Enqueuer$TargetWithContext:
-    1:3:void <init>(com.android.tools.r8.graph.Descriptor,com.android.tools.r8.graph.DexEncodedMethod):3169:3171 -> <init>
-    1:5:boolean equals(java.lang.Object):3189:3193 -> equals
-    1:1:com.android.tools.r8.graph.DexEncodedMethod getContext():3179:3179 -> getContext
-    1:1:com.android.tools.r8.graph.Descriptor getTarget():3175:3175 -> getTarget
-    1:1:int hashCode():3184:3184 -> hashCode
+    1:3:void <init>(com.android.tools.r8.graph.Descriptor,com.android.tools.r8.graph.DexEncodedMethod):3160:3162 -> <init>
+    1:5:boolean equals(java.lang.Object):3180:3184 -> equals
+    1:1:com.android.tools.r8.graph.DexEncodedMethod getContext():3170:3170 -> getContext
+    1:1:com.android.tools.r8.graph.Descriptor getTarget():3166:3166 -> getTarget
+    1:1:int hashCode():3175:3175 -> hashCode
 com.android.tools.r8.shaking.EnqueuerFactory -> com.android.tools.r8.shaking.EnqueuerFactory:
     1:1:void <init>():12:12 -> <init>
     1:1:com.android.tools.r8.shaking.Enqueuer createForFinalTreeShaking(com.android.tools.r8.graph.AppView,com.android.tools.r8.experimental.graphinfo.GraphConsumer):21:21 -> createForFinalTreeShaking
@@ -57290,16 +57500,16 @@
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo lambda$getEdgeInfo$0(com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind):409:409 -> a
     2:6:com.android.tools.r8.experimental.graphinfo.AnnotationGraphNode lambda$getAnnotationGraphNode$1(com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexItem):416:420 -> a
     7:7:com.android.tools.r8.experimental.graphinfo.ClassGraphNode lambda$getClassGraphNode$2(com.android.tools.r8.graph.DexType):428:428 -> a
-    8:8:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    8:8:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     8:8:com.android.tools.r8.experimental.graphinfo.ClassGraphNode lambda$getClassGraphNode$2(com.android.tools.r8.graph.DexType):428 -> a
     9:11:com.android.tools.r8.experimental.graphinfo.ClassGraphNode lambda$getClassGraphNode$2(com.android.tools.r8.graph.DexType):429:431 -> a
     12:12:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):439:439 -> a
-    13:13:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    13:13:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     13:13:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):439 -> a
     14:26:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):440:452 -> a
     27:27:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):446:446 -> a
     28:28:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$4(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):460:460 -> a
-    29:29:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    29:29:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     29:29:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$4(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):460 -> a
     30:35:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$4(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):461:466 -> a
     36:36:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$4(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):463:463 -> a
@@ -57315,7 +57525,7 @@
     1:1:com.android.tools.r8.experimental.graphinfo.MethodGraphNode getMethodGraphNode(com.android.tools.r8.graph.DexMethod):436:436 -> getMethodGraphNode
     1:1:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.KeepReason):388:388 -> getSourceNode
     1:1:boolean isNonProgramClass(com.android.tools.r8.graph.DexType):383:383 -> isNonProgramClass
-    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> isNonProgramClass
+    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> isNonProgramClass
     2:2:boolean isNonProgramClass(com.android.tools.r8.graph.DexType):383 -> isNonProgramClass
     3:3:boolean isNonProgramClass(com.android.tools.r8.graph.DexType):384:384 -> isNonProgramClass
     1:4:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.shaking.KeepReason):346:349 -> registerAnnotation
@@ -57334,10 +57544,10 @@
     1:4:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):192:195 -> reportCompatInstantiated
     5:10:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):193:198 -> reportCompatInstantiated
     1:2:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):170:171 -> reportCompatKeepDefaultInitializer
-    3:3:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():742:742 -> reportCompatKeepDefaultInitializer
+    3:3:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():792:792 -> reportCompatKeepDefaultInitializer
     3:3:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):171 -> reportCompatKeepDefaultInitializer
     4:4:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):171:171 -> reportCompatKeepDefaultInitializer
-    5:5:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():742:742 -> reportCompatKeepDefaultInitializer
+    5:5:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():792:792 -> reportCompatKeepDefaultInitializer
     5:5:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):171 -> reportCompatKeepDefaultInitializer
     6:9:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):172:175 -> reportCompatKeepDefaultInitializer
     10:15:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):173:178 -> reportCompatKeepDefaultInitializer
@@ -57383,21 +57593,21 @@
     6:7:boolean canRemoveSubsequentKeepRule(com.android.tools.r8.shaking.ProguardIfRule):166:167 -> canRemoveSubsequentKeepRule
     1:15:boolean evaluateClassForIfRule(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):214:228 -> evaluateClassForIfRule
     1:2:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):235:236 -> evaluateIfRuleMembersAndMaterialize
-    3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():720:720 -> evaluateIfRuleMembersAndMaterialize
-    3:3:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClass.toReference():653 -> evaluateIfRuleMembersAndMaterialize
+    3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():770:770 -> evaluateIfRuleMembersAndMaterialize
+    3:3:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClass.toReference():703 -> evaluateIfRuleMembersAndMaterialize
     3:3:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):237 -> evaluateIfRuleMembersAndMaterialize
     4:11:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):237:244 -> evaluateIfRuleMembersAndMaterialize
     12:21:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):242:251 -> evaluateIfRuleMembersAndMaterialize
     22:51:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):249:278 -> evaluateIfRuleMembersAndMaterialize
-    52:52:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():720:720 -> evaluateIfRuleMembersAndMaterialize
-    52:52:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClass.toReference():653 -> evaluateIfRuleMembersAndMaterialize
+    52:52:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():770:770 -> evaluateIfRuleMembersAndMaterialize
+    52:52:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClass.toReference():703 -> evaluateIfRuleMembersAndMaterialize
     52:52:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):284 -> evaluateIfRuleMembersAndMaterialize
     53:54:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):284:285 -> evaluateIfRuleMembersAndMaterialize
     1:10:boolean isEffectivelyLive(com.android.tools.r8.graph.DexProgramClass):191:200 -> isEffectivelyLive
     1:26:void materializeIfRule(com.android.tools.r8.shaking.ProguardIfRule,java.util.Set):294:319 -> materializeIfRule
     1:5:void registerClassCapture(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):179:183 -> registerClassCapture
     1:55:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet run():69:123 -> run
-    56:56:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> run
+    56:56:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> run
     56:56:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet run():123 -> run
     57:93:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet run():124:160 -> run
     94:94:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet run():158:158 -> run
@@ -57517,7 +57727,7 @@
     5:8:void lambda$logResults$2(java.lang.Class):174:177 -> a
     9:9:void lambda$logResults$2(java.lang.Class):173:173 -> a
     1:13:void analyze(com.android.tools.r8.ir.code.IRCode):106:118 -> analyze
-    14:14:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> analyze
+    14:14:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> analyze
     14:14:void analyze(com.android.tools.r8.ir.code.IRCode):118 -> analyze
     15:30:void analyze(com.android.tools.r8.ir.code.IRCode):119:134 -> analyze
     31:31:void analyze(com.android.tools.r8.ir.code.IRCode):133:133 -> analyze
@@ -57630,7 +57840,7 @@
     1:3:com.android.tools.r8.shaking.MainDexClasses run():61:63 -> run
     1:2:void traceMainDexDirectDependencies():133:134 -> traceMainDexDirectDependencies
     1:12:void traceRuntimeAnnotationsWithEnumForMainDex():67:78 -> traceRuntimeAnnotationsWithEnumForMainDex
-    13:35:void com.android.tools.r8.graph.DexClass.forEachAnnotation(java.util.function.Consumer):359:381 -> traceRuntimeAnnotationsWithEnumForMainDex
+    13:35:void com.android.tools.r8.graph.DexClass.forEachAnnotation(java.util.function.Consumer):409:431 -> traceRuntimeAnnotationsWithEnumForMainDex
     13:35:void traceRuntimeAnnotationsWithEnumForMainDex():78 -> traceRuntimeAnnotationsWithEnumForMainDex
 com.android.tools.r8.shaking.MemberValuePropagationRule -> com.android.tools.r8.shaking.MemberValuePropagationRule:
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.shaking.MemberValuePropagationRule$1):11:11 -> <init>
@@ -58018,7 +58228,7 @@
     1:2:com.android.tools.r8.shaking.ProguardConfiguration getConfig():154:155 -> getConfig
     1:2:com.android.tools.r8.shaking.ProguardConfiguration getConfigRawForTesting():163:164 -> getConfigRawForTesting
     1:1:com.android.tools.r8.shaking.ProguardConfiguration$Builder getConfigurationBuilder():122:122 -> getConfigurationBuilder
-    1:7:java.lang.String getTextSourceSnippet(java.lang.String,com.android.tools.r8.position.TextPosition,com.android.tools.r8.position.TextPosition):2035:2041 -> getTextSourceSnippet
+    1:7:java.lang.String getTextSourceSnippet(java.lang.String,com.android.tools.r8.position.TextPosition,com.android.tools.r8.position.TextPosition):2041:2047 -> getTextSourceSnippet
     1:1:void parse(java.nio.file.Path):168:168 -> parse
     2:2:void parse(com.android.tools.r8.shaking.ProguardConfigurationSource):172:172 -> parse
     3:10:void parse(java.util.List):176:183 -> parse
@@ -58029,13 +58239,13 @@
     8:10:void validate():129 -> validate
     11:22:void validate():134:145 -> validate
 com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards -> com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards:
-    1:3:void <init>(java.lang.String,java.util.List):2049:2051 -> <init>
-    1:2:boolean hasBackreference():2063:2064 -> hasBackreference
-    1:15:boolean hasUnusualCharacters():2068:2082 -> hasUnusualCharacters
-    1:1:boolean isMatchAllNames():2059:2059 -> isMatchAllNames
-    1:1:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards withoutWildcards(java.lang.String):2055:2055 -> withoutWildcards
+    1:3:void <init>(java.lang.String,java.util.List):2055:2057 -> <init>
+    1:2:boolean hasBackreference():2069:2070 -> hasBackreference
+    1:15:boolean hasUnusualCharacters():2074:2088 -> hasUnusualCharacters
+    1:1:boolean isMatchAllNames():2065:2065 -> isMatchAllNames
+    1:1:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards withoutWildcards(java.lang.String):2061:2061 -> withoutWildcards
 com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation -> com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation:
-    1:3:void <init>(java.lang.String,java.util.List,boolean):2093:2095 -> <init>
+    1:3:void <init>(java.lang.String,java.util.List,boolean):2099:2101 -> <init>
 com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType -> com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType:
     1:3:void <clinit>():190:192 -> <clinit>
     4:4:void <clinit>():189:189 -> <clinit>
@@ -58045,198 +58255,199 @@
 com.android.tools.r8.shaking.ProguardConfigurationParser$ProguardConfigurationSourceParser -> com.android.tools.r8.shaking.ProguardConfigurationParser$ProguardConfigurationSourceParser:
     1:1:void <clinit>():195:195 -> <clinit>
     1:1:void <init>(com.android.tools.r8.shaking.ProguardConfigurationParser,com.android.tools.r8.shaking.ProguardConfigurationSource):205:205 -> <init>
-    2:1402:void <init>(com.android.tools.r8.shaking.ProguardConfigurationParser,com.android.tools.r8.shaking.ProguardConfigurationSource):198:1598 -> <init>
-    1403:1406:void <init>(com.android.tools.r8.shaking.ProguardConfigurationParser,com.android.tools.r8.shaking.ProguardConfigurationSource):207:210 -> <init>
-    1:4:boolean lambda$parseFileName$1(boolean,char,boolean,java.lang.Integer):1347:1350 -> a
-    5:5:boolean lambda$acceptQuotedOrUnquotedString$4(char,java.lang.Integer):1573:1573 -> a
-    6:8:boolean lambda$acceptPattern$7(java.lang.Integer):1798:1800 -> a
-    1:7:boolean acceptArobaseInclude():537:543 -> acceptArobaseInclude
-    1:2:boolean acceptChar(char):1507:1508 -> acceptChar
-    1:1:java.lang.String acceptClassName():1606:1606 -> acceptClassName
-    1:22:java.lang.String acceptFieldNameOrIntegerForReturn():1738:1759 -> acceptFieldNameOrIntegerForReturn
-    1:6:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType):1611:1616 -> acceptIdentifierWithBackreference
-    7:33:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1621:1647 -> acceptIdentifierWithBackreference
-    34:35:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1642:1643 -> acceptIdentifierWithBackreference
+    2:1408:void <init>(com.android.tools.r8.shaking.ProguardConfigurationParser,com.android.tools.r8.shaking.ProguardConfigurationSource):198:1604 -> <init>
+    1409:1412:void <init>(com.android.tools.r8.shaking.ProguardConfigurationParser,com.android.tools.r8.shaking.ProguardConfigurationSource):207:210 -> <init>
+    1:4:boolean lambda$parseFileName$1(boolean,char,boolean,java.lang.Integer):1353:1356 -> a
+    5:5:boolean lambda$acceptQuotedOrUnquotedString$4(char,java.lang.Integer):1579:1579 -> a
+    6:8:boolean lambda$acceptPattern$7(java.lang.Integer):1804:1806 -> a
+    1:7:boolean acceptArobaseInclude():543:549 -> acceptArobaseInclude
+    1:2:boolean acceptChar(char):1513:1514 -> acceptChar
+    1:1:java.lang.String acceptClassName():1612:1612 -> acceptClassName
+    1:22:java.lang.String acceptFieldNameOrIntegerForReturn():1744:1765 -> acceptFieldNameOrIntegerForReturn
+    1:6:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType):1617:1622 -> acceptIdentifierWithBackreference
+    7:33:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1627:1653 -> acceptIdentifierWithBackreference
+    34:35:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1648:1649 -> acceptIdentifierWithBackreference
     36:38:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> acceptIdentifierWithBackreference
-    36:38:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1642 -> acceptIdentifierWithBackreference
-    39:41:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1650:1652 -> acceptIdentifierWithBackreference
+    36:38:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1648 -> acceptIdentifierWithBackreference
+    39:41:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1656:1658 -> acceptIdentifierWithBackreference
     42:44:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> acceptIdentifierWithBackreference
-    42:44:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1650 -> acceptIdentifierWithBackreference
-    45:51:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1656:1662 -> acceptIdentifierWithBackreference
+    42:44:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1656 -> acceptIdentifierWithBackreference
+    45:51:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1662:1668 -> acceptIdentifierWithBackreference
     52:54:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> acceptIdentifierWithBackreference
-    52:54:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1661 -> acceptIdentifierWithBackreference
-    55:98:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1673:1716 -> acceptIdentifierWithBackreference
+    52:54:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1667 -> acceptIdentifierWithBackreference
+    55:98:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1679:1722 -> acceptIdentifierWithBackreference
     99:101:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> acceptIdentifierWithBackreference
-    99:101:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1712 -> acceptIdentifierWithBackreference
-    102:102:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1706:1706 -> acceptIdentifierWithBackreference
-    103:130:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1701:1728 -> acceptIdentifierWithBackreference
+    99:101:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1718 -> acceptIdentifierWithBackreference
+    102:102:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1712:1712 -> acceptIdentifierWithBackreference
+    103:130:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1707:1734 -> acceptIdentifierWithBackreference
     131:133:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> acceptIdentifierWithBackreference
-    131:133:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1727 -> acceptIdentifierWithBackreference
-    134:135:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1733:1734 -> acceptIdentifierWithBackreference
-    1:5:java.lang.Integer acceptInteger():1581:1585 -> acceptInteger
-    1:1:java.lang.String acceptPattern():1796:1796 -> acceptPattern
-    1:28:java.util.List acceptPatternList():1763:1790 -> acceptPatternList
-    1:1:char acceptQuoteIfPresent():1516:1516 -> acceptQuoteIfPresent
-    1:4:java.lang.String acceptQuotedOrUnquotedString():1572:1575 -> acceptQuotedOrUnquotedString
-    1:9:boolean acceptString(java.lang.String):1555:1563 -> acceptString
-    10:10:java.lang.String acceptString():1568:1568 -> acceptString
-    11:25:java.lang.String acceptString(java.util.function.Predicate):1804:1818 -> acceptString
-    1:1:boolean lambda$acceptString$3(java.lang.Integer):1568:1568 -> b
-    1:7:boolean lambda$new$5(java.lang.Integer):1590:1596 -> c
-    1:10:void checkConstructorPattern(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards,com.android.tools.r8.position.TextPosition):1260:1269 -> checkConstructorPattern
-    11:11:void checkConstructorPattern(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards,com.android.tools.r8.position.TextPosition):1266:1266 -> checkConstructorPattern
-    1:4:boolean lambda$new$6(java.lang.Integer):1600:1603 -> d
-    1:2:boolean lambda$parseFileFilter$2(java.lang.Integer):1405:1406 -> e
-    1:1:boolean eof():1481:1481 -> eof
-    2:2:boolean eof(int):1485:1485 -> eof
-    1:2:void expectChar(char):1549:1550 -> expectChar
-    1:5:void expectClosingQuote(char):1520:1524 -> expectClosingQuote
-    6:6:void expectClosingQuote(char):1522:1522 -> expectClosingQuote
-    1:1:boolean lambda$skipOptimizationName$0(java.lang.Integer):629:629 -> f
-    1:1:int getColumn():2024:2024 -> getColumn
-    1:4:com.android.tools.r8.position.Position getPosition(com.android.tools.r8.position.TextPosition):2012:2015 -> getPosition
-    5:5:com.android.tools.r8.position.TextPosition getPosition():2020:2020 -> getPosition
-    1:2:java.lang.String getSourceSnippet(java.lang.String,com.android.tools.r8.position.Position,com.android.tools.r8.position.Position):2028:2029 -> getSourceSnippet
-    1:4:boolean hasNextChar(char):1489:1492 -> hasNextChar
-    5:8:boolean hasNextChar(java.util.function.Predicate):1496:1499 -> hasNextChar
-    1:2:void infoIgnoringModifier(java.lang.String,com.android.tools.r8.position.TextPosition):2007:2008 -> infoIgnoringModifier
-    3:3:void infoIgnoringModifier(java.lang.String,com.android.tools.r8.position.TextPosition):2007:2007 -> infoIgnoringModifier
-    1:2:void infoIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):1982:1983 -> infoIgnoringOptions
-    3:3:void infoIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):1982:1982 -> infoIgnoringOptions
-    1:2:boolean isInteger(java.lang.String):1472:1473 -> isInteger
-    1:1:boolean isOptionalArgumentGiven():1503:1503 -> isOptionalArgumentGiven
-    1:4:void parse():215:218 -> parse
-    1:13:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():903:915 -> parseAnnotation
-    14:14:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():914:914 -> parseAnnotation
-    1:12:java.util.List parseArgumentList():1275:1286 -> parseArgumentList
-    13:22:java.util.List parseArgumentList():1283:1292 -> parseArgumentList
-    23:25:java.util.List parseArgumentList():1291:1293 -> parseArgumentList
-    26:33:java.util.List parseArgumentList():1290:1297 -> parseArgumentList
-    1:6:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1428:1433 -> parseAssumeMayHaveSideEffectsRule
-    1:8:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1415:1422 -> parseAssumeNoSideEffectsRule
-    1:8:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1438:1445 -> parseAssumeValuesRule
-    1:8:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):680:687 -> parseCheckDiscardRule
-    1:6:void parseClassFilter(java.util.function.Consumer):1850:1855 -> parseClassFilter
-    7:7:void parseClassFilter(java.util.function.Consumer):1854:1854 -> parseClassFilter
-    1:23:void parseClassFlagsAndAnnotations(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):928:950 -> parseClassFlagsAndAnnotations
-    1:6:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):693:698 -> parseClassInlineRule
-    1:6:com.android.tools.r8.shaking.ClassMergingRule parseClassMergingRule(com.android.tools.r8.shaking.ClassMergingRule$Type,com.android.tools.r8.position.Position):704:709 -> parseClassMergingRule
-    1:3:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():1882:1884 -> parseClassName
-    4:7:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):1889:1892 -> parseClassName
-    1:4:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):1861:1864 -> parseClassNameAddToBuilder
-    5:8:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):1862:1865 -> parseClassNameAddToBuilder
-    1:5:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():1869:1873 -> parseClassNames
-    1:10:java.util.List parseClassPath():1367:1376 -> parseClassPath
-    1:14:com.android.tools.r8.com.google.common.collect.ImmutableList parseClassPathFilters():1382:1395 -> parseClassPathFilters
-    15:20:com.android.tools.r8.com.google.common.collect.ImmutableList parseClassPathFilters():1392:1397 -> parseClassPathFilters
-    1:5:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):836:840 -> parseClassSpec
-    1:20:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):963:982 -> parseClassType
-    1:2:com.android.tools.r8.utils.StringDiagnostic parseClassTypeUnexpected(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.TextPosition):958:959 -> parseClassTypeUnexpected
-    1:6:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):777:782 -> parseConstantArgumentRule
-    1:1:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String):1962:1962 -> parseError
-    2:2:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String,java.lang.Throwable):1966:1966 -> parseError
-    3:4:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.Throwable):1972:1973 -> parseError
-    5:6:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String,com.android.tools.r8.position.TextPosition):1977:1978 -> parseError
-    1:7:java.lang.String parseFileFilter():1402:1408 -> parseFileFilter
-    1:22:java.nio.file.Path parseFileName(boolean):1337:1358 -> parseFileName
-    23:30:java.nio.file.Path parseFileName(boolean):1356:1363 -> parseFileName
-    31:31:java.nio.file.Path parseFileName(boolean):1352:1352 -> parseFileName
-    32:32:java.nio.file.Path parseFileName(boolean):1341:1341 -> parseFileName
-    1:8:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):740:747 -> parseIdentifierNameStringRule
-    1:20:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):752:771 -> parseIfRule
+    131:133:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1733 -> acceptIdentifierWithBackreference
+    134:135:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1739:1740 -> acceptIdentifierWithBackreference
+    1:5:java.lang.Integer acceptInteger():1587:1591 -> acceptInteger
+    1:1:java.lang.String acceptPattern():1802:1802 -> acceptPattern
+    1:28:java.util.List acceptPatternList():1769:1796 -> acceptPatternList
+    1:1:char acceptQuoteIfPresent():1522:1522 -> acceptQuoteIfPresent
+    1:4:java.lang.String acceptQuotedOrUnquotedString():1578:1581 -> acceptQuotedOrUnquotedString
+    1:9:boolean acceptString(java.lang.String):1561:1569 -> acceptString
+    10:10:java.lang.String acceptString():1574:1574 -> acceptString
+    11:25:java.lang.String acceptString(java.util.function.Predicate):1810:1824 -> acceptString
+    1:1:boolean lambda$acceptString$3(java.lang.Integer):1574:1574 -> b
+    1:7:boolean lambda$new$5(java.lang.Integer):1596:1602 -> c
+    1:10:void checkConstructorPattern(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards,com.android.tools.r8.position.TextPosition):1266:1275 -> checkConstructorPattern
+    11:11:void checkConstructorPattern(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards,com.android.tools.r8.position.TextPosition):1272:1272 -> checkConstructorPattern
+    1:4:boolean lambda$new$6(java.lang.Integer):1606:1609 -> d
+    1:2:boolean lambda$parseFileFilter$2(java.lang.Integer):1411:1412 -> e
+    1:1:boolean eof():1487:1487 -> eof
+    2:2:boolean eof(int):1491:1491 -> eof
+    1:2:void expectChar(char):1555:1556 -> expectChar
+    1:5:void expectClosingQuote(char):1526:1530 -> expectClosingQuote
+    6:6:void expectClosingQuote(char):1528:1528 -> expectClosingQuote
+    1:1:boolean lambda$skipOptimizationName$0(java.lang.Integer):635:635 -> f
+    1:1:int getColumn():2030:2030 -> getColumn
+    1:4:com.android.tools.r8.position.Position getPosition(com.android.tools.r8.position.TextPosition):2018:2021 -> getPosition
+    5:5:com.android.tools.r8.position.TextPosition getPosition():2026:2026 -> getPosition
+    1:2:java.lang.String getSourceSnippet(java.lang.String,com.android.tools.r8.position.Position,com.android.tools.r8.position.Position):2034:2035 -> getSourceSnippet
+    1:4:boolean hasNextChar(char):1495:1498 -> hasNextChar
+    5:8:boolean hasNextChar(java.util.function.Predicate):1502:1505 -> hasNextChar
+    1:2:void infoIgnoringModifier(java.lang.String,com.android.tools.r8.position.TextPosition):2013:2014 -> infoIgnoringModifier
+    3:3:void infoIgnoringModifier(java.lang.String,com.android.tools.r8.position.TextPosition):2013:2013 -> infoIgnoringModifier
+    1:2:void infoIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):1988:1989 -> infoIgnoringOptions
+    3:3:void infoIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):1988:1988 -> infoIgnoringOptions
+    1:2:boolean isInteger(java.lang.String):1478:1479 -> isInteger
+    1:1:boolean isOptionalArgumentGiven():1509:1509 -> isOptionalArgumentGiven
+    1:6:void parse():215:220 -> parse
+    7:12:void parse():219:224 -> parse
+    1:13:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():909:921 -> parseAnnotation
+    14:14:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():920:920 -> parseAnnotation
+    1:12:java.util.List parseArgumentList():1281:1292 -> parseArgumentList
+    13:22:java.util.List parseArgumentList():1289:1298 -> parseArgumentList
+    23:25:java.util.List parseArgumentList():1297:1299 -> parseArgumentList
+    26:33:java.util.List parseArgumentList():1296:1303 -> parseArgumentList
+    1:6:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1434:1439 -> parseAssumeMayHaveSideEffectsRule
+    1:8:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1421:1428 -> parseAssumeNoSideEffectsRule
+    1:8:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1444:1451 -> parseAssumeValuesRule
+    1:8:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):686:693 -> parseCheckDiscardRule
+    1:6:void parseClassFilter(java.util.function.Consumer):1856:1861 -> parseClassFilter
+    7:7:void parseClassFilter(java.util.function.Consumer):1860:1860 -> parseClassFilter
+    1:23:void parseClassFlagsAndAnnotations(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):934:956 -> parseClassFlagsAndAnnotations
+    1:6:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):699:704 -> parseClassInlineRule
+    1:6:com.android.tools.r8.shaking.ClassMergingRule parseClassMergingRule(com.android.tools.r8.shaking.ClassMergingRule$Type,com.android.tools.r8.position.Position):710:715 -> parseClassMergingRule
+    1:3:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():1888:1890 -> parseClassName
+    4:7:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):1895:1898 -> parseClassName
+    1:4:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):1867:1870 -> parseClassNameAddToBuilder
+    5:8:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):1868:1871 -> parseClassNameAddToBuilder
+    1:5:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():1875:1879 -> parseClassNames
+    1:10:java.util.List parseClassPath():1373:1382 -> parseClassPath
+    1:14:com.android.tools.r8.com.google.common.collect.ImmutableList parseClassPathFilters():1388:1401 -> parseClassPathFilters
+    15:20:com.android.tools.r8.com.google.common.collect.ImmutableList parseClassPathFilters():1398:1403 -> parseClassPathFilters
+    1:5:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):842:846 -> parseClassSpec
+    1:20:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):969:988 -> parseClassType
+    1:2:com.android.tools.r8.utils.StringDiagnostic parseClassTypeUnexpected(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.TextPosition):964:965 -> parseClassTypeUnexpected
+    1:6:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):783:788 -> parseConstantArgumentRule
+    1:1:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String):1968:1968 -> parseError
+    2:2:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String,java.lang.Throwable):1972:1972 -> parseError
+    3:4:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.Throwable):1978:1979 -> parseError
+    5:6:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String,com.android.tools.r8.position.TextPosition):1983:1984 -> parseError
+    1:7:java.lang.String parseFileFilter():1408:1414 -> parseFileFilter
+    1:22:java.nio.file.Path parseFileName(boolean):1343:1364 -> parseFileName
+    23:30:java.nio.file.Path parseFileName(boolean):1362:1369 -> parseFileName
+    31:31:java.nio.file.Path parseFileName(boolean):1358:1358 -> parseFileName
+    32:32:java.nio.file.Path parseFileName(boolean):1347:1347 -> parseFileName
+    1:8:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):746:753 -> parseIdentifierNameStringRule
+    1:20:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):758:777 -> parseIfRule
     21:23:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> parseIfRule
-    21:23:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):770 -> parseIfRule
-    1:3:boolean parseIgnoredOption(com.android.tools.r8.position.TextPosition):513:515 -> parseIgnoredOption
-    4:8:boolean parseIgnoredOption(com.android.tools.r8.position.TextPosition):514:518 -> parseIgnoredOption
-    1:8:boolean parseIgnoredOptionAndWarn(com.android.tools.r8.position.TextPosition):493:500 -> parseIgnoredOptionAndWarn
-    9:17:boolean parseIgnoredOptionAndWarn(com.android.tools.r8.position.TextPosition):499:507 -> parseIgnoredOptionAndWarn
-    1:10:void parseInclude():522:531 -> parseInclude
-    11:11:void parseInclude():528:528 -> parseInclude
-    1:11:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):988:998 -> parseInheritance
-    12:12:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):997:997 -> parseInheritance
-    1:9:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):726:734 -> parseInlineRule
-    1:5:void parseKeepAttributes():548:552 -> parseKeepAttributes
-    6:6:void parseKeepAttributes():550:550 -> parseKeepAttributes
-    1:11:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):645:655 -> parseKeepRule
-    12:21:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):654:663 -> parseKeepRule
-    1:50:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1030:1079 -> parseMemberAccessFlags
-    51:68:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1067:1084 -> parseMemberAccessFlags
-    69:74:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1058:1063 -> parseMemberAccessFlags
-    75:76:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1053:1054 -> parseMemberAccessFlags
-    77:78:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1048:1049 -> parseMemberAccessFlags
-    79:80:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1043:1044 -> parseMemberAccessFlags
-    81:137:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1038:1094 -> parseMemberAccessFlags
-    1:46:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1102:1147 -> parseMemberPattern
-    47:63:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1142:1158 -> parseMemberPattern
-    64:86:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1153:1175 -> parseMemberPattern
-    87:101:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1174:1188 -> parseMemberPattern
-    102:134:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1187:1219 -> parseMemberPattern
-    135:135:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1218:1218 -> parseMemberPattern
-    136:148:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1216:1228 -> parseMemberPattern
-    149:149:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1227:1227 -> parseMemberPattern
-    150:155:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1226:1231 -> parseMemberPattern
-    156:179:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1230:1253 -> parseMemberPattern
-    1:6:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1020:1025 -> parseMemberRule
-    1:8:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1007:1014 -> parseMemberRules
-    1:6:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):716:721 -> parseMemberValuePropagationRule
-    1:2:boolean parseNegation():921:922 -> parseNegation
-    1:9:boolean parseOptimizationOption(com.android.tools.r8.position.TextPosition):609:617 -> parseOptimizationOption
-    1:51:boolean parseOption():222:272 -> parseOption
-    52:53:boolean parseOption():269:270 -> parseOption
+    21:23:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):776 -> parseIfRule
+    1:3:boolean parseIgnoredOption(com.android.tools.r8.position.TextPosition):519:521 -> parseIgnoredOption
+    4:8:boolean parseIgnoredOption(com.android.tools.r8.position.TextPosition):520:524 -> parseIgnoredOption
+    1:8:boolean parseIgnoredOptionAndWarn(com.android.tools.r8.position.TextPosition):499:506 -> parseIgnoredOptionAndWarn
+    9:17:boolean parseIgnoredOptionAndWarn(com.android.tools.r8.position.TextPosition):505:513 -> parseIgnoredOptionAndWarn
+    1:10:void parseInclude():528:537 -> parseInclude
+    11:11:void parseInclude():534:534 -> parseInclude
+    1:11:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):994:1004 -> parseInheritance
+    12:12:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1003:1003 -> parseInheritance
+    1:9:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):732:740 -> parseInlineRule
+    1:5:void parseKeepAttributes():554:558 -> parseKeepAttributes
+    6:6:void parseKeepAttributes():556:556 -> parseKeepAttributes
+    1:11:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):651:661 -> parseKeepRule
+    12:21:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):660:669 -> parseKeepRule
+    1:50:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1036:1085 -> parseMemberAccessFlags
+    51:68:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1073:1090 -> parseMemberAccessFlags
+    69:74:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1064:1069 -> parseMemberAccessFlags
+    75:76:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1059:1060 -> parseMemberAccessFlags
+    77:78:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1054:1055 -> parseMemberAccessFlags
+    79:80:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1049:1050 -> parseMemberAccessFlags
+    81:137:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1044:1100 -> parseMemberAccessFlags
+    1:46:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1108:1153 -> parseMemberPattern
+    47:63:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1148:1164 -> parseMemberPattern
+    64:86:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1159:1181 -> parseMemberPattern
+    87:101:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1180:1194 -> parseMemberPattern
+    102:134:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1193:1225 -> parseMemberPattern
+    135:135:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1224:1224 -> parseMemberPattern
+    136:148:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1222:1234 -> parseMemberPattern
+    149:149:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1233:1233 -> parseMemberPattern
+    150:155:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1232:1237 -> parseMemberPattern
+    156:179:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1236:1259 -> parseMemberPattern
+    1:6:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1026:1031 -> parseMemberRule
+    1:8:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1013:1020 -> parseMemberRules
+    1:6:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):722:727 -> parseMemberValuePropagationRule
+    1:2:boolean parseNegation():927:928 -> parseNegation
+    1:9:boolean parseOptimizationOption(com.android.tools.r8.position.TextPosition):615:623 -> parseOptimizationOption
+    1:51:boolean parseOption():228:278 -> parseOption
+    52:53:boolean parseOption():275:276 -> parseOption
     54:56:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> parseOption
-    54:56:boolean parseOption():269 -> parseOption
-    57:139:boolean parseOption():273:355 -> parseOption
-    140:189:boolean parseOption():354:403 -> parseOption
-    1:10:void parsePackageFilter(java.util.function.BiConsumer):1831:1840 -> parsePackageFilter
-    11:14:void parsePackageFilter(java.util.function.BiConsumer):1839:1842 -> parsePackageFilter
-    15:22:void parsePackageFilter(java.util.function.BiConsumer):1837:1844 -> parsePackageFilter
-    1:1:java.lang.String parsePackageNameOrEmptyString():1877:1877 -> parsePackageNameOrEmptyString
-    1:5:void parsePathFilter(java.util.function.Consumer):1903:1907 -> parsePathFilter
-    6:25:com.android.tools.r8.shaking.ProguardPathList parsePathFilter():1912:1931 -> parsePathFilter
-    26:31:com.android.tools.r8.shaking.ProguardPathList parsePathFilter():1928:1933 -> parsePathFilter
-    32:32:com.android.tools.r8.shaking.ProguardPathList parsePathFilter():1918:1918 -> parsePathFilter
-    1:18:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):881:898 -> parseRuleModifiers
-    1:34:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):844:877 -> parseRuleTypeAndModifiers
-    1:54:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):410:463 -> parseTestingOption
-    1:4:boolean parseUnsupportedOptionAndErr(com.android.tools.r8.position.TextPosition):482:485 -> parseUnsupportedOptionAndErr
-    5:5:boolean parseUnsupportedOptionAndErr(com.android.tools.r8.position.TextPosition):484:484 -> parseUnsupportedOptionAndErr
-    1:6:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):788:793 -> parseUnusedArgumentRule
-    1:8:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):668:675 -> parseWhyAreYouKeepingRule
-    1:6:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):799:804 -> parseWhyAreYouNotInliningRule
-    1:1:boolean pathFilterMatcher(java.lang.Integer):1898:1898 -> pathFilterMatcher
-    1:1:char peekChar():1532:1532 -> peekChar
-    1:2:char peekCharAt(int):1536:1537 -> peekCharAt
-    1:1:char readChar():1541:1541 -> readChar
-    1:1:int remainingChars():1545:1545 -> remainingChars
-    1:21:java.lang.String replaceSystemPropertyReferences(java.lang.String):1303:1323 -> replaceSystemPropertyReferences
-    22:34:java.lang.String replaceSystemPropertyReferences(java.lang.String):1321:1333 -> replaceSystemPropertyReferences
-    1:8:void skipComment():1460:1467 -> skipComment
-    1:3:boolean skipFlag(java.lang.String):556:558 -> skipFlag
-    1:11:void skipOptimizationName():622:632 -> skipOptimizationName
-    1:10:boolean skipOptionWithClassSpec(java.lang.String):591:600 -> skipOptionWithClassSpec
-    1:7:boolean skipOptionWithOptionalSingleArg(java.lang.String):577:583 -> skipOptionWithOptionalSingleArg
-    1:5:boolean skipOptionWithSingleArg(java.lang.String):566:570 -> skipOptionWithSingleArg
-    1:3:void skipSingleArgument():637:639 -> skipSingleArgument
-    1:8:void skipWhitespace():1449:1456 -> skipWhitespace
-    1:10:java.lang.String snippetForPosition():1938:1947 -> snippetForPosition
-    11:17:java.lang.String snippetForPosition():1943:1949 -> snippetForPosition
-    18:21:java.lang.String snippetForPosition(com.android.tools.r8.position.TextPosition):1954:1957 -> snippetForPosition
-    1:4:void unacceptString(java.lang.String):1822:1825 -> unacceptString
-    1:1:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition):471:471 -> unknownOption
-    2:4:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):476:478 -> unknownOption
+    54:56:boolean parseOption():275 -> parseOption
+    57:139:boolean parseOption():279:361 -> parseOption
+    140:189:boolean parseOption():360:409 -> parseOption
+    1:10:void parsePackageFilter(java.util.function.BiConsumer):1837:1846 -> parsePackageFilter
+    11:14:void parsePackageFilter(java.util.function.BiConsumer):1845:1848 -> parsePackageFilter
+    15:22:void parsePackageFilter(java.util.function.BiConsumer):1843:1850 -> parsePackageFilter
+    1:1:java.lang.String parsePackageNameOrEmptyString():1883:1883 -> parsePackageNameOrEmptyString
+    1:5:void parsePathFilter(java.util.function.Consumer):1909:1913 -> parsePathFilter
+    6:25:com.android.tools.r8.shaking.ProguardPathList parsePathFilter():1918:1937 -> parsePathFilter
+    26:31:com.android.tools.r8.shaking.ProguardPathList parsePathFilter():1934:1939 -> parsePathFilter
+    32:32:com.android.tools.r8.shaking.ProguardPathList parsePathFilter():1924:1924 -> parsePathFilter
+    1:18:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):887:904 -> parseRuleModifiers
+    1:34:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):850:883 -> parseRuleTypeAndModifiers
+    1:54:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):416:469 -> parseTestingOption
+    1:4:boolean parseUnsupportedOptionAndErr(com.android.tools.r8.position.TextPosition):488:491 -> parseUnsupportedOptionAndErr
+    5:5:boolean parseUnsupportedOptionAndErr(com.android.tools.r8.position.TextPosition):490:490 -> parseUnsupportedOptionAndErr
+    1:6:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):794:799 -> parseUnusedArgumentRule
+    1:8:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):674:681 -> parseWhyAreYouKeepingRule
+    1:6:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):805:810 -> parseWhyAreYouNotInliningRule
+    1:1:boolean pathFilterMatcher(java.lang.Integer):1904:1904 -> pathFilterMatcher
+    1:1:char peekChar():1538:1538 -> peekChar
+    1:2:char peekCharAt(int):1542:1543 -> peekCharAt
+    1:1:char readChar():1547:1547 -> readChar
+    1:1:int remainingChars():1551:1551 -> remainingChars
+    1:21:java.lang.String replaceSystemPropertyReferences(java.lang.String):1309:1329 -> replaceSystemPropertyReferences
+    22:34:java.lang.String replaceSystemPropertyReferences(java.lang.String):1327:1339 -> replaceSystemPropertyReferences
+    1:8:void skipComment():1466:1473 -> skipComment
+    1:3:boolean skipFlag(java.lang.String):562:564 -> skipFlag
+    1:11:void skipOptimizationName():628:638 -> skipOptimizationName
+    1:10:boolean skipOptionWithClassSpec(java.lang.String):597:606 -> skipOptionWithClassSpec
+    1:7:boolean skipOptionWithOptionalSingleArg(java.lang.String):583:589 -> skipOptionWithOptionalSingleArg
+    1:5:boolean skipOptionWithSingleArg(java.lang.String):572:576 -> skipOptionWithSingleArg
+    1:3:void skipSingleArgument():643:645 -> skipSingleArgument
+    1:8:void skipWhitespace():1455:1462 -> skipWhitespace
+    1:10:java.lang.String snippetForPosition():1944:1953 -> snippetForPosition
+    11:17:java.lang.String snippetForPosition():1949:1955 -> snippetForPosition
+    18:21:java.lang.String snippetForPosition(com.android.tools.r8.position.TextPosition):1960:1963 -> snippetForPosition
+    1:4:void unacceptString(java.lang.String):1828:1831 -> unacceptString
+    1:1:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition):477:477 -> unknownOption
+    2:4:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):482:484 -> unknownOption
     5:7:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> unknownOption
-    5:7:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):476 -> unknownOption
-    1:13:void verifyAndLinkBackReferences(java.lang.Iterable):808:820 -> verifyAndLinkBackReferences
-    14:17:void verifyAndLinkBackReferences(java.lang.Iterable):815:818 -> verifyAndLinkBackReferences
+    5:7:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):482 -> unknownOption
+    1:13:void verifyAndLinkBackReferences(java.lang.Iterable):814:826 -> verifyAndLinkBackReferences
+    14:17:void verifyAndLinkBackReferences(java.lang.Iterable):821:824 -> verifyAndLinkBackReferences
     18:20:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> verifyAndLinkBackReferences
-    18:20:void verifyAndLinkBackReferences(java.lang.Iterable):815 -> verifyAndLinkBackReferences
-    21:23:void verifyAndLinkBackReferences(java.lang.Iterable):822:824 -> verifyAndLinkBackReferences
-    1:2:void warnIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):1987:1988 -> warnIgnoringOptions
-    3:3:void warnIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):1987:1987 -> warnIgnoringOptions
-    1:2:void warnOverridingOptions(java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):1992:1993 -> warnOverridingOptions
-    3:3:void warnOverridingOptions(java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):1992:1992 -> warnOverridingOptions
-    1:6:void warnUnusualCharacters(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):1998:2003 -> warnUnusualCharacters
-    7:7:void warnUnusualCharacters(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):1998:1998 -> warnUnusualCharacters
+    18:20:void verifyAndLinkBackReferences(java.lang.Iterable):821 -> verifyAndLinkBackReferences
+    21:23:void verifyAndLinkBackReferences(java.lang.Iterable):828:830 -> verifyAndLinkBackReferences
+    1:2:void warnIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):1993:1994 -> warnIgnoringOptions
+    3:3:void warnIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):1993:1993 -> warnIgnoringOptions
+    1:2:void warnOverridingOptions(java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):1998:1999 -> warnOverridingOptions
+    3:3:void warnOverridingOptions(java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):1998:1998 -> warnOverridingOptions
+    1:6:void warnUnusualCharacters(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):2004:2009 -> warnUnusualCharacters
+    7:7:void warnUnusualCharacters(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):2004:2004 -> warnUnusualCharacters
 com.android.tools.r8.shaking.ProguardConfigurationRule -> com.android.tools.r8.shaking.ProguardConfigurationRule:
     1:1:void <clinit>():21:21 -> <clinit>
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):39:39 -> <init>
@@ -58251,7 +58462,7 @@
     1:1:boolean isUsed():45:45 -> isUsed
     1:1:void markAsUsed():49:49 -> markAsUsed
     1:5:java.lang.Iterable relevantCandidatesForRule(com.android.tools.r8.graph.AppView,java.lang.Iterable):70:74 -> relevantCandidatesForRule
-    6:6:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> relevantCandidatesForRule
+    6:6:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> relevantCandidatesForRule
     6:6:java.lang.Iterable relevantCandidatesForRule(com.android.tools.r8.graph.AppView,java.lang.Iterable):75 -> relevantCandidatesForRule
     7:10:java.lang.Iterable relevantCandidatesForRule(com.android.tools.r8.graph.AppView,java.lang.Iterable):76:79 -> relevantCandidatesForRule
     11:11:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> relevantCandidatesForRule
@@ -58740,7 +58951,7 @@
     9:10:void lambda$markMatchingMethods$8(java.util.Map,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexEncodedMethod):625:626 -> a
     11:12:void lambda$markMatchingFields$10(java.util.Map,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexEncodedField):658:659 -> a
     13:13:boolean lambda$anySourceMatchesInheritanceRuleDirectly$11(boolean,com.android.tools.r8.graph.DexType):816:816 -> a
-    14:14:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    14:14:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     14:14:boolean lambda$anySourceMatchesInheritanceRuleDirectly$11(boolean,com.android.tools.r8.graph.DexType):816 -> a
     15:15:boolean lambda$anySourceMatchesInheritanceRuleDirectly$11(boolean,com.android.tools.r8.graph.DexType):816:816 -> a
     16:16:java.util.Set lambda$addItemToSets$14(com.android.tools.r8.graph.DexType):1046:1046 -> a
@@ -58755,11 +58966,11 @@
     22:22:boolean com.android.tools.r8.graph.DexMethod.isLambdaDeserializeMethod(com.android.tools.r8.graph.DexItemFactory):194:194 -> addItemToSets
     22:22: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):1013 -> addItemToSets
     23:26: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):1019:1022 -> addItemToSets
-    27:27:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> addItemToSets
+    27:27:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> addItemToSets
     27:27: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):1022 -> addItemToSets
     28:33: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):1023:1028 -> addItemToSets
     34:55: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):1025:1046 -> addItemToSets
-    56:56:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():720:720 -> addItemToSets
+    56:56:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():770:770 -> addItemToSets
     56:56: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):1046 -> addItemToSets
     57:113: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):1046:1102 -> addItemToSets
     114:114: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):1096:1096 -> addItemToSets
@@ -58793,7 +59004,7 @@
     1:1:java.util.Map lambda$includeDescriptor$12(com.android.tools.r8.graph.DexReference):965:965 -> f
     1:1:java.util.Set lambda$includeDescriptor$13(com.android.tools.r8.graph.DexReference):966:966 -> g
     1:10:void includeDescriptor(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase):950:959 -> includeDescriptor
-    11:11:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> includeDescriptor
+    11:11:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> includeDescriptor
     11:11:void includeDescriptor(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase):959 -> includeDescriptor
     12:21:void includeDescriptor(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase):960:969 -> includeDescriptor
     1:11:void includeDescriptorClasses(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase):973:983 -> includeDescriptorClasses
@@ -58808,7 +59019,7 @@
     1:1:void markMatchingFields(com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,com.android.tools.r8.shaking.ProguardIfRule):656:656 -> markMatchingFields
     1:1:void markMatchingMethods(com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,com.android.tools.r8.shaking.ProguardIfRule):623:623 -> markMatchingMethods
     1:11:void markMatchingOverriddenMethods(com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,boolean,com.android.tools.r8.shaking.ProguardIfRule):589:599 -> markMatchingOverriddenMethods
-    12:12:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> markMatchingOverriddenMethods
+    12:12:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> markMatchingOverriddenMethods
     12:12:void markMatchingOverriddenMethods(com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,boolean,com.android.tools.r8.shaking.ProguardIfRule):599 -> markMatchingOverriddenMethods
     13:23:void markMatchingOverriddenMethods(com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,boolean,com.android.tools.r8.shaking.ProguardIfRule):603:613 -> markMatchingOverriddenMethods
     1:9:void markMatchingVisibleFields(com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,boolean,com.android.tools.r8.shaking.ProguardIfRule):638:646 -> markMatchingVisibleFields
@@ -58857,7 +59068,7 @@
     1:1:void <clinit>():1190:1190 -> <clinit>
     1:1:void <init>(java.util.Map,java.util.Set,java.util.Set,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.List,com.android.tools.r8.shaking.RootSetBuilder$1):1190:1190 -> <init>
     2:26:void <init>(java.util.Map,java.util.Set,java.util.Set,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.List):1242:1266 -> <init>
-    1:1:com.android.tools.r8.graph.DexDefinition com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexReference):174:174 -> a
+    1:1:com.android.tools.r8.graph.DexDefinition com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexReference):176:176 -> a
     1:1:void lambda$forEachDependentNonStaticMember$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexReference,java.util.Set):1345 -> a
     2:4:void lambda$forEachDependentNonStaticMember$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexReference,java.util.Set):1347:1349 -> a
     5:5:java.util.Set lambda$addConsequentRootSet$0(com.android.tools.r8.graph.DexReference):1295:1295 -> a
@@ -58868,7 +59079,7 @@
     12:12:void lambda$toString$9(java.lang.StringBuilder,com.android.tools.r8.graph.DexReference):1568:1568 -> a
     1:14:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet,boolean):1289:1302 -> addConsequentRootSet
     1:1:void addDependentItems(java.util.Map):1308:1308 -> addDependentItems
-    1:1:com.android.tools.r8.graph.DexDefinition com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexReference):174:174 -> b
+    1:1:com.android.tools.r8.graph.DexDefinition com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexReference):176:176 -> b
     1:1:void lambda$forEachDependentStaticMember$6(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexReference,java.util.Set):1331 -> b
     2:3:void lambda$forEachDependentStaticMember$6(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexReference,java.util.Set):1332:1333 -> b
     4:4:java.util.Map lambda$addDependentItems$4(com.android.tools.r8.graph.DexReference):1311:1311 -> b
@@ -58910,12 +59121,12 @@
     5:7:void lambda$tryAndKeepMethodOnClass$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.shaking.RootSetBuilder):569:571 -> a
     1:1:void run():495:495 -> run
     1:17:void tryAndKeepMethodOnClass(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.ProguardMemberRule):528:544 -> tryAndKeepMethodOnClass
-    18:18:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> tryAndKeepMethodOnClass
+    18:18:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> tryAndKeepMethodOnClass
     18:18:void tryAndKeepMethodOnClass(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.ProguardMemberRule):544 -> tryAndKeepMethodOnClass
     19:33:void tryAndKeepMethodOnClass(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.ProguardMemberRule):545:559 -> tryAndKeepMethodOnClass
     34:34:void tryAndKeepMethodOnClass(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.ProguardMemberRule):556:556 -> tryAndKeepMethodOnClass
     1:1:void visitAllSuperInterfaces(com.android.tools.r8.graph.DexType):499:499 -> visitAllSuperInterfaces
-    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> visitAllSuperInterfaces
+    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> visitAllSuperInterfaces
     2:2:void visitAllSuperInterfaces(com.android.tools.r8.graph.DexType):499 -> visitAllSuperInterfaces
     3:24:void visitAllSuperInterfaces(com.android.tools.r8.graph.DexType):500:521 -> visitAllSuperInterfaces
 com.android.tools.r8.shaking.ScopedDexMethodSet -> com.android.tools.r8.shaking.ScopedDexMethodSet:
@@ -58974,7 +59185,7 @@
     1:12:com.android.tools.r8.graph.GraphLense run():229:240 -> run
     13:19:com.android.tools.r8.graph.GraphLense run():236:242 -> run
     1:41:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup satisfiesMergeCriteria(com.android.tools.r8.graph.DexProgramClass):262:302 -> satisfiesMergeCriteria
-    42:42:boolean com.android.tools.r8.graph.DexClass.classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView):786:786 -> satisfiesMergeCriteria
+    42:42:boolean com.android.tools.r8.graph.DexClass.classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView):836:836 -> satisfiesMergeCriteria
     42:42:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup satisfiesMergeCriteria(com.android.tools.r8.graph.DexProgramClass):302 -> satisfiesMergeCriteria
     43:53:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup satisfiesMergeCriteria(com.android.tools.r8.graph.DexProgramClass):309:319 -> satisfiesMergeCriteria
     1:8:void setRepresentative(com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key,com.android.tools.r8.shaking.StaticClassMerger$Representative):391:398 -> setRepresentative
@@ -59016,16 +59227,16 @@
     3:20:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.TreePrunerConfiguration):39:56 -> <init>
     1:1:void lambda$new$0(com.android.tools.r8.utils.InternalOptions,java.lang.String):54:54 -> a
     2:2:boolean lambda$clearDeadNestMembers$1(com.android.tools.r8.graph.NestMemberClassAttribute):204:204 -> a
-    3:3:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> a
+    3:3:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
     3:3:boolean lambda$clearDeadNestMembers$1(com.android.tools.r8.graph.NestMemberClassAttribute):204 -> a
     4:4:boolean lambda$clearDeadNestMembers$1(com.android.tools.r8.graph.NestMemberClassAttribute):205:205 -> a
     5:5:boolean lambda$reachableMethods$2(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexEncodedMethod):260:260 -> a
     6:6:boolean lambda$reachableFields$3(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexEncodedField):321:321 -> a
     1:1:void claimNestOwnership(com.android.tools.r8.graph.DexClass):209:209 -> claimNestOwnership
-    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> claimNestOwnership
+    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> claimNestOwnership
     2:2:void claimNestOwnership(com.android.tools.r8.graph.DexClass):209 -> claimNestOwnership
     3:6:void claimNestOwnership(com.android.tools.r8.graph.DexClass):214:217 -> claimNestOwnership
-    7:7:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> claimNestOwnership
+    7:7:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> claimNestOwnership
     7:7:void claimNestOwnership(com.android.tools.r8.graph.DexClass):217 -> claimNestOwnership
     8:14:void claimNestOwnership(com.android.tools.r8.graph.DexClass):219:225 -> claimNestOwnership
     1:2:void clearDeadNestMembers(com.android.tools.r8.graph.DexClass):201:202 -> clearDeadNestMembers
@@ -59040,17 +59251,17 @@
     1:20:void pruneUnusedInterfaces(com.android.tools.r8.graph.DexProgramClass):119:138 -> pruneUnusedInterfaces
     1:30:com.android.tools.r8.graph.DexEncodedField[] reachableFields(java.util.List):319:348 -> reachableFields
     1:15:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):257:271 -> reachableMethods
-    16:16:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getKey():1086:1086 -> reachableMethods
+    16:16:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getKey():1163:1163 -> reachableMethods
     16:16:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):271 -> reachableMethods
     17:24:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):271:278 -> reachableMethods
     25:30:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):275:280 -> reachableMethods
-    31:31:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getKey():1086:1086 -> reachableMethods
+    31:31:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getKey():1163:1163 -> reachableMethods
     31:31:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):280 -> reachableMethods
     32:57:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):280:305 -> reachableMethods
-    58:58:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():345:345 -> reachableMethods
-    58:58:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexEncodedMethod.toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):671 -> reachableMethods
+    58:58:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():337:337 -> reachableMethods
+    58:58:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexEncodedMethod.toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):745 -> reachableMethods
     58:58:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):305 -> reachableMethods
-    59:60:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexEncodedMethod.toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):672:673 -> reachableMethods
+    59:60:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexEncodedMethod.toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):746:747 -> reachableMethods
     59:60:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):305 -> reachableMethods
     61:72:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):304:315 -> reachableMethods
     1:2:com.android.tools.r8.graph.DexApplication$Builder removeUnused(com.android.tools.r8.graph.DexApplication):72:73 -> removeUnused
@@ -59084,7 +59295,7 @@
     1:1:void <clinit>():88:88 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.shaking.MainDexClasses):219:219 -> <init>
     2:41:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.shaking.MainDexClasses):192:231 -> <init>
-    1:1:boolean lambda$isStillMergeCandidate$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):441:441 -> a
+    1:1:boolean lambda$isStillMergeCandidate$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):423:423 -> a
     1:1:java.util.Set access$000(com.android.tools.r8.shaking.VerticalClassMerger):88:88 -> access$000
     1:1:com.android.tools.r8.shaking.AppInfoWithLiveness access$100(com.android.tools.r8.shaking.VerticalClassMerger):88:88 -> access$100
     1:1:com.android.tools.r8.ir.optimize.MethodPoolCollection access$1000(com.android.tools.r8.shaking.VerticalClassMerger):88:88 -> access$1000
@@ -59099,44 +59310,44 @@
     1:1:com.android.tools.r8.graph.AppView access$200(com.android.tools.r8.shaking.VerticalClassMerger):88:88 -> access$200
     1:1:java.util.concurrent.ExecutorService access$800(com.android.tools.r8.shaking.VerticalClassMerger):88:88 -> access$800
     1:1:com.android.tools.r8.utils.Timing access$900(com.android.tools.r8.shaking.VerticalClassMerger):88:88 -> access$900
-    1:17:com.android.tools.r8.shaking.VerticalClassMerger$AbortReason disallowInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):1645:1661 -> disallowInlining
-    18:26:com.android.tools.r8.shaking.VerticalClassMerger$AbortReason disallowInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):1660:1668 -> disallowInlining
-    1:18:void extractPinnedItems(java.lang.Iterable,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):299:316 -> extractPinnedItems
-    1:18:boolean fieldResolutionMayChange(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):853:870 -> fieldResolutionMayChange
-    1:4:java.util.Collection getInvokes():537:540 -> getInvokes
+    1:17:com.android.tools.r8.shaking.VerticalClassMerger$AbortReason disallowInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):1627:1643 -> disallowInlining
+    18:26:com.android.tools.r8.shaking.VerticalClassMerger$AbortReason disallowInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):1642:1650 -> disallowInlining
+    1:18:void extractPinnedItems(java.lang.Iterable,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):281:298 -> extractPinnedItems
+    1:18:boolean fieldResolutionMayChange(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):835:852 -> fieldResolutionMayChange
+    1:4:java.util.Collection getInvokes():519:522 -> getInvokes
     1:1:com.android.tools.r8.graph.classmerging.VerticallyMergedClasses getMergedClasses():235:235 -> getMergedClasses
-    1:1:java.util.Collection getRemovedClasses():1967:1967 -> getRemovedClasses
+    1:1:java.util.Collection getRemovedClasses():1949:1949 -> getRemovedClasses
     1:3:void initializeMergeCandidates(java.lang.Iterable):239:241 -> initializeMergeCandidates
-    1:44:void initializePinnedTypes(java.lang.Iterable):251:294 -> initializePinnedTypes
-    1:9:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):345:353 -> isMergeCandidate
+    1:26:void initializePinnedTypes(java.lang.Iterable):251:276 -> initializePinnedTypes
+    1:9:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):327:335 -> isMergeCandidate
     10:10:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> isMergeCandidate
-    10:10:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):353 -> isMergeCandidate
-    11:13:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):353:355 -> isMergeCandidate
-    14:71:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):353:410 -> isMergeCandidate
-    72:72:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> isMergeCandidate
-    72:72:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):410 -> isMergeCandidate
-    73:75:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):413:415 -> isMergeCandidate
-    76:77:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):405:406 -> isMergeCandidate
-    1:17:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):426:442 -> isStillMergeCandidate
-    18:18:boolean com.android.tools.r8.graph.DexClass.classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView):786:786 -> isStillMergeCandidate
-    18:18:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):442 -> isStillMergeCandidate
-    19:53:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):449:483 -> isStillMergeCandidate
-    54:55:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):462:463 -> isStillMergeCandidate
-    56:57:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):444:445 -> isStillMergeCandidate
-    1:4:void makePrivate(com.android.tools.r8.graph.DexEncodedMethod):1427:1430 -> makePrivate
-    1:14:void markTypeAsPinned(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):323:336 -> markTypeAsPinned
-    1:66:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):776:841 -> mergeClassIfPossible
-    67:77:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):837:847 -> mergeClassIfPossible
-    78:78:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):843:843 -> mergeClassIfPossible
-    79:79:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):828:828 -> mergeClassIfPossible
-    1:38:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):491:528 -> mergeMayLeadToIllegalAccesses
-    1:46:boolean methodResolutionMayChange(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):719:764 -> methodResolutionMayChange
-    1:16:com.android.tools.r8.graph.GraphLense run():635:650 -> run
-    17:22:com.android.tools.r8.graph.GraphLense run():646:651 -> run
-    1:57:boolean verifyGraphLense(com.android.tools.r8.graph.GraphLense):656:712 -> verifyGraphLense
+    10:10:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):335 -> isMergeCandidate
+    11:13:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):335:337 -> isMergeCandidate
+    14:71:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):335:392 -> isMergeCandidate
+    72:72:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> isMergeCandidate
+    72:72:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):392 -> isMergeCandidate
+    73:75:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):395:397 -> isMergeCandidate
+    76:77:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):387:388 -> isMergeCandidate
+    1:17:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):408:424 -> isStillMergeCandidate
+    18:18:boolean com.android.tools.r8.graph.DexClass.classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView):836:836 -> isStillMergeCandidate
+    18:18:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):424 -> isStillMergeCandidate
+    19:53:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):431:465 -> isStillMergeCandidate
+    54:55:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):444:445 -> isStillMergeCandidate
+    56:57:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):426:427 -> isStillMergeCandidate
+    1:4:void makePrivate(com.android.tools.r8.graph.DexEncodedMethod):1409:1412 -> makePrivate
+    1:14:void markTypeAsPinned(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):305:318 -> markTypeAsPinned
+    1:66:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):758:823 -> mergeClassIfPossible
+    67:77:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):819:829 -> mergeClassIfPossible
+    78:78:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):825:825 -> mergeClassIfPossible
+    79:79:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):810:810 -> mergeClassIfPossible
+    1:38:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):473:510 -> mergeMayLeadToIllegalAccesses
+    1:46:boolean methodResolutionMayChange(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):701:746 -> methodResolutionMayChange
+    1:16:com.android.tools.r8.graph.GraphLense run():617:632 -> run
+    17:22:com.android.tools.r8.graph.GraphLense run():628:633 -> run
+    1:57:boolean verifyGraphLense(com.android.tools.r8.graph.GraphLense):638:694 -> verifyGraphLense
 com.android.tools.r8.shaking.VerticalClassMerger$1 -> com.android.tools.r8.shaking.VerticalClassMerger$1:
-    1:1:void <clinit>():1950:1950 -> <clinit>
-    2:2:void <clinit>():1367:1367 -> <clinit>
+    1:1:void <clinit>():1932:1932 -> <clinit>
+    2:2:void <clinit>():1349:1349 -> <clinit>
     3:3:void <clinit>():116:116 -> <clinit>
 com.android.tools.r8.shaking.VerticalClassMerger$AbortReason -> com.android.tools.r8.shaking.VerticalClassMerger$AbortReason:
     1:19:void <clinit>():90:108 -> <clinit>
@@ -59148,94 +59359,94 @@
     1:1:com.android.tools.r8.shaking.VerticalClassMerger$AbortReason valueOf(java.lang.String):90:90 -> valueOf
     1:1:com.android.tools.r8.shaking.VerticalClassMerger$AbortReason[] values():90:90 -> values
 com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger -> com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger:
-    1:1:void <clinit>():881:881 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.VerticalClassMerger$1):881:881 -> <init>
-    2:2:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):893:893 -> <init>
-    3:11:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):887:895 -> <init>
-    1:4:boolean lambda$merge$0(java.util.Set,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexMethod):910:913 -> a
-    5:7:boolean lambda$merge$1(java.util.function.Predicate,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool,com.android.tools.r8.graph.DexMethod):987:989 -> a
-    8:8:boolean lambda$merge$1(java.util.function.Predicate,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool,com.android.tools.r8.graph.DexMethod):988:988 -> a
-    9:9:boolean lambda$merge$2(java.util.Set,com.android.tools.r8.graph.DexField):1050:1050 -> a
-    10:10:java.util.Set lambda$merge$3(com.android.tools.r8.graph.DexType):1094:1094 -> a
-    11:12:void lambda$restoreDebuggingState$4(com.android.tools.r8.graph.DexEncodedMethod):1102:1103 -> a
-    1:1:void add(java.util.Map,com.android.tools.r8.graph.KeyedDexItem,com.android.tools.r8.com.google.common.base.Equivalence):1275:1275 -> add
-    1:2:void addAll(java.util.Collection,java.lang.Iterable,com.android.tools.r8.com.google.common.base.Equivalence):1280:1281 -> addAll
-    1:2:void lambda$restoreDebuggingState$5(com.android.tools.r8.graph.DexEncodedMethod):1107:1108 -> b
-    1:1:void blockRedirectionOfSuperCalls(com.android.tools.r8.graph.DexMethod):1201:1201 -> blockRedirectionOfSuperCalls
-    1:34:com.android.tools.r8.graph.DexEncodedMethod buildBridgeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1206:1239 -> buildBridgeMethod
-    1:1:boolean lambda$restoreDebuggingState$6(com.android.tools.r8.graph.DexEncodedMethod):1112:1112 -> c
-    1:21:com.android.tools.r8.graph.DexEncodedMethod findMethodInTarget(com.android.tools.r8.graph.DexEncodedMethod):1246:1266 -> findMethodInTarget
-    22:22:com.android.tools.r8.graph.DexEncodedMethod findMethodInTarget(com.android.tools.r8.graph.DexEncodedMethod):1261:1261 -> findMethodInTarget
-    1:5:com.android.tools.r8.graph.DexString getFreshName(java.lang.String,int,com.android.tools.r8.graph.DexType):1318:1322 -> getFreshName
-    1:1:com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder getRenamings():1117:1117 -> getRenamings
-    1:1:java.util.List getSynthesizedBridges():1121:1121 -> getSynthesizedBridges
-    1:5:void makeStatic(com.android.tools.r8.graph.DexEncodedMethod):1417:1421 -> makeStatic
-    1:20:boolean merge():902:921 -> merge
-    21:30:boolean merge():918:927 -> merge
-    31:57:boolean merge():924:950 -> merge
-    58:68:boolean merge():949:959 -> merge
-    69:69:boolean com.android.tools.r8.graph.DexClass.isAbstract():626:626 -> merge
-    69:69:boolean merge():959 -> merge
-    70:103:boolean merge():960:993 -> merge
-    104:151:boolean merge():984:1031 -> merge
-    152:177:boolean merge():1030:1055 -> merge
-    178:187:boolean merge():1053:1062 -> merge
-    188:223:boolean merge():1060:1095 -> merge
-    1:3:java.util.Set mergeArrays(java.lang.Object[],java.lang.Object[]):1286:1288 -> mergeArrays
-    1:13:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1297:1309 -> mergeFields
-    1:55:void redirectSuperCallsInTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):1125:1179 -> redirectSuperCallsInTarget
-    1:20:com.android.tools.r8.graph.DexEncodedMethod renameConstructor(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):1327:1346 -> renameConstructor
-    1:16:com.android.tools.r8.graph.DexEncodedField renameFieldIfNeeded(com.android.tools.r8.graph.DexEncodedField,java.util.function.Predicate):1398:1413 -> renameFieldIfNeeded
-    1:1:com.android.tools.r8.graph.DexEncodedMethod renameMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate,com.android.tools.r8.shaking.VerticalClassMerger$Rename):1352:1352 -> renameMethod
-    2:30:com.android.tools.r8.graph.DexEncodedMethod renameMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate,com.android.tools.r8.shaking.VerticalClassMerger$Rename,com.android.tools.r8.graph.DexProto):1362:1390 -> renameMethod
-    31:55:com.android.tools.r8.graph.DexEncodedMethod renameMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate,com.android.tools.r8.shaking.VerticalClassMerger$Rename,com.android.tools.r8.graph.DexProto):1369:1393 -> renameMethod
-    1:13:boolean restoreDebuggingState(java.util.stream.Stream):1100:1112 -> restoreDebuggingState
-    14:14:boolean restoreDebuggingState(java.util.stream.Stream):1111:1111 -> restoreDebuggingState
+    1:1:void <clinit>():863:863 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.VerticalClassMerger$1):863:863 -> <init>
+    2:2:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):875:875 -> <init>
+    3:11:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):869:877 -> <init>
+    1:4:boolean lambda$merge$0(java.util.Set,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexMethod):892:895 -> a
+    5:7:boolean lambda$merge$1(java.util.function.Predicate,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool,com.android.tools.r8.graph.DexMethod):969:971 -> a
+    8:8:boolean lambda$merge$1(java.util.function.Predicate,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool,com.android.tools.r8.graph.DexMethod):970:970 -> a
+    9:9:boolean lambda$merge$2(java.util.Set,com.android.tools.r8.graph.DexField):1032:1032 -> a
+    10:10:java.util.Set lambda$merge$3(com.android.tools.r8.graph.DexType):1076:1076 -> a
+    11:12:void lambda$restoreDebuggingState$4(com.android.tools.r8.graph.DexEncodedMethod):1084:1085 -> a
+    1:1:void add(java.util.Map,com.android.tools.r8.graph.KeyedDexItem,com.android.tools.r8.com.google.common.base.Equivalence):1257:1257 -> add
+    1:2:void addAll(java.util.Collection,java.lang.Iterable,com.android.tools.r8.com.google.common.base.Equivalence):1262:1263 -> addAll
+    1:2:void lambda$restoreDebuggingState$5(com.android.tools.r8.graph.DexEncodedMethod):1089:1090 -> b
+    1:1:void blockRedirectionOfSuperCalls(com.android.tools.r8.graph.DexMethod):1183:1183 -> blockRedirectionOfSuperCalls
+    1:34:com.android.tools.r8.graph.DexEncodedMethod buildBridgeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1188:1221 -> buildBridgeMethod
+    1:1:boolean lambda$restoreDebuggingState$6(com.android.tools.r8.graph.DexEncodedMethod):1094:1094 -> c
+    1:21:com.android.tools.r8.graph.DexEncodedMethod findMethodInTarget(com.android.tools.r8.graph.DexEncodedMethod):1228:1248 -> findMethodInTarget
+    22:22:com.android.tools.r8.graph.DexEncodedMethod findMethodInTarget(com.android.tools.r8.graph.DexEncodedMethod):1243:1243 -> findMethodInTarget
+    1:5:com.android.tools.r8.graph.DexString getFreshName(java.lang.String,int,com.android.tools.r8.graph.DexType):1300:1304 -> getFreshName
+    1:1:com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder getRenamings():1099:1099 -> getRenamings
+    1:1:java.util.List getSynthesizedBridges():1103:1103 -> getSynthesizedBridges
+    1:5:void makeStatic(com.android.tools.r8.graph.DexEncodedMethod):1399:1403 -> makeStatic
+    1:20:boolean merge():884:903 -> merge
+    21:30:boolean merge():900:909 -> merge
+    31:57:boolean merge():906:932 -> merge
+    58:68:boolean merge():931:941 -> merge
+    69:69:boolean com.android.tools.r8.graph.DexClass.isAbstract():676:676 -> merge
+    69:69:boolean merge():941 -> merge
+    70:103:boolean merge():942:975 -> merge
+    104:151:boolean merge():966:1013 -> merge
+    152:177:boolean merge():1012:1037 -> merge
+    178:187:boolean merge():1035:1044 -> merge
+    188:223:boolean merge():1042:1077 -> merge
+    1:3:java.util.Set mergeArrays(java.lang.Object[],java.lang.Object[]):1268:1270 -> mergeArrays
+    1:13:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1279:1291 -> mergeFields
+    1:55:void redirectSuperCallsInTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):1107:1161 -> redirectSuperCallsInTarget
+    1:20:com.android.tools.r8.graph.DexEncodedMethod renameConstructor(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):1309:1328 -> renameConstructor
+    1:16:com.android.tools.r8.graph.DexEncodedField renameFieldIfNeeded(com.android.tools.r8.graph.DexEncodedField,java.util.function.Predicate):1380:1395 -> renameFieldIfNeeded
+    1:1:com.android.tools.r8.graph.DexEncodedMethod renameMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate,com.android.tools.r8.shaking.VerticalClassMerger$Rename):1334:1334 -> renameMethod
+    2:30:com.android.tools.r8.graph.DexEncodedMethod renameMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate,com.android.tools.r8.shaking.VerticalClassMerger$Rename,com.android.tools.r8.graph.DexProto):1344:1372 -> renameMethod
+    31:55:com.android.tools.r8.graph.DexEncodedMethod renameMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate,com.android.tools.r8.shaking.VerticalClassMerger$Rename,com.android.tools.r8.graph.DexProto):1351:1375 -> renameMethod
+    1:13:boolean restoreDebuggingState(java.util.stream.Stream):1082:1094 -> restoreDebuggingState
+    14:14:boolean restoreDebuggingState(java.util.stream.Stream):1093:1093 -> restoreDebuggingState
 com.android.tools.r8.shaking.VerticalClassMerger$CollisionDetector -> com.android.tools.r8.shaking.VerticalClassMerger$CollisionDetector:
-    1:1:void <clinit>():1534:1534 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.VerticalClassMerger$1):1534:1534 -> <init>
-    2:2:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):1545:1545 -> <init>
-    3:15:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):1539:1551 -> <init>
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap lambda$fillSeenPositions$0(com.android.tools.r8.graph.DexString):1588:1589 -> a
-    1:32:int computePositionsFor(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1608:1639 -> computePositionsFor
-    1:18:void fillSeenPositions():1581:1598 -> fillSeenPositions
-    1:22:boolean mayCollide():1555:1576 -> mayCollide
+    1:1:void <clinit>():1516:1516 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.VerticalClassMerger$1):1516:1516 -> <init>
+    2:2:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):1527:1527 -> <init>
+    3:15:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):1521:1533 -> <init>
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap lambda$fillSeenPositions$0(com.android.tools.r8.graph.DexString):1570:1571 -> a
+    1:32:int computePositionsFor(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1590:1621 -> computePositionsFor
+    1:18:void fillSeenPositions():1563:1580 -> fillSeenPositions
+    1:22:boolean mayCollide():1537:1558 -> mayCollide
 com.android.tools.r8.shaking.VerticalClassMerger$IllegalAccessDetector -> com.android.tools.r8.shaking.VerticalClassMerger$IllegalAccessDetector:
-    1:1:void <clinit>():1753:1753 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):1762:1762 -> <init>
-    2:11:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):1755:1764 -> <init>
-    1:8:boolean checkFieldReference(com.android.tools.r8.graph.DexField):1776:1783 -> checkFieldReference
-    9:9:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexField):179:179 -> checkFieldReference
-    9:9:boolean checkFieldReference(com.android.tools.r8.graph.DexField):1783 -> checkFieldReference
-    10:11:boolean checkFieldReference(com.android.tools.r8.graph.DexField):1784:1785 -> checkFieldReference
-    1:10:boolean checkMethodReference(com.android.tools.r8.graph.DexMethod):1793:1802 -> checkMethodReference
-    11:11:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):184:184 -> checkMethodReference
-    11:11:boolean checkMethodReference(com.android.tools.r8.graph.DexMethod):1802 -> checkMethodReference
-    12:13:boolean checkMethodReference(com.android.tools.r8.graph.DexMethod):1803:1804 -> checkMethodReference
-    1:5:boolean checkTypeReference(com.android.tools.r8.graph.DexType):1812:1816 -> checkTypeReference
-    6:6:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> checkTypeReference
-    6:6:boolean checkTypeReference(com.android.tools.r8.graph.DexType):1816 -> checkTypeReference
-    7:8:boolean checkTypeReference(com.android.tools.r8.graph.DexType):1817:1818 -> checkTypeReference
-    1:1:boolean foundIllegalAccess():1768:1768 -> foundIllegalAccess
-    1:1:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):1872:1872 -> registerInstanceFieldRead
-    1:1:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):1867:1867 -> registerInstanceFieldWrite
-    1:4:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod):1835:1838 -> registerInvokeDirect
-    1:4:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod):1851:1854 -> registerInvokeInterface
-    1:4:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod):1843:1846 -> registerInvokeStatic
-    1:4:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):1859:1862 -> registerInvokeSuper
-    1:4:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):1827:1830 -> registerInvokeVirtual
-    1:1:boolean registerNewInstance(com.android.tools.r8.graph.DexType):1877:1877 -> registerNewInstance
-    1:1:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):1882:1882 -> registerStaticFieldRead
-    1:1:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):1887:1887 -> registerStaticFieldWrite
-    1:1:boolean registerTypeReference(com.android.tools.r8.graph.DexType):1892:1892 -> registerTypeReference
-    1:1:void setContext(com.android.tools.r8.graph.DexEncodedMethod):1772:1772 -> setContext
+    1:1:void <clinit>():1735:1735 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):1744:1744 -> <init>
+    2:11:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):1737:1746 -> <init>
+    1:8:boolean checkFieldReference(com.android.tools.r8.graph.DexField):1758:1765 -> checkFieldReference
+    9:9:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexField):181:181 -> checkFieldReference
+    9:9:boolean checkFieldReference(com.android.tools.r8.graph.DexField):1765 -> checkFieldReference
+    10:11:boolean checkFieldReference(com.android.tools.r8.graph.DexField):1766:1767 -> checkFieldReference
+    1:10:boolean checkMethodReference(com.android.tools.r8.graph.DexMethod):1775:1784 -> checkMethodReference
+    11:11:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):186:186 -> checkMethodReference
+    11:11:boolean checkMethodReference(com.android.tools.r8.graph.DexMethod):1784 -> checkMethodReference
+    12:13:boolean checkMethodReference(com.android.tools.r8.graph.DexMethod):1785:1786 -> checkMethodReference
+    1:5:boolean checkTypeReference(com.android.tools.r8.graph.DexType):1794:1798 -> checkTypeReference
+    6:6:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> checkTypeReference
+    6:6:boolean checkTypeReference(com.android.tools.r8.graph.DexType):1798 -> checkTypeReference
+    7:8:boolean checkTypeReference(com.android.tools.r8.graph.DexType):1799:1800 -> checkTypeReference
+    1:1:boolean foundIllegalAccess():1750:1750 -> foundIllegalAccess
+    1:1:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):1854:1854 -> registerInstanceFieldRead
+    1:1:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):1849:1849 -> registerInstanceFieldWrite
+    1:4:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod):1817:1820 -> registerInvokeDirect
+    1:4:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod):1833:1836 -> registerInvokeInterface
+    1:4:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod):1825:1828 -> registerInvokeStatic
+    1:4:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):1841:1844 -> registerInvokeSuper
+    1:4:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):1809:1812 -> registerInvokeVirtual
+    1:1:boolean registerNewInstance(com.android.tools.r8.graph.DexType):1859:1859 -> registerNewInstance
+    1:1:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):1864:1864 -> registerStaticFieldRead
+    1:1:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):1869:1869 -> registerStaticFieldWrite
+    1:1:boolean registerTypeReference(com.android.tools.r8.graph.DexType):1874:1874 -> registerTypeReference
+    1:1:void setContext(com.android.tools.r8.graph.DexEncodedMethod):1754:1754 -> setContext
 com.android.tools.r8.shaking.VerticalClassMerger$OverloadedMethodSignaturesRetriever -> com.android.tools.r8.shaking.VerticalClassMerger$OverloadedMethodSignaturesRetriever:
-    1:1:void <init>(com.android.tools.r8.shaking.VerticalClassMerger):551:551 -> <init>
-    2:9:void <init>(com.android.tools.r8.shaking.VerticalClassMerger):546:553 -> <init>
-    1:1:com.android.tools.r8.graph.DexProto lambda$get$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexString):576:576 -> a
-    1:35:java.util.Collection get():558:592 -> get
-    1:15:boolean protoMayReferenceMergedSourceOrTarget(com.android.tools.r8.graph.DexProto):600:614 -> protoMayReferenceMergedSourceOrTarget
-    1:8:boolean typeMayReferenceMergedSourceOrTarget(com.android.tools.r8.graph.DexType):620:627 -> typeMayReferenceMergedSourceOrTarget
+    1:1:void <init>(com.android.tools.r8.shaking.VerticalClassMerger):533:533 -> <init>
+    2:9:void <init>(com.android.tools.r8.shaking.VerticalClassMerger):528:535 -> <init>
+    1:1:com.android.tools.r8.graph.DexProto lambda$get$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexString):558:558 -> a
+    1:35:java.util.Collection get():540:574 -> get
+    1:15:boolean protoMayReferenceMergedSourceOrTarget(com.android.tools.r8.graph.DexProto):582:596 -> protoMayReferenceMergedSourceOrTarget
+    1:8:boolean typeMayReferenceMergedSourceOrTarget(com.android.tools.r8.graph.DexType):602:609 -> typeMayReferenceMergedSourceOrTarget
 com.android.tools.r8.shaking.VerticalClassMerger$Rename -> com.android.tools.r8.shaking.VerticalClassMerger$Rename:
     1:3:void <clinit>():179:181 -> <clinit>
     4:4:void <clinit>():178:178 -> <clinit>
@@ -59243,38 +59454,38 @@
     1:1:com.android.tools.r8.shaking.VerticalClassMerger$Rename valueOf(java.lang.String):178:178 -> valueOf
     1:1:com.android.tools.r8.shaking.VerticalClassMerger$Rename[] values():178:178 -> values
 com.android.tools.r8.shaking.VerticalClassMerger$SingleTypeMapperGraphLense -> com.android.tools.r8.shaking.VerticalClassMerger$SingleTypeMapperGraphLense:
-    1:1:void <clinit>():1671:1671 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):1676:1678 -> <init>
-    1:1:com.android.tools.r8.graph.DexField getOriginalFieldSignature(com.android.tools.r8.graph.DexField):1688:1688 -> getOriginalFieldSignature
-    1:1:com.android.tools.r8.graph.DexMethod getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):1693:1693 -> getOriginalMethodSignature
-    1:1:com.android.tools.r8.graph.DexType getOriginalType(com.android.tools.r8.graph.DexType):1683:1683 -> getOriginalType
-    1:1:com.android.tools.r8.graph.DexField getRenamedFieldSignature(com.android.tools.r8.graph.DexField):1698:1698 -> getRenamedFieldSignature
-    1:1:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):1703:1703 -> getRenamedMethodSignature
-    1:1:com.android.tools.r8.graph.DexField lookupField(com.android.tools.r8.graph.DexField):1742:1742 -> lookupField
-    1:18:com.android.tools.r8.graph.GraphLense$GraphLenseLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):1715:1732 -> lookupMethod
-    1:1:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription lookupPrototypeChanges(com.android.tools.r8.graph.DexMethod):1737:1737 -> lookupPrototypeChanges
-    1:1:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexType):1708:1708 -> lookupType
+    1:1:void <clinit>():1653:1653 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):1658:1660 -> <init>
+    1:1:com.android.tools.r8.graph.DexField getOriginalFieldSignature(com.android.tools.r8.graph.DexField):1670:1670 -> getOriginalFieldSignature
+    1:1:com.android.tools.r8.graph.DexMethod getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):1675:1675 -> getOriginalMethodSignature
+    1:1:com.android.tools.r8.graph.DexType getOriginalType(com.android.tools.r8.graph.DexType):1665:1665 -> getOriginalType
+    1:1:com.android.tools.r8.graph.DexField getRenamedFieldSignature(com.android.tools.r8.graph.DexField):1680:1680 -> getRenamedFieldSignature
+    1:1:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):1685:1685 -> getRenamedMethodSignature
+    1:1:com.android.tools.r8.graph.DexField lookupField(com.android.tools.r8.graph.DexField):1724:1724 -> lookupField
+    1:18:com.android.tools.r8.graph.GraphLense$GraphLenseLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):1697:1714 -> lookupMethod
+    1:1:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription lookupPrototypeChanges(com.android.tools.r8.graph.DexMethod):1719:1719 -> lookupPrototypeChanges
+    1:1:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexType):1690:1690 -> lookupType
 com.android.tools.r8.shaking.VerticalClassMerger$SynthesizedBridgeCode -> com.android.tools.r8.shaking.VerticalClassMerger$SynthesizedBridgeCode:
-    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):1909:1914 -> <init>
-    1:11:void lambda$getRegistryCallback$0(com.android.tools.r8.graph.UseRegistry):1950:1960 -> a
-    12:12:void lambda$getRegistryCallback$0(com.android.tools.r8.graph.UseRegistry):1952:1952 -> a
-    1:1:com.android.tools.r8.graph.DexMethod access$500(com.android.tools.r8.shaking.VerticalClassMerger$SynthesizedBridgeCode):1896:1896 -> access$500
-    1:1:java.util.function.Consumer getRegistryCallback():1949:1949 -> getRegistryCallback
-    1:10:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():1935:1944 -> getSourceCodeProvider
-    1:2:void updateMethodSignatures(java.util.function.Function):1929:1930 -> updateMethodSignatures
+    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):1891:1896 -> <init>
+    1:11:void lambda$getRegistryCallback$0(com.android.tools.r8.graph.UseRegistry):1932:1942 -> a
+    12:12:void lambda$getRegistryCallback$0(com.android.tools.r8.graph.UseRegistry):1934:1934 -> a
+    1:1:com.android.tools.r8.graph.DexMethod access$500(com.android.tools.r8.shaking.VerticalClassMerger$SynthesizedBridgeCode):1878:1878 -> access$500
+    1:1:java.util.function.Consumer getRegistryCallback():1931:1931 -> getRegistryCallback
+    1:10:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():1917:1926 -> getSourceCodeProvider
+    1:2:void updateMethodSignatures(java.util.function.Function):1911:1912 -> updateMethodSignatures
 com.android.tools.r8.shaking.VerticalClassMerger$TreeFixer -> com.android.tools.r8.shaking.VerticalClassMerger$TreeFixer:
-    1:5:void <init>(com.android.tools.r8.shaking.VerticalClassMerger):1433:1437 -> <init>
-    6:8:void <init>(com.android.tools.r8.shaking.VerticalClassMerger):1436:1438 -> <init>
-    9:9:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.shaking.VerticalClassMerger$1):1433:1433 -> <init>
-    1:1:com.android.tools.r8.graph.GraphLense access$400(com.android.tools.r8.shaking.VerticalClassMerger$TreeFixer):1433:1433 -> access$400
-    1:11:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):1477:1487 -> fixupFields
-    1:2:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1493:1494 -> fixupMethod
-    3:3:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1493:1493 -> fixupMethod
-    1:9:void fixupMethods(java.util.List,com.android.tools.r8.graph.DexClass$MethodSetter):1460:1468 -> fixupMethods
-    1:6:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):1498:1503 -> fixupProto
-    1:11:com.android.tools.r8.graph.DexType fixupType(com.android.tools.r8.graph.DexType):1509:1519 -> fixupType
-    1:11:com.android.tools.r8.graph.GraphLense fixupTypeReferences():1442:1452 -> fixupTypeReferences
-    1:3:com.android.tools.r8.graph.DexType[] fixupTypes(com.android.tools.r8.graph.DexType[]):1526:1528 -> fixupTypes
+    1:5:void <init>(com.android.tools.r8.shaking.VerticalClassMerger):1415:1419 -> <init>
+    6:8:void <init>(com.android.tools.r8.shaking.VerticalClassMerger):1418:1420 -> <init>
+    9:9:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.shaking.VerticalClassMerger$1):1415:1415 -> <init>
+    1:1:com.android.tools.r8.graph.GraphLense access$400(com.android.tools.r8.shaking.VerticalClassMerger$TreeFixer):1415:1415 -> access$400
+    1:11:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):1459:1469 -> fixupFields
+    1:2:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1475:1476 -> fixupMethod
+    3:3:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1475:1475 -> fixupMethod
+    1:9:void fixupMethods(java.util.List,com.android.tools.r8.graph.DexClass$MethodSetter):1442:1450 -> fixupMethods
+    1:6:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):1480:1485 -> fixupProto
+    1:11:com.android.tools.r8.graph.DexType fixupType(com.android.tools.r8.graph.DexType):1491:1501 -> fixupType
+    1:11:com.android.tools.r8.graph.GraphLense fixupTypeReferences():1424:1434 -> fixupTypeReferences
+    1:3:com.android.tools.r8.graph.DexType[] fixupTypes(com.android.tools.r8.graph.DexType[]):1508:1510 -> fixupTypes
 com.android.tools.r8.shaking.VerticalClassMergerGraphLense -> com.android.tools.r8.shaking.VerticalClassMergerGraphLense:
     1:1:void <clinit>():47:47 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Map,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.com.google.common.collect.BiMap,java.util.Map,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.shaking.VerticalClassMergerGraphLense$1):47:47 -> <init>
@@ -59898,7 +60109,38 @@
     1:1:java.lang.Object get():18:18 -> a
     2:2:void set(java.lang.Object):22:22 -> a
     1:1:boolean isSet():26:26 -> b
-com.android.tools.r8.utils.CfgPrinter -> com.android.tools.r8.utils.z:
+com.android.tools.r8.utils.CfLineToMethodMapper -> com.android.tools.r8.utils.C:
+    java.util.Map sourceMethodMapping -> a
+    com.android.tools.r8.utils.AndroidApp inputApp -> b
+    boolean $assertionsDisabled -> c
+    1:1:void <clinit>():19:19 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.utils.AndroidApp):25:25 -> <init>
+    2:7:void <init>(com.android.tools.r8.utils.AndroidApp):21:26 -> <init>
+    1:1:java.util.Map access$100(com.android.tools.r8.utils.CfLineToMethodMapper):19:19 -> a
+    2:2:java.lang.String lookupNameAndDescriptor(java.lang.String,int):31:31 -> a
+    3:7:void readLineNumbersFromClassFiles():39:43 -> a
+    3:7:java.lang.String lookupNameAndDescriptor(java.lang.String,int):32 -> a
+    8:8:void com.android.tools.r8.org.objectweb.asm.ClassReader.accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):400:400 -> a
+    8:8:void readLineNumbersFromClassFiles():44 -> a
+    8:8:java.lang.String lookupNameAndDescriptor(java.lang.String,int):32 -> a
+    9:10:java.lang.String lookupNameAndDescriptor(java.lang.String,int):34:35 -> a
+com.android.tools.r8.utils.CfLineToMethodMapper$1 -> com.android.tools.r8.utils.z:
+com.android.tools.r8.utils.CfLineToMethodMapper$ClassVisitor -> com.android.tools.r8.utils.A:
+    com.android.tools.r8.utils.CfLineToMethodMapper this$0 -> d
+    com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap currentLineNumberMapping -> c
+    1:1:void <init>(com.android.tools.r8.utils.CfLineToMethodMapper,com.android.tools.r8.utils.CfLineToMethodMapper$1):62:62 -> <init>
+    2:3:void <init>(com.android.tools.r8.utils.CfLineToMethodMapper):66:67 -> <init>
+    4:4:void <init>(com.android.tools.r8.utils.CfLineToMethodMapper):64:64 -> <init>
+    1:3:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):78:80 -> a
+    4:4:com.android.tools.r8.org.objectweb.asm.MethodVisitor visitMethod(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):86:86 -> a
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap lambda$visit$0(java.lang.String):80:80 -> c
+com.android.tools.r8.utils.CfLineToMethodMapper$MethodLineVisitor -> com.android.tools.r8.utils.B:
+    java.lang.String nameAndDescriptor -> j
+    java.util.Map lineMethodMapping -> k
+    1:1:void <init>(java.lang.String,java.util.Map,com.android.tools.r8.utils.CfLineToMethodMapper$1):91:91 -> <init>
+    2:4:void <init>(java.lang.String,java.util.Map):97:99 -> <init>
+    1:1:void visitLineNumber(int,com.android.tools.r8.org.objectweb.asm.Label):104:104 -> b
+com.android.tools.r8.utils.CfgPrinter -> com.android.tools.r8.utils.D:
     java.util.Stack opened -> b
     java.lang.StringBuilder builder -> a
     int nextUnusedValue -> c
@@ -59924,7 +60166,7 @@
     7:8:void printIndent():75:76 -> c
     1:2:com.android.tools.r8.utils.CfgPrinter print(java.lang.String):49:50 -> d
     1:1:java.lang.String toString():82:82 -> toString
-com.android.tools.r8.utils.ClassMap -> com.android.tools.r8.utils.C:
+com.android.tools.r8.utils.ClassMap -> com.android.tools.r8.utils.G:
     java.util.Map classes -> a
     java.util.concurrent.atomic.AtomicReference classProvider -> b
     boolean $assertionsDisabled -> c
@@ -59946,8 +60188,8 @@
     com.android.tools.r8.graph.ClassKind getClassKind() -> c
     1:1:boolean isFullyLoaded():228:228 -> d
     1:1:java.lang.String toString():81:81 -> toString
-com.android.tools.r8.utils.ClassMap$1 -> com.android.tools.r8.utils.A:
-com.android.tools.r8.utils.ClassMap$ConcurrentClassLoader -> com.android.tools.r8.utils.B:
+com.android.tools.r8.utils.ClassMap$1 -> com.android.tools.r8.utils.E:
+com.android.tools.r8.utils.ClassMap$ConcurrentClassLoader -> com.android.tools.r8.utils.F:
     boolean ready -> e
     boolean $assertionsDisabled -> f
     com.android.tools.r8.graph.DexType type -> c
@@ -59966,7 +60208,7 @@
     1:1:java.lang.Object get():234:234 -> get
     2:42:com.android.tools.r8.graph.DexClass get():251:291 -> get
     43:43:com.android.tools.r8.graph.DexClass get():287:287 -> get
-com.android.tools.r8.utils.ClassProvider -> com.android.tools.r8.utils.H:
+com.android.tools.r8.utils.ClassProvider -> com.android.tools.r8.utils.L:
     com.android.tools.r8.graph.ClassKind classKind -> a
     1:2:void <init>(com.android.tools.r8.graph.ClassKind):30:31 -> <init>
     void collectClass(com.android.tools.r8.graph.DexType,java.util.function.Consumer) -> a
@@ -59977,8 +60219,8 @@
     3:3:com.android.tools.r8.utils.ClassProvider forPreloadedClasses(com.android.tools.r8.graph.ClassKind,java.util.Collection):68 -> a
     4:7:com.android.tools.r8.utils.ClassProvider forPreloadedClasses(com.android.tools.r8.graph.ClassKind,java.util.Collection):69:72 -> a
     1:1:com.android.tools.r8.graph.ClassKind getClassKind():36:36 -> b
-com.android.tools.r8.utils.ClassProvider$1 -> com.android.tools.r8.utils.D:
-com.android.tools.r8.utils.ClassProvider$ClassFileResourceReader -> com.android.tools.r8.utils.E:
+com.android.tools.r8.utils.ClassProvider$1 -> com.android.tools.r8.utils.H:
+com.android.tools.r8.utils.ClassProvider$ClassFileResourceReader -> com.android.tools.r8.utils.I:
     com.android.tools.r8.graph.JarApplicationReader reader -> d
     com.android.tools.r8.graph.ClassKind classKind -> b
     com.android.tools.r8.ClassFileResourceProvider provider -> c
@@ -59989,21 +60231,21 @@
     12:18:void collectClass(com.android.tools.r8.graph.DexType,java.util.function.Consumer):99:105 -> a
     19:21:java.util.Collection collectTypes():112:114 -> a
     1:1:java.lang.String toString():121:121 -> toString
-com.android.tools.r8.utils.ClassProvider$CombinedClassProvider -> com.android.tools.r8.utils.F:
+com.android.tools.r8.utils.ClassProvider$CombinedClassProvider -> com.android.tools.r8.utils.J:
     java.util.List providers -> b
     1:1:void <init>(com.android.tools.r8.graph.ClassKind,java.util.List,com.android.tools.r8.utils.ClassProvider$1):151:151 -> <init>
     2:3:void <init>(com.android.tools.r8.graph.ClassKind,java.util.List):155:156 -> <init>
     1:2:void collectClass(com.android.tools.r8.graph.DexType,java.util.function.Consumer):161:162 -> a
     3:5:java.util.Collection collectTypes():168:170 -> a
     1:8:java.lang.String toString():177:184 -> toString
-com.android.tools.r8.utils.ClassProvider$PreloadedClassProvider -> com.android.tools.r8.utils.G:
+com.android.tools.r8.utils.ClassProvider$PreloadedClassProvider -> com.android.tools.r8.utils.K:
     com.android.tools.r8.com.google.common.collect.Multimap classes -> b
     1:1:void <init>(com.android.tools.r8.graph.ClassKind,com.android.tools.r8.com.google.common.collect.Multimap,com.android.tools.r8.utils.ClassProvider$1):125:125 -> <init>
     2:3:void <init>(com.android.tools.r8.graph.ClassKind,com.android.tools.r8.com.google.common.collect.Multimap):129:130 -> <init>
     1:2:void collectClass(com.android.tools.r8.graph.DexType,java.util.function.Consumer):135:136 -> a
     3:3:java.util.Collection collectTypes():142:142 -> a
     1:1:java.lang.String toString():147:147 -> toString
-com.android.tools.r8.utils.ClasspathClassCollection -> com.android.tools.r8.utils.I:
+com.android.tools.r8.utils.ClasspathClassCollection -> com.android.tools.r8.utils.M:
     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
@@ -60020,74 +60262,86 @@
     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.Consumer3 -> com.android.tools.r8.utils.J:
+com.android.tools.r8.utils.Consumer3 -> com.android.tools.r8.utils.N:
     void accept(java.lang.Object,java.lang.Object,java.lang.Object) -> a
-com.android.tools.r8.utils.DescriptorUtils -> com.android.tools.r8.utils.K:
+com.android.tools.r8.utils.DescriptorUtils -> com.android.tools.r8.utils.O:
     java.util.Map typeNameToLetterMap -> a
     boolean $assertionsDisabled -> b
-    1:17:void <clinit>():20:36 -> <clinit>
+    1:17:void <clinit>():22:38 -> <clinit>
+    1:1:java.lang.String javaTypeToShorty(java.lang.String):150:150 -> A
     boolean isPrimitiveType(char) -> a
-    1:12:java.lang.String internalToDescriptor(java.lang.String,boolean,boolean):42:53 -> a
-    13:17:java.lang.String internalToDescriptor(java.lang.String,boolean,boolean):52:56 -> a
-    18:23:java.lang.String toArrayDescriptor(int,java.lang.String):107:112 -> a
-    24:30:java.lang.String descriptorToInternalName(java.lang.String):168:174 -> a
-    31:31:java.lang.String descriptorToInternalName(java.lang.String):172:172 -> a
-    32:32:java.lang.String descriptorToJavaType(java.lang.String,com.android.tools.r8.naming.ClassNameMapper):187:187 -> a
-    33:33:java.lang.String primitiveDescriptorToJavaType(char):252:252 -> a
-    33:33:java.lang.String descriptorToJavaType(java.lang.String,com.android.tools.r8.naming.ClassNameMapper):199 -> a
-    34:34:java.lang.String descriptorToJavaType(java.lang.String,com.android.tools.r8.naming.ClassNameMapper):197:197 -> a
-    35:39:java.lang.String descriptorToJavaType(java.lang.String,com.android.tools.r8.naming.ClassNameMapper):190:194 -> a
-    40:46:java.lang.String computeInnerClassSeparator(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):375:381 -> a
-    47:47:java.lang.String computeInnerClassSeparator(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):380:380 -> a
-    48:48:java.lang.String computeInnerClassSeparator(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):378:378 -> a
-    49:56:java.lang.String computeInnerClassSeparator(java.lang.String,java.lang.String,java.lang.String):386:393 -> a
-    57:60:java.lang.String computeInnerClassSeparator(java.lang.String,java.lang.String,java.lang.String):392:395 -> a
-    61:65:java.lang.String guessTypeDescriptor(java.nio.file.Path):467:471 -> a
-    66:66:java.lang.String getPathFromJavaType(java.lang.Class):541:541 -> a
-    1:1:java.lang.String descriptorToJavaType(java.lang.String):158:158 -> b
-    1:2:java.lang.String getBinaryNameFromDescriptor(java.lang.String):331:332 -> c
-    1:1:java.lang.String getBinaryNameFromJavaType(java.lang.String):327:327 -> d
-    1:3:java.lang.String getClassBinaryNameFromDescriptor(java.lang.String):305:307 -> e
-    1:2:java.lang.String getClassFileName(java.lang.String):550:551 -> f
-    1:2:java.lang.String getClassNameFromDescriptor(java.lang.String):273:274 -> g
-    1:2:java.lang.String getDescriptorFromClassBinaryName(java.lang.String):342:343 -> h
-    1:3:java.lang.String getDescriptorFromKotlinClassifier(java.lang.String):352:354 -> i
-    1:1:java.lang.String getPackageBinaryNameFromJavaType(java.lang.String):317:317 -> j
-    1:3:java.lang.String getPackageNameFromBinaryName(java.lang.String):445:447 -> k
-    1:1:java.lang.String getPackageNameFromDescriptor(java.lang.String):295:295 -> l
-    1:3:java.lang.String getPathFromDescriptor(java.lang.String):535:537 -> m
-    1:2:java.lang.String getPathFromJavaType(java.lang.String):545:546 -> n
-    1:1:java.lang.String getUnqualifiedClassNameFromDescriptor(java.lang.String):263:263 -> o
-    2:3:java.lang.String getUnqualifiedClassNameFromBinaryName(java.lang.String):369:370 -> o
-    2:3:java.lang.String getUnqualifiedClassNameFromDescriptor(java.lang.String):263 -> o
-    1:13:com.android.tools.r8.utils.DescriptorUtils$ModuleAndDescriptor guessJrtModuleAndTypeDescriptor(java.lang.String):518:530 -> p
-    14:14:com.android.tools.r8.utils.DescriptorUtils$ModuleAndDescriptor guessJrtModuleAndTypeDescriptor(java.lang.String):528:528 -> p
-    15:15:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> p
-    15:15:com.android.tools.r8.utils.DescriptorUtils$ModuleAndDescriptor guessJrtModuleAndTypeDescriptor(java.lang.String):528 -> p
-    16:16:com.android.tools.r8.utils.DescriptorUtils$ModuleAndDescriptor guessJrtModuleAndTypeDescriptor(java.lang.String):528:528 -> p
-    1:8:java.lang.String guessTypeDescriptor(java.lang.String):483:490 -> q
-    9:9:java.lang.String guessTypeDescriptor(java.lang.String):488:488 -> q
-    10:10:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> q
-    10:10:java.lang.String guessTypeDescriptor(java.lang.String):488 -> q
-    11:11:java.lang.String guessTypeDescriptor(java.lang.String):488:488 -> q
-    1:26:boolean isClassDescriptor(java.lang.String):402:427 -> r
-    1:1:boolean isDescriptor(java.lang.String):226:226 -> s
-    2:5:boolean isPrimitiveDescriptor(java.lang.String):204:207 -> s
-    2:5:boolean isDescriptor(java.lang.String):227 -> s
-    6:10:boolean isArrayDescriptor(java.lang.String):216:220 -> s
-    6:10:boolean isDescriptor(java.lang.String):228 -> s
-    1:6:boolean isValidJavaType(java.lang.String):122:127 -> t
-    1:2:java.lang.String javaTypeToDescriptor(java.lang.String):66:67 -> u
-    1:2:java.lang.String javaTypeToDescriptorIfValidJavaType(java.lang.String):92:93 -> v
-    1:2:java.lang.String javaTypeToDescriptorIgnorePrimitives(java.lang.String):81:82 -> w
-    1:1:java.lang.String javaTypeToShorty(java.lang.String):148:148 -> x
-com.android.tools.r8.utils.DescriptorUtils$ModuleAndDescriptor -> com.android.tools.r8.utils.K$a:
+    1:12:java.lang.String internalToDescriptor(java.lang.String,boolean,boolean):44:55 -> a
+    13:17:java.lang.String internalToDescriptor(java.lang.String,boolean,boolean):54:58 -> a
+    18:23:java.lang.String toArrayDescriptor(int,java.lang.String):109:114 -> a
+    24:30:java.lang.String descriptorToInternalName(java.lang.String):170:176 -> a
+    31:31:java.lang.String descriptorToInternalName(java.lang.String):174:174 -> a
+    32:32:java.lang.String descriptorToJavaType(java.lang.String,com.android.tools.r8.naming.ClassNameMapper):189:189 -> a
+    33:33:java.lang.String primitiveDescriptorToJavaType(char):254:254 -> a
+    33:33:java.lang.String descriptorToJavaType(java.lang.String,com.android.tools.r8.naming.ClassNameMapper):201 -> a
+    34:34:java.lang.String descriptorToJavaType(java.lang.String,com.android.tools.r8.naming.ClassNameMapper):199:199 -> a
+    35:39:java.lang.String descriptorToJavaType(java.lang.String,com.android.tools.r8.naming.ClassNameMapper):192:196 -> a
+    40:58:java.lang.String getDescriptorFromKmType(com.android.tools.r8.jetbrains.kotlinx.metadata.KmType):368:386 -> a
+    59:65:java.lang.String computeInnerClassSeparator(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):407:413 -> a
+    66:66:java.lang.String computeInnerClassSeparator(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):412:412 -> a
+    67:67:java.lang.String computeInnerClassSeparator(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):410:410 -> a
+    68:75:java.lang.String computeInnerClassSeparator(java.lang.String,java.lang.String,java.lang.String):418:425 -> a
+    76:79:java.lang.String computeInnerClassSeparator(java.lang.String,java.lang.String,java.lang.String):424:427 -> a
+    80:84:java.lang.String guessTypeDescriptor(java.nio.file.Path):499:503 -> a
+    85:85:java.lang.String getPathFromJavaType(java.lang.Class):573:573 -> a
+    1:1:java.lang.String descriptorToJavaType(java.lang.String):160:160 -> b
+    1:3:int getArgumentCount(java.lang.String):646:648 -> c
+    1:36:java.lang.String[] getArgumentTypeDescriptors(java.lang.String):600:635 -> d
+    37:42:java.lang.String[] getArgumentTypeDescriptors(java.lang.String):621:626 -> d
+    43:67:java.lang.String[] getArgumentTypeDescriptors(java.lang.String):608:632 -> d
+    68:68:java.lang.String[] getArgumentTypeDescriptors(java.lang.String):617:617 -> d
+    1:2:java.lang.String getBinaryNameFromDescriptor(java.lang.String):333:334 -> e
+    1:1:java.lang.String getBinaryNameFromJavaType(java.lang.String):329:329 -> f
+    1:3:java.lang.String getClassBinaryNameFromDescriptor(java.lang.String):307:309 -> g
+    1:2:java.lang.String getClassFileName(java.lang.String):582:583 -> h
+    1:2:java.lang.String getClassNameFromDescriptor(java.lang.String):275:276 -> i
+    1:2:java.lang.String getDescriptorFromClassBinaryName(java.lang.String):344:345 -> j
+    1:3:java.lang.String getDescriptorFromKotlinClassifier(java.lang.String):354:356 -> k
+    1:1:java.lang.String getPackageBinaryNameFromJavaType(java.lang.String):319:319 -> l
+    1:3:java.lang.String getPackageNameFromBinaryName(java.lang.String):477:479 -> m
+    1:1:java.lang.String getPackageNameFromDescriptor(java.lang.String):297:297 -> n
+    1:3:java.lang.String getPathFromDescriptor(java.lang.String):567:569 -> o
+    1:2:java.lang.String getPathFromJavaType(java.lang.String):577:578 -> p
+    1:2:java.lang.String getReturnTypeDescriptor(java.lang.String):587:588 -> q
+    1:1:java.lang.String getUnqualifiedClassNameFromDescriptor(java.lang.String):265:265 -> r
+    2:3:java.lang.String getUnqualifiedClassNameFromBinaryName(java.lang.String):401:402 -> r
+    2:3:java.lang.String getUnqualifiedClassNameFromDescriptor(java.lang.String):265 -> r
+    1:13:com.android.tools.r8.utils.DescriptorUtils$ModuleAndDescriptor guessJrtModuleAndTypeDescriptor(java.lang.String):550:562 -> s
+    14:14:com.android.tools.r8.utils.DescriptorUtils$ModuleAndDescriptor guessJrtModuleAndTypeDescriptor(java.lang.String):560:560 -> s
+    15:15:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> s
+    15:15:com.android.tools.r8.utils.DescriptorUtils$ModuleAndDescriptor guessJrtModuleAndTypeDescriptor(java.lang.String):560 -> s
+    16:16:com.android.tools.r8.utils.DescriptorUtils$ModuleAndDescriptor guessJrtModuleAndTypeDescriptor(java.lang.String):560:560 -> s
+    1:8:java.lang.String guessTypeDescriptor(java.lang.String):515:522 -> t
+    9:9:java.lang.String guessTypeDescriptor(java.lang.String):520:520 -> t
+    10:10:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> t
+    10:10:java.lang.String guessTypeDescriptor(java.lang.String):520 -> t
+    11:11:java.lang.String guessTypeDescriptor(java.lang.String):520:520 -> t
+    1:26:boolean isClassDescriptor(java.lang.String):434:459 -> u
+    1:1:boolean isDescriptor(java.lang.String):228:228 -> v
+    2:5:boolean isPrimitiveDescriptor(java.lang.String):206:209 -> v
+    2:5:boolean isDescriptor(java.lang.String):229 -> v
+    6:10:boolean isArrayDescriptor(java.lang.String):218:222 -> v
+    6:10:boolean isDescriptor(java.lang.String):230 -> v
+    1:6:boolean isValidJavaType(java.lang.String):124:129 -> w
+    1:2:java.lang.String javaTypeToDescriptor(java.lang.String):68:69 -> x
+    1:2:java.lang.String javaTypeToDescriptorIfValidJavaType(java.lang.String):94:95 -> y
+    1:2:java.lang.String javaTypeToDescriptorIgnorePrimitives(java.lang.String):83:84 -> z
+com.android.tools.r8.utils.DescriptorUtils$1 -> com.android.tools.r8.utils.O$a:
+    com.android.tools.r8.utils.Box val$descriptor -> b
+    1:1:void <init>(com.android.tools.r8.utils.Box):369:369 -> <init>
+    1:2:void visitClass(java.lang.String):374:375 -> a
+    1:2:void visitTypeAlias(java.lang.String):382:383 -> b
+com.android.tools.r8.utils.DescriptorUtils$ModuleAndDescriptor -> com.android.tools.r8.utils.O$b:
     java.lang.String module -> a
     java.lang.String descriptor -> b
-    1:3:void <init>(java.lang.String,java.lang.String):497:499 -> <init>
-    1:1:java.lang.String getDescriptor():507:507 -> a
-    1:1:java.lang.String getModule():503:503 -> b
-com.android.tools.r8.utils.DexVersion -> com.android.tools.r8.utils.L:
+    1:3:void <init>(java.lang.String,java.lang.String):529:531 -> <init>
+    1:1:java.lang.String getDescriptor():539:539 -> a
+    1:1:java.lang.String getModule():535:535 -> b
+com.android.tools.r8.utils.DexVersion -> com.android.tools.r8.utils.P:
     byte[] dexVersionBytes -> b
     com.android.tools.r8.utils.DexVersion[] $VALUES -> g
     com.android.tools.r8.utils.DexVersion V35 -> c
@@ -60113,13 +60367,13 @@
     44:44:java.util.Optional getDexVersion(int):86:86 -> b
     45:45:java.util.Optional getDexVersion(int):84:84 -> b
     46:46:java.util.Optional getDexVersion(int):82:82 -> b
-com.android.tools.r8.utils.DiagnosticWithThrowable -> com.android.tools.r8.utils.M:
+com.android.tools.r8.utils.DiagnosticWithThrowable -> com.android.tools.r8.utils.Q:
     java.lang.Throwable throwable -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():9:9 -> <clinit>
     1:3:void <init>(java.lang.Throwable):13:15 -> <init>
     1:1:java.lang.Throwable getThrowable():19:19 -> getThrowable
-com.android.tools.r8.utils.DirectoryBuilder -> com.android.tools.r8.utils.N:
+com.android.tools.r8.utils.DirectoryBuilder -> com.android.tools.r8.utils.S:
     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>
@@ -60133,7 +60387,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.utils.O:
+com.android.tools.r8.utils.DisjointSets -> com.android.tools.r8.utils.T:
     java.util.Map parent -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():16:16 -> <clinit>
@@ -60149,7 +60403,7 @@
     1:3:java.lang.Object makeSet(java.lang.Object):27:29 -> e
     1:1:java.util.Set lambda$collectSets$0(java.lang.Object):143:143 -> f
     1:12:java.lang.String toString():150:161 -> toString
-com.android.tools.r8.utils.EncodedValueUtils -> com.android.tools.r8.utils.P:
+com.android.tools.r8.utils.EncodedValueUtils -> com.android.tools.r8.utils.U:
     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
@@ -60172,7 +60426,7 @@
     14:14:java.lang.String getDiagnosticMessage():45:45 -> getDiagnosticMessage
     1:1:com.android.tools.r8.origin.Origin getOrigin():33:33 -> getOrigin
     1:1:com.android.tools.r8.position.Position getPosition():38:38 -> getPosition
-com.android.tools.r8.utils.ExceptionUtils -> com.android.tools.r8.utils.Q:
+com.android.tools.r8.utils.ExceptionUtils -> com.android.tools.r8.utils.V:
     1:1:boolean com.android.tools.r8.utils.IdentifierUtils.isDexIdentifierPart(int):14:14 -> a
     2:2:void lambda$withConsumeResourceHandler$0(com.android.tools.r8.StringConsumer,java.lang.String,com.android.tools.r8.DiagnosticsHandler):27:27 -> a
     3:3:void withConsumeResourceHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.StringConsumer,java.lang.String):27:27 -> a
@@ -60218,8 +60472,8 @@
     1:2:boolean com.android.tools.r8.utils.IdentifierUtils.isRelaxedDexIdentifierPart(int):18:19 -> c
     boolean com.android.tools.r8.utils.IdentifierUtils.isSimpleNameChar(int) -> d
     boolean com.android.tools.r8.utils.IdentifierUtils.isUnicodeSpace(int) -> e
-com.android.tools.r8.utils.ExceptionUtils$CompileAction -> com.android.tools.r8.utils.Q$a:
-com.android.tools.r8.utils.ExceptionUtils$MainAction -> com.android.tools.r8.utils.Q$b:
+com.android.tools.r8.utils.ExceptionUtils$CompileAction -> com.android.tools.r8.utils.V$a:
+com.android.tools.r8.utils.ExceptionUtils$MainAction -> com.android.tools.r8.utils.V$b:
 com.android.tools.r8.utils.FeatureClassMapping -> com.android.tools.r8.utils.FeatureClassMapping:
     java.util.Map parsedRules -> a
     java.util.Map parseNonClassRules -> b
@@ -60279,7 +60533,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.utils.S:
+com.android.tools.r8.utils.FieldSignatureEquivalence -> com.android.tools.r8.utils.W:
     boolean ignoreName -> a
     com.android.tools.r8.utils.FieldSignatureEquivalence INSTANCE_IGNORE_NAME -> c
     com.android.tools.r8.utils.FieldSignatureEquivalence INSTANCE -> b
@@ -60293,7 +60547,7 @@
     1:1:int doHash(java.lang.Object):14:14 -> doHash
     2:5:int doHash(com.android.tools.r8.graph.DexField):45:48 -> doHash
     2:5:int doHash(java.lang.Object):14 -> doHash
-com.android.tools.r8.utils.FileUtils -> com.android.tools.r8.utils.T:
+com.android.tools.r8.utils.FileUtils -> com.android.tools.r8.utils.X:
     boolean isAndroid -> a
     boolean $assertionsDisabled -> b
     1:16:void <clinit>():21:36 -> <clinit>
@@ -60317,14 +60571,14 @@
     1:2:boolean isVDexFile(java.nio.file.Path):44:45 -> f
     1:2:boolean isZipFile(java.nio.file.Path):63:64 -> g
     1:1:java.util.List readAllLines(java.nio.file.Path):90:90 -> h
-com.android.tools.r8.utils.FilteredArchiveClassFileProvider -> com.android.tools.r8.utils.U:
+com.android.tools.r8.utils.FilteredArchiveClassFileProvider -> com.android.tools.r8.utils.Y:
     1:1:void <init>(com.android.tools.r8.shaking.FilteredClassPath):13:13 -> <init>
     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.utils.V:
+com.android.tools.r8.utils.FlagFile$FlagFileOrigin -> com.android.tools.r8.utils.Z:
     java.nio.file.Path path -> a
     1:2:void <init>(java.nio.file.Path):22:23 -> <init>
     1:1:java.lang.String part():28:28 -> part
-com.android.tools.r8.utils.HeapUtils -> com.android.tools.r8.utils.W:
+com.android.tools.r8.utils.HeapUtils -> com.android.tools.r8.utils.a0:
     com.sun.management.HotSpotDiagnosticMXBean hotSpotDiagnosticMXBean -> a
     1:3:void initHotSpotMBean():19:21 -> a
     1:3:void dumpHeap(java.nio.file.Path,boolean):35 -> a
@@ -60334,17 +60588,17 @@
     6:8:void initHotSpotMBean():22:24 -> a
     6:8:void dumpHeap(java.nio.file.Path,boolean):35 -> a
     9:9:void dumpHeap(java.nio.file.Path,boolean):36:36 -> a
-com.android.tools.r8.utils.IROrdering -> com.android.tools.r8.utils.X:
+com.android.tools.r8.utils.IROrdering -> com.android.tools.r8.utils.b0:
     java.lang.Iterable order(java.lang.Iterable) -> a
     java.util.Collection order(java.util.Collection) -> a
-com.android.tools.r8.utils.IROrdering$IdentityIROrdering -> com.android.tools.r8.utils.X$a:
+com.android.tools.r8.utils.IROrdering$IdentityIROrdering -> com.android.tools.r8.utils.b0$a:
     com.android.tools.r8.utils.IROrdering$IdentityIROrdering INSTANCE -> a
     1:1:void <clinit>():21:21 -> <clinit>
     1:1:void <init>():23:23 -> <init>
     java.lang.Iterable order(java.lang.Iterable) -> a
     java.util.Collection order(java.util.Collection) -> a
     1:1:com.android.tools.r8.utils.IROrdering$IdentityIROrdering getInstance():26:26 -> a
-com.android.tools.r8.utils.IROrdering$NondeterministicIROrdering -> com.android.tools.r8.utils.X$b:
+com.android.tools.r8.utils.IROrdering$NondeterministicIROrdering -> com.android.tools.r8.utils.b0$b:
     com.android.tools.r8.utils.IROrdering$NondeterministicIROrdering INSTANCE -> a
     1:1:void <clinit>():42:42 -> <clinit>
     1:1:void <init>():44:44 -> <init>
@@ -60354,9 +60608,9 @@
     4:5:java.util.List order(java.lang.Iterable):52:53 -> a
     4:5:java.util.List order(java.util.Collection):59 -> a
     4:5:java.util.Collection order(java.util.Collection):40 -> a
-com.android.tools.r8.utils.IntObjConsumer -> com.android.tools.r8.utils.Y:
+com.android.tools.r8.utils.IntObjConsumer -> com.android.tools.r8.utils.c0:
     void accept(int,java.lang.Object) -> a
-com.android.tools.r8.utils.InternalArchiveClassFileProvider -> com.android.tools.r8.utils.Z:
+com.android.tools.r8.utils.InternalArchiveClassFileProvider -> com.android.tools.r8.utils.d0:
     java.util.Set descriptors -> c
     com.android.tools.r8.origin.Origin origin -> b
     java.util.zip.ZipFile openedZipFile -> d
@@ -60379,13 +60633,14 @@
     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.utils.a0:
+com.android.tools.r8.utils.InternalOptions -> com.android.tools.r8.utils.e0:
     java.lang.String printCfgFile -> I0
     com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration desugaredLibraryConfiguration -> f1
     boolean enableRedundantConstNumberOptimization -> f0
     com.android.tools.r8.experimental.graphinfo.GraphConsumer mainDexKeptGraphConsumer -> i1
-    boolean enableSourceDebugExtensionRewriter -> P
+    boolean enableCfInterfaceMethodDesugaring -> P
     java.lang.String dumpInputToDirectory -> j
+    com.android.tools.r8.AssertionsConfiguration assertionsConfiguration -> L0
     boolean enableRedundantFieldLoadElimination -> b0
     com.android.tools.r8.utils.InternalOptions$TestingOptions testing -> R0
     int SUPPORTED_DEX_VERSION -> m1
@@ -60421,7 +60676,6 @@
     com.android.tools.r8.StringConsumer configurationConsumer -> e1
     boolean enableInitializedClassesAnalysis -> E
     int inliningMonitorEnterValuesAllowance -> V
-    com.android.tools.r8.utils.InternalOptions$AssertionProcessing assertionProcessing -> L0
     boolean debug -> O0
     java.util.function.Consumer syntheticProguardRulesConsumer -> k1
     com.android.tools.r8.ProgramConsumer programConsumer -> d
@@ -60498,225 +60752,219 @@
     boolean disableInliningOfLibraryMethodOverrides -> B
     int classInliningInstructionAllowance -> S
     boolean verbose -> i0
-    1:23:void <clinit>():66:88 -> <clinit>
-    1:1:void <init>():112:112 -> <init>
-    2:544:void <init>():106:648 -> <init>
-    545:549:void <init>():113:117 -> <init>
-    550:550:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):121:121 -> <init>
-    551:1093:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):106:648 -> <init>
-    1094:1101:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):122:129 -> <init>
-    1102:1102:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):133:133 -> <init>
-    1103:1645:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):106:648 -> <init>
-    1646:1657:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):134:145 -> <init>
-    1:1:boolean hasMethodsFilter():898:898 -> A
-    1:1:boolean hasProguardConfiguration():95:95 -> B
-    1:1:boolean hasUsageInformationConsumer():605:605 -> C
-    1:1:boolean isDesugaredLibraryCompilation():324:324 -> D
-    1:1:boolean isGeneratingClassFiles():345:345 -> E
-    1:1:boolean isGeneratingDexIndexed():337:337 -> F
-    1:1:boolean isGeneratingDex():333 -> F
-    2:2:boolean isGeneratingDexFilePerClassFile():341:341 -> F
-    2:2:boolean isGeneratingDex():333 -> F
-    1:1:boolean hasConsumer():308:308 -> G
-    1:1:boolean isInterfaceMethodDesugaringEnabled():1130 -> G
-    2:4:boolean isInterfaceMethodDesugaringEnabled():1133:1135 -> G
-    1:1:boolean isMinifying():437:437 -> H
-    1:1:boolean isShrinking():433:433 -> I
-    1:1:boolean isStringSwitchConversionEnabled():1139:1139 -> J
-    1:1:com.android.tools.r8.utils.InternalOptions$KotlinOptimizationOptions kotlinOptimizationOptions():476:476 -> K
-    1:32:boolean printWarnings():823:854 -> L
-    33:72:boolean printWarnings():850:889 -> L
-    1:1:com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions protoShrinking():472:472 -> M
-    1:4:boolean shouldDesugarNests():380:383 -> N
-    5:5:boolean isGeneratingClassFiles():345:345 -> N
-    5:5:boolean canUseNestBasedAccess():1113 -> N
-    5:5:boolean shouldDesugarNests():383 -> N
-    1:13:void signalFinishedToConsumers():361:373 -> O
-    1:1:boolean assertionsEnabled():643:643 -> P
-    1:9:java.util.Set getExtensiveInterfaceMethodMinifierLoggingFilter():510:518 -> Q
-    1:9:java.util.Set getExtensiveLoggingFilter():484:492 -> R
-    1:1:boolean shouldEnableKeepRuleSynthesisForRecompilation():480:480 -> S
+    1:14:void <clinit>():67:80 -> <clinit>
+    1:1:void <init>():104:104 -> <init>
+    2:544:void <init>():98:640 -> <init>
+    545:549:void <init>():105:109 -> <init>
+    550:550:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):113:113 -> <init>
+    551:1093:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):98:640 -> <init>
+    1094:1101:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):114:121 -> <init>
+    1102:1102:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):125:125 -> <init>
+    1103:1645:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):98:640 -> <init>
+    1646:1657:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):126:137 -> <init>
+    1:1:boolean hasMethodsFilter():890:890 -> A
+    1:1:boolean hasProguardConfiguration():87:87 -> B
+    1:1:boolean hasUsageInformationConsumer():597:597 -> C
+    1:1:boolean isDesugaredLibraryCompilation():316:316 -> D
+    1:1:boolean isGeneratingClassFiles():337:337 -> E
+    1:1:boolean isGeneratingDexIndexed():329:329 -> F
+    1:1:boolean isGeneratingDex():325 -> F
+    2:2:boolean isGeneratingDexFilePerClassFile():333:333 -> F
+    2:2:boolean isGeneratingDex():325 -> F
+    1:1:boolean hasConsumer():300:300 -> G
+    1:1:boolean isInterfaceMethodDesugaringEnabled():1122 -> G
+    2:4:boolean isInterfaceMethodDesugaringEnabled():1125:1127 -> G
+    1:1:boolean isMinifying():429:429 -> H
+    1:1:boolean isShrinking():425:425 -> I
+    1:1:boolean isStringSwitchConversionEnabled():1131:1131 -> J
+    1:1:com.android.tools.r8.utils.InternalOptions$KotlinOptimizationOptions kotlinOptimizationOptions():468:468 -> K
+    1:32:boolean printWarnings():815:846 -> L
+    33:72:boolean printWarnings():842:881 -> L
+    1:1:com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions protoShrinking():464:464 -> M
+    1:4:boolean shouldDesugarNests():372:375 -> N
+    5:5:boolean isGeneratingClassFiles():337:337 -> N
+    5:5:boolean canUseNestBasedAccess():1105 -> N
+    5:5:boolean shouldDesugarNests():375 -> N
+    1:13:void signalFinishedToConsumers():353:365 -> O
+    1:1:boolean assertionsEnabled():635:635 -> P
+    1:9:java.util.Set getExtensiveInterfaceMethodMinifierLoggingFilter():502:510 -> Q
+    1:9:java.util.Set getExtensiveLoggingFilter():476:484 -> R
+    1:1:boolean shouldEnableKeepRuleSynthesisForRecompilation():472:472 -> S
     boolean lambda$new$0(java.lang.String,java.lang.Long) -> a
-    1:2:void setMarker(com.android.tools.r8.dex.Marker):277:278 -> a
-    3:4:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):282:283 -> a
-    5:12:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):290:297 -> a
-    5:12:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):285 -> a
-    13:13:boolean isGeneratingClassFiles():345:345 -> a
-    13:13:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):298 -> a
-    13:13:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):285 -> a
-    14:17:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):299:302 -> a
-    14:17:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):285 -> a
-    18:18:void errorMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):651:651 -> a
-    19:19:void errorMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):673:673 -> a
-    20:26: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.DexType):767:773 -> a
-    27:27: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.DexType):768:768 -> a
-    28:29:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):780:781 -> a
-    30:30:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():716:716 -> a
-    30:30:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):783 -> a
-    31:33:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):783:785 -> a
-    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():720:720 -> a
-    34:34:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):786 -> a
-    35:35:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):786:786 -> a
-    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():720:720 -> a
-    36:36:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):789 -> a
-    37:37:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):789:789 -> a
-    38:38:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):781:781 -> a
-    39:42:void warningMissingEnclosingMember(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,int):794:797 -> a
-    43:47:void warningInvalidParameterAnnotations(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.origin.Origin,int,int):802:806 -> a
-    48:54:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):811:817 -> a
-    55:55:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):812:812 -> a
-    56:56:java.util.List lambda$warningInvalidDebugInfo$3(com.android.tools.r8.origin.Origin):816:816 -> a
-    57:62:boolean methodMatchesFilter(com.android.tools.r8.graph.DexEncodedMethod):903:908 -> a
-    63:64:boolean hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1084:1085 -> a
-    65:65:boolean canHaveArtCheckCastVerifierBug():1460:1460 -> a
-    1:4:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):662:665 -> b
-    5:5:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():716:716 -> b
-    5:5:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):667 -> b
-    6:8:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):667:669 -> b
-    9:9:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):665:665 -> b
-    10:10:void errorMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):651:651 -> b
-    10:10:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):663 -> b
-    11:11:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):689:689 -> b
-    12:12:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> b
-    12:12:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):690 -> b
-    13:15:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):691:693 -> b
-    16:16:void errorMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):673:673 -> b
-    16:16:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):694 -> b
-    17:18:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):698:699 -> b
-    19:19:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():716:716 -> b
-    19:19:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):701 -> b
-    20:20:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):701:701 -> b
-    21:21:java.lang.String messageWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):761:761 -> b
-    21:21:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):703 -> b
-    22:22:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):703:703 -> b
-    23:23:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):699:699 -> b
-    24:24:java.util.List lambda$warningInvalidParameterAnnotations$2(com.android.tools.r8.origin.Origin):805:805 -> b
-    25:26:boolean canHaveArtInstanceOfVerifierBug():1415:1416 -> b
-    1:4:void warningMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):655:658 -> c
-    5:5:void errorMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):651:651 -> c
-    5:5:void warningMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):656 -> c
-    6:6:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):677:677 -> c
-    7:7:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> c
-    7:7:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):678 -> c
-    8:8:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):679:679 -> c
-    9:9:void errorMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):673:673 -> c
-    9:9:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):680 -> c
-    10:10:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):684:684 -> c
-    11:11:java.lang.String messageWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):761:761 -> c
-    11:11:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):684 -> c
-    12:12:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):684:684 -> c
-    13:13:java.util.List lambda$warningMissingEnclosingMember$1(com.android.tools.r8.origin.Origin):796:796 -> c
-    14:14:boolean canHaveDalvikAbstractMethodOnNonAbstractClassVerificationBug():1492:1492 -> c
-    1:1:boolean isGeneratingClassFiles():345:345 -> d
-    1:1:boolean canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():1506 -> d
-    2:2:boolean canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():1506:1506 -> d
-    3:5:java.lang.String messageErrorMissingNestHost(com.android.tools.r8.graph.DexClass):707:709 -> d
-    6:11:java.lang.String messageErrorIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):723:728 -> d
-    12:12:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):189:189 -> d
-    12:12:java.lang.String messageErrorIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):728 -> d
-    13:40:java.lang.String messageErrorIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):730:757 -> d
-    1:1:boolean isGeneratingClassFiles():345:345 -> e
-    1:1:boolean canInitCauseAfterAssertionErrorObjectConstructor():1162 -> e
-    2:2:boolean canInitCauseAfterAssertionErrorObjectConstructor():1162:1162 -> e
-    3:5:java.lang.String messageWarningMissingNestHost(com.android.tools.r8.graph.DexClass):716:718 -> e
-    1:1:boolean isGeneratingClassFiles():345:345 -> f
-    1:1:boolean canLeaveStaticInterfaceMethodInvokes():1117 -> f
-    2:2:boolean canLeaveStaticInterfaceMethodInvokes():1117:1117 -> f
-    1:1:boolean isGeneratingClassFiles():345:345 -> g
-    1:1:boolean canUseAssertionErrorTwoArgumentConstructor():1152 -> g
-    2:2:boolean canUseAssertionErrorTwoArgumentConstructor():1152:1152 -> g
-    1:1:boolean isGeneratingClassFiles():345:345 -> h
-    1:1:boolean canUseConstantMethodHandle():1097 -> h
-    2:2:boolean canUseConstantMethodHandle():1097:1097 -> h
-    1:1:boolean isGeneratingClassFiles():345:345 -> i
-    1:1:boolean canUseConstantMethodType():1101 -> i
-    2:2:boolean canUseConstantMethodType():1101:1101 -> i
-    1:1:boolean isGeneratingClassFiles():345:345 -> j
-    1:1:boolean canUseDefaultAndStaticInterfaceMethods():1109 -> j
-    2:2:boolean canUseDefaultAndStaticInterfaceMethods():1109:1109 -> j
-    1:2:boolean canUseFilledNewArrayOfObjects():1174:1175 -> k
-    1:1:boolean isGeneratingClassFiles():345:345 -> l
-    1:1:boolean canUseInvokeCustom():1105 -> l
-    2:2:boolean canUseInvokeCustom():1105:1105 -> l
-    1:1:boolean isGeneratingClassFiles():345:345 -> m
-    1:1:boolean canUseInvokePolymorphic():1093 -> m
-    2:2:boolean canUseInvokePolymorphic():1093:1093 -> m
-    1:1:boolean isGeneratingClassFiles():345:345 -> n
-    1:1:boolean canUseInvokePolymorphicOnVarHandle():1089 -> n
-    2:2:boolean canUseInvokePolymorphicOnVarHandle():1089:1089 -> n
-    1:2:boolean canUseMultidex():1143:1144 -> o
-    1:1:boolean isGeneratingClassFiles():345:345 -> p
-    1:1:boolean canUseNotInstruction():1210 -> p
-    2:2:boolean canUseNotInstruction():1210:1210 -> p
-    1:1:boolean isGeneratingClassFiles():345:345 -> q
-    1:1:boolean canUsePrivateInterfaceMethods():1125 -> q
-    2:2:boolean canUsePrivateInterfaceMethods():1125:1125 -> q
-    1:2:boolean canUseSameArrayAndResultRegisterInArrayGetWide():1183:1184 -> r
-    1:1:boolean isGeneratingClassFiles():345:345 -> s
-    1:1:boolean canUseSuppressedExceptions():1148 -> s
-    2:2:boolean canUseSuppressedExceptions():1148:1148 -> s
-    1:1:boolean isGeneratingClassFiles():345:345 -> t
-    1:1:boolean canUseTwrCloseResourceMethod():1121 -> t
-    2:2:boolean canUseTwrCloseResourceMethod():1121:1121 -> t
-    1:4:void disableAllOptimizations():149:152 -> u
-    1:18:void disableGlobalOptimizations():156:173 -> v
-    1:1:void disableNameReflectionOptimization():1073:1073 -> w
-    1:2:void enablePropagationOfConstantsAtCallSites():1079:1080 -> x
-    1:1:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():312:312 -> y
-    2:2:boolean hasConsumer():308:308 -> y
-    2:2:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():312 -> y
-    3:3:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():312:312 -> y
-    4:4:boolean isGeneratingDexIndexed():337:337 -> y
-    4:4:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():313 -> y
-    5:5:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():314:314 -> y
-    6:6:boolean isGeneratingDexFilePerClassFile():341:341 -> y
-    6:6:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():315 -> y
-    7:7:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():316:316 -> y
-    8:8:boolean isGeneratingClassFiles():345:345 -> y
-    8:8:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():317 -> y
-    9:11:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():318:320 -> y
-    1:1:com.android.tools.r8.shaking.ProguardConfiguration getProguardConfiguration():99:99 -> z
-com.android.tools.r8.utils.InternalOptions$AssertionProcessing -> com.android.tools.r8.utils.a0$a:
-    com.android.tools.r8.utils.InternalOptions$AssertionProcessing LEAVE -> a
-    com.android.tools.r8.utils.InternalOptions$AssertionProcessing REMOVE -> b
-    com.android.tools.r8.utils.InternalOptions$AssertionProcessing ENABLE -> c
-    1:5:void <clinit>():79:83 -> <clinit>
-    1:1:void <init>(java.lang.String,int):77:77 -> <init>
-com.android.tools.r8.utils.InternalOptions$InvalidParameterAnnotationInfo -> com.android.tools.r8.utils.a0$b:
+    1:2:void setMarker(com.android.tools.r8.dex.Marker):269:270 -> a
+    3:4:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):274:275 -> a
+    5:12:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):282:289 -> a
+    5:12:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):277 -> a
+    13:13:boolean isGeneratingClassFiles():337:337 -> a
+    13:13:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):290 -> a
+    13:13:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):277 -> a
+    14:17:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):291:294 -> a
+    14:17:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):277 -> a
+    18:18:void errorMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):643:643 -> a
+    19:19:void errorMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):665:665 -> a
+    20:26: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.DexType):759:765 -> a
+    27:27: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.DexType):760:760 -> a
+    28:29:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):772:773 -> a
+    30:30:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():766:766 -> a
+    30:30:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):775 -> a
+    31:33:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):775:777 -> a
+    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():770:770 -> a
+    34:34:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):778 -> a
+    35:35:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):778:778 -> a
+    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():770:770 -> a
+    36:36:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):781 -> a
+    37:37:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):781:781 -> a
+    38:38:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):773:773 -> a
+    39:42:void warningMissingEnclosingMember(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,int):786:789 -> a
+    43:47:void warningInvalidParameterAnnotations(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.origin.Origin,int,int):794:798 -> a
+    48:54:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):803:809 -> a
+    55:55:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):804:804 -> a
+    56:56:java.util.List lambda$warningInvalidDebugInfo$3(com.android.tools.r8.origin.Origin):808:808 -> a
+    57:62:boolean methodMatchesFilter(com.android.tools.r8.graph.DexEncodedMethod):895:900 -> a
+    63:64:boolean hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1076:1077 -> a
+    65:65:boolean canHaveArtCheckCastVerifierBug():1452:1452 -> a
+    1:4:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):654:657 -> b
+    5:5:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():766:766 -> b
+    5:5:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):659 -> b
+    6:8:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):659:661 -> b
+    9:9:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):657:657 -> b
+    10:10:void errorMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):643:643 -> b
+    10:10:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):655 -> b
+    11:11:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):681:681 -> b
+    12:12:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> b
+    12:12:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):682 -> b
+    13:15:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):683:685 -> b
+    16:16:void errorMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):665:665 -> b
+    16:16:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):686 -> b
+    17:18:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):690:691 -> b
+    19:19:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():766:766 -> b
+    19:19:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):693 -> b
+    20:20:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):693:693 -> b
+    21:21:java.lang.String messageWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):753:753 -> b
+    21:21:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):695 -> b
+    22:22:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):695:695 -> b
+    23:23:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):691:691 -> b
+    24:24:java.util.List lambda$warningInvalidParameterAnnotations$2(com.android.tools.r8.origin.Origin):797:797 -> b
+    25:26:boolean canHaveArtInstanceOfVerifierBug():1407:1408 -> b
+    1:4:void warningMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):647:650 -> c
+    5:5:void errorMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):643:643 -> c
+    5:5:void warningMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):648 -> c
+    6:6:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):669:669 -> c
+    7:7:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> c
+    7:7:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):670 -> c
+    8:8:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):671:671 -> c
+    9:9:void errorMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):665:665 -> c
+    9:9:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):672 -> c
+    10:10:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):676:676 -> c
+    11:11:java.lang.String messageWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):753:753 -> c
+    11:11:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):676 -> c
+    12:12:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):676:676 -> c
+    13:13:java.util.List lambda$warningMissingEnclosingMember$1(com.android.tools.r8.origin.Origin):788:788 -> c
+    14:14:boolean canHaveDalvikAbstractMethodOnNonAbstractClassVerificationBug():1484:1484 -> c
+    1:1:boolean isGeneratingClassFiles():337:337 -> d
+    1:1:boolean canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():1498 -> d
+    2:2:boolean canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():1498:1498 -> d
+    3:5:java.lang.String messageErrorMissingNestHost(com.android.tools.r8.graph.DexClass):699:701 -> d
+    6:11:java.lang.String messageErrorIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):715:720 -> d
+    12:12:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> d
+    12:12:java.lang.String messageErrorIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):720 -> d
+    13:40:java.lang.String messageErrorIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):722:749 -> d
+    1:1:boolean isGeneratingClassFiles():337:337 -> e
+    1:1:boolean canInitCauseAfterAssertionErrorObjectConstructor():1154 -> e
+    2:2:boolean canInitCauseAfterAssertionErrorObjectConstructor():1154:1154 -> e
+    3:5:java.lang.String messageWarningMissingNestHost(com.android.tools.r8.graph.DexClass):708:710 -> e
+    1:1:boolean isGeneratingClassFiles():337:337 -> f
+    1:1:boolean canLeaveStaticInterfaceMethodInvokes():1109 -> f
+    2:2:boolean canLeaveStaticInterfaceMethodInvokes():1109:1109 -> f
+    1:1:boolean isGeneratingClassFiles():337:337 -> g
+    1:1:boolean canUseAssertionErrorTwoArgumentConstructor():1144 -> g
+    2:2:boolean canUseAssertionErrorTwoArgumentConstructor():1144:1144 -> g
+    1:1:boolean isGeneratingClassFiles():337:337 -> h
+    1:1:boolean canUseConstantMethodHandle():1089 -> h
+    2:2:boolean canUseConstantMethodHandle():1089:1089 -> h
+    1:1:boolean isGeneratingClassFiles():337:337 -> i
+    1:1:boolean canUseConstantMethodType():1093 -> i
+    2:2:boolean canUseConstantMethodType():1093:1093 -> i
+    1:1:boolean isGeneratingClassFiles():337:337 -> j
+    1:1:boolean canUseDefaultAndStaticInterfaceMethods():1101 -> j
+    2:2:boolean canUseDefaultAndStaticInterfaceMethods():1101:1101 -> j
+    1:2:boolean canUseFilledNewArrayOfObjects():1166:1167 -> k
+    1:1:boolean isGeneratingClassFiles():337:337 -> l
+    1:1:boolean canUseInvokeCustom():1097 -> l
+    2:2:boolean canUseInvokeCustom():1097:1097 -> l
+    1:1:boolean isGeneratingClassFiles():337:337 -> m
+    1:1:boolean canUseInvokePolymorphic():1085 -> m
+    2:2:boolean canUseInvokePolymorphic():1085:1085 -> m
+    1:1:boolean isGeneratingClassFiles():337:337 -> n
+    1:1:boolean canUseInvokePolymorphicOnVarHandle():1081 -> n
+    2:2:boolean canUseInvokePolymorphicOnVarHandle():1081:1081 -> n
+    1:2:boolean canUseMultidex():1135:1136 -> o
+    1:1:boolean isGeneratingClassFiles():337:337 -> p
+    1:1:boolean canUseNotInstruction():1202 -> p
+    2:2:boolean canUseNotInstruction():1202:1202 -> p
+    1:1:boolean isGeneratingClassFiles():337:337 -> q
+    1:1:boolean canUsePrivateInterfaceMethods():1117 -> q
+    2:2:boolean canUsePrivateInterfaceMethods():1117:1117 -> q
+    1:2:boolean canUseSameArrayAndResultRegisterInArrayGetWide():1175:1176 -> r
+    1:1:boolean isGeneratingClassFiles():337:337 -> s
+    1:1:boolean canUseSuppressedExceptions():1140 -> s
+    2:2:boolean canUseSuppressedExceptions():1140:1140 -> s
+    1:1:boolean isGeneratingClassFiles():337:337 -> t
+    1:1:boolean canUseTwrCloseResourceMethod():1113 -> t
+    2:2:boolean canUseTwrCloseResourceMethod():1113:1113 -> t
+    1:4:void disableAllOptimizations():141:144 -> u
+    1:18:void disableGlobalOptimizations():148:165 -> v
+    1:1:void disableNameReflectionOptimization():1065:1065 -> w
+    1:2:void enablePropagationOfConstantsAtCallSites():1071:1072 -> x
+    1:1:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():304:304 -> y
+    2:2:boolean hasConsumer():300:300 -> y
+    2:2:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():304 -> y
+    3:3:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():304:304 -> y
+    4:4:boolean isGeneratingDexIndexed():329:329 -> y
+    4:4:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():305 -> y
+    5:5:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():306:306 -> y
+    6:6:boolean isGeneratingDexFilePerClassFile():333:333 -> y
+    6:6:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():307 -> y
+    7:7:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():308:308 -> y
+    8:8:boolean isGeneratingClassFiles():337:337 -> y
+    8:8:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():309 -> y
+    9:11:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():310:312 -> y
+    1:1:com.android.tools.r8.shaking.ProguardConfiguration getProguardConfiguration():91:91 -> z
+com.android.tools.r8.utils.InternalOptions$InvalidParameterAnnotationInfo -> com.android.tools.r8.utils.e0$a:
     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):562:565 -> <init>
-com.android.tools.r8.utils.InternalOptions$KotlinOptimizationOptions -> com.android.tools.r8.utils.a0$c:
+    1:4:void <init>(com.android.tools.r8.graph.DexMethod,int,int):554:557 -> <init>
+com.android.tools.r8.utils.InternalOptions$KotlinOptimizationOptions -> com.android.tools.r8.utils.e0$b:
     boolean disableKotlinSpecificOptimizations -> a
-    1:3:void <init>():941:943 -> <init>
-com.android.tools.r8.utils.InternalOptions$LineNumberOptimization -> com.android.tools.r8.utils.a0$d:
+    1:3:void <init>():933:935 -> <init>
+com.android.tools.r8.utils.InternalOptions$LineNumberOptimization -> com.android.tools.r8.utils.e0$c:
     com.android.tools.r8.utils.InternalOptions$LineNumberOptimization ON -> b
     com.android.tools.r8.utils.InternalOptions$LineNumberOptimization OFF -> a
-    1:2:void <clinit>():73:74 -> <clinit>
-    1:1:void <init>(java.lang.String,int):72:72 -> <init>
-com.android.tools.r8.utils.InternalOptions$OutlineOptions -> com.android.tools.r8.utils.a0$e:
+    1:2:void <clinit>():74:75 -> <clinit>
+    1:1:void <init>(java.lang.String,int):73:73 -> <init>
+com.android.tools.r8.utils.InternalOptions$OutlineOptions -> com.android.tools.r8.utils.e0$d:
     int threshold -> d
     boolean enabled -> a
     int minSize -> b
     int maxSize -> c
-    1:9:void <init>():930:938 -> <init>
-com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode -> com.android.tools.r8.utils.a0$f:
+    1:9:void <init>():922:930 -> <init>
+com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode -> com.android.tools.r8.utils.e0$e:
     com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode[] $VALUES -> d
     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>():923:927 -> <clinit>
-    6:6:void <clinit>():921:921 -> <clinit>
-    1:1:void <init>(java.lang.String,int):921:921 -> <init>
-com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions -> com.android.tools.r8.utils.a0$g:
+    1:5:void <clinit>():915:919 -> <clinit>
+    6:6:void <clinit>():913:913 -> <clinit>
+    1:1:void <init>(java.lang.String,int):913:913 -> <init>
+com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions -> com.android.tools.r8.utils.e0$f:
     boolean enableGeneratedExtensionRegistryShrinking -> a
     boolean enableGeneratedMessageLiteShrinking -> b
     boolean enableGeneratedMessageLiteBuilderShrinking -> c
     boolean traverseOneOfAndRepeatedProtoFields -> d
-    1:13:void <init>():946:958 -> <init>
-    1:1:boolean isProtoShrinkingEnabled():961:961 -> a
-com.android.tools.r8.utils.InternalOptions$TestingOptions -> com.android.tools.r8.utils.a0$h:
+    1:13:void <init>():938:950 -> <init>
+    1:1:boolean isProtoShrinkingEnabled():953:953 -> a
+com.android.tools.r8.utils.InternalOptions$TestingOptions -> com.android.tools.r8.utils.e0$g:
     boolean enableSwitchToIfRewriting -> m
     boolean forceAssumeNoneInsertion -> o
     java.util.function.Consumer callSiteOptimizationInfoInspector -> N
@@ -60757,21 +61005,21 @@
     boolean deterministicSortingBasedOnDexType -> B
     boolean addCallEdgesForLibraryInvokes -> c
     boolean trackDesugaredAPIConversions -> D
-    1:100:void <init>():967:1066 -> <init>
-com.android.tools.r8.utils.InternalOptions$TestingOptions$MinifierTestingOptions -> com.android.tools.r8.utils.a0$h$a:
+    1:100:void <init>():959:1058 -> <init>
+com.android.tools.r8.utils.InternalOptions$TestingOptions$MinifierTestingOptions -> com.android.tools.r8.utils.e0$g$a:
     java.util.Comparator interfaceMethodOrdering -> a
-    1:3:void <init>():1043:1045 -> <init>
-    1:2:java.util.Comparator getInterfaceMethodOrderingOrDefault(java.util.Comparator):1049:1050 -> 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):1050:1050 -> a
-com.android.tools.r8.utils.InternalOptions$TestingOptions$ProguardIfRuleEvaluationData -> com.android.tools.r8.utils.a0$h$b:
+    1:3:void <init>():1035:1037 -> <init>
+    1:2:java.util.Comparator getInterfaceMethodOrderingOrDefault(java.util.Comparator):1041:1042 -> 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):1042:1042 -> a
+com.android.tools.r8.utils.InternalOptions$TestingOptions$ProguardIfRuleEvaluationData -> com.android.tools.r8.utils.e0$g$b:
     int numberOfProguardIfRuleMemberEvaluations -> b
     int numberOfProguardIfRuleClassEvaluations -> a
-    1:4:void <init>():1060:1063 -> <init>
-com.android.tools.r8.utils.InternalOptions$TypeVersionPair -> com.android.tools.r8.utils.a0$i:
+    1:4:void <init>():1052:1055 -> <init>
+com.android.tools.r8.utils.InternalOptions$TypeVersionPair -> com.android.tools.r8.utils.e0$h:
     com.android.tools.r8.graph.DexType type -> b
     int version -> a
-    1:3:void <init>(int,com.android.tools.r8.graph.DexType):574:576 -> <init>
-com.android.tools.r8.utils.InternalOutputMode -> com.android.tools.r8.utils.b0:
+    1:3:void <init>(int,com.android.tools.r8.graph.DexType):566:568 -> <init>
+com.android.tools.r8.utils.InternalOutputMode -> com.android.tools.r8.utils.f0:
     com.android.tools.r8.utils.InternalOutputMode DexIndexed -> a
     com.android.tools.r8.utils.InternalOutputMode DexFilePerClassFile -> b
     com.android.tools.r8.utils.InternalOutputMode ClassFile -> c
@@ -60779,7 +61027,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.IteratorUtils -> com.android.tools.r8.utils.d0:
+com.android.tools.r8.utils.IteratorUtils -> com.android.tools.r8.utils.h0:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:java.util.Iterator filter(java.util.Iterator,java.util.function.Predicate):20:20 -> a
@@ -60787,7 +61035,7 @@
     6:18:boolean anyRemainingMatch(java.util.ListIterator,java.util.function.Predicate):103:115 -> a
     1:3:java.lang.Object peekPrevious(java.util.ListIterator):53:55 -> b
     4:7:void removeIf(java.util.Iterator,java.util.function.Predicate):80:83 -> b
-com.android.tools.r8.utils.IteratorUtils$1 -> com.android.tools.r8.utils.c0:
+com.android.tools.r8.utils.IteratorUtils$1 -> com.android.tools.r8.utils.g0:
     java.util.Iterator val$iterator -> b
     java.util.function.Predicate val$predicate -> c
     java.lang.Object next -> a
@@ -60796,7 +61044,7 @@
     1:1:boolean hasNext():37:37 -> hasNext
     1:5:java.lang.Object next():42:46 -> next
     6:6:java.lang.Object next():44:44 -> next
-com.android.tools.r8.utils.LRUCacheTable -> com.android.tools.r8.utils.f0:
+com.android.tools.r8.utils.LRUCacheTable -> com.android.tools.r8.utils.j0:
     int columnCapacity -> b
     int rowCapacity -> a
     1:3:void <init>(int,int,float):31:33 -> <init>
@@ -60804,11 +61052,11 @@
     2:2:java.util.Map lambda$put$0(java.lang.Object):46:46 -> a
     3:4:java.lang.Object put(java.lang.Object,java.lang.Object,java.lang.Object):46:47 -> a
     1:1:boolean removeEldestEntry(java.util.Map$Entry):42:42 -> removeEldestEntry
-com.android.tools.r8.utils.LRUCacheTable$LRUCacheRow -> com.android.tools.r8.utils.e0:
+com.android.tools.r8.utils.LRUCacheTable$LRUCacheRow -> com.android.tools.r8.utils.i0:
     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.LebUtils -> com.android.tools.r8.utils.g0:
+com.android.tools.r8.utils.LebUtils -> com.android.tools.r8.utils.k0:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():10:10 -> <clinit>
     1:6:int parseSleb128(com.android.tools.r8.dex.BinaryReader):65:70 -> a
@@ -60819,7 +61067,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.utils.h0:
+com.android.tools.r8.utils.LibraryClassCollection -> com.android.tools.r8.utils.l0:
     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
@@ -60829,98 +61077,130 @@
     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.utils.o0:
+com.android.tools.r8.utils.LineNumberOptimizer -> com.android.tools.r8.utils.t0:
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():54:54 -> <clinit>
-    1:10:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.naming.NamingLens):167:176 -> a
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():720:720 -> a
-    11:11:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.naming.NamingLens):177 -> a
-    12:14:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.naming.NamingLens):177:179 -> a
-    15:17:void addClassToClassNaming(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,java.util.function.Supplier):343:345 -> a
-    15:17:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.naming.NamingLens):187 -> a
-    18:44:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.naming.NamingLens):190:216 -> a
-    45:147:void optimizeDexCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List,boolean):430:532 -> a
-    45:147:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.naming.NamingLens):217 -> a
-    148:148:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.naming.NamingLens):219:219 -> a
-    149:180:void optimizeCfCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List,com.android.tools.r8.graph.AppView):541:572 -> a
-    149:180:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.naming.NamingLens):220 -> a
-    181:181:void optimizeCfCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List,com.android.tools.r8.graph.AppView):565:565 -> a
-    181:181:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.naming.NamingLens):220 -> a
-    182:213:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.naming.NamingLens):224:255 -> a
-    214:214:void com.android.tools.r8.naming.MemberNaming.<init>(com.android.tools.r8.naming.MemberNaming$Signature,java.lang.String):61:61 -> a
-    214:214:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.naming.NamingLens):255 -> a
-    215:243:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.naming.NamingLens):256:284 -> a
-    244:254:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.naming.NamingLens):282:292 -> a
-    255:267:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.naming.NamingLens):289:301 -> a
-    268:269:com.android.tools.r8.naming.ClassNaming$Builder lambda$run$0(com.android.tools.r8.naming.ClassNameMapper$Builder,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType):182:183 -> a
-    270:270:com.android.tools.r8.naming.ClassNaming$Builder lambda$run$0(com.android.tools.r8.naming.ClassNameMapper$Builder,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType):181:181 -> a
-    271:272:com.android.tools.r8.naming.MemberNaming$MethodSignature lambda$run$2(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):247:248 -> a
-    273:273:com.android.tools.r8.naming.MemberNaming$MethodSignature lambda$run$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):251:251 -> a
-    274:274:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():720:720 -> a
-    274:274:com.android.tools.r8.naming.MemberNaming$MethodSignature lambda$run$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):252 -> a
-    275:275:com.android.tools.r8.naming.MemberNaming$MethodSignature lambda$run$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):251:251 -> a
-    276:289:int getMethodStartLine(com.android.tools.r8.graph.DexEncodedMethod):305:318 -> a
-    290:290:void sortMethods(java.util.List):327:327 -> a
-    291:292:int lambda$sortMethods$3(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):329:330 -> a
-    293:293:int com.android.tools.r8.graph.DexEncodedMethod.slowCompare(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1123:1123 -> a
-    293:293:int lambda$sortMethods$3(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):333 -> a
-    294:294:void addFieldsToClassNaming(com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):354:354 -> a
-    295:301:void lambda$addFieldsToClassNaming$4(com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier,com.android.tools.r8.graph.DexEncodedField):356:362 -> a
-    302:302:void com.android.tools.r8.naming.MemberNaming.<init>(com.android.tools.r8.naming.MemberNaming$Signature,java.lang.String):61:61 -> a
-    302:302:void lambda$addFieldsToClassNaming$4(com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier,com.android.tools.r8.graph.DexEncodedField):362 -> a
-    303:303:void lambda$addFieldsToClassNaming$4(com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier,com.android.tools.r8.graph.DexEncodedField):363:363 -> a
-    304:311:java.util.IdentityHashMap groupMethodsByRenamedName(com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass):370:377 -> a
-    312:319:boolean doesContainPositions(com.android.tools.r8.graph.DexEncodedMethod):388:395 -> a
-    312:319:java.util.IdentityHashMap groupMethodsByRenamedName(com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass):378 -> a
-    320:322:java.util.IdentityHashMap groupMethodsByRenamedName(com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass):379:381 -> a
-    323:323:java.util.List lambda$groupMethodsByRenamedName$5(com.android.tools.r8.graph.DexString):380:380 -> a
-    324:329:boolean doesContainPositions(com.android.tools.r8.graph.DexCode):401:406 -> a
-    330:332:boolean doesContainPositions(com.android.tools.r8.graph.CfCode):414:416 -> a
-com.android.tools.r8.utils.LineNumberOptimizer$1 -> com.android.tools.r8.utils.i0:
+    1:1:void <clinit>():60:60 -> <clinit>
+    1:1:com.android.tools.r8.ir.code.Position access$900(com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):60:60 -> a
+    2:12:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):270:280 -> a
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():770:770 -> a
+    13:13:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):281 -> a
+    14:16:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):281:283 -> a
+    17:19:void addClassToClassNaming(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,java.util.function.Supplier):455:457 -> a
+    17:19:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):291 -> a
+    20:54:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):294:328 -> a
+    55:157:void optimizeDexCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List,boolean):542:644 -> a
+    55:157:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):329 -> a
+    158:158:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):331:331 -> a
+    159:183:void optimizeCfCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List,com.android.tools.r8.graph.AppView):653:677 -> a
+    159:183:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):332 -> a
+    184:184:void optimizeCfCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List,com.android.tools.r8.graph.AppView):670:670 -> a
+    184:184:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):332 -> a
+    185:216:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):336:367 -> a
+    217:217:void com.android.tools.r8.naming.MemberNaming.<init>(com.android.tools.r8.naming.MemberNaming$Signature,java.lang.String):61:61 -> a
+    217:217:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):367 -> a
+    218:246:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):368:396 -> a
+    247:257:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):394:404 -> a
+    258:270:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):401:413 -> a
+    271:272:com.android.tools.r8.naming.ClassNaming$Builder lambda$run$0(com.android.tools.r8.naming.ClassNameMapper$Builder,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType):286:287 -> a
+    273:273:com.android.tools.r8.naming.ClassNaming$Builder lambda$run$0(com.android.tools.r8.naming.ClassNameMapper$Builder,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType):285:285 -> a
+    274:275:com.android.tools.r8.naming.MemberNaming$MethodSignature lambda$run$2(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):359:360 -> a
+    276:276:com.android.tools.r8.naming.MemberNaming$MethodSignature lambda$run$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):363:363 -> a
+    277:277:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():770:770 -> a
+    277:277:com.android.tools.r8.naming.MemberNaming$MethodSignature lambda$run$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):364 -> a
+    278:278:com.android.tools.r8.naming.MemberNaming$MethodSignature lambda$run$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):363:363 -> a
+    279:292:int getMethodStartLine(com.android.tools.r8.graph.DexEncodedMethod):417:430 -> a
+    293:293:void sortMethods(java.util.List):439:439 -> a
+    294:295:int lambda$sortMethods$3(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):441:442 -> a
+    296:296:int com.android.tools.r8.graph.DexEncodedMethod.slowCompare(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1200:1200 -> a
+    296:296:int lambda$sortMethods$3(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):445 -> a
+    297:297:void addFieldsToClassNaming(com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):466:466 -> a
+    298:304:void lambda$addFieldsToClassNaming$4(com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier,com.android.tools.r8.graph.DexEncodedField):468:474 -> a
+    305:305:void com.android.tools.r8.naming.MemberNaming.<init>(com.android.tools.r8.naming.MemberNaming$Signature,java.lang.String):61:61 -> a
+    305:305:void lambda$addFieldsToClassNaming$4(com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier,com.android.tools.r8.graph.DexEncodedField):474 -> a
+    306:306:void lambda$addFieldsToClassNaming$4(com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier,com.android.tools.r8.graph.DexEncodedField):475:475 -> a
+    307:314:java.util.IdentityHashMap groupMethodsByRenamedName(com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass):482:489 -> a
+    315:322:boolean doesContainPositions(com.android.tools.r8.graph.DexEncodedMethod):500:507 -> a
+    315:322:java.util.IdentityHashMap groupMethodsByRenamedName(com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass):490 -> a
+    323:325:java.util.IdentityHashMap groupMethodsByRenamedName(com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass):491:493 -> a
+    326:326:java.util.List lambda$groupMethodsByRenamedName$5(com.android.tools.r8.graph.DexString):492:492 -> a
+    327:332:boolean doesContainPositions(com.android.tools.r8.graph.DexCode):513:518 -> a
+    333:335:boolean doesContainPositions(com.android.tools.r8.graph.CfCode):526:528 -> 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):683:686 -> b
+com.android.tools.r8.utils.LineNumberOptimizer$1 -> com.android.tools.r8.utils.m0:
+    boolean $assertionsDisabled -> m
     com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper val$positionRemapper -> i
     com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter val$positionEventEmitter -> h
-    boolean $assertionsDisabled -> l
+    com.android.tools.r8.utils.Box val$inlinedOriginalPosition -> k
     java.util.List val$mappedPositions -> j
     int emittedPc -> g
-    java.util.List val$processedEvents -> k
-    1:1:void <clinit>():439:439 -> <clinit>
-    1:4:void <init>(int,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List,java.util.List):439:442 -> <init>
-    1:8:void visit(com.android.tools.r8.graph.DexDebugEvent$Default):455:462 -> a
-    9:18:void visit(com.android.tools.r8.graph.DexDebugEvent$Default):458:467 -> a
-    19:26:void visit(com.android.tools.r8.graph.DexDebugEvent$Default):463:470 -> a
-    27:27:void visit(com.android.tools.r8.graph.DexDebugEvent$SetFile):479:479 -> a
-    28:28:void visit(com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd):484:484 -> a
-    29:29:void visit(com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin):489:489 -> a
-    30:31:void visit(com.android.tools.r8.graph.DexDebugEvent$StartLocal):496:497 -> a
-    32:33:void visit(com.android.tools.r8.graph.DexDebugEvent$EndLocal):502:503 -> a
-    34:35:void visit(com.android.tools.r8.graph.DexDebugEvent$RestartLocal):508:509 -> a
-    1:3:void flushPc():446:448 -> f
-com.android.tools.r8.utils.LineNumberOptimizer$IdentityPositionRemapper -> com.android.tools.r8.utils.j0:
-    1:1:void <init>():63:63 -> <init>
-    2:2:void <init>(com.android.tools.r8.utils.LineNumberOptimizer$1):63:63 -> <init>
-    1:1:com.android.tools.r8.ir.code.Position createRemappedPosition(int,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):67:67 -> a
-com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition -> com.android.tools.r8.utils.k0:
+    java.util.List val$processedEvents -> l
+    1:1:void <clinit>():553:553 -> <clinit>
+    1:4:void <init>(int,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List,com.android.tools.r8.utils.Box,java.util.List):553:556 -> <init>
+    1:14:void visit(com.android.tools.r8.graph.DexDebugEvent$Default):569:582 -> a
+    15:15:void visit(com.android.tools.r8.graph.DexDebugEvent$SetFile):591:591 -> a
+    16:16:void visit(com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd):596:596 -> a
+    17:17:void visit(com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin):601:601 -> a
+    18:19:void visit(com.android.tools.r8.graph.DexDebugEvent$StartLocal):608:609 -> a
+    20:21:void visit(com.android.tools.r8.graph.DexDebugEvent$EndLocal):614:615 -> a
+    22:23:void visit(com.android.tools.r8.graph.DexDebugEvent$RestartLocal):620:621 -> a
+    1:3:void flushPc():560:562 -> f
+com.android.tools.r8.utils.LineNumberOptimizer$IdentityPositionRemapper -> com.android.tools.r8.utils.n0:
+    1:1:void <init>():68:68 -> <init>
+    2:2:void <init>(com.android.tools.r8.utils.LineNumberOptimizer$1):68:68 -> <init>
+    1:1:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):72:72 -> a
+com.android.tools.r8.utils.LineNumberOptimizer$KotlinInlineFunctionPositionRemapper -> com.android.tools.r8.utils.o0:
+    com.android.tools.r8.graph.DexItemFactory factory -> b
+    com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result parsedData -> g
+    java.util.Map parsedKotlinSourceDebugExtensions -> c
+    com.android.tools.r8.graph.AppView appView -> a
+    com.android.tools.r8.utils.CfLineToMethodMapper lineToMethodMapper -> d
+    boolean $assertionsDisabled -> h
+    com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper baseRemapper -> e
+    com.android.tools.r8.graph.DexEncodedMethod currentMethod -> f
+    1:1:void <clinit>():109:109 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.utils.CfLineToMethodMapper,com.android.tools.r8.utils.LineNumberOptimizer$1):109:109 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.utils.CfLineToMethodMapper,com.android.tools.r8.utils.LineNumberOptimizer$1):125:125 -> <init>
+    3:19:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.utils.CfLineToMethodMapper,com.android.tools.r8.utils.LineNumberOptimizer$1):113:129 -> <init>
+    1:1:com.android.tools.r8.graph.DexEncodedMethod access$202(com.android.tools.r8.utils.LineNumberOptimizer$KotlinInlineFunctionPositionRemapper,com.android.tools.r8.graph.DexEncodedMethod):109:109 -> a
+    2:4:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):134:136 -> a
+    5:11:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result getAndParseSourceDebugExtension(com.android.tools.r8.graph.DexType):182:188 -> a
+    5:11:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):136 -> a
+    12:12:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):191:191 -> a
+    12:12:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result getAndParseSourceDebugExtension(com.android.tools.r8.graph.DexType):188 -> a
+    12:12:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):136 -> a
+    13:18:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result getAndParseSourceDebugExtension(com.android.tools.r8.graph.DexType):189:194 -> a
+    13:18:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):136 -> a
+    19:19:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result getAndParseSourceDebugExtension(com.android.tools.r8.graph.DexType):186:186 -> a
+    19:19:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):136 -> a
+    20:36:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):138:154 -> a
+    37:39:java.lang.String com.android.tools.r8.utils.CfLineToMethodMapper.getName(java.lang.String):51:53 -> a
+    37:39:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):155 -> a
+    40:42:java.lang.String com.android.tools.r8.utils.CfLineToMethodMapper.getDescriptor(java.lang.String):57:59 -> a
+    40:42:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):156 -> a
+    43:53:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):157:167 -> a
+    54:68:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):164:178 -> a
+com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition -> com.android.tools.r8.utils.p0:
     int obfuscatedLine -> d
     int originalLine -> b
     com.android.tools.r8.ir.code.Position caller -> c
     com.android.tools.r8.graph.DexMethod method -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexMethod,int,com.android.tools.r8.ir.code.Position,int,com.android.tools.r8.utils.LineNumberOptimizer$1):148:148 -> <init>
-    2:6:void <init>(com.android.tools.r8.graph.DexMethod,int,com.android.tools.r8.ir.code.Position,int):155:159 -> <init>
-    1:1:com.android.tools.r8.graph.DexMethod access$100(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):148:148 -> a
-    1:1:int access$200(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):148:148 -> b
-    1:1:int access$300(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):148:148 -> c
-    1:1:com.android.tools.r8.ir.code.Position access$400(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):148:148 -> d
-com.android.tools.r8.utils.LineNumberOptimizer$OptimizingPositionRemapper -> com.android.tools.r8.utils.l0:
+    1:1:void <init>(com.android.tools.r8.graph.DexMethod,int,com.android.tools.r8.ir.code.Position,int,com.android.tools.r8.utils.LineNumberOptimizer$1):248:248 -> <init>
+    2:6:void <init>(com.android.tools.r8.graph.DexMethod,int,com.android.tools.r8.ir.code.Position,int):255:259 -> <init>
+    1:1:com.android.tools.r8.graph.DexMethod access$300(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):248:248 -> a
+    1:1:int access$400(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):248:248 -> b
+    1:1:int access$500(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):248:248 -> c
+    1:1:com.android.tools.r8.ir.code.Position access$600(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):248:248 -> d
+com.android.tools.r8.utils.LineNumberOptimizer$OptimizingPositionRemapper -> com.android.tools.r8.utils.q0:
     boolean $assertionsDisabled -> e
     int nextOptimizedLineNumber -> d
     com.android.tools.r8.graph.DexMethod previousMethod -> b
     int previousSourceLine -> c
     int maxLineDelta -> a
-    1:1:void <clinit>():71:71 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.utils.InternalOptions):77:77 -> <init>
-    2:10:void <init>(com.android.tools.r8.utils.InternalOptions):73:81 -> <init>
-    1:12:com.android.tools.r8.ir.code.Position createRemappedPosition(int,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):87:98 -> a
-com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter -> com.android.tools.r8.utils.m0:
+    1:1:void <clinit>():76:76 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.utils.InternalOptions):82:82 -> <init>
+    2:10:void <init>(com.android.tools.r8.utils.InternalOptions):78:86 -> <init>
+    1:15:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):91:105 -> a
+com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter -> com.android.tools.r8.utils.r0:
     java.util.List processedEvents -> f
     boolean $assertionsDisabled -> g
     int previousPc -> d
@@ -60928,23 +61208,23 @@
     com.android.tools.r8.graph.DexMethod method -> c
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> a
     com.android.tools.r8.ir.code.Position previousPosition -> e
-    1:1:void <clinit>():105:105 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,java.util.List,com.android.tools.r8.utils.LineNumberOptimizer$1):105:105 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,java.util.List):114:114 -> <init>
-    3:13:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,java.util.List):107:117 -> <init>
-    1:2:void emitAdvancePc(int):121:122 -> a
-    1:2:void access$600(com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter,int):105 -> a
-    3:15:void emitPositionEvents(int,com.android.tools.r8.ir.code.Position):126:138 -> a
-    3:15:void access$800(com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter,int,com.android.tools.r8.ir.code.Position):105 -> a
-    16:17:int getStartLine():142:143 -> a
-    16:17:int access$900(com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter):105 -> a
-com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper -> com.android.tools.r8.utils.n0:
-    com.android.tools.r8.ir.code.Position createRemappedPosition(int,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position) -> a
-com.android.tools.r8.utils.ListUtils -> com.android.tools.r8.utils.p0:
+    1:1:void <clinit>():205:205 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,java.util.List,com.android.tools.r8.utils.LineNumberOptimizer$1):205:205 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,java.util.List):214:214 -> <init>
+    3:13:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,java.util.List):207:217 -> <init>
+    1:2:void emitAdvancePc(int):221:222 -> a
+    1:2:void access$800(com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter,int):205 -> a
+    3:15:void emitPositionEvents(int,com.android.tools.r8.ir.code.Position):226:238 -> a
+    3:15:void access$1000(com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter,int,com.android.tools.r8.ir.code.Position):205 -> a
+    16:17:int getStartLine():242:243 -> a
+    16:17:int access$1100(com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter):205 -> a
+com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper -> com.android.tools.r8.utils.s0:
+    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.utils.u0:
     1:1:java.lang.Object last(java.util.List):20:20 -> a
     2:3:int lastIndexMatching(java.util.List,java.util.function.Predicate):24:25 -> a
     4:6:java.util.List map(java.util.Collection,java.util.function.Function):33:35 -> a
-com.android.tools.r8.utils.LongInterval -> com.android.tools.r8.utils.q0:
+com.android.tools.r8.utils.LongInterval -> com.android.tools.r8.utils.v0:
     long max -> b
     long min -> a
     boolean $assertionsDisabled -> c
@@ -60960,7 +61240,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.MainDexList -> com.android.tools.r8.utils.r0:
+com.android.tools.r8.utils.MainDexList -> com.android.tools.r8.utils.w0:
     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
@@ -60975,7 +61255,7 @@
     33:33:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):34:34 -> a
     33:33:java.util.Set parseList(com.android.tools.r8.StringResource,com.android.tools.r8.graph.DexItemFactory):37 -> a
     34:34:java.util.Set parseList(com.android.tools.r8.StringResource,com.android.tools.r8.graph.DexItemFactory):37:37 -> a
-com.android.tools.r8.utils.MethodJavaSignatureEquivalence -> com.android.tools.r8.utils.s0:
+com.android.tools.r8.utils.MethodJavaSignatureEquivalence -> com.android.tools.r8.utils.x0:
     com.android.tools.r8.utils.MethodJavaSignatureEquivalence INSTANCE_IGNORE_NAME -> c
     com.android.tools.r8.utils.MethodJavaSignatureEquivalence INSTANCE -> b
     boolean ignoreName -> a
@@ -60989,7 +61269,7 @@
     1:1:int doHash(java.lang.Object):15:15 -> doHash
     2:5:int doHash(com.android.tools.r8.graph.DexMethod):47:50 -> doHash
     2:5:int doHash(java.lang.Object):15 -> doHash
-com.android.tools.r8.utils.MethodSignatureEquivalence -> com.android.tools.r8.utils.t0:
+com.android.tools.r8.utils.MethodSignatureEquivalence -> com.android.tools.r8.utils.y0:
     com.android.tools.r8.utils.MethodSignatureEquivalence INSTANCE -> b
     com.android.tools.r8.utils.MethodSignatureEquivalence INSTANCE_IGNORE_NAME -> c
     boolean ignoreName -> a
@@ -61003,14 +61283,14 @@
     1:1:int doHash(java.lang.Object):14:14 -> doHash
     2:5:int doHash(com.android.tools.r8.graph.DexMethod):45:48 -> doHash
     2:5:int doHash(java.lang.Object):14 -> doHash
-com.android.tools.r8.utils.OffOrAuto -> com.android.tools.r8.utils.u0:
+com.android.tools.r8.utils.OffOrAuto -> com.android.tools.r8.utils.z0:
     com.android.tools.r8.utils.OffOrAuto Auto -> b
     com.android.tools.r8.utils.OffOrAuto Off -> a
     com.android.tools.r8.utils.OffOrAuto[] $VALUES -> c
     1:1:void <clinit>():11:11 -> <clinit>
     2:2:void <clinit>():10:10 -> <clinit>
     1:1:void <init>(java.lang.String,int):10:10 -> <init>
-com.android.tools.r8.utils.OneShotByteResource -> com.android.tools.r8.utils.v0:
+com.android.tools.r8.utils.OneShotByteResource -> com.android.tools.r8.utils.A0:
     com.android.tools.r8.origin.Origin origin -> a
     java.util.Set classDescriptors -> d
     boolean $assertionsDisabled -> e
@@ -61023,7 +61303,7 @@
     1:1:java.util.Set getClassDescriptors():54:54 -> 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.utils.z0:
+com.android.tools.r8.utils.OptionalBool -> com.android.tools.r8.utils.E0:
     com.android.tools.r8.utils.OptionalBool UNKNOWN -> e
     com.android.tools.r8.utils.OptionalBool TRUE -> c
     com.android.tools.r8.utils.OptionalBool FALSE -> d
@@ -61033,16 +61313,16 @@
     1:1:com.android.tools.r8.utils.OptionalBool of(boolean):54:54 -> a
     1:1:com.android.tools.r8.utils.OptionalBool unknown():58:58 -> g
     1:1:int hashCode():73:73 -> hashCode
-com.android.tools.r8.utils.OptionalBool$1 -> com.android.tools.r8.utils.w0:
+com.android.tools.r8.utils.OptionalBool$1 -> com.android.tools.r8.utils.B0:
     1:1:void <init>():10:10 -> <init>
     boolean isTrue() -> e
-com.android.tools.r8.utils.OptionalBool$2 -> com.android.tools.r8.utils.x0:
+com.android.tools.r8.utils.OptionalBool$2 -> com.android.tools.r8.utils.C0:
     1:1:void <init>():24:24 -> <init>
     boolean isFalse() -> c
-com.android.tools.r8.utils.OptionalBool$3 -> com.android.tools.r8.utils.y0:
+com.android.tools.r8.utils.OptionalBool$3 -> com.android.tools.r8.utils.D0:
     1:1:void <init>():38:38 -> <init>
     boolean isUnknown() -> f
-com.android.tools.r8.utils.OptionsParsing -> com.android.tools.r8.utils.A0:
+com.android.tools.r8.utils.OptionsParsing -> com.android.tools.r8.utils.F0:
     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
@@ -61050,14 +61330,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.utils.A0$a:
+com.android.tools.r8.utils.OptionsParsing$ParseContext -> com.android.tools.r8.utils.F0$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.OrderedMergingIterator -> com.android.tools.r8.utils.B0:
+com.android.tools.r8.utils.OrderedMergingIterator -> com.android.tools.r8.utils.G0:
     java.util.List other -> b
     java.util.List one -> a
     int otherIndex -> d
@@ -61080,14 +61360,14 @@
     17:17:com.android.tools.r8.graph.KeyedDexItem next():44 -> next
     18:25:com.android.tools.r8.graph.KeyedDexItem next():46:53 -> next
     26:26:com.android.tools.r8.graph.KeyedDexItem next():51:51 -> next
-com.android.tools.r8.utils.OutputBuilder -> com.android.tools.r8.utils.C0:
+com.android.tools.r8.utils.OutputBuilder -> com.android.tools.r8.utils.H0:
     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.utils.D0:
+com.android.tools.r8.utils.Pair -> com.android.tools.r8.utils.I0:
     java.lang.Object second -> b
     java.lang.Object first -> a
     1:3:void <init>(java.lang.Object,java.lang.Object):23:25 -> <init>
@@ -61097,7 +61377,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.PreloadedClassFileProvider -> com.android.tools.r8.utils.E0:
+com.android.tools.r8.utils.PreloadedClassFileProvider -> com.android.tools.r8.utils.J0:
     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>
@@ -61107,8 +61387,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.utils.E0$a:
-com.android.tools.r8.utils.PreloadedClassFileProvider$Builder -> com.android.tools.r8.utils.E0$b:
+com.android.tools.r8.utils.PreloadedClassFileProvider$1 -> com.android.tools.r8.utils.J0$a:
+com.android.tools.r8.utils.PreloadedClassFileProvider$Builder -> com.android.tools.r8.utils.J0$b:
     java.util.Map content -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():74:74 -> <clinit>
@@ -61117,49 +61397,49 @@
     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.utils.E0$c:
+com.android.tools.r8.utils.PreloadedClassFileProvider$ClassDescriptorOrigin -> com.android.tools.r8.utils.J0$c:
     java.lang.String descriptor -> a
     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.utils.F0:
+com.android.tools.r8.utils.ProgramClassCollection -> com.android.tools.r8.utils.K0:
     com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver conflictResolver -> d
     boolean $assertionsDisabled -> e
-    1:1:void <clinit>():26:26 -> <clinit>
-    1:2:void <init>(java.util.concurrent.ConcurrentHashMap,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver):44:45 -> <init>
-    1:1:java.util.function.Supplier getTransparentSupplier(com.android.tools.r8.graph.DexClass):26:26 -> a
-    2:2:com.android.tools.r8.graph.DexClass resolveClassConflict(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):26:26 -> a
-    3:3:com.android.tools.r8.graph.DexProgramClass resolveClassConflict(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):55:55 -> a
-    3:3:com.android.tools.r8.graph.DexClass resolveClassConflict(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):26 -> a
-    4:9:com.android.tools.r8.utils.ProgramClassCollection create(java.util.List,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver):33:38 -> a
-    10:10:java.util.function.Supplier lambda$create$0(com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver,java.util.function.Supplier,java.util.function.Supplier):36:36 -> a
-    11:11:com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver defaultConflictResolver(com.android.tools.r8.utils.Reporter):71:71 -> a
-    12:16:com.android.tools.r8.graph.DexProgramClass lambda$defaultConflictResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):72:76 -> a
-    17:25:com.android.tools.r8.graph.DexProgramClass mergeClasses(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):93:101 -> a
-    17:25:com.android.tools.r8.graph.DexProgramClass lambda$defaultConflictResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):77 -> a
-    26:29:com.android.tools.r8.graph.DexProgramClass mergeWrappers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):114:117 -> a
-    26:29:com.android.tools.r8.graph.DexProgramClass mergeClasses(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):102 -> a
-    26:29: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):77 -> a
-    30:30:com.android.tools.r8.graph.DexProgramClass mergeClasses(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):104:104 -> a
-    30:30:com.android.tools.r8.graph.DexProgramClass lambda$defaultConflictResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):77 -> a
-    31:31:com.android.tools.r8.graph.DexProgramClass mergeClasses(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):98:98 -> a
-    31:31:com.android.tools.r8.graph.DexProgramClass lambda$defaultConflictResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):77 -> a
-    32:33:boolean assertEqualClasses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):108:109 -> a
-    32:33:com.android.tools.r8.graph.DexProgramClass mergeClasses(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):98 -> a
-    32:33:com.android.tools.r8.graph.DexProgramClass lambda$defaultConflictResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):77 -> a
-    34:34:com.android.tools.r8.graph.DexProgramClass lambda$defaultConflictResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):79:79 -> a
-    35:40:com.android.tools.r8.graph.DexEncodedMethod findConversionMethod(com.android.tools.r8.graph.DexProgramClass):123:128 -> a
-    41:41:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    41:41:com.android.tools.r8.graph.DexEncodedMethod findConversionMethod(com.android.tools.r8.graph.DexProgramClass):128 -> a
-    42:42:com.android.tools.r8.graph.DexEncodedMethod findConversionMethod(com.android.tools.r8.graph.DexProgramClass):128:128 -> 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):85:87 -> b
-    4:4:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():716:716 -> 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):88 -> 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):88:88 -> b
+    1:1:void <clinit>():21:21 -> <clinit>
+    1:2:void <init>(java.util.concurrent.ConcurrentHashMap,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver):39:40 -> <init>
+    1:1:java.util.function.Supplier getTransparentSupplier(com.android.tools.r8.graph.DexClass):21:21 -> a
+    2:2:com.android.tools.r8.graph.DexClass resolveClassConflict(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):21:21 -> a
+    3:3:com.android.tools.r8.graph.DexProgramClass resolveClassConflict(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):50:50 -> a
+    3:3:com.android.tools.r8.graph.DexClass resolveClassConflict(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):21 -> a
+    4:9:com.android.tools.r8.utils.ProgramClassCollection create(java.util.List,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver):28:33 -> a
+    10:10:java.util.function.Supplier lambda$create$0(com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver,java.util.function.Supplier,java.util.function.Supplier):31:31 -> a
+    11:11:com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver defaultConflictResolver(com.android.tools.r8.utils.Reporter):66:66 -> a
+    12:16:com.android.tools.r8.graph.DexProgramClass lambda$defaultConflictResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):67:71 -> a
+    17:17:com.android.tools.r8.graph.DexProgramClass mergeClasses(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):88:88 -> a
+    17:17:com.android.tools.r8.graph.DexProgramClass lambda$defaultConflictResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):72 -> a
+    18:21:com.android.tools.r8.graph.DexProgramClass mergeWrappers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):105:108 -> a
+    18:21:com.android.tools.r8.graph.DexProgramClass mergeClasses(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):89 -> a
+    18:21:com.android.tools.r8.graph.DexProgramClass lambda$defaultConflictResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):72 -> a
+    22:23:com.android.tools.r8.graph.DexProgramClass mergeClasses(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):91:92 -> a
+    22: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):72 -> a
+    24:25:boolean assertEqualClasses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):99:100 -> a
+    24:25:com.android.tools.r8.graph.DexProgramClass mergeClasses(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):92 -> a
+    24:25:com.android.tools.r8.graph.DexProgramClass lambda$defaultConflictResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):72 -> a
+    26:26:com.android.tools.r8.graph.DexProgramClass mergeClasses(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):95:95 -> a
+    26:26:com.android.tools.r8.graph.DexProgramClass lambda$defaultConflictResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):72 -> a
+    27:27:com.android.tools.r8.graph.DexProgramClass lambda$defaultConflictResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):74:74 -> a
+    28:33:com.android.tools.r8.graph.DexEncodedMethod findConversionMethod(com.android.tools.r8.graph.DexProgramClass):114:119 -> a
+    34:34:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    34:34:com.android.tools.r8.graph.DexEncodedMethod findConversionMethod(com.android.tools.r8.graph.DexProgramClass):119 -> a
+    35:35:com.android.tools.r8.graph.DexEncodedMethod findConversionMethod(com.android.tools.r8.graph.DexProgramClass):119:119 -> 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):80:82 -> b
+    4:4:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():766:766 -> 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):83 -> 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):83:83 -> b
     6:8:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> b
-    6:8:java.lang.RuntimeException reportDuplicateTypes(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):85 -> b
-    1:1:com.android.tools.r8.graph.ClassKind getClassKind():65:65 -> c
-    1:1:java.lang.String toString():50:50 -> toString
-com.android.tools.r8.utils.Reporter -> com.android.tools.r8.utils.G0:
+    6:8:java.lang.RuntimeException reportDuplicateTypes(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):80 -> b
+    1:1:com.android.tools.r8.graph.ClassKind getClassKind():60:60 -> c
+    1:1:java.lang.String toString():45:45 -> toString
+com.android.tools.r8.utils.Reporter -> com.android.tools.r8.utils.L0:
     com.android.tools.r8.DiagnosticsHandler clientHandler -> a
     com.android.tools.r8.Diagnostic lastError -> c
     java.util.Collection suppressedExceptions -> d
@@ -61181,11 +61461,24 @@
     1:3:void error(com.android.tools.r8.Diagnostic):43:45 -> error
     1:1:void info(com.android.tools.r8.Diagnostic):33:33 -> info
     1:1:void warning(com.android.tools.r8.Diagnostic):38:38 -> warning
-com.android.tools.r8.utils.Reporter$1 -> com.android.tools.r8.utils.G0$a:
+com.android.tools.r8.utils.Reporter$1 -> com.android.tools.r8.utils.L0$a:
     1:1:void <init>():24:24 -> <init>
-com.android.tools.r8.utils.SingletonEquivalence -> com.android.tools.r8.utils.H0:
+com.android.tools.r8.utils.SegmentTree -> com.android.tools.r8.utils.M0:
+    java.util.TreeMap internalTree -> a
+    boolean allowIntervalOverwrites -> b
+    int size -> c
+    boolean $assertionsDisabled -> d
+    1:1:void <clinit>():14:14 -> <clinit>
+    1:1:void <init>(boolean):21:21 -> <init>
+    2:8:void <init>(boolean):16:22 -> <init>
+    1:2:java.lang.Object find(int):26:27 -> a
+    3:4:java.util.Map$Entry findEntry(java.lang.Integer):31:32 -> a
+    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.SingletonEquivalence -> com.android.tools.r8.utils.N0:
     1:1:void <init>():11:11 -> <init>
-com.android.tools.r8.utils.StreamUtils -> com.android.tools.r8.utils.I0:
+com.android.tools.r8.utils.StreamUtils -> com.android.tools.r8.utils.O0:
     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 -> a
@@ -61197,7 +61490,7 @@
     1:1:java.lang.String getDiagnosticMessage():53:53 -> getDiagnosticMessage
     1:1:com.android.tools.r8.origin.Origin getOrigin():43:43 -> getOrigin
     1:1:com.android.tools.r8.position.Position getPosition():48:48 -> getPosition
-com.android.tools.r8.utils.StringUtils -> com.android.tools.r8.utils.J0:
+com.android.tools.r8.utils.StringUtils -> com.android.tools.r8.utils.P0:
     char[] EMPTY_CHAR_ARRAY -> a
     java.lang.String LINE_SEPARATOR -> c
     java.lang.String[] EMPTY_ARRAY -> b
@@ -61224,17 +61517,18 @@
     56:64:java.lang.String hexString(long,int):232 -> a
     65:69:java.lang.String times(java.lang.String,int):263:267 -> a
     70:70:boolean isWhitespace(int):275:275 -> a
-    71:73:boolean onlyContainsDigits(java.lang.String):304:306 -> a
+    71:76:int firstNonWhitespaceCharacter(java.lang.String):323:328 -> a
     1:3:java.lang.StringBuilder appendRightPadded(java.lang.StringBuilder,java.lang.String,int):96:98 -> b
     4:4:java.lang.String lines(java.lang.String[]):151:151 -> b
-    5:22:java.util.List splitLines(java.lang.String):173:190 -> b
-    23:23:java.lang.String zeroPrefix(int,int):197:197 -> b
-    24:30:java.lang.String zeroPrefixString(java.lang.String,int):202:208 -> b
-    1:2:java.lang.String stripLeadingBOM(java.lang.String):279:280 -> c
-    1:9:java.lang.String toASCIIString(java.lang.String):49:57 -> d
-    1:9:java.lang.String trim(java.lang.String):288:296 -> e
-    1:5:java.lang.String withNativeLineSeparator(java.lang.String):155:159 -> f
-com.android.tools.r8.utils.StringUtils$BraceType -> com.android.tools.r8.utils.J0$a:
+    5:5:java.lang.String zeroPrefix(int,int):197:197 -> b
+    6:12:java.lang.String zeroPrefixString(java.lang.String,int):202:208 -> b
+    13:15:boolean onlyContainsDigits(java.lang.String):304:306 -> b
+    1:18:java.util.List splitLines(java.lang.String):173:190 -> c
+    1:2:java.lang.String stripLeadingBOM(java.lang.String):279:280 -> d
+    1:9:java.lang.String toASCIIString(java.lang.String):49:57 -> e
+    1:9:java.lang.String trim(java.lang.String):288:296 -> f
+    1:5:java.lang.String withNativeLineSeparator(java.lang.String):155:159 -> g
+com.android.tools.r8.utils.StringUtils$BraceType -> com.android.tools.r8.utils.P0$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
@@ -61243,7 +61537,7 @@
     1:4:void <clinit>():22:25 -> <clinit>
     5:5:void <clinit>():21:21 -> <clinit>
     1:1:void <init>(java.lang.String,int):21:21 -> <init>
-com.android.tools.r8.utils.SymbolGenerationUtils -> com.android.tools.r8.utils.K0:
+com.android.tools.r8.utils.SymbolGenerationUtils -> com.android.tools.r8.utils.Q0:
     char[] IDENTIFIER_CHARACTERS -> b
     boolean $assertionsDisabled -> e
     java.util.Set PRIMITIVE_TYPE_NAMES -> a
@@ -61252,12 +61546,12 @@
     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.utils.K0$a:
+com.android.tools.r8.utils.SymbolGenerationUtils$MixedCasing -> com.android.tools.r8.utils.Q0$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>
     1:1:void <init>(java.lang.String,int):15:15 -> <init>
-com.android.tools.r8.utils.ThreadUtils -> com.android.tools.r8.utils.L0:
+com.android.tools.r8.utils.ThreadUtils -> com.android.tools.r8.utils.R0:
     1:9:void processItems(java.lang.Iterable,com.android.tools.r8.utils.ThrowingConsumer,java.util.concurrent.ExecutorService):21:29 -> a
     10:10:java.lang.Object lambda$processItems$0(com.android.tools.r8.utils.ThrowingConsumer,java.lang.Object):25:25 -> a
     11:24:void awaitFutures(java.lang.Iterable):34:47 -> a
@@ -61265,27 +61559,27 @@
     36:37:java.util.concurrent.ExecutorService getExecutorService(int):64:65 -> a
     38:38:java.util.concurrent.ExecutorService getExecutorService(com.android.tools.r8.utils.InternalOptions):69:69 -> a
     1:2:java.util.concurrent.ExecutorService getExecutorServiceForProcessors(int):57:58 -> b
-com.android.tools.r8.utils.ThrowingBiConsumer -> com.android.tools.r8.utils.M0:
-com.android.tools.r8.utils.ThrowingCharIterator -> com.android.tools.r8.utils.N0:
+com.android.tools.r8.utils.ThrowingBiConsumer -> com.android.tools.r8.utils.S0:
+com.android.tools.r8.utils.ThrowingCharIterator -> com.android.tools.r8.utils.T0:
     char nextChar() -> a
-com.android.tools.r8.utils.ThrowingConsumer -> com.android.tools.r8.utils.O0:
-com.android.tools.r8.utils.ThrowingIntIterator -> com.android.tools.r8.utils.P0:
+com.android.tools.r8.utils.ThrowingConsumer -> com.android.tools.r8.utils.U0:
+com.android.tools.r8.utils.ThrowingIntIterator -> com.android.tools.r8.utils.V0:
     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.utils.Q0:
+com.android.tools.r8.utils.ThrowingIntSupplier -> com.android.tools.r8.utils.W0:
     int getAsInt() -> a
-com.android.tools.r8.utils.ThrowingIterator -> com.android.tools.r8.utils.R0:
+com.android.tools.r8.utils.ThrowingIterator -> com.android.tools.r8.utils.X0:
     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.ThrowingSupplier -> com.android.tools.r8.utils.S0:
-com.android.tools.r8.utils.Timing -> com.android.tools.r8.utils.T0:
+com.android.tools.r8.utils.ThrowingSupplier -> com.android.tools.r8.utils.Y0:
+com.android.tools.r8.utils.Timing -> com.android.tools.r8.utils.Z0:
     java.util.Stack stack -> a
     boolean trackMemory -> b
     1:1:void <init>():27:27 -> <init>
@@ -61319,10 +61613,10 @@
     12:12:java.util.Map access$100(com.android.tools.r8.utils.Timing):21 -> b
     13:13:java.util.Map computeMemoryInformation():211:211 -> b
     13:13:java.util.Map access$100(com.android.tools.r8.utils.Timing):21 -> b
-com.android.tools.r8.utils.Timing$MemInfo -> com.android.tools.r8.utils.T0$a:
+com.android.tools.r8.utils.Timing$MemInfo -> com.android.tools.r8.utils.Z0$a:
     long used -> a
     1:2:void <init>(long):43:44 -> <init>
-com.android.tools.r8.utils.Timing$Node -> com.android.tools.r8.utils.T0$b:
+com.android.tools.r8.utils.Timing$Node -> com.android.tools.r8.utils.Z0$b:
     com.android.tools.r8.utils.Timing this$0 -> g
     java.util.Map children -> b
     java.lang.String title -> a
@@ -61369,9 +61663,9 @@
     3:3:java.lang.String com.android.tools.r8.utils.Timing.access$200(long):21 -> toString
     3:3:java.lang.String toString():96 -> toString
     4:4:java.lang.String toString():96:96 -> toString
-com.android.tools.r8.utils.TriFunction -> com.android.tools.r8.utils.U0:
+com.android.tools.r8.utils.TriFunction -> com.android.tools.r8.utils.a1:
     java.lang.Object apply(java.lang.Object,java.lang.Object,java.lang.Object) -> a
-com.android.tools.r8.utils.VersionProperties -> com.android.tools.r8.utils.V0:
+com.android.tools.r8.utils.VersionProperties -> com.android.tools.r8.utils.b1:
     com.android.tools.r8.utils.VersionProperties INSTANCE -> c
     java.lang.String sha -> a
     java.lang.String releaser -> b
@@ -61390,7 +61684,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.ZipUtils -> com.android.tools.r8.utils.W0:
+com.android.tools.r8.utils.ZipUtils -> com.android.tools.r8.utils.c1:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():37:37 -> <clinit>
     boolean lambda$unzip$1(java.util.zip.ZipEntry) -> a
@@ -61414,5 +61708,5 @@
     84:96:void writeToZipStream(java.util.zip.ZipOutputStream,java.lang.String,com.android.tools.r8.ByteDataView,int):127:139 -> a
     97:104:boolean isClassFile(java.lang.String):148:155 -> a
     1:2:boolean isDexFile(java.lang.String):143:144 -> b
-com.android.tools.r8.utils.ZipUtils$OnEntryHandler -> com.android.tools.r8.utils.W0$a:
+com.android.tools.r8.utils.ZipUtils$OnEntryHandler -> com.android.tools.r8.utils.c1$a:
     void onEntry(java.util.zip.ZipEntry,java.io.InputStream) -> a